@akylas/nativescript-cli 8.11.1 → 8.11.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akylas/nativescript-cli",
   "main": "./lib/nativescript-cli-lib.js",
-  "version": "8.11.1",
+  "version": "8.11.2",
   "author": "NativeScript <oss@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
@@ -22,6 +22,7 @@
     "!lib/common/test",
     "!lib/common/docs/fonts",
     "!node_modules",
+    "patches",
     "resources",
     "setup",
     "vendor",
@@ -88,6 +89,7 @@
     "open": "8.4.2",
     "ora": "5.4.1",
     "pacote": "21.0.3",
+    "patch-package": "^8.0.1",
     "pbxproj-dom": "1.2.0",
     "plist": "3.1.0",
     "plist-merge-patch": "0.2.0",
@@ -156,7 +158,6 @@
     "istanbul": "0.4.5",
     "lint-staged": "~15.5.2",
     "mocha": "11.7.4",
-    "patch-package": "^8.0.1",
     "sinon": "19.0.5",
     "source-map-support": "0.5.21",
     "standard-version": "9.5.0",

package/patches/@nstudio+trapezedev-project+7.2.3.patch

@@ -0,0 +1,39 @@
+diff --git a/node_modules/@nstudio/trapezedev-project/dist/ios/spm.js b/node_modules/@nstudio/trapezedev-project/dist/ios/spm.js
+index 1c1e4af..bba232f 100644
+--- a/node_modules/@nstudio/trapezedev-project/dist/ios/spm.js
++++ b/node_modules/@nstudio/trapezedev-project/dist/ios/spm.js
+@@ -138,14 +138,14 @@ function addSPMPackageToProject(project, targetId, pkg, projectRoot) {
+         comment: packageReferenceComment,
+     });
+     for (const lib of pkg.libs) {
+-        const { uuid: spmProductDependencyUUID } = helper.addOrUpdateEntry('XCSwiftPackageProductDependency', lib, {
++        const { uuid: spmProductDependencyUUID } = helper.addEntry('XCSwiftPackageProductDependency', lib, {
+             isa: 'XCSwiftPackageProductDependency',
+             package: spmPackageReferenceUUID,
+             package_comment: spmPackageReferenceComment,
+             productName: lib,
+         });
+         const libComment = `${lib} in Frameworks`;
+-        const { uuid: spmBuildFileUuid } = helper.addOrUpdateEntry('PBXBuildFile', libComment, {
++        const { uuid: spmBuildFileUuid } = helper.addEntry('PBXBuildFile', libComment, {
+             isa: 'PBXBuildFile',
+             productRef: spmProductDependencyUUID,
+             productRef_comment: lib,
+@@ -184,6 +184,17 @@ class SPMHelper {
+             comment: entryComment,
+         };
+     }
++    addEntry(section, entryComment, entry) {
++        const pbxSection = this.getOrCreateSection(section);
++        const entryUuid = this.pbxProject.generateUuid();
++        const entryCommentKey = `${entryUuid}_comment`;
++        pbxSection[entryCommentKey] = entryComment;
++        pbxSection[entryUuid] = entry;
++        return {
++            uuid: entryUuid,
++            comment: entryComment,
++        };
++    }
+     getExistingOrGenerateUUID(section, comment) {
+         var _a;
+         const existingUUID = (_a = Object.keys(this.pbxProject.hash.project.objects[section])

package/patches/nativescript-dev-xcode+0.8.1.patch

@@ -0,0 +1,189 @@
+diff --git a/node_modules/nativescript-dev-xcode/lib/pbxFile.js b/node_modules/nativescript-dev-xcode/lib/pbxFile.js
+index 1b52d25..1c14085 100644
+--- a/node_modules/nativescript-dev-xcode/lib/pbxFile.js
++++ b/node_modules/nativescript-dev-xcode/lib/pbxFile.js
+@@ -128,9 +128,9 @@ function pbxFile(filepath, opt) {
+     if (opt.explicitFileType) {
+         this.explicitFileType = opt.explicitFileType;
+         this.basename = this.basename + '.' + defaultExtension(this);
+-        delete this.path;
++        // delete this.path;
+         delete this.lastKnownFileType;
+-        delete this.group;
++        // delete this.group;
+         delete this.defaultEncoding;
+     }
+ 
+diff --git a/node_modules/nativescript-dev-xcode/lib/pbxProject.js b/node_modules/nativescript-dev-xcode/lib/pbxProject.js
+index 70f82ea..423c074 100644
+--- a/node_modules/nativescript-dev-xcode/lib/pbxProject.js
++++ b/node_modules/nativescript-dev-xcode/lib/pbxProject.js
+@@ -119,8 +119,8 @@ pbxProject.prototype.addPluginFile = function(path, opt) {
+     file.plugin = true; // durr
+     correctForPluginsPath(file, this);
+ 
+-    // null is better for early errors
+-    if (this.hasFile(file.path)) return null;
++    const existingFile = this.hasFile(file.path);
++    if (existingFile) return {...file, fileRef: existingFile.fileRef};
+ 
+     file.fileRef = this.generateUuid();
+ 
+@@ -256,19 +256,23 @@ pbxProject.prototype.addResourceFile = function(path, opt, group) {
+     opt = opt || {};
+ 
+     var file;
+-
++    var fileIsAlreadyAdded = false;
+     if (opt.plugin) {
+         file = this.addPluginFile(path, opt);
+         if (!file) return false;
+     } else {
+         file = new pbxFile(path, opt);
+-        if (this.hasFile(file.path)) return false;
++        const existingFile = this.hasFile(file.path);
++        fileIsAlreadyAdded = !!existingFile;
++        if (existingFile) {
++            file.fileRef = existingFile.fileRef;
++        }
+     }
+ 
+     file.uuid = this.generateUuid();
+     file.target = opt ? opt.target : undefined;
+ 
+-    if (!opt.plugin) {
++    if (!opt.plugin && !fileIsAlreadyAdded) {
+         correctForResourcesPath(file, this);
+         file.fileRef = this.generateUuid();
+     }
+@@ -278,7 +282,7 @@ pbxProject.prototype.addResourceFile = function(path, opt, group) {
+         this.addToPbxResourcesBuildPhase(file);     // PBXResourcesBuildPhase
+     }
+ 
+-    if (!opt.plugin) {
++    if (!opt.plugin && !fileIsAlreadyAdded) {
+         this.addToPbxFileReferenceSection(file);    // PBXFileReference
+         if (group) {
+             if (this.getPBXGroupByKey(group)) {
+@@ -859,20 +863,20 @@ pbxProject.prototype.removeFromPluginsPbxGroup = function(file) {
+     }
+ }
+ 
+-pbxProject.prototype.addToResourcesPbxGroup = function(file) {
+-    var pluginsGroup = this.pbxGroupByName('Resources');
++pbxProject.prototype.addToResourcesPbxGroup = function(file, groupName = 'Resources') {
++    var pluginsGroup = this.pbxGroupByName(groupName);
+     if (!pluginsGroup) {
+-        this.addPbxGroup([file.path], 'Resources');
++        this.addPbxGroup([file.path], groupName);
+     } else {
+         pluginsGroup.children.push(pbxGroupChild(file));
+     }
+ }
+ 
+-pbxProject.prototype.removeFromResourcesPbxGroup = function(file) {
+-    if (!this.pbxGroupByName('Resources')) {
++pbxProject.prototype.removeFromResourcesPbxGroup = function(file, groupName = 'Resources') {
++    if (!this.pbxGroupByName(groupName)) {
+         return null;
+     }
+-    var pluginsGroupChildren = this.pbxGroupByName('Resources').children, i;
++    var pluginsGroupChildren = this.pbxGroupByName(groupName).children, i;
+     for (i in pluginsGroupChildren) {
+         if (pbxGroupChild(file).value == pluginsGroupChildren[i].value &&
+             pbxGroupChild(file).comment == pluginsGroupChildren[i].comment) {
+@@ -1363,7 +1367,6 @@ pbxProject.prototype.buildPhaseObject = function(name, group, target) {
+     var section = this.hash.project.objects[name],
+         obj, sectionKey, key;
+     var buildPhase = this.buildPhase(group, target);
+-
+     for (key in section) {
+ 
+         // only look for comments
+@@ -1680,7 +1683,7 @@ pbxProject.prototype.hasFile = function(filePath) {
+     for (id in files) {
+         file = files[id];
+         if (file.path == filePath || file.path == ('"' + filePath + '"')) {
+-            return file;
++            return {...file,  fileRef: id};
+         }
+     }
+ 
+@@ -1700,11 +1703,21 @@ pbxProject.prototype.getFileKey = function(filePath) {
+     return false;
+ }
+ 
+-pbxProject.prototype.addTarget = function(name, type, subfolder, parentTarget) {
++pbxProject.prototype.getProductFile = function(target) {
++    var productReferenceUuid = target.pbxNativeTarget.productReference;
++    const fileReferenceSection = this.pbxFileReferenceSection();
++    const productReference = fileReferenceSection[productReferenceUuid];
++    const productFile = new pbxFile(productReference.path);
++    productFile.fileRef = productReferenceUuid;
++    productFile.uuid = productReferenceUuid;
++    return productFile;
++}
++pbxProject.prototype.addTarget = function(name, type, subfolder, parentTarget, productTargetType) {
+ 
+     // Setup uuid and name of new target
+     var targetUuid = this.generateUuid(),
+         targetType = type,
++        productTargetType = productTargetType || targetType,
+         targetSubfolder = subfolder || name,
+         targetName = name.trim();
+ 
+@@ -1753,7 +1766,7 @@ pbxProject.prototype.addTarget = function(name, type, subfolder, parentTarget) {
+ 
+     // Product: Create
+     var productName = targetName,
+-        productType = producttypeForTargettype(targetType),
++        productType = producttypeForTargettype(productTargetType),
+         productFileType = filetypeForProducttype(productType),
+         productFile = this.addProductFile(productName, { group: 'Copy Files', 'target': targetUuid, 'explicitFileType': productFileType}),
+         productFileName = productFile.basename;
+@@ -1781,10 +1794,10 @@ pbxProject.prototype.addTarget = function(name, type, subfolder, parentTarget) {
+     // Target: Add to PBXNativeTarget section
+     this.addToPbxNativeTargetSection(target);
+ 
+-    if (targetType === 'app_extension' || targetType === 'watch_extension' || targetType === 'watch_app') {
+-        const isWatchApp = targetType === 'watch_app';
++    if (productTargetType === 'app_extension' || productTargetType === 'watch_extension' || productTargetType === 'watch_app') {
++        const isWatchApp = productTargetType === 'watch_app';
+         const copyTargetUuid = parentTarget || this.getFirstTarget().uuid;
+-        const phaseComment = targetType === 'watch_app' ? 'Embed Watch Content' : 'Copy Files';
++        const phaseComment = productTargetType === 'watch_app' ? 'Embed Watch Content' : 'Copy Files';
+         let destination;
+ 
+         if(isWatchApp) {
+@@ -1792,7 +1805,7 @@ pbxProject.prototype.addTarget = function(name, type, subfolder, parentTarget) {
+         }
+ 
+         // Create CopyFiles phase in parent target
+-        this.addBuildPhase([], 'PBXCopyFilesBuildPhase', phaseComment, copyTargetUuid,  targetType, destination);
++        this.addBuildPhase([], 'PBXCopyFilesBuildPhase', phaseComment, copyTargetUuid,  productTargetType, destination);
+ 
+         // Add product to CopyFiles phase
+         this.addToPbxCopyfilesBuildPhase(productFile, phaseComment, copyTargetUuid);
+@@ -2058,7 +2071,7 @@ function pbxFileReferenceObj(file) {
+         fileObject.name = "\"" + fileObject.name + "\"";
+     }
+ 
+-    if(!file.path.match(NO_SPECIAL_SYMBOLS)) {
++    if(file.path && !file.path.match(NO_SPECIAL_SYMBOLS)) {
+         fileObject.path = "\"" + fileObject.path + "\"";
+     }
+ 
+@@ -2525,10 +2538,11 @@ pbxProject.prototype.getPBXObject = function(name) {
+ pbxProject.prototype.addFile = function (path, group, opt) {
+     var file = new pbxFile(path, opt);
+ 
+-    // null is better for early errors
+-    if (this.hasFile(file.path)) return null;
++    const existingFile = this.hasFile(file.path);
++    if (existingFile) return {...file,  fileRef: existingFile.fileRef};
+ 
+     file.fileRef = this.generateUuid();
++    file.target = opt ? opt.target : undefined;
+ 
+     this.addToPbxFileReferenceSection(file);    // PBXFileReference
+