@akylas/nativescript-cli 8.7.2 → 8.8.2

package/lib/services/project-changes-service.js

@@ -37,10 +37,11 @@ class ProjectChangesInfo {
     }
 }
 class ProjectChangesService {
-    constructor($devicePlatformsConstants, $fs, $logger, $hooksService, $nodeModulesDependenciesBuilder) {
+    constructor($devicePlatformsConstants, $fs, $logger, $options, $hooksService, $nodeModulesDependenciesBuilder) {
         this.$devicePlatformsConstants = $devicePlatformsConstants;
         this.$fs = $fs;
         this.$logger = $logger;
+        this.$options = $options;
         this.$hooksService = $hooksService;
         this.$nodeModulesDependenciesBuilder = $nodeModulesDependenciesBuilder;
     }
@@ -130,6 +131,9 @@ class ProjectChangesService {
         return prepareInfoFilePath;
     }
     getPrepareInfo(platformData) {
+        if (this.$options.hostProjectPath) {
+            return null;
+        }
         const prepareInfoFilePath = this.getPrepareInfoFilePath(platformData);
         let prepareInfo = null;
         if (this.$fs.exists(prepareInfoFilePath)) {
@@ -147,6 +151,9 @@ class ProjectChangesService {
             if (!this._prepareInfo) {
                 yield this.ensurePrepareInfo(platformData, projectData, prepareData);
             }
+            if (this.$options.hostProjectPath) {
+                return null;
+            }
             const prepareInfoFilePath = this.getPrepareInfoFilePath(platformData);
             this.$fs.writeJson(prepareInfoFilePath, this._prepareInfo);
         });

package/lib/services/project-config-service.js

@@ -195,7 +195,7 @@ export default {
                     singleQuote: true,
                 };
                 this.$logger.trace("updating config, prettier options: ", prettierOptions);
-                this.$fs.writeFile(configFilePath, (0, prettier_1.format)(newContent, Object.assign(Object.assign({}, prettierOptions), { parser: "typescript" })));
+                this.$fs.writeFile(configFilePath, (0, prettier_1.format)(newContent, Object.assign(Object.assign({}, prettierOptions), { parser: "typescript", plugins: [] })));
             }
             catch (error) {
                 this.$logger.error(`Failed to update config.` + error);

package/lib/services/project-data-service.js

@@ -368,28 +368,22 @@ class ProjectDataService {
         return this.getInstalledRuntimePackage(projectDir, platform);
     }
     getInstalledRuntimePackage(projectDir, platform) {
-        var _a, _b;
+        var _a, _b, _c, _d;
+        console.log('getInstalledRuntimePackage');
+        let packageName = [];
+        if (platform === "ios") {
+            packageName.push((_a = this.$projectData.nsConfig.ios) === null || _a === void 0 ? void 0 : _a.runtimePackageName, constants.SCOPED_IOS_RUNTIME_NAME, constants.TNS_IOS_RUNTIME_NAME);
+        }
+        else if (platform === "android") {
+            packageName.push((_b = this.$projectData.nsConfig.android) === null || _b === void 0 ? void 0 : _b.runtimePackageName, constants.SCOPED_ANDROID_RUNTIME_NAME, constants.TNS_IOS_RUNTIME_NAME);
+        }
+        else if (platform === "visionos") {
+            packageName.push(constants.SCOPED_VISIONOS_RUNTIME_NAME);
+        }
         const runtimePackage = this.$pluginsService
             .getDependenciesFromPackageJson(projectDir)
             .devDependencies.find((d) => {
-            var _a, _b;
-            if (platform === "ios") {
-                const packageName = ((_a = this.$projectData.nsConfig.ios) === null || _a === void 0 ? void 0 : _a.runtimePackageName) || constants.SCOPED_IOS_RUNTIME_NAME;
-                return [
-                    packageName,
-                    constants.TNS_IOS_RUNTIME_NAME,
-                ].includes(d.name);
-            }
-            else if (platform === "android") {
-                const packageName = ((_b = this.$projectData.nsConfig.android) === null || _b === void 0 ? void 0 : _b.runtimePackageName) || constants.SCOPED_ANDROID_RUNTIME_NAME;
-                return [
-                    packageName,
-                    constants.TNS_ANDROID_RUNTIME_NAME,
-                ].includes(d.name);
-            }
-            else if (platform === "visionos") {
-                return d.name === constants.SCOPED_VISIONOS_RUNTIME_NAME;
-            }
+            return packageName.includes(d.name);
         });
         if (runtimePackage) {
             const coerced = semver.coerce(runtimePackage.version);
@@ -420,13 +414,13 @@ class ProjectDataService {
         this.$logger.trace("Could not find an installed runtime, falling back to default runtimes");
         if (platform === "ios") {
             return {
-                name: ((_a = this.$projectData.nsConfig.ios) === null || _a === void 0 ? void 0 : _a.runtimePackageName) || constants.SCOPED_IOS_RUNTIME_NAME,
+                name: ((_c = this.$projectData.nsConfig.ios) === null || _c === void 0 ? void 0 : _c.runtimePackageName) || constants.SCOPED_IOS_RUNTIME_NAME,
                 version: null,
             };
         }
         else if (platform === "android") {
             return {
-                name: ((_b = this.$projectData.nsConfig.android) === null || _b === void 0 ? void 0 : _b.runtimePackageName) || constants.SCOPED_ANDROID_RUNTIME_NAME,
+                name: ((_d = this.$projectData.nsConfig.android) === null || _d === void 0 ? void 0 : _d.runtimePackageName) || constants.SCOPED_ANDROID_RUNTIME_NAME,
                 version: null,
             };
         }

package/lib/services/webpack/webpack-compiler-service.js

@@ -94,8 +94,8 @@ class WebpackCompilerService extends events_1.EventEmitter {
                                     hash: "",
                                 };
                             }
-                            const files = result.emittedFiles.map((file) => path.join(platformData.appDestinationDirectoryPath, "app", file));
-                            const fallbackFiles = result.fallbackFiles.map((file) => path.join(platformData.appDestinationDirectoryPath, "app", file));
+                            const files = result.emittedFiles.map((file) => path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, file));
+                            const fallbackFiles = result.fallbackFiles.map((file) => path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, file));
                             const data = {
                                 files,
                                 hasOnlyHotUpdateFiles: files.every((f) => f.indexOf("hot-update") > -1),
@@ -214,10 +214,18 @@ class WebpackCompilerService extends events_1.EventEmitter {
                 args.push("--watch");
             }
             const stdio = prepareData.watch ? ["ipc"] : "inherit";
-            const childProcess = this.$childProcess.spawn(process.execPath, args, {
+            const options = {
                 cwd: projectData.projectDir,
                 stdio,
-            });
+            };
+            if (this.$options.hostProjectPath) {
+                options.env = {
+                    USER_PROJECT_PLATFORMS_ANDROID: this.$options.hostProjectPath,
+                    USER_PROJECT_PLATFORMS_ANDROID_MODULE: this.$options.hostProjectModuleName,
+                    USER_PROJECT_PLATFORMS_IOS: this.$options.hostProjectPath,
+                };
+            }
+            const childProcess = this.$childProcess.spawn(process.execPath, args, options);
             this.webpackProcesses[platformData.platformNameLowerCase] = childProcess;
             yield this.$cleanupService.addKillProcess(childProcess.pid.toString());
             return childProcess;
@@ -338,8 +346,8 @@ class WebpackCompilerService extends events_1.EventEmitter {
             return;
         }
         this.$logger.trace("Webpack build done!");
-        const files = message.data.emittedAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, "app", asset));
-        const staleFiles = message.data.staleAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, "app", asset));
+        const files = message.data.emittedAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, asset));
+        const staleFiles = message.data.staleAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, asset));
         const lastHash = (() => {
             const absoluteFileNameWithLastHash = files.find((fileName) => fileName.endsWith("hot-update.js"));
             if (!absoluteFileNameWithLastHash) {

package/lib/services/xcproj-service.js

@@ -1,11 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
+const fs = require("fs");
 const constants_1 = require("../constants");
 const yok_1 = require("../common/yok");
 class XcprojService {
     getXcodeprojPath(projectData, projectRoot) {
         return path.join(projectRoot, projectData.projectName + constants_1.IosProjectConstants.XcodeProjExtName);
     }
+    findXcodeProject(dir) {
+        const filesAndDirs = fs.readdirSync(dir);
+        for (let i = 0; i < filesAndDirs.length; i++) {
+            const fullPath = path.join(dir, filesAndDirs[i]);
+            if (fs.statSync(fullPath).isDirectory() &&
+                filesAndDirs[i].endsWith(".xcodeproj")) {
+                return fullPath;
+            }
+        }
+        return null;
+    }
 }
 yok_1.injector.register("xcprojService", XcprojService);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akylas/nativescript-cli",
   "main": "./lib/nativescript-cli-lib.js",
-  "version": "8.7.2",
+  "version": "8.8.2",
   "author": "NativeScript <support@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
@@ -55,7 +55,7 @@
     "mobile"
   ],
   "dependencies": {
-    "@nativescript/doctor": "2.0.14",
+    "@nativescript/doctor": "2.0.15",
     "@nativescript/schematics-executor": "0.0.2",
     "@npmcli/arborist": "^7.2.0",
     "@npmcli/move-file": "^2.0.0",
@@ -86,7 +86,7 @@
     "minimatch": "7.4.2",
     "mkdirp": "2.1.6",
     "mute-stream": "1.0.0",
-    "nativescript-dev-xcode": "0.7.0",
+    "nativescript-dev-xcode": "0.8.0",
     "open": "8.4.2",
     "ora": "5.4.1",
     "pacote": "15.1.1",

package/vendor/aab-tool/README.txt

@@ -1 +1 @@
-Downloaded from https://github.com/google/bundletool/releases/tag/1.8.2
+Downloaded from https://github.com/google/bundletool/releases/tag/1.15.6

package/vendor/gradle-app/app/build.gradle

@@ -86,8 +86,8 @@ def pluginsJarLibraries = new LinkedList<String>()
 def allJarLibraries = new LinkedList<String>()
 
 def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "${ns_default_kotlin_version}" }
-def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int }
-def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int }
+def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk as int : NS_DEFAULT_COMPILE_SDK_VERSION as int }
+def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk as int : NS_DEFAULT_COMPILE_SDK_VERSION as int }
 def computeBuildToolsVersion = { ->
     project.hasProperty("buildToolsVersion") ? buildToolsVersion : NS_DEFAULT_BUILD_TOOLS_VERSION as String
 }
