feat: snapshot in docker container when the local tools are not avail…

…able
NativeScript · Sep 18, 2019 · 6861d22 · 6861d22
1 parent 561c597
commit 6861d22
Show file tree

Hide file tree

Showing 10 changed files with 301 additions and 82 deletions.
diff --git a/plugins/NativeScriptSnapshotPlugin/index.js b/plugins/NativeScriptSnapshotPlugin/index.js
@@ -113,6 +113,7 @@ exports.NativeScriptSnapshotPlugin = (function () {
             useLibs: options.useLibs,
             androidNdkPath: options.androidNdkPath,
             v8Version: options.v8Version,
+            snapshotInDocker: options.snapshotInDocker
         }).then(() => {
             // Make the original files empty
             inputFiles.forEach(inputFile =>

diff --git a/plugins/NativeScriptSnapshotPlugin/options.json b/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,9 @@
       "type": "boolean",
       "default": false
     },
+    "snapshotInDocker": {
+      "type": "boolean"
+    },
     "v8Version": {
       "type": "string"
     },
@@ -56,4 +59,4 @@
     "webpackConfig"
   ],
   "additionalProperties": false
-}
+}
diff --git a/snapshot/android/project-snapshot-generator-cli-ags-parser.js b/snapshot/android/project-snapshot-generator-cli-ags-parser.js
@@ -9,6 +9,10 @@ module.exports = function parseProjectSnapshotGeneratorArgs() {
         result.useLibs = parseBool(result.useLibs);
     }
 
+    if (result.snapshotInDocker !== undefined) {
+        result.snapshotInDocker = parseBool(result.snapshotInDocker);
+    }
+
     if (result.install !== undefined) {
         result.install = parseBool(result.install);
     }
@@ -22,7 +26,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 --git a/snapshot/android/project-snapshot-generator.js b/snapshot/android/project-snapshot-generator.js
@@ -114,7 +114,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 +172,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 +186,7 @@ ProjectSnapshotGenerator.prototype.getV8Version = function (generationOptions) {
                         const version = findV8Version(runtimeVersion, latestVersionsMap)
                         return resolve(version);
                     })
-                    .catch(reject);
+                        .catch(reject);
                 } else {
                     return resolve(v8Version);
                 }
@@ -254,7 +256,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(() => {