nativescript 9.1.0-alpha.0 → 9.1.0-alpha.2

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

@@ -11,7 +11,6 @@ class PlatformsDataService {
             ios: $iOSProjectService,
             android: $androidProjectService,
             visionos: $iOSProjectService,
-            macos: $iOSProjectService,
         };
     }
     getPlatformData(platform, projectData) {

package/lib/services/plugins-service.js

@@ -109,16 +109,15 @@ class PluginsService {
     async preparePluginNativeCode({ pluginData, platform, projectData, }) {
         const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
         const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(platform);
-        const pluginNativeFilesPath = this.getPluginNativeFilesPath(pluginData, platform, pluginPlatformsFolderPath);
-        if (pluginNativeFilesPath) {
+        if (this.$fs.exists(pluginPlatformsFolderPath)) {
             const pathToPluginsBuildFile = path.join(platformData.projectRoot, constants.PLUGINS_BUILD_DATA_FILENAME);
             const allPluginsNativeHashes = this.getAllPluginsNativeHashes(pathToPluginsBuildFile);
             const oldPluginNativeHashes = allPluginsNativeHashes[pluginData.name];
-            const currentPluginNativeHashes = await this.getPluginNativeHashes(pluginNativeFilesPath);
+            const currentPluginNativeHashes = await this.getPluginNativeHashes(pluginPlatformsFolderPath);
             if (!oldPluginNativeHashes ||
                 this.$filesHashService.hasChangesInShasums(oldPluginNativeHashes, currentPluginNativeHashes)) {
                 await platformData.platformProjectService.preparePluginNativeCode(pluginData, projectData);
-                const updatedPluginNativeHashes = await this.getPluginNativeHashes(pluginNativeFilesPath);
+                const updatedPluginNativeHashes = await this.getPluginNativeHashes(pluginPlatformsFolderPath);
                 this.setPluginNativeHashes({
                     pathToPluginsBuildFile,
                     pluginData,
@@ -128,20 +127,6 @@ class PluginsService {
             }
         }
     }
-    getPluginNativeFilesPath(pluginData, platform, pluginPlatformsFolderPath) {
-        if (this.$fs.exists(pluginPlatformsFolderPath)) {
-            return pluginPlatformsFolderPath;
-        }
-        if (this.$mobileHelper.ismacOSPlatform(platform)) {
-            const iosSourcePath = path.join(pluginData.pluginPlatformsFolderPath("ios" /* constants.PlatformTypes.ios */), "src");
-            if (this.$fs.exists(iosSourcePath)) {
-                // For macOS, allow iOS native source fallback only.
-                // Binary framework/static library discovery remains strict to `platforms/macos`.
-                return iosSourcePath;
-            }
-        }
-        return null;
-    }
     async ensureAllDependenciesAreInstalled(projectData) {
         const packageJsonContent = this.$fs.readJson(this.getPackageJsonFilePath(projectData.projectDir));
         const allDependencies = _.keys(packageJsonContent.dependencies).concat(_.keys(packageJsonContent.devDependencies));
@@ -435,12 +420,7 @@ This framework comes from ${dependencyName} plugin, which is installed multiple
         const installedFrameworkVersion = this.getInstalledFrameworkVersion(platform, projectData);
         const pluginPlatformsData = pluginData.platformsData;
         if (pluginPlatformsData) {
-            let versionRequiredByPlugin = pluginPlatformsData[platform];
-            if (!versionRequiredByPlugin &&
-                this.$mobileHelper.ismacOSPlatform(platform)) {
-                // Keep macOS compatible with existing iOS plugin declarations.
-                versionRequiredByPlugin = pluginPlatformsData["ios" /* constants.PlatformTypes.ios */];
-            }
+            const versionRequiredByPlugin = pluginPlatformsData[platform];
             if (!versionRequiredByPlugin) {
                 this.$logger.warn(`${pluginData.name} is not supported for ${platform}.`);
                 isValid = false;

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

@@ -44,23 +44,12 @@ class ProjectChangesService {
         const isNewPrepareInfo = await this.ensurePrepareInfo(platformData, projectData, prepareData);
         if (!isNewPrepareInfo) {
             let platformResourcesDir = path.join(projectData.appResourcesDirectoryPath, platformData.normalizedPlatformName);
-            const visionOSPlatformName = this.$devicePlatformsConstants.visionOS &&
-                this.$devicePlatformsConstants.visionOS.toLowerCase();
-            const macOSPlatformName = this.$devicePlatformsConstants.macOS &&
-                this.$devicePlatformsConstants.macOS.toLowerCase();
-            const iOSPlatformName = this.$devicePlatformsConstants.iOS || "iOS";
             if (!this.$fs.exists(platformResourcesDir) &&
-                (platformData.platformNameLowerCase === visionOSPlatformName ||
-                    platformData.platformNameLowerCase === macOSPlatformName)) {
-                platformResourcesDir = path.join(projectData.appResourcesDirectoryPath, iOSPlatformName);
-            }
-            if (this.$fs.exists(platformResourcesDir)) {
-                this._changesInfo.appResourcesChanged = this.containsNewerFiles(platformResourcesDir, projectData);
-            }
-            else {
-                this.$logger.trace(`App resources path does not exist: ${platformResourcesDir}`);
-                this._changesInfo.appResourcesChanged = false;
+                platformData.platformNameLowerCase ===
+                    this.$devicePlatformsConstants.visionOS.toLowerCase()) {
+                platformResourcesDir = path.join(projectData.appResourcesDirectoryPath, this.$devicePlatformsConstants.iOS);
             }
+            this._changesInfo.appResourcesChanged = this.containsNewerFiles(platformResourcesDir, projectData);
             this.$nodeModulesDependenciesBuilder
                 .getProductionDependencies(projectData.projectDir, projectData.ignoredDependencies)
                 .filter((dep) => dep.nativescript &&

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

@@ -357,9 +357,7 @@ class ProjectDataService {
         const packageJson = this.$fs.readJson(path.join(projectDir, constants.PACKAGE_JSON_FILE_NAME));
         const runtimeName = platform === "android" /* PlatformTypes.android */
             ? constants.TNS_ANDROID_RUNTIME_NAME
-            : platform === "macos" /* PlatformTypes.macos */
-                ? constants.SCOPED_MACOS_RUNTIME_NAME
-                : constants.TNS_IOS_RUNTIME_NAME;
+            : constants.TNS_IOS_RUNTIME_NAME;
         if (packageJson &&
             packageJson.nativescript &&
             packageJson.nativescript[runtimeName] &&
@@ -393,12 +391,8 @@ class ProjectDataService {
             else if (platform === "visionos" /* constants.PlatformTypes.visionos */) {
                 return d.name === constants.SCOPED_VISIONOS_RUNTIME_NAME;
             }
-            else if (platform === "macos" /* constants.PlatformTypes.macos */) {
-                return d.name === constants.SCOPED_MACOS_RUNTIME_NAME;
-            }
         });
         if (runtimePackage) {
-            const originalVersion = runtimePackage.version;
             const coerced = semver.coerce(runtimePackage.version);
             const isRange = !!coerced && coerced.version !== runtimePackage.version;
             const isTag = !coerced;
@@ -415,13 +409,7 @@ class ProjectDataService {
                     runtimePackage.version = this.$fs.readJson(runtimePackageJsonPath).version;
                 }
                 catch (err) {
-                    // Keep local file/tgz runtime specs even if the package is not yet
-                    // installed in node_modules. `npm install <name>@<file:...>` works.
-                    if ((originalVersion === null || originalVersion === void 0 ? void 0 : originalVersion.startsWith("file:")) ||
-                        (originalVersion === null || originalVersion === void 0 ? void 0 : originalVersion.includes("tgz"))) {
-                        runtimePackage.version = originalVersion;
-                    }
-                    else if (isRange) {
+                    if (isRange) {
                         runtimePackage.version = semver.coerce(runtimePackage.version).version;
                         runtimePackage._coerced = true;
                     }
@@ -452,12 +440,6 @@ class ProjectDataService {
                 version: null,
             };
         }
-        else if (platform === "macos" /* constants.PlatformTypes.macos */) {
-            return {
-                name: constants.SCOPED_MACOS_RUNTIME_NAME,
-                version: null,
-            };
-        }
     }
     getNsConfigDefaultContent(data) {
         const config = this.getNsConfigDefaultObject(data);

package/lib/services/versions-service.js

@@ -76,7 +76,6 @@ class VersionsService {
     async getRuntimesVersions(platform) {
         const iosRuntime = this.$projectDataService.getRuntimePackage(this.projectData.projectDir, "ios" /* constants.PlatformTypes.ios */);
         const androidRuntime = this.$projectDataService.getRuntimePackage(this.projectData.projectDir, "android" /* constants.PlatformTypes.android */);
-        const macOSRuntime = this.$projectDataService.getRuntimePackage(this.projectData.projectDir, "macos" /* constants.PlatformTypes.macos */);
         let runtimes = [];
         if (!platform) {
             runtimes = [iosRuntime, androidRuntime];
@@ -87,9 +86,6 @@ class VersionsService {
         else if (platform === "android" /* PlatformTypes.android */) {
             runtimes.push(androidRuntime);
         }
-        else if (platform === "macos" /* PlatformTypes.macos */) {
-            runtimes.push(macOSRuntime);
-        }
         const runtimesVersions = await Promise.all(runtimes.map(async (runtime) => {
             const latestVersion = await this.$packageInstallationManager.getLatestVersion(runtime.name);
             const runtimeInformation = {

package/lib/tools/config-manipulation/config-transformer.js

@@ -117,16 +117,36 @@ class ConfigTransformer {
         }
         return `{}`;
     }
+    isBooleanLiteralNode(initializer) {
+        return ((initializer === null || initializer === void 0 ? void 0 : initializer.getKind()) === ts_morph_1.SyntaxKind.TrueKeyword ||
+            (initializer === null || initializer === void 0 ? void 0 : initializer.getKind()) === ts_morph_1.SyntaxKind.FalseKeyword);
+    }
+    replaceInitializer(initializer, newValue) {
+        return initializer.replaceWithText(this.createInitializer(newValue));
+    }
     setInitializerValue(initializer, newValue) {
         if (ts_morph_1.Node.isStringLiteral(initializer)) {
+            if (typeof newValue !== "string") {
+                return this.replaceInitializer(initializer, newValue);
+            }
             return initializer.setLiteralValue(newValue);
         }
         if (ts_morph_1.Node.isNumericLiteral(initializer)) {
+            if (typeof newValue !== "number") {
+                return this.replaceInitializer(initializer, newValue);
+            }
             return initializer.setLiteralValue(newValue);
         }
-        if (ts_morph_1.Node.isBooleanKeyword(initializer)) {
+        if (this.isBooleanLiteralNode(initializer)) {
+            if (typeof newValue !== "boolean") {
+                return this.replaceInitializer(initializer, newValue);
+            }
             return initializer.setLiteralValue(newValue);
         }
+        if (ts_morph_1.Node.isArrayLiteralExpression(initializer) ||
+            ts_morph_1.Node.isObjectLiteralExpression(initializer)) {
+            return this.replaceInitializer(initializer, newValue);
+        }
         if (ts_morph_1.Node.isIdentifier(initializer)) {
             return this.setIdentifierValue(initializer, newValue);
         }
@@ -139,9 +159,25 @@ class ConfigTransformer {
         if (ts_morph_1.Node.isNumericLiteral(initializer)) {
             return initializer.getLiteralValue();
         }
-        if (ts_morph_1.Node.isBooleanKeyword(initializer)) {
+        if (this.isBooleanLiteralNode(initializer)) {
             return initializer.getLiteralValue();
         }
+        if (ts_morph_1.Node.isArrayLiteralExpression(initializer)) {
+            return initializer
+                .getElements()
+                .map((element) => this.getInitializerValue(element));
+        }
+        if (ts_morph_1.Node.isObjectLiteralExpression(initializer)) {
+            const result = {};
+            for (const property of initializer.getProperties()) {
+                if (!ts_morph_1.Node.isPropertyAssignment(property)) {
+                    continue;
+                }
+                const name = property.getNameNode().getText().replace(/['\"]/g, "");
+                result[name] = this.getInitializerValue(property.getInitializerOrThrow());
+            }
+            return result;
+        }
         if (ts_morph_1.Node.isIdentifier(initializer)) {
             return this.getIdentifierValue(initializer);
         }
@@ -176,9 +212,25 @@ class ConfigTransformer {
         if (ts_morph_1.Node.isNumericLiteral(initializer)) {
             return initializer.getLiteralValue();
         }
-        if (ts_morph_1.Node.isBooleanKeyword(initializer)) {
+        if (this.isBooleanLiteralNode(initializer)) {
             return initializer.getLiteralValue();
         }
+        if (ts_morph_1.Node.isArrayLiteralExpression(initializer)) {
+            return initializer
+                .getElements()
+                .map((element) => this.getInitializerValue(element));
+        }
+        if (ts_morph_1.Node.isObjectLiteralExpression(initializer)) {
+            const result = {};
+            for (const property of initializer.getProperties()) {
+                if (!ts_morph_1.Node.isPropertyAssignment(property)) {
+                    continue;
+                }
+                const name = property.getNameNode().getText().replace(/['\"]/g, "");
+                result[name] = this.getInitializerValue(property.getInitializerOrThrow());
+            }
+            return result;
+        }
         if (ts_morph_1.Node.isIdentifier(initializer)) {
             return this.getIdentifierValue(initializer);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "main": "./lib/nativescript-cli-lib.js",
-  "version": "9.1.0-alpha.0",
+  "version": "9.1.0-alpha.2",
   "author": "NativeScript <oss@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
@@ -56,14 +56,13 @@
   "dependencies": {
     "@foxt/js-srp": "0.0.3-patch2",
     "@nativescript/doctor": "2.0.17",
-    "@nativescript/hook": "3.0.4",
+    "@nativescript/hook": "3.0.5",
     "@npmcli/arborist": "9.1.8",
-    "@rigor789/resolve-package-path": "1.0.7",
     "@nstudio/trapezedev-project": "7.2.3",
-    "archiver": "7.0.1",
-    "axios": "1.13.2",
+    "@rigor789/resolve-package-path": "1.0.7",
+    "axios": "1.13.5",
     "byline": "5.0.0",
-    "chokidar": "4.0.3",
+    "chokidar": "^3.6.0",
     "cli-table3": "0.6.5",
     "color": "4.2.3",
     "convert-source-map": "2.0.0",
@@ -75,11 +74,11 @@
     "ios-mobileprovision-finder": "1.2.1",
     "ios-sim-portable": "4.5.1",
     "jimp": "1.6.0",
-    "lodash": "4.17.21",
+    "lodash": "4.17.23",
     "log4js": "6.9.1",
     "marked": "15.0.12",
     "marked-terminal": "7.3.0",
-    "minimatch": "10.1.1",
+    "minimatch": "10.2.4",
     "mkdirp": "3.0.1",
     "mute-stream": "2.0.0",
     "nativescript-dev-xcode": "0.8.1",
@@ -100,7 +99,7 @@
     "simple-git": "3.30.0",
     "simple-plist": "1.4.0",
     "source-map": "0.7.6",
-    "tar": "7.5.2",
+    "tar": "7.5.9",
     "ts-morph": "25.0.1",
     "tunnel": "0.0.6",
     "typescript": "5.7.3",
@@ -109,16 +108,16 @@
     "winreg": "1.2.5",
     "ws": "8.18.3",
     "xml2js": "0.6.2",
-    "yargs": "17.7.2"
+    "yargs": "17.7.2",
+    "yazl": "^3.3.1"
   },
   "devDependencies": {
-    "@types/archiver": "^6.0.3",
     "@types/byline": "^4.2.36",
     "@types/chai": "5.2.2",
     "@types/chai-as-promised": "8.0.2",
     "@types/color": "4.2.0",
     "@types/convert-source-map": "2.0.3",
-    "@types/lodash": "4.17.21",
+    "@types/lodash": "4.17.23",
     "@types/marked-terminal": "^6.1.1",
     "@types/node": "^22.0.0",
     "@types/npmcli__arborist": "^6.3.0",
@@ -139,10 +138,12 @@
     "@types/ws": "8.18.1",
     "@types/xml2js": "0.4.14",
     "@types/yargs": "17.0.33",
+    "@types/yazl": "^3.3.0",
     "braces": ">=3.0.3",
     "chai": "5.3.3",
     "chai-as-promised": "8.0.2",
     "conventional-changelog-cli": "^5.0.0",
+    "fast-check": "3.23.2",
     "grunt": "1.6.1",
     "grunt-contrib-clean": "2.0.1",
     "grunt-contrib-copy": "1.0.0",
@@ -162,11 +163,21 @@
     "fsevents": "*"
   },
   "overrides": {
+    "@conventional-changelog/git-client": "2.5.1",
     "jimp": {
       "xml2js": "0.6.2"
     },
     "npm-watch": {
       "nodemon": "3.0.3"
+    },
+    "grunt": {
+      "minimatch": "3.1.5"
+    },
+    "globule": {
+      "minimatch": "3.1.5"
+    },
+    "replace": {
+      "minimatch": "3.1.5"
     }
   },
   "analyze": true,