vike 0.4.162 → 0.4.163

package/dist/cjs/node/plugin/plugins/buildConfig.js

@@ -66,24 +66,28 @@ function buildConfig() {
         buildStart() {
             assertNodeEnv();
         },
-        async writeBundle(options, bundle) {
-            if (isSsrBuild) {
-                // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
-                //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
-                //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
-                const assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
-                const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, manifestTempFile);
-                const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, manifestTempFile);
-                if (!isServerAssetsFixEnabled) {
-                    await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
-                }
-                else {
-                    const clientManifestMod = await (0, fixServerAssets_js_1.fixServerAssets)(outDirs);
-                    await promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
+        writeBundle: {
+            order: 'post',
+            sequential: true,
+            async handler(options, bundle) {
+                if (isSsrBuild) {
+                    // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
+                    //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
+                    //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
+                    const assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
+                    const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, manifestTempFile);
+                    const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, manifestTempFile);
+                    if (!isServerAssetsFixEnabled) {
+                        await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
+                    }
+                    else {
+                        const clientManifestMod = await (0, fixServerAssets_js_1.fixServerAssets)(outDirs);
+                        await promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
+                    }
+                    await promises_1.default.rm(clientManifestFilePath);
+                    await promises_1.default.rm(serverManifestFilePath);
+                    await (0, index_js_1.set_constant_ASSETS_MAP)(options, bundle);
                 }
-                await promises_1.default.rm(clientManifestFilePath);
-                await promises_1.default.rm(serverManifestFilePath);
-                await (0, index_js_1.set_constant_ASSETS_MAP)(options, bundle);
             }
         }
     };

package/dist/cjs/node/plugin/plugins/commonConfig.js

