fix snapshots

Author: Plamen5kov

index.js

@@ -1,8 +1,7 @@
 const path = require("path");
 const { existsSync } = require("fs");
-const semver = require("semver");
 
-const { getPackageJson, getProjectDir, isAngular, getAndroidRuntimeVersion } = require("./projectHelpers");
+const { getPackageJson, getProjectDir, isAngular, resolveAndroidAppPath } = require("./projectHelpers");
 
 const PROJECT_DIR = getProjectDir({ nestingLvl: 2 });
 const APP_DIR = path.join(PROJECT_DIR, "app");
@@ -32,16 +31,7 @@ exports.getAppPath = platform => {
 
         return `platforms/ios/${sanitizedName}/app`;
     } else if (/android/i.test(platform)) {
-        const androidPackageVersion = getAndroidRuntimeVersion(PROJECT_DIR);
-        const RESOURCES_PATH = "src/main/assets/app";
-        const PROJECT_ROOT_PATH = "platforms/android";
-
-        const normalizedPlatformVersion = `${semver.major(androidPackageVersion)}.${semver.minor(androidPackageVersion)}.0`;
-        const appPath = semver.lt(normalizedPlatformVersion, "3.4.0") ?
-            path.join(PROJECT_ROOT_PATH, RESOURCES_PATH) :
-            path.join(PROJECT_ROOT_PATH, "app", RESOURCES_PATH);
-
-        return path.join(PROJECT_DIR, appPath);
+        return resolveAndroidAppPath(PROJECT_DIR);
     } else {
         throw new Error(`Invalid platform: ${platform}`);
     }

plugins/NativeScriptSnapshotPlugin.js

@@ -2,6 +2,7 @@ const { resolve, join } = require("path");
 const { closeSync, openSync } = require("fs");
 
 const ProjectSnapshotGenerator = require("../snapshot/android/project-snapshot-generator");