@@ -401,7 +401,11 @@ dependencies {
 
 task addDependenciesFromNativeScriptPlugins {
     nativescriptDependencies.each { dep ->
-        def aarFiles = fileTree(dir: file("$rootDir/${dep.directory}/$PLATFORMS_ANDROID"), include: ["**/*.aar"])
+        def aarFiles = fileTree(dir: file("$rootDir/${dep.directory}/$PLATFORMS_ANDROID")).matching {
+            include "**/*.aar"
+            exclude "cpp/**"
+            exclude project.hasProperty("aarIgnoreFilter") ? project.findProperty('aarIgnoreFilter').split(',').collect{it as String} : []
+        }
         aarFiles.each { aarFile ->
             def length = aarFile.name.length() - 4
             def fileName = aarFile.name[0..<length]
@@ -409,7 +413,11 @@ task addDependenciesFromNativeScriptPlugins {
             project.dependencies.add("implementation", [name: fileName, ext: "aar"])
         }
 
-        def jarFiles = fileTree(dir: file("$rootDir/${dep.directory}/$PLATFORMS_ANDROID"), include: ["**/*.jar"])
+        def jarFiles = fileTree(dir: file("$rootDir/${dep.directory}/$PLATFORMS_ANDROID")).matching {
+            include "**/*.jar"
+            exclude "cpp/**"
+            exclude project.hasProperty("jarIgnoreFilter") ? project.findProperty('jarIgnoreFilter').split(',').collect{it as String} : []
+        }
         jarFiles.each { jarFile ->
             def jarFileAbsolutePath = jarFile.getAbsolutePath()
             outLogger.withStyle(Style.SuccessHeader).println "\t + adding jar plugin dependency: $jarFileAbsolutePath"

package/vendor/gradle-plugin/build.gradle

@@ -284,8 +284,8 @@ android {
         }
     }
 
-    def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? project.compileSdk : 31 }
-    def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? project.targetSdk : 31 as int }
+    def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? project.compileSdk as int : 31 }
+    def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? project.targetSdk as int : 31 as int }
     def computeBuildToolsVersion = { ->
         project.hasProperty("buildToolsVersion") ? project.buildToolsVersion : "31.0.0"
     }
