nativescript 9.1.0-alpha.14 → 9.1.0-alpha.15

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

@@ -44,6 +44,12 @@ class BundlerCompilerService extends events_1.EventEmitter {
     getViteDistOutputPath(projectDir) {
         return path.join(projectDir, process.env.NS_VITE_DIST_DIR || constants_1.VITE_DIST_FOLDER_NAME);
     }
+    getViteBuildPaths(platformData, projectData) {
+        return {
+            distOutput: this.getViteDistOutputPath(projectData.projectDir),
+            destDir: path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName),
+        };
+    }
     async compileWithWatch(platformData, projectData, prepareData) {
         return new Promise(async (resolve, reject) => {
             if (this.bundlerProcesses[platformData.platformNameLowerCase]) {
@@ -88,8 +94,7 @@ class BundlerCompilerService extends events_1.EventEmitter {
                             console.log("Received Vite IPC message:", message);
                         }
                         // Copy Vite output files directly to platform destination
-                        const distOutput = this.getViteDistOutputPath(projectData.projectDir);
-                        const destDir = path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName);
+                        const { distOutput, destDir } = this.getViteBuildPaths(platformData, projectData);
                         if (debugLog) {
                             console.log(`Copying from ${distOutput} to ${destDir}.`);
                         }
@@ -256,17 +261,19 @@ class BundlerCompilerService extends events_1.EventEmitter {
                         // is left empty (or worse, runs stale dev/HMR artifacts from
                         // a previous `ns debug` run) and the runtime crashes on
                         // launch with `Check failed: has_pending_exception()`.
-                        if (isVite) {
-                            try {
-                                const distOutput = this.getViteDistOutputPath(projectData.projectDir);
-                                const destDir = path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName);
-                                this.copyViteBundleToNative(distOutput, destDir);
-                            }
-                            catch (copyErr) {
-                                this.$logger.warn(`Failed to copy Vite output to platform destination: ${copyErr.message}`);
+                        // The copy must succeed for the build to succeed — a build
+                        // whose bundle never reached the native app is not a
+                        // successful build, so copy failures reject here.
+                        try {
+                            if (isVite) {
+                                const { distOutput, destDir } = this.getViteBuildPaths(platformData, projectData);
+                                this.copyViteBundleToNative(distOutput, destDir, null, true);
                             }
+                            resolve();
+                        }
+                        catch (error) {
+                            reject(error);
                         }
-                        resolve();
                     }
                     else {
                         const error = new Error(`Executing ${projectData.bundler} failed with exit code ${exitCode}.`);
@@ -732,7 +739,7 @@ class BundlerCompilerService extends events_1.EventEmitter {
     getBundler() {
         return this.$projectConfigService.getValue(`bundler`, "webpack");
     }
-    copyViteBundleToNative(distOutput, destDir, specificFiles = null) {
+    copyViteBundleToNative(distOutput, destDir, specificFiles = null, failOnError = false) {
         // Clean and copy Vite output to native platform folder
         if (debugLog) {
             console.log(`Copying Vite bundle from "${distOutput}" to "${destDir}".`);
@@ -764,22 +771,27 @@ class BundlerCompilerService extends events_1.EventEmitter {
                 if (debugLog) {
                     console.log("Full build: Copying all files.");
                 }
+                // Validate the source before touching the destination — cleaning
+                // destDir first would wipe a previously good bundle and leave an
+                // empty app folder behind a missing Vite output.
+                if (!this.$fs.exists(distOutput)) {
+                    throw new Error(`Vite output directory does not exist: ${distOutput}`);
+                }
                 // Clean destination directory
                 if (this.$fs.exists(destDir)) {
                     this.$fs.deleteDirectory(destDir);
                 }
                 this.$fs.createDirectory(destDir);
                 // Copy all files from dist to platform destination
-                if (this.$fs.exists(distOutput)) {
-                    this.copyRecursiveSync(distOutput, destDir);
-                }
-                else {
-                    this.$logger.warn(`Vite output directory does not exist: ${distOutput}`);
-                }
+                this.copyRecursiveSync(distOutput, destDir);
             }
         }
         catch (error) {
-            this.$logger.warn(`Failed to copy Vite bundle: ${error.message}`);
+            const copyError = error instanceof Error ? error : new Error(String(error));
+            if (failOnError) {
+                throw copyError;
+            }
+            this.$logger.warn(`Failed to copy Vite bundle: ${copyError.message}`);
         }
     }
     getIncrementalFilesToCopy(emittedFiles) {

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

@@ -62,12 +62,10 @@ class SPMService {
                 this.$logger.trace("SPM: no SPM packages to apply.");
                 return;
             }
-            // one compact line naming every package and where it comes from —
-            // when resolution is slow or fails, this is the first thing needed
-            // to tell WHICH dependency is responsible.
-            this.$logger.info(`Swift Packages: ${spmPackages
-                .map((pkg) => this.describePackageSource(pkg))
-                .join(", ")}`);
+            // name every package and where it comes from — when resolution is
+            // slow or fails, this is the first thing needed to tell WHICH
+            // dependency is responsible.
+            this.$logger.info(this.formatPackageListing(spmPackages));
             const project = new trapezedev_project_1.MobileProject(platformData.projectRoot, {
                 ios: {
                     path: ".",
@@ -179,7 +177,7 @@ class SPMService {
                     spinner.stopAndPersist({
                         symbol: color_1.color.yellow("ℹ"),
                         text: color_1.color.yellow(`the "${fetchingPackageRef}" package is hosted in a repository with a large git history — ` +
-                            `SwiftPM clones the entire repository on first fetch, which can take a long time.\n` +
+                            `SwiftPM clones the entire repository on first fetch, which can take a long time.${os.EOL}` +
                             `  cache: ${SPMService.SWIFTPM_REPO_CACHE}`),
                     });
                     spinner.start();
@@ -189,7 +187,8 @@ class SPMService {
         }, 1000);
         const onProgress = (chunk) => {
             lineBuffer += chunk.data;
-            const lines = lineBuffer.split("\n");
+            // tolerate CRLF as well as LF so parsed lines never carry a stray \r
+            const lines = lineBuffer.split(/\r?\n/);
             // keep the last (possibly partial) line in the buffer
             lineBuffer = lines.pop();
             for (const line of lines) {
@@ -335,6 +334,17 @@ class SPMService {
         const seconds = totalSeconds % 60;
         return `${minutes}m ${seconds}s`;
     }
+    /**
+     * Multi-line listing of every package and its source — one package per
+     * line, separated by the platform EOL so entries never clump together in
+     * terminal output on macOS, Windows, or Linux.
+     */
+    formatPackageListing(spmPackages) {
+        return [
+            "Swift Packages:",
+            ...spmPackages.map((pkg) => `  ${this.describePackageSource(pkg)}`),
+        ].join(os.EOL);
+    }
     /**
      * One-line description of a package and where it resolves from, e.g.
      * "FontManager (1.0.12 · https://github.com/NativeScript/font-manager.git)"
@@ -364,8 +374,7 @@ class SPMService {
         let total = 0;
         for (const entry of entries) {
             if (entry.isDirectory() &&
-                (entry.name === packageRef ||
-                    entry.name.startsWith(`${packageRef}-`))) {
+                (entry.name === packageRef || entry.name.startsWith(`${packageRef}-`))) {
                 total += this.getDirectorySizeBytes(path.join(SPMService.SWIFTPM_REPO_CACHE, entry.name));
             }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "main": "./lib/nativescript-cli-lib.js",
-  "version": "9.1.0-alpha.14",
+  "version": "9.1.0-alpha.15",
   "author": "NativeScript <oss@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
@@ -60,7 +60,7 @@
     "@npmcli/arborist": "9.1.8",
     "@nstudio/trapezedev-project": "7.2.4",
     "@rigor789/resolve-package-path": "1.0.7",
-    "axios": "1.13.5",
+    "axios": "1.18.1",
     "byline": "5.0.0",
     "chokidar": "^3.6.0",
     "cli-table3": "0.6.5",
@@ -96,7 +96,7 @@
     "qrcode-terminal": "0.12.0",
     "semver": "7.7.3",
     "shelljs": "0.10.0",
-    "simple-git": "3.30.0",
+    "simple-git": "3.36.0",
     "simple-plist": "1.4.0",
     "source-map": "0.7.6",
     "tar": "7.5.9",