nativescript 9.1.0-alpha.1 → 9.1.0-alpha.10

package/lib/declarations.d.ts

@@ -31,7 +31,7 @@ interface INodePackageManager {
 	install(
 		packageName: string,
 		pathToSave: string,
-		config: INodePackageManagerInstallOptions
+		config: INodePackageManagerInstallOptions,
 	): Promise<INpmInstallResultInfo>;
 
 	/**
@@ -44,7 +44,7 @@ interface INodePackageManager {
 	uninstall(
 		packageName: string,
 		config?: IDictionary<string | boolean>,
-		path?: string
+		path?: string,
 	): Promise<string>;
 
 	/**
@@ -84,7 +84,7 @@ interface INodePackageManager {
 	 */
 	search(
 		filter: string[],
-		config: IDictionary<string | boolean>
+		config: IDictionary<string | boolean>,
 	): Promise<string>;
 
 	/**
@@ -130,7 +130,7 @@ interface IPerformanceService {
 		methodInfo: string,
 		startTime: number,
 		endTime: number,
-		args: any[]
+		args: any[],
 	): void;
 
 	// Will return a reference time in milliseconds
@@ -141,39 +141,39 @@ interface IPackageInstallationManager {
 	install(
 		packageName: string,
 		packageDir: string,
-		options?: INpmInstallOptions
+		options?: INpmInstallOptions,
 	): Promise<any>;
 	uninstall(
 		packageName: string,
 		packageDir: string,
-		options?: IDictionary<string | boolean>
+		options?: IDictionary<string | boolean>,
 	): Promise<any>;
 	getLatestVersion(packageName: string): Promise<string>;
 	getNextVersion(packageName: string): Promise<string>;
 	getLatestCompatibleVersion(
 		packageName: string,
-		referenceVersion?: string
+		referenceVersion?: string,
 	): Promise<string>;
 	getMaxSatisfyingVersion(
 		packageName: string,
-		versionRange: string
+		versionRange: string,
 	): Promise<string>;
 	getLatestCompatibleVersionSafe(
 		packageName: string,
-		referenceVersion?: string
+		referenceVersion?: string,
 	): Promise<string>;
 	getInspectorFromCache(
 		inspectorNpmPackageName: string,
-		projectDir: string
+		projectDir: string,
 	): Promise<string>;
 	clearInspectorCache(): void;
 	getInstalledDependencyVersion(
 		packageName: string,
-		projectDir?: string
+		projectDir?: string,
 	): Promise<string>;
 	getMaxSatisfyingVersionSafe(
 		packageName: string,
-		versionIdentifier: string
+		versionIdentifier: string,
 	): Promise<string>;
 }
 
@@ -181,8 +181,7 @@ interface IPackageInstallationManager {
  * Describes options that can be passed to manipulate package installation.
  */
 interface INodePackageManagerInstallOptions
-	extends INpmInstallConfigurationOptions,
-		IDictionary<string | boolean> {
+	extends INpmInstallConfigurationOptions, IDictionary<string | boolean> {
 	/**
 	 * Destination of the installation.
 	 * @type {string}
@@ -266,7 +265,7 @@ interface INpmPeerDependencyInfo {
 				 * @type {string}
 				 */
 				requires: string;
-			}
+			},
 		];
 		/**
 		 * Dependencies of the dependency.
@@ -550,8 +549,7 @@ interface INpmInstallConfigurationOptionsBase {
 	ignoreScripts: boolean; //npm flag
 }
 
-interface INpmInstallConfigurationOptions
-	extends INpmInstallConfigurationOptionsBase {
+interface INpmInstallConfigurationOptions extends INpmInstallConfigurationOptionsBase {
 	disableNpmInstall: boolean;
 }
 
@@ -597,7 +595,8 @@ interface ITypingsOptions {
 }
 
 interface IOptions
-	extends IRelease,
+	extends
+		IRelease,
 		IDeviceIdentifier,
 		IJustLaunch,
 		IAvd,
@@ -622,7 +621,7 @@ interface IOptions
 	argv: IYargArgv;
 	validateOptions(
 		commandSpecificDashedOptions?: IDictionary<IDashedOption>,
-		projectData?: IProjectData
+		projectData?: IProjectData,
 	): void;
 	options: IDictionary<IDashedOption>;
 	shorthands: string[];
@@ -709,6 +708,7 @@ interface IOptions
 	dryRun: boolean;
 
 	platformOverride: string;
+	skipNative: boolean;
 	uniqueBundle: boolean;
 	// allow arbitrary options
 	[optionName: string]: any;
@@ -719,26 +719,22 @@ interface IEnvOptions {
 }
 
 interface IAndroidBuildOptionsSettings
-	extends IAndroidReleaseOptions,
-		IRelease,
-		Partial<IHasAndroidBundle> {}
+	extends IAndroidReleaseOptions, IRelease, Partial<IHasAndroidBundle> {}
 
 interface IHasAndroidBundle {
 	androidBundle: boolean;
 }
 
 interface IPlatformBuildData
-	extends IRelease,
-		IHasUseHotModuleReloadOption,
-		IBuildConfig,
-		IEnvOptions {}
+	extends IRelease, IHasUseHotModuleReloadOption, IBuildConfig, IEnvOptions {}
 
 interface IDeviceEmulator extends IHasEmulatorOption, IDeviceIdentifier {}
 
 interface IRunPlatformOptions extends IJustLaunch, IDeviceEmulator {}
 
 interface IDeployPlatformOptions
-	extends IAndroidReleaseOptions,
+	extends
+		IAndroidReleaseOptions,
 		IRelease,
 		IClean,
 		IDeviceEmulator,
@@ -834,7 +830,7 @@ interface IAndroidToolsInfo {
 	 */
 	validateJavacVersion(
 		installedJavaVersion: string,
-		options?: IAndroidToolsInfoOptions
+		options?: IAndroidToolsInfoOptions,
 	): boolean;
 
 	/**
@@ -913,14 +909,14 @@ interface IAppDebugSocketProxyFactory extends NodeJS.EventEmitter {
 		device: Mobile.IiOSDevice,
 		appId: string,
 		projectName: string,
-		projectDir: string
+		projectDir: string,
 	): Promise<any>;
 
 	ensureWebSocketProxy(
 		device: Mobile.IiOSDevice,
 		appId: string,
 		projectName: string,
-		projectDir: string
+		projectDir: string,
 	): Promise<any>;
 
 	removeAllProxies(): void;
@@ -939,12 +935,12 @@ interface IiOSSocketRequestExecutor {
 	executeAttachRequest(
 		device: Mobile.IiOSDevice,
 		timeout: number,
-		projectId: string
+		projectId: string,
 	): Promise<void>;
 	executeRefreshRequest(
 		device: Mobile.IiOSDevice,
 		timeout: number,
-		appId: string
+		appId: string,
 	): Promise<boolean>;
 }
 
@@ -995,7 +991,7 @@ interface IProjectNameService {
 	 */
 	ensureValidName(
 		projectName: string,
-		validateOptions?: { force: boolean }
+		validateOptions?: { force: boolean },
 	): Promise<string>;
 }
 
