nativescript 8.2.4-alpha.1 → 8.3.0-beta.0

package/config/test-deps-versions-generated.json

@@ -1 +1 @@
-{"@jsdevtools/coverage-istanbul-loader":"3.0.5","karma":"6.3.19","karma-coverage":"2.2.0","karma-nativescript-launcher":"0.4.0","mocha":"9.2.2","karma-mocha":"2.0.1","karma-chai":"0.1.0","karma-jasmine":"5.0.0","karma-qunit":"4.1.2","@types/karma-chai":"0.1.3","@types/mocha":"9.1.1","@types/jasmine":"4.0.3","@types/qunit":"2.11.3","nyc":"15.1.0"}
+{"@jsdevtools/coverage-istanbul-loader":"3.0.5","karma":"6.4.0","karma-coverage":"2.2.0","karma-nativescript-launcher":"0.4.0","mocha":"10.0.0","karma-mocha":"2.0.1","karma-chai":"0.1.0","karma-jasmine":"5.1.0","karma-qunit":"4.1.2","@types/karma-chai":"0.1.3","@types/mocha":"9.1.1","@types/jasmine":"4.0.3","@types/qunit":"2.19.2","nyc":"15.1.0"}

package/lib/commands/create-project.js

@@ -82,7 +82,7 @@ class CreateProjectCommand {
                 selectedTemplate = yield this.interactiveFlavorAndTemplateSelection(getNextInteractiveAdverb(), getNextInteractiveAdverb());
             }
             this.createdProjectData = yield this.$projectService.createProject({
-                projectName,
+                projectName: projectName,
                 template: selectedTemplate,
                 appId: this.$options.appid,
                 pathToProject: this.$options.path,

package/lib/commands/preview.js

@@ -11,15 +11,71 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PreviewCommand = void 0;
 const yok_1 = require("../common/yok");
+const path = require("path");
+const resolve_package_path_1 = require("@rigor789/resolve-package-path");
+const constants_1 = require("../constants");
+const PREVIEW_CLI_PACKAGE = "@nativescript/preview-cli";
 class PreviewCommand {
-    constructor($errors) {
+    constructor($logger, $errors, $projectData, $packageManager, $childProcess, $options) {
+        this.$logger = $logger;
         this.$errors = $errors;
+        this.$projectData = $projectData;
+        this.$packageManager = $packageManager;
+        this.$childProcess = $childProcess;
+        this.$options = $options;
         this.allowedParameters = [];
     }
+    getPreviewCLIPath() {
+        return (0, resolve_package_path_1.resolvePackagePath)(PREVIEW_CLI_PACKAGE, {
+            paths: [this.$projectData.projectDir],
+        });
+    }
     execute(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.$errors.fail(`The Preview service has been disabled until further notice.\n\n` +
-                `Configure local builds and use "ns run ${args.join(" ")}" instead.`);
+            if (!this.$options.disableNpmInstall) {
+                yield this.$packageManager.install(`${PREVIEW_CLI_PACKAGE}@latest`, this.$projectData.projectDir, {
+                    "save-dev": true,
+                    "save-exact": true,
+                });
+            }
+            const previewCLIPath = this.getPreviewCLIPath();
+            if (!previewCLIPath) {
+                const packageManagerName = yield this.$packageManager.getPackageManagerName();
+                let installCommand = "";
+                switch (packageManagerName) {
+                    case constants_1.PackageManagers.npm:
+                        installCommand = "npm install --save-dev @nativescript/preview-cli";
+                        break;
+                    case constants_1.PackageManagers.yarn:
+                        installCommand = "yarn add -D @nativescript/preview-cli";
+                        break;
+                    case constants_1.PackageManagers.pnpm:
+                        installCommand = "pnpm install --save-dev @nativescript/preview-cli";
+                        break;
+                }
+                this.$logger.info([
+                    `Uhh ohh, no Preview CLI found.`,
+                    "",
+                    `This should not happen under regular circumstances, but seems like it did somehow... :(`,
+                    `Good news though, you can install the Preview CLI by running`,
+                    "",
+                    "  " + installCommand.green,
+                    "",
+                    "Once installed, run this command again and everything should work!",
+                    "If it still fails, you can invoke the preview-cli directly as a last resort with",
+                    "",
+                    "  ./node_modules/.bin/preview-cli".cyan,
+                    "",
+                    "And if you are still having issues, try again - or reach out on Discord/open an issue on GitHub.",
+                ].join("\n"));
+                this.$errors.fail("Running preview failed.");
+            }
+            const previewCLIBinPath = path.resolve(previewCLIPath, "./dist/index.js");
+            const commandIndex = process.argv.indexOf("preview");
+            const commandArgs = process.argv.slice(commandIndex + 1);
+            this.$childProcess.spawn(previewCLIBinPath, commandArgs, {
+                stdio: "inherit",
+            });
         });
     }
     canExecute(args) {

package/lib/controllers/run-controller.js

@@ -47,7 +47,6 @@ class RunController extends events_1.EventEmitter {
         this.$projectChangesService = $projectChangesService;
         this.$projectDataService = $projectDataService;
         this.prepareReadyEventHandler = null;
-        this.currentStartingHash = "";
     }
     run(runData) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -434,17 +433,8 @@ class RunController extends events_1.EventEmitter {
                                 },
                             });
                             yield this.refreshApplication(projectData, liveSyncResultInfo, data, deviceDescriptor, fullSyncAction);
-                            const startingHash = this.$hmrStatusService.getStartingHash();
-                            if (!liveSyncResultInfo.didRecover &&
-                                isInHMRMode &&
-                                filesToSync.some((file) => file.includes("hot-update")) &&
-                                (!startingHash ||
-                                    this.currentStartingHash === startingHash ||
-                                    startingHash === data.hmrData.hash)) {
-                                this.currentStartingHash = startingHash;
-                                console.time("hmrStatus");
+                            if (!liveSyncResultInfo.didRecover && isInHMRMode) {
                                 const status = yield this.$hmrStatusService.getHmrStatus(device.deviceInfo.identifier, data.hmrData.hash);
-                                console.timeEnd("hmrStatus");
                                 if (status === constants_1.HmrConstants.HMR_ERROR_STATUS) {
                                     yield fullSyncAction();
                                     liveSyncResultInfo.isFullSync = true;

package/lib/definitions/hmr-status-service.d.ts

@@ -2,5 +2,4 @@ interface IHmrStatusService {
 	watchHmrStatus(deviceId: string, operationHash: string): void;
 	getHmrStatus(deviceId: string, operationHash: string): Promise<number>;
 	attachToHmrStatusEvent(): void;
-	getStartingHash(): string;
 }

package/lib/services/hmr-status-service.js

@@ -21,20 +21,13 @@ class HmrStatusService {
     getHmrStatus(deviceId, operationHash) {
         return new Promise((resolve, reject) => {
             const key = `${deviceId}${operationHash}`;
-            this.$logger.trace("INITIAL CHECKING HASH STATUS", operationHash);
-            const status = this.getStatusByKey(operationHash);
-            if (status) {
-                resolve(status);
-                return;
-            }
             let retryCount = 40;
             this.intervals[key] = setInterval(() => {
-                this.$logger.trace("CHECKING HASH STATUS", operationHash);
                 const status = this.getStatusByKey(key);
                 if (status || retryCount === 0) {
                     clearInterval(this.intervals[key]);
                     this.intervals[key] = null;
-                    resolve(status !== null && status !== void 0 ? status : constants_1.HmrConstants.HMR_ERROR_STATUS);
+                    resolve(status);
                 }
                 else {
                     retryCount--;
@@ -71,9 +64,6 @@ class HmrStatusService {
             regex: /\[HMR]\[(.+)]\s*(\w+)\s*\|/,
             handler: (matches, deviceId) => {
                 const [hash, status] = matches.slice(1);
-                if (status.trim() === "boot") {
-                    this.startingBundleHash = hash;
-                }
                 const mappedStatus = statusStringMap[status.trim()];
                 if (mappedStatus) {
                     this.setData(deviceId, hash, statusStringMap[status]);
@@ -82,9 +72,6 @@ class HmrStatusService {
             name: "hmr-status",
         });
     }
-    getStartingHash() {
-        return this.startingBundleHash;
-    }
     handleAppCrash(matches, deviceId) {
         for (const operationId in this.hashOperationStatuses) {
             const operation = this.hashOperationStatuses[operationId];

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

@@ -40,8 +40,6 @@ class WebpackCompilerService extends events_1.EventEmitter {
         this.$packageInstallationManager = $packageInstallationManager;
         this.webpackProcesses = {};
         this.expectedHashes = {};
-        this.hashQueue = [];
-        this.lastEmittedHash = "";
     }
     compileWithWatch(platformData, projectData, prepareData) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -59,12 +57,6 @@ class WebpackCompilerService extends events_1.EventEmitter {
                         if (typeof message === "object" &&
                             "version" in message &&
                             "type" in message) {
-                            const currentHash = message.hash;
-                            if (this.hashQueue.length == 0 ||
-                                this.hashQueue[this.hashQueue.length - 1] !== currentHash) {
-                                this.hashQueue.push(currentHash);
-                            }
-                            this.currentCompilationHash = currentHash;
                             if (isFirstWebpackWatchCompilation) {
                                 isFirstWebpackWatchCompilation = false;
                                 resolve(childProcess);
@@ -341,30 +333,25 @@ class WebpackCompilerService extends events_1.EventEmitter {
         this.$logger.trace("Webpack build done!");
         const files = message.data.emittedAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, "app", asset));
         const staleFiles = message.data.staleAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, "app", asset));
+        const lastHash = (() => {
+            const fileWithLastHash = files.find((fileName) => fileName.endsWith("hot-update.js"));
+            if (!fileWithLastHash) {
+                return null;
+            }
+            const matches = fileWithLastHash.match(/\.(.+).hot-update\.js/);
+            if (matches) {
+                return matches[1];
+            }
+        })();
         if (!files.length) {
             return;
         }
-        let currentIdx = 0;
-        let lastHash = this.hashQueue.length > 0
-            ? this.hashQueue[currentIdx]
-            : this.currentCompilationHash;
-        while (lastHash !== this.currentCompilationHash) {
-            if (files.some((f) => f.endsWith(`${lastHash}.hot-update.js`))) {
-                this.hashQueue.splice(0, currentIdx + 1);
-                break;
-            }
-            currentIdx++;
-            lastHash =
-                this.hashQueue.length > currentIdx
-                    ? this.hashQueue[currentIdx]
-                    : this.currentCompilationHash;
-        }
         this.emit(constants_1.WEBPACK_COMPILATION_COMPLETE, {
             files,
             staleFiles,
             hasOnlyHotUpdateFiles: prepareData.hmr,
             hmrData: {
-                hash: lastHash,
+                hash: lastHash || message.hash,
                 fallbackFiles: [],
             },
             platform: platformData.platformNameLowerCase,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "8.2.4-alpha.1",
+  "version": "8.3.0-beta.0",
   "author": "NativeScript <support@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
@@ -86,7 +86,7 @@
     "minimatch": "3.0.4",
     "mkdirp": "1.0.4",
     "mute-stream": "0.0.8",
-    "nativescript-dev-xcode": "0.4.0",
+    "nativescript-dev-xcode": "0.2.1",
     "nativescript-preview-sdk": "0.4.2",
     "open": "7.1.0",
     "ora": "5.0.0",
@@ -106,7 +106,7 @@
     "shelljs": "0.8.4",
     "simple-git": "^2.20.1",
     "simple-plist": "1.1.0",
-    "source-map": "0.7.3",
+    "source-map": "0.7.4",
     "stringify-package": "1.0.1",
     "tabtab": "https://github.com/Icenium/node-tabtab/tarball/master",
     "tar": "6.0.2",