nativescript 9.0.6-dev.0 → 9.0.6-dev.1

package/lib/services/ios-watch-app-service.js

@@ -7,24 +7,52 @@ const yok_1 = require("../common/yok");
 const trapezedev_project_1 = require("@nstudio/trapezedev-project");
 const minimatch_1 = require("minimatch");
 const sourceExtensions = [
-    '.swift', '.m', '.mm', '.c', '.cpp', '.cc', '.cxx', '.h', '.hpp'
+    ".swift",
+    ".m",
+    ".mm",
+    ".c",
+    ".cpp",
+    ".cc",
+    ".cxx",
+    ".h",
+    ".hpp",
 ];
 const resourceExtensions = [
-    '.png', '.jpg', '.jpeg', '.gif', '.svg', '.pdf', // Images
-    '.ttf', '.otf', '.woff', '.woff2', // Fonts
-    '.xcassets', // Asset catalogs
-    '.storyboard', '.xib', // Interface files
-    '.strings', '.stringsdict', // Localization
-    '.json', '.xml', '.plist', // Data files
-    '.m4a', '.mp3', '.wav', '.caf', // Audio
-    '.mp4', '.mov', // Video
-    '.bundle', // Resource bundles
+    ".png",
+    ".jpg",
+    ".jpeg",
+    ".gif",
+    ".svg",
+    ".pdf", // Images
+    ".ttf",
+    ".otf",
+    ".woff",
+    ".woff2", // Fonts
+    ".xcassets", // Asset catalogs
+    ".storyboard",
+    ".xib", // Interface files
+    ".strings",
+    ".stringsdict", // Localization
+    ".json",
+    ".xml",
+    ".plist", // Data files
+    ".m4a",
+    ".mp3",
+    ".wav",
+    ".caf", // Audio
+    ".mp4",
+    ".mov", // Video
+    ".bundle", // Resource bundles
 ];
 const WATCH_APP_IDENTIFIER = "watchkitapp";
 const WACTCH_EXTENSION_IDENTIFIER = "watchkitextension";
 const CONFIG_FILE_WATCHAPP = "watchapp.json";
 const CONFIG_FILE_EXTENSION = "extension.json";
