fix: stop searching for snapshot artefacts when the snapshot tools are skipped (it's a cloud build, there aren't any snapshot artefacts locally)

DimitarTachev · DimitarTachev · commit b8da140f9c7d · 2020-01-27T10:21:03.000+02:00
diff --git a/lib/after-prepare.js b/lib/after-prepare.js
@@ -12,7 +12,12 @@ module.exports = function (hookArgs) {
 		release: hookArgs.prepareData.release
 	};
 
-	if (env.snapshot && shouldSnapshot(shouldSnapshotOptions)) {
+	if (env.snapshot &&
+		shouldSnapshot(shouldSnapshotOptions) &&
+		(!hookArgs.prepareData ||
+			!hookArgs.prepareData.nativePrepare ||
+			!hookArgs.prepareData.nativePrepare.skipNativePrepare)) {
+
 		installSnapshotArtefacts(hookArgs.prepareData.projectDir);
 	}
 }
diff --git a/lib/utils.js b/lib/utils.js
@@ -1,4 +1,6 @@
 const os = require("os");
+const { dirname } = require("path");
+const { existsSync, mkdirSync } = require("fs");
 const { isAndroid } = require("../projectHelpers");
 
 function shouldSnapshot(config) {
@@ -21,9 +23,19 @@ function warn(message) {
     }
 }
 
+function ensureDirectoryExistence(filePath) {
+    var dir = dirname(filePath);
+    if (existsSync(dir)) {
+        return true;
+    }
+    ensureDirectoryExistence(dir);
+    mkdirSync(dir);
+}
+
 module.exports = {
     shouldSnapshot,
     convertToUnixPath,
     isWinOS,
-    warn
+    warn,
+    ensureDirectoryExistence
 };
diff --git a/plugins/NativeScriptSnapshotPlugin/index.js b/plugins/NativeScriptSnapshotPlugin/index.js
@@ -1,5 +1,5 @@
-const { relative, resolve, join, dirname } = require("path");
-const { closeSync, openSync, writeFileSync, existsSync, mkdirSync } = require("fs");
+const { relative, resolve, join } = require("path");
+const { closeSync, openSync, writeFileSync } = require("fs");
 const validateOptions = require("schema-utils");
 
 const ProjectSnapshotGenerator = require("../../snapshot/android/project-snapshot-generator");
@@ -8,6 +8,7 @@ const {
     ANDROID_PROJECT_DIR,
     ANDROID_APP_PATH,
 } = require("../../androidProjectHelpers");
+const { ensureDirectoryExistence } = require("../../lib/utils");
 const schema = require("./options.json");
 
 const SNAPSHOT_ENTRY_NAME = "snapshot-entry";
@@ -69,16 +70,6 @@ exports.NativeScriptSnapshotPlugin = (function () {
         // ensure that the runtime is installed only in the snapshotted chunk
         webpackConfig.optimization.runtimeChunk = { name: SNAPSHOT_ENTRY_NAME };
     }
-
-    function ensureDirectoryExistence(filePath) {
-        var dir = dirname(filePath);
-        if (existsSync(dir)) {
-            return true;
-        }
-        ensureDirectoryExistence(dir);
-        mkdirSync(dir);
-    }
-
     NativeScriptSnapshotPlugin.getInternalRequireModules = function (webpackContext) {
         const packageJson = getPackageJson(webpackContext);
         return (packageJson && packageJson["android"] && packageJson["android"]["requireModules"]) || [];

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,12 @@ module.exports = function (hookArgs) {`
`12`	`12`	`release: hookArgs.prepareData.release`
`13`	`13`	`};`
`14`	`14`
`15`		`- if (env.snapshot && shouldSnapshot(shouldSnapshotOptions)) {`
	`15`	`+ if (env.snapshot &&`
	`16`	`+ shouldSnapshot(shouldSnapshotOptions) &&`
	`17`	`+ (!hookArgs.prepareData \|\|`
	`18`	`+ !hookArgs.prepareData.nativePrepare \|\|`
	`19`	`+ !hookArgs.prepareData.nativePrepare.skipNativePrepare)) {`
	`20`	`+`
`16`	`21`	`installSnapshotArtefacts(hookArgs.prepareData.projectDir);`
`17`	`22`	`}`
`18`	`23`	`}`