@nativescript/vite 2.0.0 → 2.0.2

package/hmr/server/websocket.js

@@ -2626,9 +2626,25 @@ function createHmrWebSocketPlugin(opts) {
                     const candidates = [...(hasExt ? [spec] : []), baseNoExt + '.ts', baseNoExt + '.js', baseNoExt + '.tsx', baseNoExt + '.jsx', baseNoExt + '.mjs', baseNoExt + '.mts', baseNoExt + '.cts', baseNoExt + '.vue', baseNoExt + '/index.ts', baseNoExt + '/index.js', baseNoExt + '/index.tsx', baseNoExt + '/index.jsx', baseNoExt + '/index.mjs'];
                     let transformed = null;
                     let resolvedCandidate = null;
+                    // Wrap transformRequest with a timeout to prevent Vite 7+ optimizeDeps
+                    // discovery from blocking the HTTP ESM pipeline indefinitely.
+                    const transformWithTimeout = (url, timeoutMs = 30000) => {
+                        return Promise.race([
+                            server.transformRequest(url),
+                            new Promise((resolve) => {
+                                setTimeout(() => {
+                                    try {
+                                        console.warn('[ns:m] transformRequest timeout for', url, '(' + timeoutMs + 'ms)');
+                                    }
+                                    catch { }
+                                    resolve(null);
+                                }, timeoutMs);
+                            }),
+                        ]);
+                    };
                     for (const cand of candidates) {
                         try {
-                            const r = await server.transformRequest(cand);
+                            const r = await transformWithTimeout(cand);
                             if (r?.code) {
                                 transformed = r;
                                 resolvedCandidate = cand;
@@ -2643,7 +2659,7 @@ function createHmrWebSocketPlugin(opts) {
                             const rid = await server.pluginContainer?.resolveId?.(spec, undefined);
                             const ridStr = typeof rid === 'string' ? rid : rid?.id || null;
                             if (ridStr) {
-                                const r = await server.transformRequest(ridStr);
+                                const r = await transformWithTimeout(ridStr);
                                 if (r?.code) {
                                     transformed = r;
                                     resolvedCandidate = ridStr;
@@ -2660,7 +2676,7 @@ function createHmrWebSocketPlugin(opts) {
                             const rootPosix = toPosix(projectRoot).replace(/\/$/, '');
                             const absPosix = `${rootPosix}${spec.startsWith('/') ? '' : '/'}${spec}`;
                             const fsId = `/@fs${absPosix}`;
-                            const r = await server.transformRequest(fsId);
+                            const r = await transformWithTimeout(fsId);
                             if (r?.code) {
                                 transformed = r;
                                 resolvedCandidate = fsId;
@@ -2672,7 +2688,7 @@ function createHmrWebSocketPlugin(opts) {
                     if (!transformed?.code) {
                         for (const cand of candidates) {
                             try {
-                                const r = await server.transformRequest(`${cand}${cand.includes('?') ? '&' : '?'}import`);
+                                const r = await transformWithTimeout(`${cand}${cand.includes('?') ? '&' : '?'}import`);
                                 if (r?.code) {
                                     transformed = r;
                                     resolvedCandidate = `${cand}?import`;
@@ -4990,32 +5006,33 @@ export const piniaSymbol = p.piniaSymbol;
                     if (verbose)
                         console.warn('[hmr-ws][graph] initial population failed', e);
                 }
-                // Send SFC registry on first connection
-                if (!registrySent) {
-                    try {
-                        await ACTIVE_STRATEGY.buildRegistry({
-                            server,
-                            sfcFileMap,
-                            depFileMap,
-                            wss: wss,
-                            verbose,
-                            helpers: {
-                                cleanCode,
-                                collectImportDependencies,
-                                isCoreGlobalsReference,
-                                isNativeScriptCoreModule,
-                                isNativeScriptPluginModule,
-                                resolveVendorFromCandidate,
-                                createHash: (value) => createHash('md5').update(value).digest('hex'),
-                                rewriteImports,
-                                processSfcCode,
-                            },
-                        });
-                        registrySent = true;
-                    }
-                    catch (error) {
-                        console.warn('[hmr-ws] Failed to send registry:', error);
-                    }
+                // Send SFC registry on every connection (not just the first).
+                // When the NativeScript app restarts (e.g. CLI auto-reload), the new
+                // JS context has an empty sfcArtifactMap. Without the registry the
+                // rescue-mount cannot find the root .vue component.
+                try {
+                    await ACTIVE_STRATEGY.buildRegistry({
+                        server,
+                        sfcFileMap,
+                        depFileMap,
+                        wss: wss,
+                        verbose,
+                        helpers: {
+                            cleanCode,
+                            collectImportDependencies,
+                            isCoreGlobalsReference,
+                            isNativeScriptCoreModule,
+                            isNativeScriptPluginModule,
+                            resolveVendorFromCandidate,
+                            createHash: (value) => createHash('md5').update(value).digest('hex'),
+                            rewriteImports,
+                            processSfcCode,
+                        },
+                    });
+                    registrySent = true;
+                }
+                catch (error) {
+                    console.warn('[hmr-ws] Failed to send registry:', error);
                 }
                 emitFullGraph(ws);
                 // After sending registry & graph also send current module manifest if any