Merge pull request #1048 from NativeScript/tachev/snapshot-in-docker

feat: support snapshots in Docker

Author: Dimitar Tachev

Diff for: plugins/NativeScriptSnapshotPlugin/index.js

@@ -97,6 +97,11 @@ exports.NativeScriptSnapshotPlugin = (function () {
 
     NativeScriptSnapshotPlugin.prototype.generate = function (webpackChunks) {
         const options = this.options;
+        if (options.skipSnapshotTools) {
+            console.log(`Skipping snapshot tools.`);
+            return Promise.resolve();
+        }
+
         const inputFiles = webpackChunks.map(chunk => join(options.webpackConfig.output.path, chunk.files[0]));
         const preprocessedInputFile = join(
             this.options.projectRoot,
@@ -113,6 +118,8 @@ exports.NativeScriptSnapshotPlugin = (function () {
             useLibs: options.useLibs,
             androidNdkPath: options.androidNdkPath,
             v8Version: options.v8Version,
+            snapshotInDocker: options.snapshotInDocker,
+            skipSnapshotTools: options.skipSnapshotTools
         }).then(() => {
             // Make the original files empty
             inputFiles.forEach(inputFile =>

Diff for: plugins/NativeScriptSnapshotPlugin/options.json

@@ -5,8 +5,8 @@
       "type": "string"
     },
     "angular": {
-        "type": "boolean",
-        "default": false
+      "type": "boolean",
+      "default": false
     },
     "chunk": {
       "type": "string"
@@ -39,6 +39,13 @@
       "type": "boolean",
       "default": false
     },
+    "snapshotInDocker": {
+      "type": "boolean"
+    },
+    "skipSnapshotTools": {
+      "type": "boolean",
+      "default": false
+    },
     "v8Version": {
       "type": "string"
     },
@@ -56,4 +63,4 @@
     "webpackConfig"
   ],
   "additionalProperties": false
-}
+}

Diff for: snapshot/android/project-snapshot-generator-cli-ags-parser.js

@@ -9,6 +9,14 @@ module.exports = function parseProjectSnapshotGeneratorArgs() {
         result.useLibs = parseBool(result.useLibs);
     }
 
+    if (result.snapshotInDocker !== undefined) {
+        result.snapshotInDocker = parseBool(result.snapshotInDocker);
+    }
+
+    if (result.skipSnapshotTools !== undefined) {
+        result.skipSnapshotTools = parseBool(result.skipSnapshotTools);
+    }
+
     if (result.install !== undefined) {
         result.install = parseBool(result.install);
     }
@@ -22,7 +30,7 @@ function parseJsonFromProcessArgs() {
 
     var currentKey = "";
     var currentValue = "";
-    args.forEach(function(value, index, array) {
+    args.forEach(function (value, index, array) {
         if (value.startsWith("--")) { // if is key
             addKeyAndValueToResult(currentKey, currentValue, result);
             currentKey = value.slice(2);

Diff for: snapshot/android/project-snapshot-generator.js

@@ -10,7 +10,6 @@ const {
     createDirectory,
     getJsonFile,
 } = require("./utils");
-const { getPackageJson } = require("../../projectHelpers");
 const {
     ANDROID_PROJECT_DIR,
     ANDROID_APP_PATH,
@@ -114,7 +113,9 @@ ProjectSnapshotGenerator.installSnapshotArtefacts = function (projectRoot) {
         shelljs.cp("-R", blobsSrcPath + "/", resolve(appPath, "../snapshots"));
 
         /*
-        Rename TNSSnapshot.blob files to snapshot.blob files. The xxd tool uses the file name for the name of the static array. This is why the *.blob files are initially named  TNSSnapshot.blob. After the xxd step, they must be renamed to snapshot.blob, because this is the filename that the Android runtime is looking for.
+        Rename TNSSnapshot.blob files to snapshot.blob files. The xxd tool uses the file name for the name of the static array. 
+        This is why the *.blob files are initially named  TNSSnapshot.blob. 
+        After the xxd step, they must be renamed to snapshot.blob, because this is the filename that the Android runtime is looking for.
         */
         shelljs.exec("find " + blobsDestinationPath + " -name '*.blob' -execdir mv {} snapshot.blob ';'");
 
@@ -170,7 +171,7 @@ ProjectSnapshotGenerator.prototype.getV8Version = function (generationOptions) {
 
         // try to get the V8 Version from the settings.json file in android runtime folder
         const runtimeV8Version = getAndroidV8Version(this.options.projectRoot);
-        if(runtimeV8Version) {
+        if (runtimeV8Version) {
             return resolve(runtimeV8Version);
         }
 
@@ -184,7 +185,7 @@ ProjectSnapshotGenerator.prototype.getV8Version = function (generationOptions) {
                         const version = findV8Version(runtimeVersion, latestVersionsMap)
                         return resolve(version);
                     })
-                    .catch(reject);
+                        .catch(reject);
                 } else {
                     return resolve(v8Version);
                 }
@@ -209,6 +210,11 @@ ProjectSnapshotGenerator.prototype.validateAndroidRuntimeVersion = function () {
 }
 
 ProjectSnapshotGenerator.prototype.generate = function (generationOptions) {
+    if (generationOptions.skipSnapshotTools) {
+        console.log("Skipping snapshot tools.");
+        return Promise.resolve();
+    }
+
     generationOptions = generationOptions || {};
 
     console.log("Running snapshot generation with the following arguments: ");
@@ -254,7 +260,8 @@ ProjectSnapshotGenerator.prototype.generate = function (generationOptions) {
             useLibs: generationOptions.useLibs || false,
             inputFiles: generationOptions.inputFiles || [join(this.options.projectRoot, "__snapshot.js")],
             androidNdkPath,
-            mksnapshotParams: mksnapshotParams
+            mksnapshotParams: mksnapshotParams,
+            snapshotInDocker: generationOptions.snapshotInDocker
         };
 
         return generator.generate(options).then(() => {