Merge pull request #15 from YashdalfTheGray/master

Releasing v2.0.1
YashdalfTheGray · Jun 10, 2019 · f0a9c95 · f0a9c95
2 parents 1a9ebd5 + c5c5b63
commit f0a9c95
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,10 @@
 language: node_js
 
+os:
+  - linux
+  - osx
+  - windows
+
 node_js:
   - 'node'
   - '12'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v2.0.1](https://github.com/YashdalfTheGray/auto-ngtemplate-loader/tree/v2.0.1) (2019-06-09)
+
+### Fixed
+
+- `templateUrl` detection on Windows ([#14](https://github.com/YashdalfTheGray/auto-ngtemplate-loader/issues/14))
+
 ## [v2.0.0](https://github.com/YashdalfTheGray/auto-ngtemplate-loader/tree/v2.0.0) (2019-06-07)
 
 ### Breaking

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "auto-ngtemplate-loader",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Auto require AngularJS 1.x templates in Webpack style",
   "main": "index.js",
   "repository": "https://github.com/yashdalfthegray/auto-ngtemplate-loader",

diff --git a/src/util.js b/src/util.js
@@ -1,7 +1,7 @@
 const { urlToRequest } = require('loader-utils');
 
 function replaceTemplateUrl(variableName, lines, resolver) {
-  const regEx = /(^\s*templateUrl:\s*)['"](.*)['"](,*)$/;
+  const regEx = /(^\s*templateUrl:\s*)['"](.*)['"](,*)(\s*)$/;
   const lineNumbers = lines.reduce(
     (result, line, i) => (/templateUrl/.test(line) ? result.concat(i) : result),
     []