fix: run tns-xml-loader before @ngtools loader (#66)

This is needed due to changes in the behaviour of `@ngtools/webpack` v1.2.4 fixes #64
NativeScript · Feb 8, 2017 · 325cb90 · 325cb90
1 parent 8426b33
commit 325cb90
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/tns-xml-loader.js b/tns-xml-loader.js
@@ -61,7 +61,10 @@ function getTemplateSource(path, source) {
         return source;
     } else if (isComponent(path)) {
         const templateMatcher = /template\s*:\s*([`'"])((.|\n)*?)\1/;
-        return templateMatcher.test(source) ? source.replace(templateMatcher, "$2") : "";
+        let match = templateMatcher.exec(source);
+
+        return match ? match[2] : "";
+
     } else {
         throw new Error(`The NativeScript XML loader must be used with HTML, XML or TypeScript files`);
     }

diff --git a/webpack.common.js.angular.template b/webpack.common.js.angular.template
@@ -135,9 +135,9 @@ module.exports = function (platform, destinationApp) {
                 {
                     test: /\.ts$/,
                     loaders: [
-                        "nativescript-dev-webpack/tns-xml-loader",
                         "nativescript-dev-webpack/tns-aot-loader",
                         "@ngtools/webpack",
+                        "nativescript-dev-webpack/tns-xml-loader",
                     ]
                 },
                 // SASS support