nativescript 9.0.6-dev.1 → 9.0.6-dev.3

package/lib/definitions/project.d.ts

@@ -865,6 +865,7 @@ interface IAddExtensionsFromPathOptions extends IAddTargetFromPathOptions {
 
 interface IAddWatchAppFromPathOptions extends IAddTargetFromPathOptions {
 	watchAppFolderPath: string;
+	disableStubBinary?: boolean;
 }
 
 interface IRemoveExtensionsOptions {

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

@@ -96,6 +96,7 @@ class BundlerCompilerService extends events_1.EventEmitter {
                                 console.log("Vite first build completed, resolving compileWithWatch");
                             }
                             resolve(childProcess);
+                            return;
                         }
                         // Transform Vite message to match webpack format
                         const files = message.emittedFiles.map((file) => path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, file));

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

@@ -69,11 +69,13 @@ class IOSWatchAppService {
         const file = project.addSourceFile(path, opt, group);
         project.addToResourcesPbxGroup(file, group);
     }
-    async addWatchAppFromPath({ watchAppFolderPath, projectData, platformData, pbxProjPath, }) {
+    async addWatchAppFromPath({ watchAppFolderPath, projectData, platformData, pbxProjPath, disableStubBinary = false, }) {
         var _a, _b;
         const targetUuids = [];
         const targetNames = [];
         const appPath = path.join(watchAppFolderPath, constants_1.IOS_WATCHAPP_FOLDER);
+        const extensionPath = path.join(watchAppFolderPath, constants_1.IOS_WATCHAPP_EXTENSION_FOLDER);
+        const hasWatchExtension = this.$fs.exists(extensionPath);
         // Check if watchapp exists - it's required
         if (!this.$fs.exists(appPath)) {
             return false;
@@ -90,12 +92,11 @@ class IOSWatchAppService {
         project.removeTargetsByProductType(targetType);
         const parentTargetUuid = project.getFirstTarget().uuid;
         const watchApptarget = this.addTarget(appPath, appFolder, targetType, project, platformData, parentTargetUuid, constants_1.IOSNativeTargetTypes.watchApp);
-        await this.configureTarget(appFolder, path.join(appPath, appFolder), `${projectData.projectIdentifiers.ios}.${WATCH_APP_IDENTIFIER}`, configPath, config, watchApptarget, project, projectData, platformData, pbxProjPath);
+        await this.configureTarget(appFolder, path.join(appPath, appFolder), `${projectData.projectIdentifiers.ios}.${WATCH_APP_IDENTIFIER}`, configPath, config, watchApptarget, project, projectData, platformData, pbxProjPath, !hasWatchExtension);
         targetUuids.push(watchApptarget.uuid);
         targetNames.push(appFolder);
-        const extensionPath = path.join(watchAppFolderPath, constants_1.IOS_WATCHAPP_EXTENSION_FOLDER);
         // Extension is optional (Xcode 14+ supports single target)
-        if (this.$fs.exists(extensionPath)) {
+        if (hasWatchExtension) {
             const extensionFolder = this.$iOSNativeTargetService.getTargetDirectories(extensionPath)[0];
             const configPath = path.join(path.join(extensionPath, extensionFolder), "extension.json");
             const config = this.$fs.exists(configPath)
@@ -118,6 +119,9 @@ class IOSWatchAppService {
         await this.applySPMPackagesToTargets(targetNames, platformData, projectData.projectDir, watchSPMPackages);
         // nothing done after we dont need to reload project
         this.$iOSNativeTargetService.prepareSigning(targetUuids, projectData, pbxProjPath);
+        if (disableStubBinary) {
+            this.applyWatchAppStubBinaryOverrides(appFolder, pbxProjPath);
+        }
         return true;
     }
     addTarget(targetRootPath, targetFolder, targetType, project, platformData, parentTarget, productTargetType) {
@@ -213,7 +217,7 @@ class IOSWatchAppService {
         const watchAppPath = path.join(projectData.getAppResourcesDirectoryPath(), platformData.normalizedPlatformName, constants_1.IOS_WATCHAPP_FOLDER);
         return this.$fs.exists(watchAppPath);
     }
-    async configureTarget(targetName, targetPath, identifier, configPath, config, target, project, projectData, platformData, pbxProjPath) {
+    async configureTarget(targetName, targetPath, identifier, configPath, config, target, project, projectData, platformData, pbxProjPath, disableStubBinary = false) {
         const identifierParts = identifier.split(".");
         identifierParts.pop();
         const wkAppBundleIdentifier = identifierParts.join(".");
@@ -225,6 +229,9 @@ class IOSWatchAppService {
             { name: "WATCHOS_DEPLOYMENT_TARGET", value: 5.2 },
             { name: "WK_APP_BUNDLE_IDENTIFIER", value: wkAppBundleIdentifier },
         ];
+        if (disableStubBinary) {
+            buildConfigProperties.push({ name: "PRODUCT_BINARY_SOURCE_PATH", value: '""' }, { name: "PRODUCT_TYPE_HAS_STUB_BINARY", value: "NO" });
+        }
         const resourcesGroup = targetName + "Resources";
         project.addPbxGroup([], resourcesGroup, project.filepath, null, {
             isMain: true,
@@ -291,6 +298,15 @@ class IOSWatchAppService {
             await this.processWatchAppConfiguration(config, basedir, targetName, target, project, projectData, platformData, pbxProjPath, srcExclude, resourcesExclude);
         }
     }
+    applyWatchAppStubBinaryOverrides(targetName, pbxProjPath) {
+        const project = new this.$xcode.project(pbxProjPath);
+        project.parseSync();
+        this.$iOSNativeTargetService.setXcodeTargetBuildConfigurationProperties([
+            { name: "PRODUCT_BINARY_SOURCE_PATH", value: '""' },
+            { name: "PRODUCT_TYPE_HAS_STUB_BINARY", value: "NO" },
+        ], targetName, project);
+        this.$fs.writeFile(pbxProjPath, project.writeSync({ omitEmptyValues: true }));
+    }
     async processWatchAppConfiguration(config, basedir, targetName, target, project, projectData, platformData, pbxProjPath, srcExclude, resourcesExclude) {
         this.$logger.debug(`processWatchAppConfiguration ${JSON.stringify(config)}`);
         // Handle custom resources

package/package.json

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