@@ -1089,7 +1085,7 @@ interface IBundleValidatorHelper {
 	 */
 	getBundlerDependencyVersion(
 		projectData: IProjectData,
-		bundlerName?: string
+		bundlerName?: string,
 	): string;
 }
 
@@ -1171,7 +1167,7 @@ interface IAssetsGenerationService {
 	 * @returns {Promise<void>}
 	 */
 	generateSplashScreens(
-		splashesGenerationData: IResourceGenerationData
+		splashesGenerationData: IResourceGenerationData,
 	): Promise<void>;
 }
 
@@ -1207,7 +1203,7 @@ interface IPlatformValidationService {
 		provision: true | string,
 		teamId: true | string,
 		projectData: IProjectData,
-		platform?: string
+		platform?: string,
 	): Promise<boolean>;
 
 	validatePlatformInstalled(platform: string, projectData: IProjectData): void;
@@ -1220,7 +1216,7 @@ interface IPlatformValidationService {
 	 */
 	isPlatformSupportedForOS(
 		platform: string,
-		projectData: IProjectData
+		projectData: IProjectData,
 	): boolean;
 }
 
@@ -1228,27 +1224,27 @@ interface IPlatformCommandHelper {
 	addPlatforms(
 		platforms: string[],
 		projectData: IProjectData,
-		frameworkPath?: string
+		frameworkPath?: string,
 	): Promise<void>;
 	cleanPlatforms(
 		platforms: string[],
 		projectData: IProjectData,
-		frameworkPath: string
+		frameworkPath: string,
 	): Promise<void>;
 	removePlatforms(
 		platforms: string[],
-		projectData: IProjectData
+		projectData: IProjectData,
 	): Promise<void>;
 	updatePlatforms(
 		platforms: string[],
-		projectData: IProjectData
+		projectData: IProjectData,
 	): Promise<void>;
 	getInstalledPlatforms(projectData: IProjectData): string[];
 	getAvailablePlatforms(projectData: IProjectData): string[];
 	getPreparedPlatforms(projectData: IProjectData): string[];
 	getCurrentPlatformVersion(
 		platform: string,
-		projectData: IProjectData
+		projectData: IProjectData,
 	): string;
 }
 