+const { resolveAndroidAppPath } = require("../projectHelpers");
 
 exports.NativeScriptSnapshotPlugin = (function() {
     function NativeScriptSnapshotPlugin(options) {
@@ -43,16 +44,16 @@ exports.NativeScriptSnapshotPlugin = (function() {
 
         console.log(`\n Snapshotting bundle at ${inputFile}`);
 
-        const preparedAppRootPath = join(options.projectRoot, "platforms/android/src/main/assets");
-        const preprocessedInputFile = join(preparedAppRootPath, "app/_embedded_script_.js");
+        const preparedAppRootPath = resolveAndroidAppPath(this.options.projectRoot);
+        const preprocessedInputFile = join(preparedAppRootPath, "_embedded_script_.js");
 
         return ProjectSnapshotGenerator.prototype.generate.call(this, {
             inputFile,
             preprocessedInputFile,
             targetArchs: options.targetArchs,
             useLibs: options.useLibs,
             androidNdkPath: options.androidNdkPath,
-            tnsJavaClassesPath: join(preparedAppRootPath, "app/tns-java-classes.js")
+            tnsJavaClassesPath: join(preparedAppRootPath, "tns-java-classes.js")
         }).then(() => {
             // Make the original file empty
             if (inputFile !== preprocessedInputFile) {

projectHelpers.js

@@ -1,5 +1,6 @@
 const path = require("path");
 const fs = require("fs");
+const semver = require("semver");
 
 const isTypeScript = ({ projectDir, packageJson } = {}) => {
     packageJson = packageJson || getPackageJson(projectDir);
@@ -63,6 +64,19 @@ const getProjectDir = ({ nestingLvl } = { nestingLvl: 0 }) => {
             .reduce(dir => path.dirname(dir), __dirname);
 };
 
+const resolveAndroidAppPath = (projectDir) => {
+    const androidPackageVersion = getAndroidRuntimeVersion(projectDir);
+    const RESOURCES_PATH = "src/main/assets/app";
+    const PROJECT_ROOT_PATH = "platforms/android";
+
+    const normalizedPlatformVersion = `${semver.major(androidPackageVersion)}.${semver.minor(androidPackageVersion)}.0`;
+    const appPath = semver.lt(normalizedPlatformVersion, "3.4.0") ?
+        path.join(PROJECT_ROOT_PATH, RESOURCES_PATH) :
+        path.join(PROJECT_ROOT_PATH, "app", RESOURCES_PATH);
+
+    return path.join(projectDir, appPath);
+};
+
 const getPackageJsonPath = projectDir => path.resolve(projectDir, "package.json");
 
 module.exports = {
@@ -72,4 +86,5 @@ module.exports = {
     getPackageJson,
     getProjectDir,
     getAndroidRuntimeVersion,
+    resolveAndroidAppPath,
 };

snapshot/android/project-snapshot-generator.js

@@ -6,6 +6,8 @@ const semver = require("semver");
 
 const SnapshotGenerator = require("./snapshot-generator");
 const TnsJavaClassesGenerator = require("./tns-java-classes-generator");
+const { resolveAndroidAppPath } = require("../../projectHelpers");
+
 const {
     CONSTANTS,
     createDirectory,
@@ -27,7 +29,6 @@ const resolveRelativePath = (path) => {
 
 function ProjectSnapshotGenerator(options) {
     this.options = options = options || {};
-
     options.projectRoot = resolveRelativePath(options.projectRoot) || process.cwd();
 
     console.log("Project root: " + options.projectRoot);
@@ -58,7 +59,8 @@ ProjectSnapshotGenerator.cleanSnapshotArtefacts = function (projectRoot) {
 ProjectSnapshotGenerator.installSnapshotArtefacts = function (projectRoot) {
     const buildPath = ProjectSnapshotGenerator.calculateBuildPath(projectRoot);
     const platformPath = join(projectRoot, "platforms/android");
-    const assetsPath = join(platformPath, "src/main/assets");
+
+    const appPath = resolveAndroidAppPath(projectRoot);
     const configDestinationPath = join(platformPath, "configurations", SnapshotGenerator.SNAPSHOT_PACKAGE_NANE);
 
     // Remove build folder to make sure that the apk will be fully rebuild
@@ -70,7 +72,7 @@ ProjectSnapshotGenerator.installSnapshotArtefacts = function (projectRoot) {
 
     // Copy tns-java-classes.js
     if (shelljs.test("-e", join(buildPath, "tns-java-classes.js"))) {
-        shelljs.cp(join(buildPath, "tns-java-classes.js"), join(assetsPath, "app/tns-java-classes.js"));
+        shelljs.cp(join(buildPath, "tns-java-classes.js"), join(appPath, "tns-java-classes.js"));
     }
 
     if (shelljs.test("-e", join(buildPath, "ndk-build/libs"))) {
@@ -84,11 +86,11 @@ ProjectSnapshotGenerator.installSnapshotArtefacts = function (projectRoot) {
     else {
         // useLibs = false
         const blobsSrcPath = join(buildPath, "snapshots/blobs");
-        const blobsDestinationPath = join(assetsPath, "snapshots");
-        const appPackageJsonPath = join(assetsPath, "app/package.json");
+        const blobsDestinationPath = resolve(appPath, "../snapshots");
+        const appPackageJsonPath = join(appPath, "package.json");
 
         // Copy the blobs in the prepared app folder
-        shelljs.cp("-R", blobsSrcPath + "/", join(assetsPath, "snapshots"));
+        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.
@@ -146,7 +148,7 @@ ProjectSnapshotGenerator.prototype.getV8Version = function (generationOptions) {
             return resolve(maybeV8Version);
         }
 
-        const runtimeVersion = this.getAndroidRuntimeVersion(this.options.projectRoot);
+        const runtimeVersion = getAndroidRuntimeVersion(this.options.projectRoot);
         getV8VersionsMap(runtimeVersion)
             .then(({ versionsMap, latest }) => {
                 const v8Version = findV8Version(runtimeVersion, versionsMap);