@@ -317,7 +317,11 @@ android {
 
 task addDependenciesFromNativeScriptPlugins {
     nativescriptDependencies.each { dep ->
-        def aarFiles = fileTree(dir: getDepPlatformDir(dep), include: ["**/*.aar"])
+        def aarFiles = fileTree(dir: getDepPlatformDir(dep)).matching {
+            include "**/*.aar"
+            exclude "cpp/**"
+            exclude project.hasProperty("aarIgnoreFilter") ? project.findProperty('aarIgnoreFilter').split(',').collect{it as String} : []
+        }
         def currentDirname = file(project.buildscript.sourceFile).getParentFile().getName()
         aarFiles.each { aarFile ->
             def length = aarFile.name.length() - 4
@@ -329,7 +333,11 @@ task addDependenciesFromNativeScriptPlugins {
             project.dependencies.add("implementation", [name: fileName, ext: "aar"])
         }
 
-        def jarFiles = fileTree(dir: getDepPlatformDir(dep), include: ["*.jar"])
+        def jarFiles = fileTree(dir: getDepPlatformDir(dep)).matching {
+            include "**/*.jar"
+            exclude "cpp/**"
+            exclude project.hasProperty("jarIgnoreFilter") ? project.findProperty('jarIgnoreFilter').split(',').collect{it as String} : []
+        }
         jarFiles.each { jarFile ->
             def jarFileAbsolutePath = jarFile.getAbsolutePath()
             outLogger.withStyle(Style.SuccessHeader).println "\t + adding jar plugin dependency: $jarFileAbsolutePath"