package/lib/definitions/project.d.ts

@@ -130,6 +130,10 @@ interface INsConfigIOS extends INsConfigPlaform {
 	 * List packages to be included in the iOS build.
 	 */
 	SPMPackages?: Array<IOSSPMPackage>;
+	/**
+	 * Custom runtime package name
+	 */
+	runtimePackageName?: string;
 }
 
 interface INSConfigVisionOS extends INsConfigIOS {}
@@ -168,6 +172,11 @@ interface INsConfigAndroid extends INsConfigPlaform {
 	enableLineBreakpoints?: boolean;
 
 	enableMultithreadedJavascript?: boolean;
+
+	/**
+	 * Custom runtime package name
+	 */
+	runtimePackageName?: string;
 }
 
 interface INsConfigHooks {
@@ -191,6 +200,13 @@ interface INsConfig {
 	ignoredNativeDependencies?: string[];
 	hooks?: INsConfigHooks[];
 	projectName?: string;
+	/**
+	 * Legacy keys still found in user configs. Declared so the
+	 * runtime-package.json generation (PrepareController) can strip them
+	 * via destructuring without losing type safety.
+	 */
+	webpackPackageName?: string;
+	buildPath?: string;
 }
 
 interface IProjectData extends ICreateProjectData {

package/lib/options.js

@@ -225,6 +225,7 @@ class Options {
                 default: true,
             },
             dryRun: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
+            skipNative: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
             uniqueBundle: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
         };
     }

package/lib/services/android-plugin-build-service.js