-const RESOURCES_TO_IGNORE = [CONFIG_FILE_WATCHAPP, CONFIG_FILE_EXTENSION, 'node_modules'];
+const RESOURCES_TO_IGNORE = [
+    CONFIG_FILE_WATCHAPP,
+    CONFIG_FILE_EXTENSION,
+    "node_modules",
+];
 class IOSWatchAppService {
     constructor($fs, $pbxprojDomXcode, $xcode, $iOSNativeTargetService, $logger) {
         this.$fs = $fs;
@@ -33,11 +61,11 @@ class IOSWatchAppService {
         this.$iOSNativeTargetService = $iOSNativeTargetService;
         this.$logger = $logger;
     }
-    addResourceFile(project, path, opt, group = 'WatchResources') {
+    addResourceFile(project, path, opt, group = "WatchResources") {
         const file = project.addResourceFile(path, opt, group);
         project.addToResourcesPbxGroup(file, group);
     }
-    addSourceFile(project, path, opt, group = 'WatchSrc') {
+    addSourceFile(project, path, opt, group = "WatchSrc") {
         const file = project.addSourceFile(path, opt, group);
         project.addToResourcesPbxGroup(file, group);
     }
@@ -54,7 +82,9 @@ class IOSWatchAppService {
         const project = new this.$xcode.project(pbxProjPath);
         project.parseSync();
         const configPath = path.join(path.join(appPath, appFolder), "watchapp.json");
-        const config = this.$fs.exists(configPath) ? this.$fs.readJson(configPath) : null;
+        const config = this.$fs.exists(configPath)
+            ? this.$fs.readJson(configPath)
+            : null;
         const targetType = (_a = config === null || config === void 0 ? void 0 : config.targetType) !== null && _a !== void 0 ? _a : constants_1.IOSNativeTargetTypes.watchApp;
         project.removeTargetsByProductType(constants_1.IOSNativeTargetProductTypes.watchApp);
         project.removeTargetsByProductType(targetType);
@@ -68,7 +98,9 @@ class IOSWatchAppService {
         if (this.$fs.exists(extensionPath)) {
             const extensionFolder = this.$iOSNativeTargetService.getTargetDirectories(extensionPath)[0];
             const configPath = path.join(path.join(extensionPath, extensionFolder), "extension.json");
-            const config = this.$fs.exists(configPath) ? this.$fs.readJson(configPath) : null;
+            const config = this.$fs.exists(configPath)
+                ? this.$fs.readJson(configPath)
+                : null;
             const targetType = (_b = config === null || config === void 0 ? void 0 : config.targetType) !== null && _b !== void 0 ? _b : constants_1.IOSNativeTargetTypes.watchExtension;
             project.removeTargetsByProductType(constants_1.IOSNativeTargetProductTypes.watchExtension);
             project.removeTargetsByProductType(targetType);
@@ -96,7 +128,7 @@ class IOSWatchAppService {
         project.addBuildPhase([], "PBXSourcesBuildPhase", "Sources", target.uuid);
         project.addBuildPhase([], "PBXResourcesBuildPhase", "Resources", target.uuid);
         project.addBuildPhase([], "PBXFrameworksBuildPhase", "Frameworks", target.uuid);
-        project.addBuildPhase([], "PBXCopyFilesBuildPhase", "Embed Frameworks", target.uuid);
+        project.addBuildPhase([], "PBXCopyFilesBuildPhase", "Embed Frameworks", target.uuid, "frameworks");
         project.addToHeaderSearchPaths(targetPath, target.pbxNativeTarget.productName);
         return target;
     }
@@ -137,20 +169,21 @@ class IOSWatchAppService {
         const items = this.$fs.readDirectory(dirPath);
         for (const item of items) {
             // Skip hidden files and excluded files/directories
-            if (item.startsWith('.') || RESOURCES_TO_IGNORE.indexOf(item) !== -1) {
+            if (item.startsWith(".") || RESOURCES_TO_IGNORE.indexOf(item) !== -1) {
                 continue;
             }
             const itemPath = path.join(dirPath, item);
             const stats = this.$fs.getFsStats(itemPath);
             const relativePath = path.relative(platformData.projectRoot, itemPath);
             // Check if file/directory should be excluded based on patterns
-            if (excludePatterns && this.shouldExclude(relativePath, excludePatterns)) {
+            if (excludePatterns &&
+                this.shouldExclude(relativePath, excludePatterns)) {
                 this.$logger.debug(`Excluding from resources: ${relativePath}`);
                 continue;
             }
             if (stats.isDirectory()) {
                 // Special handling for .xcassets, .bundle, and other resource bundles
-                if (item.endsWith('.xcassets') || item.endsWith('.bundle')) {
+                if (item.endsWith(".xcassets") || item.endsWith(".bundle")) {
                     this.$logger.debug(`Adding resource bundle: ${relativePath}`);
                     this.addResourceFile(project, relativePath, { target: targetUuid }, groupName);
                 }
@@ -224,7 +257,7 @@ class IOSWatchAppService {
                 const relativeInfoPlistPath = path.relative(platformData.projectRoot, infoPlistPath);
                 buildConfigProperties.push({
                     name: "INFOPLIST_FILE",
-                    value: `"${infoPlistPath}"`
+                    value: `"${infoPlistPath}"`,
                 });
                 resourcesExclude.push(relativeInfoPlistPath);
             }
@@ -248,7 +281,7 @@ class IOSWatchAppService {
         this.$iOSNativeTargetService.setConfigurationsFromJsonFile(configPath, target.uuid, targetName, project);
         project.addToHeaderSearchPaths(targetPath, target.pbxNativeTarget.productName);
         if ((config === null || config === void 0 ? void 0 : config.importSourcesFromMainFolder) !== false) {
-            await this.addSourceFilesFromDirectory(path.dirname(configPath), target.uuid, project, platformData, targetName + 'Src', srcExclude);
+            await this.addSourceFilesFromDirectory(path.dirname(configPath), target.uuid, project, platformData, targetName + "Src", srcExclude);
         }
         if ((config === null || config === void 0 ? void 0 : config.importResourcesFromMainFolder) !== false) {
             await this.addTargetResources(path.dirname(configPath), [target.uuid], project, platformData, resourcesGroup, resourcesExclude);
@@ -270,7 +303,7 @@ class IOSWatchAppService {
         if (config.src && Array.isArray(config.src)) {
             this.$logger.debug(`Processing ${config.src.length} custom source file(s) for watch target: ${targetName}`);
             for (const srcPath of config.src) {
-                this.addCustomSourceFile(srcPath, target.uuid, project, projectData, platformData, srcExclude, targetName + 'Src', basedir);
+                this.addCustomSourceFile(srcPath, target.uuid, project, projectData, platformData, srcExclude, targetName + "Src", basedir);
             }
         }
         if (config.SPMPackages && Array.isArray(config.SPMPackages)) {
@@ -301,7 +334,8 @@ class IOSWatchAppService {
         const stats = this.$fs.getFsStats(resolvedPath);
         if (stats.isDirectory()) {
             this.$logger.debug(`Recursively adding files from resource directory: ${resourcePath}`);
-            if (relativePath.endsWith('.xcassets') || relativePath.endsWith('.bundle')) {
+            if (relativePath.endsWith(".xcassets") ||
+                relativePath.endsWith(".bundle")) {
                 this.$logger.debug(`Adding resource bundle: ${relativePath} for target:${targetUuid}`);
                 this.addResourceFile(project, relativePath, { target: targetUuid }, groupName);
             }
@@ -355,19 +389,20 @@ class IOSWatchAppService {
     addAllResourcesRecursively(dirPath, targetUuid, project, platformData, groupName, excludePatterns) {
         const items = this.$fs.readDirectory(dirPath);
         for (const item of items) {
-            if (item.startsWith('.')) {
+            if (item.startsWith(".")) {
                 continue;
             }
             const itemPath = path.join(dirPath, item);
             const stats = this.$fs.getFsStats(itemPath);
             const relativePath = path.relative(platformData.projectRoot, itemPath);
-            if (excludePatterns && this.shouldExclude(relativePath, excludePatterns)) {
+            if (excludePatterns &&
+                this.shouldExclude(relativePath, excludePatterns)) {
                 this.$logger.debug(`Excluding from resources: ${relativePath}`);
                 return;
             }
             if (stats.isDirectory()) {
                 // Special handling for .xcassets, .bundle - add as bundles, not recursively
-                if (item.endsWith('.xcassets') || item.endsWith('.bundle')) {
+                if (item.endsWith(".xcassets") || item.endsWith(".bundle")) {
                     this.$logger.debug(`Adding resource bundle: ${relativePath} for target:${targetUuid}`);
                     this.addResourceFile(project, relativePath, { target: targetUuid }, groupName);
                 }
@@ -391,7 +426,7 @@ class IOSWatchAppService {
         }
         const relativePath = path.relative(platformData.projectRoot, modulePath);
         const stats = this.$fs.getFsStats(modulePath);
-        const isFramework = modulePath.endsWith('.framework') || modulePath.endsWith('.xcframework');
+        const isFramework = modulePath.endsWith(".framework") || modulePath.endsWith(".xcframework");
         const isFolder = stats.isDirectory() && !isFramework;
         this.$logger.debug(`Adding module dependency: ${JSON.stringify(moduleDef)} to ${targetName}, basedir:${basedir}, isFramework:${isFramework} isFolder:${isFolder}`);
         if (isFramework) {
@@ -405,7 +440,8 @@ class IOSWatchAppService {
         else {
             this.$logger.warn(`Unknown module type for: ${modulePath}`);
         }
-        if (moduleDef.headerSearchPaths && Array.isArray(moduleDef.headerSearchPaths)) {
+        if (moduleDef.headerSearchPaths &&
+            Array.isArray(moduleDef.headerSearchPaths)) {
             for (const headerPath of moduleDef.headerSearchPaths) {
                 const resolvedPath = this.resolvePathWithBasedir(headerPath, basedir, projectData.projectDir);
                 const relPath = path.relative(platformData.projectRoot, resolvedPath);
@@ -430,12 +466,15 @@ class IOSWatchAppService {
     }
     getFolderFiles(dirPath, rootPath, excludePatterns) {
         const result = [];
-        const files = this.$fs.readDirectory(dirPath).filter((fileName) => !fileName.startsWith("."));
+        const files = this.$fs
+            .readDirectory(dirPath)
+            .filter((fileName) => !fileName.startsWith("."));
         for (const item of files) {
             const itemPath = path.join(dirPath, item);
             const stats = this.$fs.getFsStats(itemPath);
             const relativePath = path.relative(rootPath, itemPath);
-            if (excludePatterns && this.shouldExclude(relativePath, excludePatterns)) {
+            if (excludePatterns &&
+                this.shouldExclude(relativePath, excludePatterns)) {
                 this.$logger.debug(`Excluding from src: ${relativePath}`);
                 continue;
             }
@@ -458,22 +497,22 @@ class IOSWatchAppService {
         var _a;
         const moduleName = moduleDef.name || path.basename(modulePath);
         const targetRelativePath = path.relative(platformData.projectRoot, modulePath);
-        const moduleTarget = project.addTarget(moduleName, (_a = moduleDef.targetType) !== null && _a !== void 0 ? _a : 'framework', targetRelativePath, target.uuid);
+        const moduleTarget = project.addTarget(moduleName, (_a = moduleDef.targetType) !== null && _a !== void 0 ? _a : "framework", targetRelativePath, target.uuid);
         this.$logger.debug(`Adding folder module ${moduleName} with path ${modulePath} with target uuid:${moduleTarget.uuid}`);
         const { path: filePath, name, dependencies, frameworks, buildConfigurationProperties, src, resources, SPMPackages, ...otherProps } = moduleDef;
-        project.addFramework(moduleName + '.framework', {
+        project.addFramework(moduleName + ".framework", {
             target: target.uuid,
             basename: moduleName,
-            path: moduleName + '.framework',
+            path: moduleName + ".framework",
             customFramework: true,
-            explicitFileType: 'wrapper.framework',
-            ...otherProps
+            explicitFileType: "wrapper.framework",
+            ...otherProps,
         });
         // Add build phases
         project.addBuildPhase([], "PBXSourcesBuildPhase", "Sources", moduleTarget.uuid);
         project.addBuildPhase([], "PBXResourcesBuildPhase", "Resources", moduleTarget.uuid);
         project.addBuildPhase([], "PBXFrameworksBuildPhase", "Frameworks", moduleTarget.uuid);
-        project.addBuildPhase([], "PBXCopyFilesBuildPhase", "Embed Frameworks", moduleTarget.uuid);
+        project.addBuildPhase([], "PBXCopyFilesBuildPhase", "Embed Frameworks", moduleTarget.uuid, "frameworks");
         const files = this.getFolderFiles(modulePath, platformData.projectRoot, srcExclude);
         this.$logger.debug(`module ${moduleName} has  ${files.length} files`);
         if (files.length > 0) {
@@ -487,11 +526,14 @@ class IOSWatchAppService {
             this.$logger.debug(`Adding ${moduleDef.frameworks.length} framework(s) for module ${JSON.stringify(moduleDef)}`);
             for (const framework of moduleDef.frameworks) {
                 this.$logger.debug(`Adding framework ${JSON.stringify(framework)} for module ${JSON.stringify(moduleDef)}`);
-                if (typeof framework === 'string') {
+                if (typeof framework === "string") {
                     project.addFramework(framework, { target: moduleTarget.uuid });
                 }
                 else {
-                    project.addFramework(framework.path, { target: moduleTarget.uuid, ...framework });
+                    project.addFramework(framework.path, {
+                        target: moduleTarget.uuid,
+                        ...framework,
+                    });
                 }
                 this.$logger.debug(`Added framework dependency: ${framework}`);
             }
@@ -499,7 +541,7 @@ class IOSWatchAppService {
         if (moduleDef.src && Array.isArray(moduleDef.src)) {
             this.$logger.debug(`Processing ${config.src.length} custom source file(s) for target: ${moduleName}`);
             for (const srcPath of moduleDef.src) {
-                this.addCustomSourceFile(srcPath, moduleTarget.uuid, project, projectData, platformData, srcExclude, moduleName + 'Src', basedir);
+                this.addCustomSourceFile(srcPath, moduleTarget.uuid, project, projectData, platformData, srcExclude, moduleName + "Src", basedir);
             }
         }
         if (moduleDef.resources && Array.isArray(moduleDef.resources)) {
@@ -510,28 +552,41 @@ class IOSWatchAppService {
         }
         if (moduleDef.dependencies && Array.isArray(moduleDef.dependencies)) {
             const currentTargets = project.pbxNativeTargetSection();
-            const currentTargetsArray = Object.keys(currentTargets).map(k => currentTargets[k]['name'] ? ({ uuid: k, name: currentTargets[k]['name'] }) : null).filter(t => !!t);
-            const targets = moduleDef.dependencies.map(dependency => currentTargetsArray.find(t => t.name === `\"${dependency}\"`)).filter(s => !!s);
+            const currentTargetsArray = Object.keys(currentTargets)
+                .map((k) => currentTargets[k]["name"]
+                ? { uuid: k, name: currentTargets[k]["name"] }
+                : null)
+                .filter((t) => !!t);
+            const targets = moduleDef.dependencies
+                .map((dependency) => currentTargetsArray.find((t) => t.name === `\"${dependency}\"`))
+                .filter((s) => !!s);
             if (targets.length) {
-                this.$logger.debug(`Adding target dependencies ${moduleDef.dependencies} with uuids:${targets.map(t => t.uuid)} for module ${moduleDef.name}`);
-                project.addTargetDependency(moduleTarget.uuid, targets.map(t => t.uuid));
+                this.$logger.debug(`Adding target dependencies ${moduleDef.dependencies} with uuids:${targets.map((t) => t.uuid)} for module ${moduleDef.name}`);
+                project.addTargetDependency(moduleTarget.uuid, targets.map((t) => t.uuid));
             }
         }
         if (moduleDef.SPMPackages && Array.isArray(moduleDef.SPMPackages)) {
             // to be able to add SPM the file needs to be saved
             // but it means we need to reload it again after spm packages addition
             this.$fs.writeFile(project.filepath, project.writeSync({ omitEmptyValues: true }));
-            await this.applySPMPackagesToTargets([moduleName], platformData, basedir, moduleDef.SPMPackages.map(t => {
-                if (typeof t === 'string') {
-                    return config.SPMPackages.find(s => s.name === t);
+            await this.applySPMPackagesToTargets([moduleName], platformData, basedir, moduleDef.SPMPackages.map((t) => {
+                if (typeof t === "string") {
+                    return config.SPMPackages.find((s) => s.name === t);
                 }
                 return t;
             }));
             project.parseSync();
         }
-        if (moduleDef.buildConfigurationProperties || config.sharedModulesBuildConfigurationProperties) {
-            const configurationProperties = { ...(config.sharedModulesBuildConfigurationProperties || {}), ...(moduleDef.buildConfigurationProperties || {}) };
-            this.$iOSNativeTargetService.setXcodeTargetBuildConfigurationProperties(Object.keys(configurationProperties).map(k => ({ name: k, value: configurationProperties[k] })), moduleName, project);
+        if (moduleDef.buildConfigurationProperties ||
+            config.sharedModulesBuildConfigurationProperties) {
+            const configurationProperties = {
+                ...(config.sharedModulesBuildConfigurationProperties || {}),
+                ...(moduleDef.buildConfigurationProperties || {}),
+            };
+            this.$iOSNativeTargetService.setXcodeTargetBuildConfigurationProperties(Object.keys(configurationProperties).map((k) => ({
+                name: k,
+                value: configurationProperties[k],
+            })), moduleName, project);
         }
         this.$logger.debug(`Added folder-based module ${moduleName} at ${relativePath}`);
     }
@@ -542,7 +597,9 @@ class IOSWatchAppService {
         for (const flag of flags) {
             const currentFlags = this.getBuildProperty("OTHER_LDFLAGS", targetName, project);
             const flagsArray = currentFlags
-                ? (Array.isArray(currentFlags) ? currentFlags : [currentFlags])
+                ? Array.isArray(currentFlags)
+                    ? currentFlags
+                    : [currentFlags]
                 : ['"$(inherited)"'];
             if (!flagsArray.includes(flag)) {
                 flagsArray.push(flag);
@@ -566,7 +623,8 @@ class IOSWatchAppService {
         }
         for (const key in configurations) {
             const config = configurations[key];
-            if (config && config.buildSettings &&
+            if (config &&
+                config.buildSettings &&
                 (config.buildSettings.PRODUCT_NAME === targetName ||
                     config.buildSettings.PRODUCT_NAME === `"${targetName}"`)) {
                 return config.buildSettings[propertyName];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "main": "./lib/nativescript-cli-lib.js",
-  "version": "9.0.6-dev.0",
+  "version": "9.0.6-dev.1",
   "author": "NativeScript <oss@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {