chore: update ns-webpack to next (#255)

Author: sis0k0

app/vendor-platform.android.ts

@@ -1,25 +1,12 @@
-// Resolve JavaScript classes that extend a Java class, and need to resolve
-// their JavaScript module from a bundled script. For example:
-// NativeScriptApplication, NativeScriptActivity, etc.
-//
-// This module gets bundled together with the rest of the app code and the
-// `require` calls get resolved to the correct bundling import call.
-//
-// At runtime the module gets loaded *before* the rest of the app code, so code
-// placed here needs to be careful about its dependencies.
-
 require("application");
-require("ui/frame");
-require("ui/frame/activity");
 
-if (global.TNS_WEBPACK) {
-    global.__requireOverride = function (name, dir) {
-        if (name === "./tns_modules/application/application.js") {
-            return require("application");
-        } else if (name === "./tns_modules/ui/frame/frame.js") {
-            return require("ui/frame");
-        } else if (name === "./tns_modules/ui/frame/activity.js") {
-            return require("ui/frame/activity");
-        }
-    };
+if (!global["__snapshot"]) {
+    // In case snapshot generation is enabled these modules will get into the bundle
+    // but will not be required/evaluated.
+    // The snapshot webpack plugin will add them to the tns-java-classes.js bundle file.
+    // This way, they will be evaluated on app start as early as possible.
+
+    require("ui/frame");
+    require("ui/frame/activity");
 }
+

package.json

@@ -27,11 +27,12 @@
   "scripts": {
     "tslint": "tslint -p tsconfig.json",
     "ns-bundle": "ns-bundle",
-    "start-android-bundle": "npm run ns-bundle --android --start-app",
-    "start-ios-bundle": "npm run ns-bundle --ios --start-app",
+    "publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
+    "start-android-bundle": "npm run ns-bundle --android --run-app",
+    "start-ios-bundle": "npm run ns-bundle --ios --run-app",
     "build-android-bundle": "npm run ns-bundle --android --build-app",
     "build-ios-bundle": "npm run ns-bundle --ios --build-app",
-    "publish-ios-bundle": "npm run ns-bundle --ios --publish-app"
+    "generate-android-snapshot": "generate-android-snapshot --projectRoot . --targetArchs arm,arm64 --install"
   },
   "dependencies": {
     "@angular/common": "~4.1.3",
@@ -68,12 +69,12 @@
     "lazy": "1.0.11",
     "nativescript-css-loader": "~0.26.0",
     "nativescript-dev-typescript": "^0.4.5",
-    "nativescript-dev-webpack": "^0.6.1",
+    "nativescript-dev-webpack": "next",
     "raw-loader": "~0.5.1",
     "resolve-url-loader": "~2.0.2",
     "tslint": "^5.4.2",
-    "typescript": "^2.3.4",
-    "webpack": "^2.6.1",
-    "webpack-sources": "^1.0.1"
+    "typescript": "~2.3.4",
+    "webpack": "~2.6.1",
+    "webpack-sources": "~1.0.1"
   }
-}
+}

webpack.config.js

@@ -31,7 +31,7 @@ module.exports = env => {
     const plugins = getPlugins(platform, env);
     const extensions = getExtensions(platform);
 
-    return {
+    const config = {
         context: resolve("./app"),
         target: nativescriptTarget,
         entry,
@@ -60,6 +60,19 @@ module.exports = env => {
         module: { rules },
         plugins,
     };
+
+    if (env.snapshot) {
+        plugins.push(new nsWebpack.NativeScriptSnapshotPlugin({
+            chunk: "vendor",
+            projectRoot: __dirname,
+            webpackConfig: config,
+            targetArchs: ["arm", "arm64"],
+            tnsJavaClassesOptions: { packages: ["tns-core-modules" ] },
+            useLibs: false
+        }));
+    }
+
+    return config;
 };