@@ -14,16 +14,18 @@ const assertResolveAlias_js_1 = require("./commonConfig/assertResolveAlias.js");
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
+const pluginName = 'vike:commonConfig-1';
 function commonConfig() {
     return [
         {
-            name: 'vike-commonConfig-1',
+            name: pluginName,
             configResolved(config) {
+                assertSingleInstance(config);
                 (0, require_shim_1.installRequireShim_setUserRootDir)(config.root);
             }
         },
         {
-            name: 'vike-.commonConfig-2',
+            name: 'vike:commonConfig-2',
             enforce: 'post',
             configResolved: {
                 order: 'post',
@@ -81,3 +83,7 @@ function assertEsm(userViteRoot) {
     dir = picocolors_1.default.dim(dir);
     (0, utils_js_1.assertWarning)(packageJson.type === 'module', `We recommend setting ${dir}package.json#type to "module", see https://vike.dev/CJS`, { onlyOnce: true });
 }
+function assertSingleInstance(config) {
+    const numberOfInstances = config.plugins.filter((o) => o.name === pluginName).length;
+    (0, utils_js_1.assertUsage)(numberOfInstances === 1, `Vike's Vite plugin (${picocolors_1.default.cyan("import vike from 'vike/plugin'")}) is being added ${numberOfInstances} times to the list of Vite plugins. Make sure to add it only once instead.`);
+}

package/dist/cjs/node/plugin/plugins/importBuild/index.js

@@ -45,12 +45,11 @@ function getEntryCode(config, configVike) {
         `  import * as pageFiles from '${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer}';`,
         `  {`,
         // We first set the values to a variable because of a Rollup bug, and this workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
-        `    const clientManifest = ${ASSETS_MAP};`,
+        `    const assetsManifest = ${ASSETS_MAP};`,
         `    const pluginManifest = ${JSON.stringify(vikeManifest, null, 2)};`,
         '    setImportBuildGetters({',
         `      pageFiles: () => pageFiles,`,
-        // TODO: rename clientManifest -> assetManifest
-        `      clientManifest: () => clientManifest,`,
+        `      getAssetsManifest: () => assetsManifest,`,
         // TODO: rename pluginManifest -> vikeManifest
         `      pluginManifest: () => pluginManifest,`,
         '    });',

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -474,7 +474,8 @@ function warnOverridenConfigValues(interfaceFileWinner, interfaceFilesOverriden,
     interfaceFilesOverriden.forEach((interfaceFileLoser) => {
         const loserFilePath = interfaceFileLoser.filePath.filePathToShowToUser;
         const winnerFilePath = interfaceFileWinner.filePath.filePathToShowToUser;
-        (0, utils_js_1.assertWarning)(false, `Config ${configName} defined at ${loserFilePath} is always overwritten by ${configName} defined at ${winnerFilePath}, remove the superfluous ${configName} value defined at ${interfaceFileLoser}`, { onlyOnce: false });
+        const confName = picocolors_1.default.cyan(configName);
+        (0, utils_js_1.assertWarning)(false, `The value of the config ${confName} defined at ${loserFilePath} is always overwritten by the value defined at ${winnerFilePath}, remove the superfluous value defined at ${loserFilePath}`, { onlyOnce: true });
     });
 }
 function isInterfaceFileUserLand(interfaceFile) {
@@ -515,6 +516,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             valueIsFilePath: true,
             configEnv,
             valueIsImportedAtRuntime: true,
+            valueIsDefinedByValueFile: false,
             definedAt
         };
         return configValueSource;
@@ -530,6 +532,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
                 locationId,
                 configEnv,
                 valueIsImportedAtRuntime: true,
+                valueIsDefinedByValueFile: false,
                 definedAt: import_
             };
             // Load fake import
@@ -554,6 +557,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             value: configValue,
             configEnv,
             valueIsImportedAtRuntime: false,
+            valueIsDefinedByValueFile: false,
             definedAt: definedAtConfigFile
         };
         return configValueSource;
@@ -566,6 +570,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             locationId,
             configEnv,
             valueIsImportedAtRuntime: !valueAlreadyLoaded,
+            valueIsDefinedByValueFile: true,
             definedAt: {
                 ...interfaceFile.filePath,
                 fileExportPathToShowToUser: configName === interfaceFile.configName

package/dist/cjs/node/runtime/globalContext/loadImportBuild.js

@@ -15,12 +15,12 @@ async function loadImportBuild(outDir) {
         await (0, importServerEntry_js_1.importServerEntry)(outDir);
         (0, utils_js_1.assert)(buildGetters.getters);
     }
-    const [pageFiles, clientManifest, pluginManifest] = await Promise.all([
+    const [pageFiles, assetsManifest, pluginManifest] = await Promise.all([
         buildGetters.getters.pageFiles(),
-        buildGetters.getters.clientManifest(),
+        buildGetters.getters.getAssetsManifest(),
         buildGetters.getters.pluginManifest()
     ]);
-    const buildEntries = { pageFiles, clientManifest, pluginManifest };
+    const buildEntries = { pageFiles, assetsManifest, pluginManifest };
     return buildEntries;
 }
 exports.loadImportBuild = loadImportBuild;

package/dist/cjs/node/runtime/globalContext.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRuntimeManifest = exports.setGlobalContext_prerender = exports.setGlobalContext_viteDevServer = exports.getViteConfig = exports.getViteDevServer = exports.getGlobalContext = exports.initGlobalContext = void 0;
+exports.getRuntimeManifest = exports.setGlobalContext_prerender = exports.setGlobalContext_viteDevServer = exports.getViteConfig = exports.getViteDevServer = exports.getGlobalContext = exports.initGlobalContext = exports.getGlobalContextAsync = exports.getGlobalContextSync = void 0;
 const utils_js_1 = require("./utils.js");
 const loadImportBuild_js_1 = require("./globalContext/loadImportBuild.js");
 const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
@@ -11,12 +11,52 @@ const assertPluginManifest_js_1 = require("../shared/assertPluginManifest.js");
 const getConfigVike_js_1 = require("../shared/getConfigVike.js");
 const assertRuntimeManifest_js_1 = require("../shared/assertRuntimeManifest.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', {});
+let resolveGlobalContext;
+const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', {
+    globalContextPromise: new Promise((r) => (resolveGlobalContext = r))
+});
 function getGlobalContext() {
     (0, utils_js_1.assert)(globalObject.globalContext);
     return globalObject.globalContext;
 }
 exports.getGlobalContext = getGlobalContext;
+/** @experimental https://vike.dev/getGlobalContext */
+function getGlobalContextSync() {
+    (0, utils_js_1.assertUsage)(globalObject.globalContext, "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContextAsync() instead.");
+    return makePublic(globalObject.globalContext);
+}
+exports.getGlobalContextSync = getGlobalContextSync;
+/** @experimental https://vike.dev/getGlobalContext */
+async function getGlobalContextAsync() {
+    await globalObject.globalContextPromise;
+    (0, utils_js_1.assert)(globalObject.globalContext);
+    return makePublic(globalObject.globalContext);
+}
+exports.getGlobalContextAsync = getGlobalContextAsync;
+function makePublic(globalContext) {
+    const globalContextPublic = {
+        assetsManifest: globalContext.assetsManifest
+    };
+    // Add internals (and prepended _ prefix to their keys)
+    {
+        const publicKeys = Object.keys(globalContextPublic);
+        (0, utils_js_1.objectKeys)(globalContext)
+            .filter((key) => !publicKeys.includes(key))
+            .forEach((key) => {
+            const keyPublic = `_${key}`;
+            Object.defineProperty(globalContextPublic, keyPublic, {
+                enumerable: true,
+                get() {
+                    (0, utils_js_1.assertWarning)(false, `Using internal globalContext.${keyPublic} which is discouraged: it may break in any minor version update. Instead, reach out on GitHub and elaborate your use case.`, {
+                        onlyOnce: true
+                    });
+                    return globalContext[key];
+                }
+            });
+        });
+    }
+    return globalContextPublic;
+}
 function setGlobalContext_viteDevServer(viteDevServer) {
     if (globalObject.viteDevServer)
         return;
@@ -55,7 +95,7 @@ async function initGlobalContext(isPrerendering = false, outDir) {
         globalObject.globalContext = {
             isProduction: false,
             isPrerendering: false,
-            clientManifest: null,
+            assetsManifest: null,
             pluginManifest: null,
             viteDevServer,
             viteConfig,
@@ -70,13 +110,13 @@ async function initGlobalContext(isPrerendering = false, outDir) {
     else {
         const buildEntries = await (0, loadImportBuild_js_1.loadImportBuild)(outDir);
         assertBuildEntries(buildEntries, isPrerendering ?? false);
-        const { pageFiles, clientManifest, pluginManifest } = buildEntries;
+        const { pageFiles, assetsManifest, pluginManifest } = buildEntries;
         (0, getPageFiles_js_1.setPageFiles)(pageFiles);
-        assertViteManifest(clientManifest);
+        assertViteManifest(assetsManifest);
         (0, assertPluginManifest_js_1.assertPluginManifest)(pluginManifest);
         const globalContext = {
             isProduction: true,
-            clientManifest,
+            assetsManifest,
             pluginManifest,
             viteDevServer: null,
             baseServer: pluginManifest.baseServer,
@@ -104,6 +144,7 @@ async function initGlobalContext(isPrerendering = false, outDir) {
             globalObject.globalContext = globalContext;
         }
     }
+    resolveGlobalContext(globalObject.globalContext);
 }
 exports.initGlobalContext = initGlobalContext;
 function getRuntimeManifest(configVike) {

package/dist/cjs/node/runtime/index-common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPageRenderer = exports._injectAssets = exports.version = exports.stampPipe = exports.pipeStream = exports.pipeNodeStream = exports.pipeWebStream = exports.dangerouslySkipEscape = exports.escapeInject = exports.renderPage = void 0;
+exports.createPageRenderer = exports._injectAssets = exports.getGlobalContextAsync = exports.getGlobalContextSync = exports.version = exports.stampPipe = exports.pipeStream = exports.pipeNodeStream = exports.pipeWebStream = exports.dangerouslySkipEscape = exports.escapeInject = exports.renderPage = void 0;
 var renderPage_js_1 = require("./renderPage.js");
 Object.defineProperty(exports, "renderPage", { enumerable: true, get: function () { return renderPage_js_1.renderPage; } });
 var renderHtml_js_1 = require("./html/renderHtml.js");
@@ -13,6 +13,9 @@ Object.defineProperty(exports, "pipeStream", { enumerable: true, get: function (
 Object.defineProperty(exports, "stampPipe", { enumerable: true, get: function () { return stream_js_1.stampPipe; } });
 var utils_js_1 = require("./utils.js");
 Object.defineProperty(exports, "version", { enumerable: true, get: function () { return utils_js_1.PROJECT_VERSION; } });
+var globalContext_js_1 = require("./globalContext.js");
+Object.defineProperty(exports, "getGlobalContextSync", { enumerable: true, get: function () { return globalContext_js_1.getGlobalContextSync; } });
+Object.defineProperty(exports, "getGlobalContextAsync", { enumerable: true, get: function () { return globalContext_js_1.getGlobalContextAsync; } });
 // TODO/v1-release: remove
 var injectAssets__public_js_1 = require("./html/injectAssets/injectAssets__public.js");
 Object.defineProperty(exports, "_injectAssets", { enumerable: true, get: function () { return injectAssets__public_js_1.injectAssets__public; } });

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

@@ -5,13 +5,13 @@ const utils_js_1 = require("../../utils.js");
 const assertClientEntryId_js_1 = require("./assertClientEntryId.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
-function getManifestEntry(id, clientManifest) {
+function getManifestEntry(id, assetsManifest) {
     (0, assertClientEntryId_js_1.assertClientEntryId)(id);
-    const debugInfo = getDebugInfo(id, clientManifest);
+    const debugInfo = getDebugInfo(id, assetsManifest);
     // Vike client entry
     if (id.startsWith('@@vike/')) {
         const manifestKeyEnd = (0, utils_js_1.slice)(id, '@@vike'.length, 0);
-        const { manifestKey, manifestEntry } = findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id);
+        const { manifestKey, manifestEntry } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
         (0, utils_js_1.assert)(manifestEntry && manifestKey, debugInfo);
         return { manifestEntry, manifestKey };
     }
@@ -19,7 +19,7 @@ function getManifestEntry(id, clientManifest) {
     if ((0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id)) {
         {
             const manifestKey = id;
-            const manifestEntry = clientManifest[manifestKey];
+            const manifestEntry = assetsManifest[manifestKey];
             if (manifestEntry) {
                 return { manifestEntry, manifestKey };
             }
@@ -32,20 +32,20 @@ function getManifestEntry(id, clientManifest) {
         //  - This workaround was implemented to support Vitest runnung /tests/*
         //    - I don't know whether end users actually need this workaround? (I'm not sure what the bug actually is.)
         const manifestKeyEnd = id;
-        const { manifestKey, manifestEntry } = getEntryWithKeyEnd(manifestKeyEnd, clientManifest, id);
+        const { manifestKey, manifestEntry } = getEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
         (0, utils_js_1.assert)(manifestEntry, debugInfo);
         return { manifestEntry, manifestKey };
     }
     // User files
     if (id.startsWith('/')) {
         const manifestKey = id.slice(1);
-        let manifestEntry = clientManifest[manifestKey];
+        let manifestEntry = assetsManifest[manifestKey];
         (0, utils_js_1.assert)(manifestEntry, debugInfo);
         return { manifestEntry, manifestKey };
     }
     // npm package import
     if ((0, utils_js_1.isNpmPackageImport)(id)) {
-        const found = Object.entries(clientManifest).find(([, e]) => e.name === (0, prependEntriesDir_js_1.prependEntriesDir)(id));
+        const found = Object.entries(assetsManifest).find(([, e]) => e.name === (0, prependEntriesDir_js_1.prependEntriesDir)(id));
         (0, utils_js_1.assert)(found);
         const [manifestKey, manifestEntry] = found;
         return { manifestEntry, manifestKey };
@@ -57,7 +57,7 @@ function getManifestEntry(id, clientManifest) {
         (0, utils_js_1.assert)(!manifestKeyEnd.startsWith('/'), debugInfo);
         manifestKeyEnd = '/' + manifestKeyEnd;
         {
-            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id);
+            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
             if (manifestEntry) {
                 (0, utils_js_1.assert)(manifestKey, debugInfo);
                 return { manifestEntry, manifestKey };
@@ -71,7 +71,7 @@ function getManifestEntry(id, clientManifest) {
             (0, utils_js_1.assert)(manifestKeyEnd.startsWith('/'), debugInfo);
         }
         {
-            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id);
+            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
             if (manifestEntry) {
                 (0, utils_js_1.assert)(manifestKey, debugInfo);
                 return { manifestEntry, manifestKey };
@@ -82,11 +82,11 @@ function getManifestEntry(id, clientManifest) {
     (0, utils_js_1.assert)(false, debugInfo);
 }
 exports.getManifestEntry = getManifestEntry;
-function findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id) {
-    const debugInfo = getDebugInfo(id, clientManifest, manifestKeyEnd);
+function findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id) {
+    const debugInfo = getDebugInfo(id, assetsManifest, manifestKeyEnd);
     (0, utils_js_1.assert)(manifestKeyEnd.startsWith('/'), debugInfo);
     const manifestKeys = [];
-    for (const manifestKey in clientManifest) {
+    for (const manifestKey in assetsManifest) {
         if (manifestKey.endsWith(manifestKeyEnd)) {
             manifestKeys.push(manifestKey);
         }
@@ -97,13 +97,13 @@ function findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id) {
     if (!manifestKey) {
         return { manifestEntry: null, manifestKey: null };
     }
-    const manifestEntry = clientManifest[manifestKey];
+    const manifestEntry = assetsManifest[manifestKey];
     return { manifestEntry, manifestKey };
 }
-function getEntryWithKeyEnd(manifestKeyEnd, clientManifest, id) {
-    const debugInfo = getDebugInfo(id, clientManifest, manifestKeyEnd);
+function getEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id) {
+    const debugInfo = getDebugInfo(id, assetsManifest, manifestKeyEnd);
     const manifestKeys = [];
-    for (const manifestKey in clientManifest) {
+    for (const manifestKey in assetsManifest) {
         if (manifestKey.endsWith(manifestKeyEnd)) {
             manifestKeys.push(manifestKey);
         }
@@ -113,11 +113,11 @@ function getEntryWithKeyEnd(manifestKeyEnd, clientManifest, id) {
     if (!manifestKey) {
         return { manifestEntry: null, manifestKey: null };
     }
-    const manifestEntry = clientManifest[manifestKey];
+    const manifestEntry = assetsManifest[manifestKey];
     return { manifestEntry, manifestKey };
 }
-function getDebugInfo(id, clientManifest, manifestKeyEnd) {
-    const manifestKeys = Object.keys(clientManifest);
+function getDebugInfo(id, assetsManifest, manifestKeyEnd) {
+    const manifestKeys = Object.keys(assetsManifest);
     if (manifestKeyEnd === undefined) {
         return { manifestKeys, id };
     }

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

@@ -4,9 +4,9 @@ exports.retrieveAssetsProd = void 0;
 const utils_js_1 = require("../../utils.js");
 const getManifestEntry_js_1 = require("./getManifestEntry.js");
 const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js");
-function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImportedByServer) {
+function retrieveAssetsProd(clientDependencies, assetsManifest, includeAssetsImportedByServer) {
     let assetUrls = new Set();
-    (0, utils_js_1.assert)(clientManifest);
+    (0, utils_js_1.assert)(assetsManifest);
     const visistedAssets = new Set();
     clientDependencies.forEach(({ id, onlyAssets, eagerlyImported }) => {
         if (eagerlyImported)
@@ -21,18 +21,18 @@ function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImp
                 id = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(id);
             }
         }
-        const { manifestKey } = (0, getManifestEntry_js_1.getManifestEntry)(id, clientManifest);
-        collectAssets(manifestKey, assetUrls, visistedAssets, clientManifest, onlyAssets);
+        const { manifestKey } = (0, getManifestEntry_js_1.getManifestEntry)(id, assetsManifest);
+        collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyAssets);
     });
-    collectSingleStyle(assetUrls, clientManifest);
+    collectSingleStyle(assetUrls, assetsManifest);
     return Array.from(assetUrls);
 }
 exports.retrieveAssetsProd = retrieveAssetsProd;
-function collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCollectStaticAssets) {
+function collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyCollectStaticAssets) {
     if (visistedAssets.has(manifestKey))
         return;
     visistedAssets.add(manifestKey);
-    const manifestEntry = manifest[manifestKey];
+    const manifestEntry = assetsManifest[manifestKey];
     (0, utils_js_1.assert)(manifestEntry, { manifestKey });
     const { file } = manifestEntry;
     if (!onlyCollectStaticAssets) {
@@ -40,9 +40,9 @@ function collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCol
     }
     const { imports = [], assets = [], css = [] } = manifestEntry;
     for (const manifestKey of imports) {
-        const importManifestEntry = manifest[manifestKey];
+        const importManifestEntry = assetsManifest[manifestKey];
         (0, utils_js_1.assert)(importManifestEntry);
-        collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCollectStaticAssets);
+        collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyCollectStaticAssets);
     }
     for (const cssAsset of css) {
         assetUrls.add(`/${cssAsset}`);
@@ -52,9 +52,9 @@ function collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCol
     }
 }
 // Support `config.build.cssCodeSplit: false`, see https://github.com/vikejs/vike/issues/644
-function collectSingleStyle(assetUrls, manifest) {
-    const style = manifest['style.css'];
-    if (style && Object.values(manifest).filter((asset) => asset.file.endsWith('.css')).length === 1) {
+function collectSingleStyle(assetUrls, assetsManifest) {
+    const style = assetsManifest['style.css'];
+    if (style && Object.values(assetsManifest).filter((asset) => asset.file.endsWith('.css')).length === 1) {
         assetUrls.add(`/${style.file}`);
     }
 }

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

@@ -21,9 +21,9 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
         assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
     }
     else {
-        const { clientManifest } = globalContext;
-        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, clientManifest));
-        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, clientManifest, pageContext._includeAssetsImportedByServer);
+        const { assetsManifest } = globalContext;
+        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
+        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, assetsManifest, pageContext._includeAssetsImportedByServer);
     }
     let pageAssets = [];
     (0, utils_js_1.unique)([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
@@ -119,8 +119,8 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     (0, utils_js_1.assertPosixPath)(filePath);
     return filePath;
 }
-function resolveClientEntriesProd(clientEntry, clientManifest) {
-    const { manifestEntry } = (0, getManifestEntry_js_1.getManifestEntry)(clientEntry, clientManifest);
+function resolveClientEntriesProd(clientEntry, assetsManifest) {
+    const { manifestEntry } = (0, getManifestEntry_js_1.getManifestEntry)(clientEntry, assetsManifest);
     (0, utils_js_1.assert)(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });
     let { file } = manifestEntry;
     (0, utils_js_1.assert)(!file.startsWith('/'));

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

@@ -14,6 +14,13 @@ const knownErrors = [
     {
         errMsg: 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components)',
         link: 'https://vike.dev/broken-npm-package#react-invalid-component'
+    },
+    {
+        // ```
+        // Error [RollupError]: Could not resolve "../dist/client/assets.json" from "renderer/+onRenderHtml.tsx"
+        // ```
+        errMsg: 'assets.json',
+        link: 'https://vike.dev/getGlobalContext'
     }
 ];
 function logErrorHint(error) {

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

@@ -327,6 +327,9 @@ function normalizeUrl(pageContextInit, httpRequestId) {
     if (disableUrlNormalization)
         return null;
     const { urlOriginal } = pageContextInit;
+    const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
+    if (isPageContextRequest)
+        return null;
     const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash, baseServer);
     if (!urlNormalized)
         return null;

package/dist/cjs/shared/page-configs/serialize/serializeConfigValue.js

@@ -1,7 +1,4 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeConfigValueImported = exports.serializeConfigValue = void 0;
 // This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with:
@@ -10,7 +7,6 @@ exports.serializeConfigValueImported = exports.serializeConfigValue = void 0;
 // Both parsePageConfigs() parseConfigValuesImported() and are loaded on the client-side and server-side
 const assertIsNotProductionRuntime_js_1 = require("../../../utils/assertIsNotProductionRuntime.js");
 (0, assertIsNotProductionRuntime_js_1.assertIsNotProductionRuntime)();
-const path_1 = __importDefault(require("path"));
 const utils_js_1 = require("../../utils.js");
 const generateEagerImport_js_1 = require("../../../node/plugin/plugins/importUserCode/generateEagerImport.js");
 function serializeConfigValue(lines, configName, configValueSerialized) {
@@ -28,13 +24,10 @@ exports.serializeConfigValue = serializeConfigValue;
 function serializeConfigValueImported(configValueSource, configName, whitespace, varCounterContainer, importStatements) {
     (0, utils_js_1.assert)(!configValueSource.valueIsFilePath);
     (0, utils_js_1.assert)(whitespace.replaceAll(' ', '').length === 0);
-    const { valueIsImportedAtRuntime, definedAt } = configValueSource;
+    const { valueIsImportedAtRuntime, valueIsDefinedByValueFile, definedAt } = configValueSource;
     (0, utils_js_1.assert)(valueIsImportedAtRuntime);
     const { filePathAbsoluteVite, fileExportName } = definedAt;
-    (0, utils_js_1.assertPosixPath)(filePathAbsoluteVite);
-    const fileName = path_1.default.posix.basename(filePathAbsoluteVite);
-    const isValueFile = fileName.startsWith('+');
-    if (isValueFile)
+    if (valueIsDefinedByValueFile)
         (0, utils_js_1.assert)(fileExportName === undefined);
     const { importName, importStatement } = (0, generateEagerImport_js_1.generateEagerImport)(filePathAbsoluteVite, varCounterContainer.varCounter++, fileExportName);
     importStatements.push(importStatement);
@@ -42,8 +35,8 @@ function serializeConfigValueImported(configValueSource, configName, whitespace,
     lines.push(`  {`);
     lines.push(`    configName: '${configName}',`);
     lines.push(`    importPath: '${filePathAbsoluteVite}',`);
-    lines.push(`    isValueFile: ${JSON.stringify(isValueFile)},`);
-    if (isValueFile) {
+    lines.push(`    isValueFile: ${JSON.stringify(valueIsDefinedByValueFile)},`);
+    if (valueIsDefinedByValueFile) {
         lines.push(`    exportValues: ${importName},`);
     }
     else {

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.162';
+const PROJECT_VERSION = '0.4.163';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/client/client-routing-runtime/renderPageClientSide.js

@@ -308,35 +308,41 @@ async function renderPageClientSide(renderArgs) {
                 }
             }
         };
-        // We use globalObject.renderPromise in order to ensure that there is never two concurrent onRenderClient() calls
-        if (globalObject.renderPromise) {
+        // We use globalObject.onRenderClientPromise in order to ensure that there is never two concurrent onRenderClient() calls
+        if (globalObject.onRenderClientPromise) {
             // Make sure that the previous render has finished
-            await globalObject.renderPromise;
-            assert(globalObject.renderPromise === undefined);
+            await globalObject.onRenderClientPromise;
+            assert(globalObject.onRenderClientPromise === undefined);
             if (isRenderOutdated())
                 return;
         }
         changeUrl(urlOriginal, overwriteLastHistoryEntry);
         globalObject.previousPageContext = pageContext;
-        assert(globalObject.renderPromise === undefined);
-        globalObject.renderPromise = (async () => {
+        assert(globalObject.onRenderClientPromise === undefined);
+        globalObject.onRenderClientPromise = (async () => {
+            let onRenderClientError;
             try {
                 await executeOnRenderClientHook(pageContext, true);
             }
             catch (err) {
-                await onError(err);
-                return;
+                onRenderClientError = err;
             }
-            addLinkPrefetchHandlers(pageContext);
-            globalObject.renderPromise = undefined;
+            globalObject.onRenderClientPromise = undefined;
+            return onRenderClientError;
         })();
-        await globalObject.renderPromise;
-        assert(globalObject.renderPromise === undefined);
+        const onRenderClientError = await globalObject.onRenderClientPromise;
+        assert(globalObject.onRenderClientPromise === undefined);
+        if (onRenderClientError) {
+            await onError(onRenderClientError);
+            if (!isErrorPage)
+                return;
+        }
         /* We don't abort in order to ensure that onHydrationEnd() is called: we abort only after onHydrationEnd() is called.
         if (isRenderOutdated(true)) return
         */
+        addLinkPrefetchHandlers(pageContext);
         // onHydrationEnd()
-        if (isHydrationRender) {
+        if (isHydrationRender && !onRenderClientError) {
             assertHook(pageContext, 'onHydrationEnd');
             const hook = getHook(pageContext, 'onHydrationEnd');
             if (hook) {
@@ -353,7 +359,7 @@ async function renderPageClientSide(renderArgs) {
                     return;
             }
         }
-        // We abort *after* onHydrationEnd() is called
+        // We purposely abort *after* onHydrationEnd() is called (see comment above).
         if (isRenderOutdated(true))
             return;
         // onPageTransitionEnd()