@akylas/nativescript-cli 8.8.6 → 8.9.4

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

@@ -18,6 +18,7 @@ const projectServiceBaseLib = require("./platform-project-service-base");
 const plist_merge_patch_1 = require("plist-merge-patch");
 const os_1 = require("os");
 const plist = require("plist");
+const fastGlob = require("fast-glob");
 const constants_2 = require("../constants");
 const helpers_2 = require("../common/helpers");
 const yok_1 = require("../common/yok");
@@ -42,7 +43,7 @@ const getConfigurationName = (release) => {
     return release ? constants_1.Configurations.Release : constants_1.Configurations.Debug;
 };
 class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase {
-    constructor($fs, $options, $childProcess, $cocoapodsService, $errors, $logger, $injector, $projectDataService, $devicePlatformsConstants, $hostInfo, $xcprojService, $iOSProvisionService, $iOSSigningService, $pbxprojDomXcode, $xcode, $iOSEntitlementsService, $platformEnvironmentRequirements, $plistParser, $xcconfigService, $xcodebuildService, $iOSExtensionsService, $iOSWatchAppService, $iOSNativeTargetService, $sysInfo, $tempService, $spmService, $mobileHelper) {
+    constructor($fs, $options, $childProcess, $cocoapodsService, $errors, $logger, $injector, $projectDataService, $devicePlatformsConstants, $hostInfo, $xcprojService, $iOSProvisionService, $iOSSigningService, $pbxprojDomXcode, $xcode, $iOSEntitlementsService, $platformEnvironmentRequirements, $plistParser, $xcconfigService, $xcodebuildService, $iOSExtensionsService, $iOSWatchAppService, $iOSNativeTargetService, $sysInfo, $tempService, $spmService, $mobileHelper, $projectConfigService) {
         super($fs, $projectDataService);
         this.$options = $options;
         this.$childProcess = $childProcess;
@@ -69,6 +70,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.$tempService = $tempService;
         this.$spmService = $spmService;
         this.$mobileHelper = $mobileHelper;
+        this.$projectConfigService = $projectConfigService;
         this._platformsDirCache = null;
         this._platformData = null;
     }
@@ -362,6 +364,12 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                 resourcesNativeCodePath = path.join(resourcesDirectoryPath, this.$devicePlatformsConstants.iOS, constants.NATIVE_SOURCE_FOLDER);
             }
             await this.prepareNativeSourceCode(constants.TNS_NATIVE_SOURCE_GROUP_NAME, resourcesNativeCodePath, projectData);
+            const nativeSource = this.$projectConfigService.getValue(`${this._platformData.platformNameLowerCase}.NativeSource`, []);
+            if (nativeSource === null || nativeSource === void 0 ? void 0 : nativeSource.length) {
+                for (const source of nativeSource) {
+                    await this.prepareNativeSourceCode(source.name, source.path, projectData);
+                }
+            }
         }
         this.$iOSWatchAppService.removeWatchApp({ pbxProjPath });
         const addedWatchApp = await this.$iOSWatchAppService.addWatchAppFromPath({
@@ -532,7 +540,20 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             await this.$cocoapodsService.executePodInstall(platformData.projectRoot, this.$xcprojService.getXcodeprojPath(projectData, platformData.projectRoot));
             await this.$cocoapodsService.mergePodXcconfigFile(projectData, platformData, opts);
         }
-        await this.$spmService.applySPMPackages(platformData, projectData);
+        const pluginSpmPackages = [];
+        for (const plugin of pluginsData) {
+            if (plugin.fullPath) {
+                const pluginConfigPath = path.join(plugin.fullPath, constants.CONFIG_FILE_NAME_TS);
+                if (this.$fs.exists(pluginConfigPath)) {
+                    const config = this.$projectConfigService.readConfig(plugin.fullPath);
+                    const packages = _.get(config, `${platformData.platformNameLowerCase}.SPMPackages`, []);
+                    if (packages.length) {
+                        pluginSpmPackages.push(...packages);
+                    }
+                }
+            }
+        }
+        await this.$spmService.applySPMPackages(platformData, projectData, pluginSpmPackages);
     }
     beforePrepareAllPlugins(projectData, dependencies) {
         return Promise.resolve(dependencies);
@@ -626,7 +647,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
     }
     async prepareNativeSourceCode(groupName, sourceFolderPath, projectData) {
         const project = this.createPbxProj(projectData);
-        const group = this.getRootGroup(groupName, sourceFolderPath);
+        const group = await this.getRootGroup(groupName, sourceFolderPath);
         project.addPbxGroup(group.files, group.name, group.path, null, {
             isMain: true,
             filesRelativeToProject: true,
@@ -666,23 +687,33 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                 addedExtensionsFromPlugins || addedExtensionFromPlugin;
         }
         if (addedExtensionsFromResources || addedExtensionsFromPlugins) {
-            this.$logger.warn("The support for iOS App Extensions is currently in Beta. For more information about the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/nativescript-cli/issues/4472");
+            this.$logger.warn("Let us know if there are other Extension features you'd like! https://github.com/NativeScript/NativeScript/issues");
         }
     }
-    getRootGroup(name, rootPath) {
+    async getRootGroup(name, rootPath) {
         const filePathsArr = [];
         const rootGroup = {
             name: name,
             files: filePathsArr,
             path: rootPath,
         };
-        if (this.$fs.exists(rootPath)) {
-            const stats = this.$fs.getFsStats(rootPath);
-            if (stats.isDirectory() && !this.$fs.isEmptyDir(rootPath)) {
-                this.$fs.readDirectory(rootPath).forEach((fileName) => {
-                    const filePath = path.join(rootGroup.path, fileName);
-                    filePathsArr.push(filePath);
-                });
+        if (fastGlob.isDynamicPattern(rootPath)) {
+            const projectRoot = this.$projectDataService.getProjectData().projectDir;
+            const filePaths = await fastGlob(rootPath);
+            for (const filePath of filePaths) {
+                const sourceFilePath = path.normalize(path.join(projectRoot, filePath));
+                filePathsArr.push(sourceFilePath);
+            }
+        }
+        else {
+            if (this.$fs.exists(rootPath)) {
+                const stats = this.$fs.getFsStats(rootPath);
+                if (stats.isDirectory() && !this.$fs.isEmptyDir(rootPath)) {
+                    this.$fs.readDirectory(rootPath).forEach((fileName) => {
+                        const filePath = path.join(rootGroup.path, fileName);
+                        filePathsArr.push(filePath);
+                    });
+                }
             }
         }
         return rootGroup;
@@ -708,9 +739,9 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             await this.addStaticLibrary(path.join(pluginPlatformsFolderPath, fileName), projectData);
         }
     }
-    removeNativeSourceCode(pluginPlatformsFolderPath, pluginData, projectData) {
+    async removeNativeSourceCode(pluginPlatformsFolderPath, pluginData, projectData) {
         const project = this.createPbxProj(projectData);
-        const group = this.getRootGroup(pluginData.name, pluginPlatformsFolderPath);
+        const group = await this.getRootGroup(pluginData.name, pluginPlatformsFolderPath);
         project.removePbxGroup(group.name, group.path);
         project.removeFromHeaderSearchPaths(group.path);
         this.savePbxProj(project, projectData);

package/lib/services/livesync/android-livesync-tool.js

@@ -253,7 +253,7 @@ class AndroidLivesyncTool {
                 if (!isConnected) {
                     isConnected = true;
                     if (this.pendingConnectionData &&
-                        this.pendingConnectionData.socketTimer) {
+                        typeof this.pendingConnectionData.socketTimer === "number") {
                         clearTimeout(this.pendingConnectionData.socketTimer);
                     }
                     const applicationPid = await this.$androidProcessService.getAppProcessId(configuration.deviceIdentifier, configuration.appIdentifier);

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

@@ -167,7 +167,7 @@ export default {
         if (!this.$fs.exists(configFilePath)) {
             this.writeDefaultConfig(this.projectHelper.projectDir);
         }
-        if (typeof value === "object") {
+        if (!Array.isArray(value) && typeof value === "object") {
             let allSuccessful = true;
             for (const prop of this.flattenObjectToPaths(value)) {
                 if (!(await this.setValue(prop.key, prop.value))) {
@@ -195,7 +195,7 @@ export default {
             this.$logger.error(`Failed to update config.` + error);
         }
         finally {
-            if (this.getValue(key) !== value) {
+            if (!Array.isArray(this.getValue(key)) && this.getValue(key) !== value) {
                 this.$logger.error(`${os_1.EOL}Failed to update ${hasTSConfig ? constants_1.CONFIG_FILE_NAME_TS : constants_1.CONFIG_FILE_NAME_JS}.${os_1.EOL}`);
                 this.$logger.printMarkdown(`Please manually update \`${hasTSConfig ? constants_1.CONFIG_FILE_NAME_TS : constants_1.CONFIG_FILE_NAME_JS}\` and set \`${key}\` to \`${value}\`.${os_1.EOL}`);
                 this.$fs.writeFile(configFilePath, configContent);
@@ -297,7 +297,16 @@ You may add \`nsconfig.json\` to \`.gitignore\` as the CLI will regenerate it as
     flattenObjectToPaths(obj, basePath) {
         const toPath = (key) => [basePath, key].filter(Boolean).join(".");
         return Object.keys(obj).reduce((all, key) => {
-            if (typeof obj[key] === "object") {
+            if (Array.isArray(obj[key])) {
+                return [
+                    ...all,
+                    {
+                        key: toPath(key),
+                        value: obj[key],
+                    },
+                ];
+            }
+            else if (typeof obj[key] === "object" && obj[key] !== null) {
                 return [...all, ...this.flattenObjectToPaths(obj[key], toPath(key))];
             }
             return [

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

@@ -200,9 +200,13 @@ class WebpackCompilerService extends events_1.EventEmitter {
             cwd: projectData.projectDir,
             stdio,
         };
-        options.env = Object.assign(process.env, {
-            NATIVESCRIPT_WEBPACK_ENV: JSON.stringify(envData)
-        });
+        options.env = {
+            ...process.env,
+            NATIVESCRIPT_WEBPACK_ENV: JSON.stringify(envData),
+        };
+        if (this.$hostInfo.isWindows) {
+            Object.assign(options.env, { APPDATA: process.env.appData });
+        }
         if (this.$options.hostProjectPath) {
             Object.assign(options.env, {
                 USER_PROJECT_PLATFORMS_ANDROID: this.$options.hostProjectPath,
@@ -241,6 +245,9 @@ class WebpackCompilerService extends events_1.EventEmitter {
         if (envData.sourceMap === "true" || envData.sourceMap === "false") {
             envData.sourceMap = envData.sourceMap === "true";
         }
+        if (prepareData.uniqueBundle > 0) {
+            envData.uniqueBundle = prepareData.uniqueBundle;
+        }
         return envData;
     }
     async buildEnvCommandLineParams(envData, platformData, projectData, prepareData) {

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

@@ -102,6 +102,15 @@ class ConfigTransformer {
         else if (typeof value === "number" || typeof value === "boolean") {
             return `${value}`;
         }
+        else if (Array.isArray(value)) {
+            return `[${value.map((v) => this.createInitializer(v)).join(", ")}]`;
+        }
+        else if (typeof value === "object" && value !== null) {
+            const properties = Object.entries(value)
+                .map(([key, val]) => `${key}: ${this.createInitializer(val)}`)
+                .join(", ");
+            return `{ ${properties} }`;
+        }
         return `{}`;
     }
     setInitializerValue(initializer, newValue) {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@akylas/nativescript-cli",
   "main": "./lib/nativescript-cli-lib.js",
-  "version": "8.8.6",
-  "author": "NativeScript <support@nativescript.org>",
+  "version": "8.9.4",
+  "author": "NativeScript <oss@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
     "nativescript": "./bin/tns",
@@ -33,7 +33,7 @@
     "build": "grunt",
     "build.all": "grunt test",
     "dev": "tsc --watch",
-    "setup": "npm i --ignore-scripts && npx husky install",
+    "setup": "npm i --ignore-scripts && npx husky",
     "test": "npm run tsc && mocha --config=test/.mocharc.yml",
     "postinstall": "node postinstall.js",
     "preuninstall": "node preuninstall.js",
@@ -52,22 +52,21 @@
   },
   "keywords": [
     "nativescript",
-    "telerik",
-    "mobile"
+    "typescript",
+    "javascript"
   ],
   "dependencies": {
-    "@nativescript/doctor": "2.0.15",
-    "@nativescript/schematics-executor": "0.0.2",
-    "@npmcli/arborist": "^7.2.0",
-    "@npmcli/move-file": "^2.0.1",
+    "@foxt/js-srp": "^0.0.3-patch2",
+    "@nativescript/doctor": "2.0.16-rc.0",
+    "@npmcli/arborist": "^9.0.0",
     "@rigor789/resolve-package-path": "1.0.7",
-    "@rigor789/trapezedev-project": "7.1.1",
+    "@rigor789/trapezedev-project": "7.1.2",
     "ansi-colors": "^4.1.3",
     "archiver": "^7.0.1",
-    "axios": "1.7.7",
+    "axios": "1.11.0",
     "byline": "5.0.0",
     "chalk": "4.1.2",
-    "chokidar": "4.0.1",
+    "chokidar": "4.0.3",
     "cli-table3": "0.6.5",
     "color": "4.2.3",
     "convert-source-map": "2.0.0",
@@ -75,86 +74,81 @@
     "email-validator": "2.0.4",
     "esprima": "4.0.1",
     "font-finder": "1.1.0",
-    "glob": "11.0.0",
-    "ios-device-lib": "0.9.3",
-    "ios-mobileprovision-finder": "1.1.0",
-    "ios-sim-portable": "4.5.0",
-    "jimp": "0.22.10",
+    "glob": "11.0.1",
+    "ios-device-lib": "0.9.4",
+    "ios-mobileprovision-finder": "1.2.1",
+    "ios-sim-portable": "4.5.1",
+    "jimp": "1.6.0",
     "lodash": "4.17.21",
     "log4js": "6.9.1",
-    "marked": "13.0.3",
-    "marked-terminal": "7.1.0",
+    "marked": "15.0.7",
+    "marked-terminal": "7.3.0",
     "minimatch": "10.0.1",
     "mkdirp": "3.0.1",
     "mute-stream": "2.0.0",
-    "nativescript-dev-xcode": "0.8.0",
-    "open": "10.1.0",
+    "nativescript-dev-xcode": "0.8.1",
+    "open": "8.4.2",
     "ora": "5.4.1",
-    "pacote": "15.1.1",
+    "pacote": "21.0.0",
     "pbxproj-dom": "1.2.0",
     "plist": "3.1.0",
     "plist-merge-patch": "0.2.0",
-    "prettier": "3.3.3",
+    "prettier": "3.5.2",
     "prompts": "2.4.2",
     "proper-lockfile": "4.1.2",
     "proxy-lib": "0.4.0",
     "qr-image": "3.2.0",
     "qrcode-terminal": "0.12.0",
-    "semver": "7.6.3",
+    "semver": "7.7.1",
     "shelljs": "0.8.5",
     "simple-git": "3.27.0",
     "simple-plist": "1.4.0",
-    "source-map": "0.8.0-beta.0",
-    "stringify-package": "1.0.1",
+    "source-map": "0.7.4",
     "tar": "7.4.3",
     "temp": "0.9.4",
-    "ts-morph": "17.0.1",
+    "ts-morph": "25.0.1",
     "tunnel": "0.0.6",
-    "typescript": "5.6.3",
+    "typescript": "5.7.3",
     "universal-analytics": "0.5.3",
-    "uuid": "10.0.0",
+    "uuid": "11.1.0",
     "winreg": "1.2.5",
-    "ws": "8.18.0",
+    "ws": "8.18.1",
     "xml2js": "0.6.2",
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@types/archiver": "^6.0.2",
+    "@types/archiver": "^6.0.3",
     "@types/byline": "^4.2.36",
-    "@types/chai": "4.3.4",
-    "@types/chai-as-promised": "7.1.5",
-    "@types/chokidar": "2.1.3",
-    "@types/color": "3.0.6",
+    "@types/chai": "5.0.1",
+    "@types/chai-as-promised": "8.0.1",
+    "@types/color": "4.2.0",
     "@types/convert-source-map": "2.0.3",
-    "@types/form-data": "2.5.0",
     "@types/glob": "^8.1.0",
-    "@types/lodash": "4.17.10",
-    "@types/marked": "^6.0.0",
-    "@types/node": "22.7.5",
-    "@types/npmcli__arborist": "^5.6.11",
-    "@types/ora": "3.2.0",
+    "@types/lodash": "4.17.15",
+    "@types/marked-terminal": "^6.1.1",
+    "@types/node": "^22.0.0",
+    "@types/npmcli__arborist": "^6.3.0",
     "@types/pacote": "^11.1.8",
     "@types/plist": "^3.0.5",
-    "@types/prettier": "3.0.0",
     "@types/prompts": "2.4.9",
     "@types/proper-lockfile": "4.1.4",
     "@types/qr-image": "3.2.9",
     "@types/retry": "0.12.5",
     "@types/semver": "7.5.8",
-    "@types/shelljs": "^0.8.15",
+    "@types/shelljs": "^0.8.11",
     "@types/sinon": "^17.0.3",
-    "@types/source-map": "0.5.7",
-    "@types/tabtab": "^3.0.4",
+    "@types/tabtab": "^3.0.2",
     "@types/tar": "6.1.13",
     "@types/temp": "0.9.4",
     "@types/tunnel": "0.0.7",
     "@types/universal-analytics": "0.4.8",
     "@types/uuid": "^10.0.0",
-    "@types/ws": "8.5.12",
+    "@types/ws": "8.5.14",
     "@types/xml2js": "0.4.14",
     "@types/yargs": "17.0.33",
-    "chai": "4.3.7",
-    "chai-as-promised": "7.1.1",
+    "braces": ">=3.0.3",
+    "chai": "5.2.0",
+    "chai-as-promised": "8.0.1",
     "conventional-changelog-cli": "^5.0.0",
     "grunt": "1.6.1",
     "grunt-contrib-clean": "2.0.1",
@@ -163,14 +157,14 @@
     "grunt-shell": "4.0.0",
     "grunt-template": "1.0.0",
     "grunt-ts": "6.0.0-beta.22",
-    "husky": "8.0.3",
+    "husky": "9.1.7",
     "istanbul": "0.4.5",
-    "latest-version": "5.1.0",
-    "lint-staged": "^13.2.0",
-    "mocha": "10.2.0",
-    "sinon": "15.0.3",
+    "latest-version": "9.0.0",
+    "lint-staged": "~15.4.3",
+    "mocha": "11.1.0",
+    "sinon": "19.0.2",
     "source-map-support": "0.5.21",
-    "standard-version": "9.5.0"
+    "xml2js": ">=0.5.0"
   },
   "optionalDependencies": {
     "fsevents": "*"
@@ -186,9 +180,10 @@
   "analyze": true,
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=20.0.0"
   },
   "lint-staged": {
     "*.ts": "prettier --write"
-  }
+  },
+  "packageManager": "yarn@4.6.0+sha512.5383cc12567a95f1d668fbe762dfe0075c595b4bfff433be478dbbe24e05251a8e8c3eb992a986667c1d53b6c3a9c85b8398c35a960587fbd9fa3a0915406728"
 }