@@ -276,31 +276,37 @@ class AndroidPluginBuildService {
         }
         if (!runtimeGradleVersions) {
             const latestRuntimeVersion = await this.getLatestRuntimeVersion();
-            runtimeGradleVersions = await this.getGradleVersions(latestRuntimeVersion);
+            runtimeGradleVersions =
+                await this.getGradleVersions(latestRuntimeVersion);
             this.$logger.trace(`Got gradle versions ${JSON.stringify(runtimeGradleVersions)} from the latest runtime v${latestRuntimeVersion}`);
         }
         return runtimeGradleVersions || {};
     }
     async getLatestRuntimeVersion() {
-        var _a;
+        var _a, _b, _c;
         let runtimeVersion = null;
+        const packageName = ((_b = (_a = this.$projectData.nsConfig) === null || _a === void 0 ? void 0 : _a.android) === null || _b === void 0 ? void 0 : _b.runtimePackageName) ||
+            constants_1.SCOPED_ANDROID_RUNTIME_NAME;
         try {
-            let result = await this.$packageManager.view(constants_1.SCOPED_ANDROID_RUNTIME_NAME, {
+            let result = await this.$packageManager.view(packageName, {
                 "dist-tags": true,
             });
-            result = (_a = result === null || result === void 0 ? void 0 : result["dist-tags"]) !== null && _a !== void 0 ? _a : result;
+            result = (_c = result === null || result === void 0 ? void 0 : result["dist-tags"]) !== null && _c !== void 0 ? _c : result;
             runtimeVersion = result.latest;
         }
         catch (err) {
             this.$logger.trace(`Error while getting latest android runtime version from view command: ${err}`);
-            const registryData = await this.$packageManager.getRegistryPackageData(constants_1.SCOPED_ANDROID_RUNTIME_NAME);
+            const registryData = await this.$packageManager.getRegistryPackageData(packageName);
             runtimeVersion = registryData["dist-tags"].latest;
         }
         return runtimeVersion;
     }
     getLocalGradleVersions() {
+        var _a, _b;
+        const packageName = ((_b = (_a = this.$projectData.nsConfig) === null || _a === void 0 ? void 0 : _a.android) === null || _b === void 0 ? void 0 : _b.runtimePackageName) ||
+            constants_1.SCOPED_ANDROID_RUNTIME_NAME;
         // try reading from installed runtime first before reading from the npm registry...
-        const installedRuntimePackageJSONPath = (0, resolve_package_path_1.resolvePackageJSONPath)(constants_1.SCOPED_ANDROID_RUNTIME_NAME, {
+        const installedRuntimePackageJSONPath = (0, resolve_package_path_1.resolvePackageJSONPath)(packageName, {
             paths: [this.$projectData.projectDir],
         });
         if (!installedRuntimePackageJSONPath) {
@@ -327,16 +333,18 @@ class AndroidPluginBuildService {
         return null;
     }
     async getGradleVersions(runtimeVersion) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         let runtimeGradleVersions = null;
         const localVersionInfo = this.getLocalGradleVersions();
         if (localVersionInfo) {
             return localVersionInfo;
         }
+        const packageName = ((_b = (_a = this.$projectData.nsConfig) === null || _a === void 0 ? void 0 : _a.android) === null || _b === void 0 ? void 0 : _b.runtimePackageName) ||
+            constants_1.SCOPED_ANDROID_RUNTIME_NAME;
         // fallback to reading from npm...
         try {
-            let output = await this.$packageManager.view(`${constants_1.SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`, { version_info: true });
-            output = (_a = output === null || output === void 0 ? void 0 : output["version_info"]) !== null && _a !== void 0 ? _a : output;
+            let output = await this.$packageManager.view(`${packageName}@${runtimeVersion}`, { version_info: true });
+            output = (_c = output === null || output === void 0 ? void 0 : output["version_info"]) !== null && _c !== void 0 ? _c : output;
             if (!output) {
                 /**
                  * fallback to the old 'gradle' key in package.json
@@ -346,8 +354,8 @@ class AndroidPluginBuildService {
                  * gradle: { version: '6.4', android: '3.6.4' }
                  *
                  */
-                output = await this.$packageManager.view(`${constants_1.SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`, { gradle: true });
-                output = (_b = output === null || output === void 0 ? void 0 : output["gradle"]) !== null && _b !== void 0 ? _b : output;
+                output = await this.$packageManager.view(`${packageName}@${runtimeVersion}`, { gradle: true });
+                output = (_d = output === null || output === void 0 ? void 0 : output["gradle"]) !== null && _d !== void 0 ? _d : output;
                 const { version, android } = output;
                 // covert output to the new format...
                 output = {
@@ -359,7 +367,7 @@ class AndroidPluginBuildService {
         }
         catch (err) {
             this.$logger.trace(`Error while getting gradle data for android runtime from view command: ${err}`);
-            const registryData = await this.$packageManager.getRegistryPackageData(constants_1.SCOPED_ANDROID_RUNTIME_NAME);
+            const registryData = await this.$packageManager.getRegistryPackageData(packageName);
             runtimeGradleVersions = registryData.versions[runtimeVersion];
         }
         const result = this.getGradleVersionsCore(runtimeGradleVersions);

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

@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BundlerCompilerService = void 0;
 const path = require("path");
+const net = require("net");
 const semver = require("semver");
 const _ = require("lodash");
 const events_1 = require("events");
@@ -34,8 +35,15 @@ class BundlerCompilerService extends events_1.EventEmitter {
         this.$packageInstallationManager = $packageInstallationManager;
         this.$projectConfigService = $projectConfigService;
         this.bundlerProcesses = {};
+        // Vite-only: the long-lived `vite serve` dev server the device fetches
+        // modules and HMR updates from. Keyed by platform, managed by this CLI
+        // so users no longer need a separate `concurrently`/`wait-on` process.
+        this.viteServeProcesses = {};
         this.expectedHashes = {};
     }
+    getViteDistOutputPath(projectDir) {
+        return path.join(projectDir, process.env.NS_VITE_DIST_DIR || constants_1.VITE_DIST_FOLDER_NAME);
+    }
     async compileWithWatch(platformData, projectData, prepareData) {
         return new Promise(async (resolve, reject) => {
             if (this.bundlerProcesses[platformData.platformNameLowerCase]) {
@@ -44,6 +52,14 @@ class BundlerCompilerService extends events_1.EventEmitter {
             }
             let isFirstBundlerWatchCompilation = true;
             prepareData.watch = true;
+            // Bring up the Vite HMR dev server the device fetches modules /
+            // HMR updates from. No-op unless bundler is vite + hmr + watch.
+            // Fired in parallel with the build watcher; both child processes
+            // inherit the adb-reverse env the run-controller set before
+            // prepare, so neither one spawns adb on its own. Intentionally not
+            // awaited — the device only connects to it at app launch, well
+            // after the first build.
+            this.startViteDevServer(platformData, projectData, prepareData);
             try {
                 const childProcess = await this.startBundleProcess(platformData, projectData, prepareData);
                 // Handle Vite differently from webpack
@@ -67,7 +83,7 @@ class BundlerCompilerService extends events_1.EventEmitter {
                             console.log("Received Vite IPC message:", message);
                         }
                         // Copy Vite output files directly to platform destination
-                        const distOutput = path.join(projectData.projectDir, constants_1.VITE_DIST_FOLDER_NAME);
+                        const distOutput = this.getViteDistOutputPath(projectData.projectDir);
                         const destDir = path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName);
                         if (debugLog) {
                             console.log(`Copying from ${distOutput} to ${destDir}.`);
@@ -232,7 +248,7 @@ class BundlerCompilerService extends events_1.EventEmitter {
                         // launch with `Check failed: has_pending_exception()`.
                         if (isVite) {
                             try {
-                                const distOutput = path.join(projectData.projectDir, constants_1.VITE_DIST_FOLDER_NAME);
+                                const distOutput = this.getViteDistOutputPath(projectData.projectDir);
                                 const destDir = path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName);
                                 this.copyViteBundleToNative(distOutput, destDir);
                             }
@@ -343,6 +359,141 @@ class BundlerCompilerService extends events_1.EventEmitter {
         await this.$cleanupService.addKillProcess(childProcess.pid.toString());
         return childProcess;
     }
+    getViteHmrPort() {
+        const fromEnv = Number(process.env.NS_HMR_PORT);
+        return Number.isFinite(fromEnv) && fromEnv > 0 ? fromEnv : 5173;
+    }
+    /**
+     * Spawn and manage the Vite dev server (`vite serve`) for HMR.
+     *
+     * Why the CLI owns this. With Vite, HMR needs a long-lived dev server
+     * (HTTP + the `/ns-hmr` websocket on port 5173) that the device fetches
+     * modules and hot updates from — it is SEPARATE from the
+     * `vite build --watch` process that emits the `bundle.mjs` bootstrap
+     * baked into the app. Historically users wired this up themselves with
+     * `concurrently`/`wait-on`, which left two uncoordinated processes both
+     * touching adb during cold start (the source of the Android
+     * "Searching for devices…" freeze). By spawning it here as a child of
+     * the CLI, the dev server inherits the CLI's environment — crucially
+     * `NS_ADB_REVERSE_READY`/`NS_DEVICE_SERIAL`/`NS_ADB_PATH` set by the
+     * run-controller — so the CLI is the single adb owner and the dev
+     * server never spawns adb itself.
+     *
+     * No-op unless bundler is vite, HMR is on, watch mode, and not release.
+     * Best-effort: failures are logged, never thrown — a dev-server hiccup
+     * must not fail the run.
+     */
+    async startViteDevServer(platformData, projectData, prepareData) {
+        try {
+            if (this.getBundler() !== "vite") {
+                return;
+            }
+            if (!prepareData.watch || !prepareData.hmr || prepareData.release) {
+                return;
+            }
+            const key = platformData.platformNameLowerCase;
+            if (this.viteServeProcesses[key]) {
+                return;
+            }
+            const port = this.getViteHmrPort();
+            // One dev server per port. Simultaneous multi-platform HMR in a
+            // single CLI invocation would collide on 5173 — that case still
+            // needs a distinct NS_HMR_PORT per platform, so skip + warn rather
+            // than fail to bind.
+            const collidingPlatform = Object.keys(this.viteServeProcesses)[0];
+            if (collidingPlatform) {
+                this.$logger.warn(`Vite dev server already running for '${collidingPlatform}' on port ${port}; skipping a second server for '${key}'. For simultaneous multi-platform HMR, set a distinct NS_HMR_PORT per platform.`);
+                return;
+            }
+            const envData = this.buildEnvData(platformData.platformNameLowerCase, projectData, prepareData);
+            const cliArgs = await this.buildEnvCommandLineParams(envData, platformData, projectData, prepareData);
+            const additionalNodeArgs = semver.major(process.version) <= 8 ? ["--harmony"] : [];
+            if (await this.shouldUsePreserveSymlinksOption()) {
+                additionalNodeArgs.push("--preserve-symlinks");
+            }
+            // `vite serve` (not `build`): runs the dev server and watches on
+            // its own — no `--watch`. Env flags (`--env.android --env.hmr …`)
+            // go after `--` so vite's CLI doesn't choke on unknown options.
+            const args = [
+                ...additionalNodeArgs,
+                this.getBundlerExecutablePath(projectData),
+                "serve",
+                `--config=${projectData.bundlerConfigPath}`,
+                `--mode=development`,
+                "--",
+                ...cliArgs,
+            ].filter(Boolean);
+            const options = {
+                cwd: projectData.projectDir,
+                // Inherit so the dev server's URLs/logs stream to the user as
+                // before. No IPC needed here — the build watcher provides the
+                // bundle-complete IPC; the dev server is fetched over HTTP/ws.
+                stdio: "inherit",
+                env: {
+                    ...process.env,
+                    NATIVESCRIPT_BUNDLER_ENV: JSON.stringify(envData),
+                },
+            };
+            if (this.$hostInfo.isWindows) {
+                Object.assign(options.env, { APPDATA: process.env.appData });
+            }
+            this.$logger.info(`Starting Vite dev server (HMR) for ${key} on port ${port}…`);
+            const childProcess = this.$childProcess.spawn(process.execPath, args, options);
+            this.viteServeProcesses[key] = childProcess;
+            await this.$cleanupService.addKillProcess(childProcess.pid.toString());
+            childProcess.once("exit", (code) => {
+                delete this.viteServeProcesses[key];
+                if (code) {
+                    this.$logger.warn(`Vite dev server for ${key} exited with code ${code}.`);
+                }
+            });
+            // Bounded readiness probe so we can surface a clear log once the
+            // device can actually reach modules.
+            const ready = await this.waitForPort(port, 30000);
+            if (ready) {
+                this.$logger.info(`Vite dev server ready on port ${port} (HMR for ${key}).`);
+            }
+            else {
+                this.$logger.trace(`Vite dev server port ${port} not observed open within the readiness probe window; continuing (it may bind shortly).`);
+            }
+        }
+        catch (err) {
+            this.$logger.warn(`Failed to start the Vite dev server: ${err}. HMR may be unavailable.`);
+        }
+    }
+    /**
+     * Resolve true once `127.0.0.1:<port>` accepts a TCP connection, or
+     * false after `timeoutMs`. Used to detect the Vite dev server is up.
+     */
+    waitForPort(port, timeoutMs) {
+        const deadline = Date.now() + timeoutMs;
+        return new Promise((resolve) => {
+            const attempt = () => {
+                const socket = net.connect({ port, host: "127.0.0.1" });
+                let settled = false;
+                const done = (ok) => {
+                    if (settled) {
+                        return;
+                    }
+                    settled = true;
+                    socket.destroy();
+                    if (ok) {
+                        resolve(true);
+                    }
+                    else if (Date.now() >= deadline) {
+                        resolve(false);
+                    }
+                    else {
+                        setTimeout(attempt, 250);
+                    }
+                };
+                socket.once("connect", () => done(true));
+                socket.once("error", () => done(false));
+                socket.setTimeout(1000, () => done(false));
+            };
+            attempt();
+        });
+    }
     buildEnvData(platform, projectData, prepareData) {
         var _a, _b, _c;
         const { env } = prepareData;
@@ -474,6 +625,13 @@ class BundlerCompilerService extends events_1.EventEmitter {
             bundlerProcess.kill("SIGINT");
             delete this.bundlerProcesses[platform];
         }
+        // Tear down the Vite dev server we manage alongside the build watcher.
+        const viteServeProcess = this.viteServeProcesses[platform];
+        if (viteServeProcess) {
+            await this.$cleanupService.removeKillProcess(viteServeProcess.pid.toString());
+            viteServeProcess.kill("SIGINT");
+            delete this.viteServeProcesses[platform];
+        }
     }
     handleHMRMessage(message, platformData, projectData, prepareData) {
         // handle new bundler hmr packets

package/lib/services/ios/xcodebuild-args-service.js

@@ -100,10 +100,17 @@ class XcodebuildArgsService {
         // Introduced in Xcode 14+
         // ref: https://forums.swift.org/t/telling-xcode-14-beta-4-to-trust-build-tool-plugins-programatically/59305/5
         const skipPackageValidation = "-skipPackagePluginValidation";
+        // Introduced in Xcode 15+ to trust Swift macros (compiler plugins)
+        // non-interactively. Required for SPM packages that ship macros
+        // (e.g. apple/RealityKitScripting), otherwise the build fails with:
+        // "Macro '...' from package '...' must be enabled before it can be used"
+        // ref: https://developer.apple.com/documentation/xcode/writing-swift-macros
+        const skipMacroValidation = "-skipMacroValidation";
         const extraArgs = [
             "-scheme",
             projectData.projectName,
             skipPackageValidation,
+            skipMacroValidation,
         ];
         const BUILD_SETTINGS_FILE_PATH = path.join(projectData.appResourcesDirectoryPath, platformData.normalizedPlatformName, constants.BUILD_XCCONFIG_FILE_NAME);
         // Only include explicit properties from build.xcconfig
@@ -112,6 +119,17 @@ class XcodebuildArgsService {
         // like cocoapods issues related to ASSETCATALOG_COMPILER_APPICON_NAME
         // references: https://medium.com/@iostechset/why-cocoapods-eats-app-icons-79fe729808d4
         // https://github.com/CocoaPods/CocoaPods/issues/7003
+        // Xcode 26 makes Swift "explicitly built modules" the default. A
+        // regression there prevents macro/compiler-plugin SPM targets from
+        // resolving their swift-syntax module dependencies, failing with:
+        // "Unable to resolve module dependency: 'SwiftSyntax'" (and SwiftParser,
+        // SwiftSyntaxMacros, SwiftCompilerPlugin, SwiftDiagnostics).
+        // Passed as a command-line build setting so it overrides ALL targets,
+        // including the package targets we don't control.
+        // ref: https://forums.swift.org/t/xcode-26-unable-to-find-module-dependency/80516
+        const explicitModulesProperty = "SWIFT_ENABLE_EXPLICIT_MODULES";
+        const explicitModulesValue = this.$xcconfigService.readPropertyValue(BUILD_SETTINGS_FILE_PATH, explicitModulesProperty) || "NO";
+        extraArgs.push(`${explicitModulesProperty}=${explicitModulesValue}`);
         const deployTargetProperty = "IPHONEOS_DEPLOYMENT_TARGET";
         const deployTargetVersion = this.$xcconfigService.readPropertyValue(BUILD_SETTINGS_FILE_PATH, deployTargetProperty);
         if (deployTargetVersion) {
@@ -122,6 +140,14 @@ class XcodebuildArgsService {
         if (swiftUIBootValue) {
             extraArgs.push(`${swiftUIBootProperty}=${swiftUIBootValue}`);
         }
+        // Swift macro/compiler-plugin SPM targets must be code-signed with a
+        // development team when building for a device. Pass DEVELOPMENT_TEAM as a
+        // command-line build setting so it applies to SPM package targets too.
+        const developmentTeamProperty = "DEVELOPMENT_TEAM";
+        const developmentTeamValue = this.$xcconfigService.readPropertyValue(BUILD_SETTINGS_FILE_PATH, developmentTeamProperty);
+        if (developmentTeamValue) {
+            extraArgs.push(`${developmentTeamProperty}=${developmentTeamValue}`);
+        }
         if (this.$fs.exists(xcworkspacePath)) {
             return ["-workspace", xcworkspacePath, ...extraArgs];
         }