nativescript 8.2.3 → 8.2.4-alpha.0

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

@@ -1 +1 @@
-{"@jsdevtools/coverage-istanbul-loader":"3.0.5","karma":"6.3.17","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":"4.0.1","karma-qunit":"4.1.2","@types/karma-chai":"0.1.3","@types/mocha":"9.1.0","@types/jasmine":"4.0.0","@types/qunit":"2.11.3","nyc":"15.1.0"}
+{"@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"}

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: projectName === null || projectName === void 0 ? void 0 : projectName.toLowerCase(),
                 template: selectedTemplate,
                 appId: this.$options.appid,
                 pathToProject: this.$options.path,

package/lib/controllers/run-controller.js

@@ -47,6 +47,7 @@ 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* () {
@@ -423,15 +424,40 @@ class RunController extends events_1.EventEmitter {
                                 const fullLiveSyncResultInfo = yield platformLiveSyncService.liveSyncWatchAction(device, watchInfo);
                                 _.assign(liveSyncResultInfo, fullLiveSyncResultInfo);
                             });
+                            yield this.$hooksService.executeBeforeHooks("watchAction", {
+                                hookArgs: {
+                                    liveSyncResultInfo,
+                                    filesToSync,
+                                    allAppFiles,
+                                    isInHMRMode,
+                                    filesChangedEvent: data,
+                                },
+                            });
                             yield this.refreshApplication(projectData, liveSyncResultInfo, data, deviceDescriptor, fullSyncAction);
-                            if (!liveSyncResultInfo.didRecover && isInHMRMode) {
+                            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");
                                 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;
                                     yield this.refreshApplication(projectData, liveSyncResultInfo, data, deviceDescriptor);
                                 }
                             }
+                            yield this.$hooksService.executeAfterHooks("watchAction", {
+                                liveSyncResultInfo,
+                                filesToSync,
+                                allAppFiles,
+                                filesChangedEvent: data,
+                                isInHMRMode,
+                            });
                             this.$logger.info(util.format(successfullySyncedMessageFormat, deviceAppData.appIdentifier, device.deviceInfo.identifier));
                         });
                         if (liveSyncInfo.useHotModuleReload) {

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

@@ -2,4 +2,5 @@ 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,13 +21,20 @@ 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);
+                    resolve(status !== null && status !== void 0 ? status : constants_1.HmrConstants.HMR_ERROR_STATUS);
                 }
                 else {
                     retryCount--;
@@ -64,6 +71,9 @@ 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]);
@@ -72,6 +82,9 @@ 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,6 +40,8 @@ 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* () {
@@ -57,6 +59,12 @@ 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);
@@ -333,25 +341,30 @@ 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 || message.hash,
+                hash: lastHash,
                 fallbackFiles: [],
             },
             platform: platformData.platformNameLowerCase,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "8.2.3",
+  "version": "8.2.4-alpha.0",
   "author": "NativeScript <support@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {