vike 0.4.229-commit-2a06dcc → 0.4.229-commit-2dbbc8d

package/dist/cjs/node/plugin/shared/resolveClientEntriesDev.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveClientEntriesDev = resolveClientEntriesDev;
 const utils_js_1 = require("../utils.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-async function resolveClientEntriesDev(clientEntry, viteDevServer) {
+function resolveClientEntriesDev(clientEntry, viteDevServer) {
     let userRootDir = viteDevServer.config.root;
     (0, utils_js_1.assert)(userRootDir);
     userRootDir = (0, utils_js_1.toPosixPath)(userRootDir);

package/dist/cjs/node/runtime/html/renderHtml.js

@@ -78,12 +78,16 @@ async function renderHtmlStream(streamOriginal, injectString, pageContext, onErr
     }
     let makeClosableAgain = () => { };
     if ((0, react_streaming_js_1.isStreamFromReactStreamingPackage)(streamOriginal)) {
-        // Make sure Vike injects its HTML fragments, such as `<script id="vike_pageContext" type="application/json">`, before the stream is closed
+        // Make sure Vike injects its HTML fragments, such as `<script id="vike_pageContext" type="application/json">`, before the stream is closed (if React/Vue finishes its stream before the promise below resolves).
         makeClosableAgain = streamOriginal.doNotClose();
     }
-    const streamWrapper = await (0, stream_js_1.processStream)(streamOriginal, processStreamOptions);
-    makeClosableAgain();
-    return streamWrapper;
+    try {
+        const streamWrapper = await (0, stream_js_1.processStream)(streamOriginal, processStreamOptions);
+        return streamWrapper;
+    }
+    finally {
+        makeClosableAgain();
+    }
 }
 function isTemplateWrapped(something) {
     return (0, utils_js_1.hasProp)(something, '_template');

package/dist/cjs/node/runtime/renderPage/getPageAssets.js

@@ -19,7 +19,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     let clientEntriesSrc;
     if (isDev) {
         const { _viteDevServer: viteDevServer } = globalContext;
-        clientEntriesSrc = await Promise.all(clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer)));
+        clientEntriesSrc = clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer));
         assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
     }
     else {

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.229-commit-2a06dcc';
+exports.PROJECT_VERSION = '0.4.229-commit-2dbbc8d';

package/dist/cjs/utils/debug.js

@@ -31,6 +31,7 @@ const flags = [
     'vike:outDir',
     'vike:pageFiles',
     'vike:pointer-imports',
+    'vike:resolve',
     'vike:routing',
     'vike:setup',
     'vike:stream',

package/dist/cjs/utils/requireResolve.js

@@ -17,11 +17,13 @@ const node_module_1 = require("node:module");
 const node_path_1 = __importDefault(require("node:path"));
 const parseNpmPackage_js_1 = require("./parseNpmPackage.js");
 const isNullish_js_1 = require("./isNullish.js");
+const debug_js_1 = require("./debug.js");
 // @ts-ignore `file:///${__filename.split('\\').join('/')}` is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = `file:///${__filename.split('\\').join('/')}`;
 (0, path_js_1.assertPosixPath)(importMetaUrl);
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 (0, assertSetup_js_1.assertIsNotProductionRuntime)();
+const debug = (0, debug_js_1.createDebugger)('vike:resolve');
 // - We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
 //   - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
 // - Passing context to createRequire(context) isn't equivalent to passing it to the `paths` argument of require.resolve()
@@ -40,23 +42,22 @@ function requireResolve_(importPath, importerFilePath, { userRootDir, doNotHandl
     let failure;
     for (const context of contexts) {
         (0, path_js_1.assertPosixPath)(context);
-        const require_ = (0, node_module_1.createRequire)(ensureFilePrefix(context));
+        const contextNode = makeNodeFriendly(ensureFilePrefix(context));
+        let importPathNode = makeNodeFriendly(importPath);
+        const require_ = (0, node_module_1.createRequire)(contextNode);
         if (!doNotHandleFileExtension) {
             addFileExtensionsToRequireResolve(require_);
-            importPath = removeFileExtention(importPath);
+            importPathNode = removeFileExtention(importPathNode);
         }
         try {
-            importPathResolvedFilePath = require_.resolve(importPath);
+            importPathResolvedFilePath = require_.resolve(importPathNode);
         }
         catch (err) {
-            /* DEBUG
-            console.log('err', err)
-            console.log('importPath', importPath)
-            console.log('importerFilePath', importerFilePath)
-            console.log('context', context)
-            console.log('importMetaUrl', importMetaUrl)
-            console.log('paths', paths)
-            //*/
+            if (debug.isActivated) {
+                debug('err', err);
+                debug('importPath', importPath);
+                debug('context', context);
+            }
             failure ?? (failure = { err });
         }
         if (importPathResolvedFilePath)
@@ -64,9 +65,23 @@ function requireResolve_(importPath, importerFilePath, { userRootDir, doNotHandl
     }
     if (!importPathResolvedFilePath) {
         (0, assert_js_1.assert)(failure);
+        if (debug.isActivated) {
+            debug('FAILURE');
+            debug('importPath', importPath);
+            debug('importerFilePath', importerFilePath);
+            debug('userRootDir', userRootDir);
+            debug('doNotHandleFileExtension', doNotHandleFileExtension);
+            debug('importMetaUrl', importMetaUrl);
+            debug('contexts', contexts);
+        }
         return { importPathResolvedFilePath: undefined, err: failure.err, hasFailed: true };
     }
     else {
+        if (failure && debug.isActivated) {
+            debug('SUCCESS');
+            debug('importPath', importPath);
+            debug('contexts', contexts);
+        }
         (0, assert_js_1.assert)(importPathResolvedFilePath);
         importPathResolvedFilePath = (0, path_js_1.toPosixPath)(importPathResolvedFilePath);
         return { importPathResolvedFilePath, err: undefined, hasFailed: false };
@@ -97,7 +112,7 @@ function requireResolveVikeDistFile(vikeDistFile) {
     const vikeNodeModulesRoot = getVikeNodeModulesRoot();
     (0, path_js_1.assertPosixPath)(vikeNodeModulesRoot);
     (0, path_js_1.assertPosixPath)(vikeDistFile);
-    const importPathResolvedFilePath = node_path_1.default.posix.join(vikeNodeModulesRoot, vikeDistFile);
+    const importPathResolvedFilePath = makeNodeFriendly(node_path_1.default.posix.join(vikeNodeModulesRoot, vikeDistFile));
     // Double check
     {
         const res = requireResolve_(importPathResolvedFilePath, 
@@ -191,3 +206,7 @@ function getFilePrefix() {
         prefix += '/';
     return prefix;
 }
+function makeNodeFriendly(filePath) {
+    // https://github.com/vikejs/vike/issues/2436#issuecomment-2849145340
+    return decodeURIComponent(filePath);
+}

package/dist/esm/node/plugin/shared/resolveClientEntriesDev.d.ts

@@ -1,4 +1,4 @@
 export { resolveClientEntriesDev };
 export type ResolveClientEntriesDev = typeof resolveClientEntriesDev;
 import type { ViteDevServer } from 'vite';
-declare function resolveClientEntriesDev(clientEntry: string, viteDevServer: ViteDevServer): Promise<string>;
+declare function resolveClientEntriesDev(clientEntry: string, viteDevServer: ViteDevServer): string;

package/dist/esm/node/plugin/shared/resolveClientEntriesDev.js

@@ -1,7 +1,7 @@
 export { resolveClientEntriesDev };
 import { assert, assertPosixPath, toPosixPath, pathJoin, assertIsImportPathNpmPackage, assertIsNotProductionRuntime, requireResolveNpmPackage, requireResolveVikeDistFile } from '../utils.js';
 assertIsNotProductionRuntime();
-async function resolveClientEntriesDev(clientEntry, viteDevServer) {
+function resolveClientEntriesDev(clientEntry, viteDevServer) {
     let userRootDir = viteDevServer.config.root;
     assert(userRootDir);
     userRootDir = toPosixPath(userRootDir);

package/dist/esm/node/runtime/html/renderHtml.js

@@ -73,12 +73,16 @@ async function renderHtmlStream(streamOriginal, injectString, pageContext, onErr
     }
     let makeClosableAgain = () => { };
     if (isStreamFromReactStreamingPackage(streamOriginal)) {
-        // Make sure Vike injects its HTML fragments, such as `<script id="vike_pageContext" type="application/json">`, before the stream is closed
+        // Make sure Vike injects its HTML fragments, such as `<script id="vike_pageContext" type="application/json">`, before the stream is closed (if React/Vue finishes its stream before the promise below resolves).
         makeClosableAgain = streamOriginal.doNotClose();
     }
-    const streamWrapper = await processStream(streamOriginal, processStreamOptions);
-    makeClosableAgain();
-    return streamWrapper;
+    try {
+        const streamWrapper = await processStream(streamOriginal, processStreamOptions);
+        return streamWrapper;
+    }
+    finally {
+        makeClosableAgain();
+    }
 }
 function isTemplateWrapped(something) {
     return hasProp(something, '_template');

package/dist/esm/node/runtime/renderPage/getPageAssets.js

@@ -17,7 +17,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     let clientEntriesSrc;
     if (isDev) {
         const { _viteDevServer: viteDevServer } = globalContext;
-        clientEntriesSrc = await Promise.all(clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer)));
+        clientEntriesSrc = clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer));
         assetUrls = await retrieveAssetsDev(clientDependencies, viteDevServer);
     }
     else {

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.229-commit-2a06dcc";
+export declare const PROJECT_VERSION: "0.4.229-commit-2dbbc8d";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.229-commit-2a06dcc';
+export const PROJECT_VERSION = '0.4.229-commit-2dbbc8d';

package/dist/esm/utils/debug.d.ts

@@ -1,7 +1,7 @@
 export { createDebugger };
 export { isDebugActivated };
 export type { Debug };
-declare const flags: readonly ["vike:crawl", "vike:error", "vike:esbuild-resolve", "vike:extractAssets", "vike:extractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:routing", "vike:setup", "vike:stream", "vike:virtual-files"];
+declare const flags: readonly ["vike:crawl", "vike:error", "vike:esbuild-resolve", "vike:extractAssets", "vike:extractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:resolve", "vike:routing", "vike:setup", "vike:stream", "vike:virtual-files"];
 type Flag = (typeof flags)[number];
 type Debug = ReturnType<typeof createDebugger>;
 type Options = {

package/dist/esm/utils/debug.js

@@ -26,6 +26,7 @@ const flags = [
     'vike:outDir',
     'vike:pageFiles',
     'vike:pointer-imports',
+    'vike:resolve',
     'vike:routing',
     'vike:setup',
     'vike:stream',

package/dist/esm/utils/requireResolve.js

@@ -12,11 +12,13 @@ import { createRequire } from 'node:module';
 import path from 'node:path';
 import { assertIsImportPathNpmPackage, isImportPathNpmPackageOrPathAlias } from './parseNpmPackage.js';
 import { isNotNullish } from './isNullish.js';
+import { createDebugger } from './debug.js';
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 assertPosixPath(importMetaUrl);
 assertIsNotBrowser();
 assertIsNotProductionRuntime();
+const debug = createDebugger('vike:resolve');
 // - We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
 //   - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
 // - Passing context to createRequire(context) isn't equivalent to passing it to the `paths` argument of require.resolve()
@@ -35,23 +37,22 @@ function requireResolve_(importPath, importerFilePath, { userRootDir, doNotHandl
     let failure;
     for (const context of contexts) {
         assertPosixPath(context);
-        const require_ = createRequire(ensureFilePrefix(context));
+        const contextNode = makeNodeFriendly(ensureFilePrefix(context));
+        let importPathNode = makeNodeFriendly(importPath);
+        const require_ = createRequire(contextNode);
         if (!doNotHandleFileExtension) {
             addFileExtensionsToRequireResolve(require_);
-            importPath = removeFileExtention(importPath);
+            importPathNode = removeFileExtention(importPathNode);
         }
         try {
-            importPathResolvedFilePath = require_.resolve(importPath);
+            importPathResolvedFilePath = require_.resolve(importPathNode);
         }
         catch (err) {
-            /* DEBUG
-            console.log('err', err)
-            console.log('importPath', importPath)
-            console.log('importerFilePath', importerFilePath)
-            console.log('context', context)
-            console.log('importMetaUrl', importMetaUrl)
-            console.log('paths', paths)
-            //*/
+            if (debug.isActivated) {
+                debug('err', err);
+                debug('importPath', importPath);
+                debug('context', context);
+            }
             failure ?? (failure = { err });
         }
         if (importPathResolvedFilePath)
@@ -59,9 +60,23 @@ function requireResolve_(importPath, importerFilePath, { userRootDir, doNotHandl
     }
     if (!importPathResolvedFilePath) {
         assert(failure);
+        if (debug.isActivated) {
+            debug('FAILURE');
+            debug('importPath', importPath);
+            debug('importerFilePath', importerFilePath);
+            debug('userRootDir', userRootDir);
+            debug('doNotHandleFileExtension', doNotHandleFileExtension);
+            debug('importMetaUrl', importMetaUrl);
+            debug('contexts', contexts);
+        }
         return { importPathResolvedFilePath: undefined, err: failure.err, hasFailed: true };
     }
     else {
+        if (failure && debug.isActivated) {
+            debug('SUCCESS');
+            debug('importPath', importPath);
+            debug('contexts', contexts);
+        }
         assert(importPathResolvedFilePath);
         importPathResolvedFilePath = toPosixPath(importPathResolvedFilePath);
         return { importPathResolvedFilePath, err: undefined, hasFailed: false };
@@ -92,7 +107,7 @@ function requireResolveVikeDistFile(vikeDistFile) {
     const vikeNodeModulesRoot = getVikeNodeModulesRoot();
     assertPosixPath(vikeNodeModulesRoot);
     assertPosixPath(vikeDistFile);
-    const importPathResolvedFilePath = path.posix.join(vikeNodeModulesRoot, vikeDistFile);
+    const importPathResolvedFilePath = makeNodeFriendly(path.posix.join(vikeNodeModulesRoot, vikeDistFile));
     // Double check
     {
         const res = requireResolve_(importPathResolvedFilePath, 
@@ -186,3 +201,7 @@ function getFilePrefix() {
         prefix += '/';
     return prefix;
 }
+function makeNodeFriendly(filePath) {
+    // https://github.com/vikejs/vike/issues/2436#issuecomment-2849145340
+    return decodeURIComponent(filePath);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.229-commit-2a06dcc",
+  "version": "0.4.229-commit-2dbbc8d",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {