refactor: use global.loadModule for Angular only and require.context for

non-ng apps

Author: sis0k0

bundle-config-loader.js

@@ -1,8 +1,8 @@
 module.exports = function(source) {
     this.cacheable();
-    const { registerPages = true, loadCss = true } = this.query;
+    const { angular = false, loadCss = true } = this.query;
 
-    if (registerPages) {
+    if (!angular) {
         source = `
             require("nativescript-dev-webpack/register-modules");
             ${source}
@@ -11,7 +11,7 @@ module.exports = function(source) {
 
     if (loadCss) {
         source = `
-            require("nativescript-dev-webpack/load-application-css");
+            require("nativescript-dev-webpack/load-application-css")(${angular});
             ${source}
         `;
     }

load-application-css.js

@@ -1,9 +1,14 @@
-const application = require("tns-core-modules/application");
-require("tns-core-modules/ui/styling/style-scope");
+module.exports = function(isAngular) {
+    const application = require("tns-core-modules/application");
+    require("tns-core-modules/ui/styling/style-scope");
 
-global.registerModule("./app.css", () => require("~/app"));
-const appCssContext = require.context("~/", false, /^\.\/app\.(css|scss|less|sass)$/);
-global.registerWebpackModules(appCssContext);
+    if (isAngular) {
+        global.registerModule("./app.css", () => require("~/app"));
+    } else {
+        const appCssContext = require.context("~/", false, /^\.\/app\.(css|scss|less|sass)$/);
+        global.registerWebpackModules(appCssContext);
+    }
 
-application.loadAppCss();
+    application.loadAppCss();
+}
 

plugins/NativeScriptSnapshotPlugin/index.js

@@ -45,7 +45,7 @@ exports.NativeScriptSnapshotPlugin = (function() {
 
         let snapshotEntryContent = "";
         if (includeApplicationCss) {
-            snapshotEntryContent += `require("nativescript-dev-webpack/load-application-css");`;
+            snapshotEntryContent += `require("nativescript-dev-webpack/load-application-css")(${options.angular});`;
         }
         snapshotEntryContent += [ ...requireModules, ...internalRequireModules]
             .map(mod => `require('${mod}')`).join(";");
@@ -155,3 +155,4 @@ exports.NativeScriptSnapshotPlugin = (function() {
 
     return NativeScriptSnapshotPlugin;
 })();
+

plugins/NativeScriptSnapshotPlugin/options.json

@@ -4,6 +4,10 @@
     "androidNdkPath": {
       "type": "string"
     },
+    "angular": {
+        "type": "boolean",
+        "default": false
+    },
     "chunk": {
       "type": "string"
     },