vike 0.4.171 → 0.4.172-commit-c1b0884

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

@@ -6,13 +6,11 @@ const virtualFilePageConfigValuesAll_js_1 = require("../../../../shared/virtual-
 const getVikeConfig_js_1 = require("./getVikeConfig.js");
 const extractAssetsQuery_js_1 = require("../../../../shared/extractAssetsQuery.js");
 const debug_js_1 = require("./debug.js");
-const getConfigValue_js_1 = require("../../../../../shared/page-configs/getConfigValue.js");
-const getConfigValueSourcesNotOverriden_js_1 = require("../../../shared/getConfigValueSourcesNotOverriden.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
-const serializeConfigValue_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValue.js");
+const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
 const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
-const getConfigValuesSerialized_js_1 = require("./getConfigValuesSerialized.js");
 const fixServerAssets_js_1 = require("../../buildConfig/fixServerAssets.js");
+const getConfigValueBuildTime_js_1 = require("../../../../../shared/page-configs/getConfigValueBuildTime.js");
 async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const result = (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id);
     (0, utils_js_1.assert)(result);
@@ -23,7 +21,7 @@ async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     }
     */
     const { pageId, isForClientSide } = result;
-    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, true);
+    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, { tolerateInvalidConfig: true });
     const pageConfig = pageConfigs.find((pageConfig) => pageConfig.pageId === pageId);
     (0, utils_js_1.assert)(pageConfig);
     const configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
@@ -35,16 +33,9 @@ exports.getVirtualFilePageConfigValuesAll = getVirtualFilePageConfigValuesAll;
 function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, isDev) {
     const lines = [];
     const importStatements = [];
-    const isClientRouting = (0, getConfigValue_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
-    lines.push('export const configValuesImported = [');
-    lines.push(getConfigValuesImported(pageConfig, isForClientSide, isClientRouting, importStatements));
-    lines.push('];');
+    const isClientRouting = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
     lines.push('export const configValuesSerialized = {');
-    lines.push((0, getConfigValuesSerialized_js_1.getConfigValuesSerialized)(pageConfig, (configEnv, configValueSource) => isEnvMatch(configEnv, !configValueSource ? false : checkWhetherIsImport(configValueSource), {
-        isImport: false,
-        isForClientSide,
-        isClientRouting
-    })));
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: false, isDev }), ''));
     lines.push('};');
     if (!(0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && includeAssetsImportedByServer && isForClientSide && !isDev) {
         importStatements.push(`import '${(0, extractAssetsQuery_js_1.extractAssetsAddQuery)((0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, false))}'`);
@@ -52,33 +43,3 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
     const code = [...importStatements, ...lines].join('\n');
     return code;
 }
-function getConfigValuesImported(pageConfig, isForClientSide, isClientRouting, importStatements) {
-    const lines = [];
-    const varCounterContainer = { varCounter: 0 };
-    (0, getConfigValueSourcesNotOverriden_js_1.getConfigValueSourcesNotOverriden)(pageConfig).forEach((configValueSource) => {
-        if (!isEnvMatch(configValueSource.configEnv, checkWhetherIsImport(configValueSource), {
-            isImport: true,
-            isForClientSide,
-            isClientRouting
-        }))
-            return;
-        const whitespace = '  ';
-        lines.push(...(0, serializeConfigValue_js_1.serializeConfigValueImported)(configValueSource, configValueSource.configName, whitespace, varCounterContainer, importStatements));
-    });
-    const code = lines.join('\n');
-    return code;
-}
-function checkWhetherIsImport(configValueSource) {
-    const { valueIsImportedAtRuntime, valueIsFilePath } = configValueSource;
-    return valueIsImportedAtRuntime && !valueIsFilePath;
-}
-function isEnvMatch(configEnv, isImport, runtime) {
-    // Whether config value is imported or serialized
-    if (isImport !== runtime.isImport)
-        return false;
-    // Runtime match
-    const { isForClientSide, isClientRouting } = runtime;
-    if (!(0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: false }))
-        return false;
-    return true;
-}

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

@@ -1,33 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVirtualFilePageConfigs = void 0;
-const utils_js_1 = require("../../../utils.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const debug_js_1 = require("./debug.js");
 const getVikeConfig_js_1 = require("./getVikeConfig.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
-const serializeConfigValue_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValue.js");
-const getConfigValuesSerialized_js_1 = require("./getConfigValuesSerialized.js");
+const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
 async function getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, config) {
-    const { pageConfigs, pageConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, true);
+    const { pageConfigs, pageConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, { tolerateInvalidConfig: true });
     return getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting);
 }
 exports.getVirtualFilePageConfigs = getVirtualFilePageConfigs;
 function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting) {
     const lines = [];
     const importStatements = [];
-    const varCounterContainer = { varCounter: 0 };
     lines.push('export const pageConfigsSerialized = [');
-    lines.push(getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements, varCounterContainer));
+    lines.push(getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, isDev, importStatements));
     lines.push('];');
     lines.push('export const pageConfigGlobalSerialized = {');
-    lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements, varCounterContainer));
+    lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements));
     lines.push('};');
     const code = [...importStatements, ...lines].join('\n');
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }
-function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements, varCounterContainer) {
+function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, isDev, importStatements) {
     const lines = [];
     pageConfigs.forEach((pageConfig) => {
         const { pageId, routeFilesystem, isErrorPage } = pageConfig;
@@ -37,57 +34,19 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
         lines.push(`    isErrorPage: ${JSON.stringify(isErrorPage)},`);
         lines.push(`    routeFilesystem: ${JSON.stringify(routeFilesystem)},`);
         lines.push(`    loadConfigValuesAll: () => import(${JSON.stringify(virtualFileIdPageConfigValuesAll)}),`);
-        // Serialized config values
         lines.push(`    configValuesSerialized: {`);
-        lines.push((0, getConfigValuesSerialized_js_1.getConfigValuesSerialized)(pageConfig, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: true })));
+        lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: true, isDev }), '    '));
         lines.push(`    },`);
-        // Imported config values
-        const whitespace = '    ';
-        lines.push(`${whitespace}configValuesImported: [`);
-        Object.entries(pageConfig.configValueSources).forEach(([configName, sources]) => {
-            const configValue = pageConfig.configValues[configName];
-            if (configValue)
-                return;
-            const configValueSource = sources[0];
-            (0, utils_js_1.assert)(configValueSource);
-            if (!configValueSource.configEnv.eager)
-                return;
-            if (!(0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configValueSource.configEnv, { isForClientSide, isClientRouting, isEager: true }))
-                return;
-            lines.push(...(0, serializeConfigValue_js_1.serializeConfigValueImported)(configValueSource, configName, whitespace, varCounterContainer, importStatements));
-        });
-        lines.push(`${whitespace}],`);
         lines.push(`  },`);
     });
     const code = lines.join('\n');
     return code;
 }
-function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements, varCounterContainer) {
+function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements) {
     const lines = [];
-    /* Nothing (yet)
-    lines.push(`  configValuesSerialized: {`)
-    lines.push(`  },`)
-    */
-    lines.push(`  configValuesImported: [`);
-    (0, utils_js_1.objectEntries)(pageConfigGlobal.configValueSources).forEach(([configName, sources]) => {
-        if (configName === 'onBeforeRoute') {
-            // if( isForClientSide && !isClientRouting ) return
-        }
-        else if (configName === 'onPrerenderStart') {
-            if (isDev || isForClientSide) {
-                // Only load onPrerenderStart() in server production runtime
-                return;
-            }
-        }
-        else {
-            (0, utils_js_1.assert)(false);
-        }
-        const configValueSource = sources[0];
-        (0, utils_js_1.assert)(configValueSource);
-        const whitespace = '    ';
-        lines.push(...(0, serializeConfigValue_js_1.serializeConfigValueImported)(configValueSource, configName, whitespace, varCounterContainer, importStatements));
-    });
-    lines.push(`  ],`);
+    lines.push(`  configValuesSerialized: {`);
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfigGlobal, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: true, isDev }), '    '));
+    lines.push(`  },`);
     const code = lines.join('\n');
     return code;
 }

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

@@ -16,6 +16,12 @@ function isRuntimeEnvMatch(configEnv, runtime) {
     // Eager
     if (runtime.isEager !== !!configEnv.eager)
         return false;
+    // Production/development
+    if (
+    //
+    (configEnv.production === true && runtime.isDev) ||
+        (configEnv.production === false && !runtime.isDev))
+        return false;
     return true;
 }
 exports.isRuntimeEnvMatch = isRuntimeEnvMatch;

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

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveClientEntriesDev = void 0;
+const utils_js_1 = require("./utils.js");
+const module_1 = require("module");
+const path_1 = require("path");
+const url_1 = require("url");
+// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+const importMetaUrl = `file://${__filename}`;
+const require_ = (0, module_1.createRequire)(importMetaUrl);
+const __dirname_ = (0, path_1.dirname)((0, url_1.fileURLToPath)(importMetaUrl));
+(0, utils_js_1.assertIsNotProductionRuntime)();
+async function resolveClientEntriesDev(clientEntry, viteDevServer) {
+    let root = viteDevServer.config.root;
+    (0, utils_js_1.assert)(root);
+    root = (0, utils_js_1.toPosixPath)(root);
+    // The `?import` suffix is needed for MDX to be transpiled:
+    //   - Not transpiled: `/pages/markdown.page.mdx`
+    //   - Transpiled: `/pages/markdown.page.mdx?import`
+    // But `?import` doesn't work with `/@fs/`:
+    //   - Not transpiled: /@fs/home/runner/work/vike/vike/examples/react-full/pages/markdown.page.mdx
+    //   - Not transpiled: /@fs/home/runner/work/vike/vike/examples/react-full/pages/markdown.page.mdx?import
+    if (clientEntry.endsWith('?import')) {
+        (0, utils_js_1.assert)(clientEntry.startsWith('/'));
+        return clientEntry;
+    }
+    (0, utils_js_1.assertPosixPath)(clientEntry);
+    let filePath;
+    if (clientEntry.startsWith('/')) {
+        filePath = (0, utils_js_1.pathJoin)(root, clientEntry);
+    }
+    else {
+        if (clientEntry.startsWith('@@vike/')) {
+            (0, utils_js_1.assert)(clientEntry.endsWith('.js'));
+            try {
+                // For Vitest (which doesn't resolve vike to its dist but to its source files)
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/plugin/resolveClientEntriesDev.js
+                filePath = (0, utils_js_1.toPosixPath)(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../client/').replace('.js', '.ts')));
+            }
+            catch {
+                // For users
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/resolveClientEntriesDev.js
+                filePath = (0, utils_js_1.toPosixPath)(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../../../dist/esm/client/')));
+            }
+        }
+        else {
+            (0, utils_js_1.assertIsNpmPackageImport)(clientEntry);
+            filePath = require_.resolve(clientEntry);
+        }
+    }
+    if (!filePath.startsWith('/')) {
+        (0, utils_js_1.assert)(process.platform === 'win32');
+        filePath = '/' + filePath;
+    }
+    filePath = '/@fs' + filePath;
+    (0, utils_js_1.assertPosixPath)(filePath);
+    return filePath;
+}
+exports.resolveClientEntriesDev = resolveClientEntriesDev;

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

@@ -1,7 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addSsrMiddleware = void 0;
 const renderPage_js_1 = require("../../runtime/renderPage.js");
+const utils_js_1 = require("../utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 function addSsrMiddleware(middlewares) {
     middlewares.use(async (req, res, next) => {
         if (res.headersSent)
@@ -10,11 +15,21 @@ function addSsrMiddleware(middlewares) {
         if (!url)
             return next();
         const { headers } = req;
-        const userAgent = headers['user-agent'];
         const pageContextInit = {
             urlOriginal: url,
-            userAgent
+            headersOriginal: headers
         };
+        Object.defineProperty(pageContextInit, 'userAgent', {
+            get() {
+                // TODO/next-major-release: assertUsage() instead of assertWarning()
+                (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('pageContext.userAgent')} is deprecated: use ${picocolors_1.default.cyan("pageContext.headers['user-agent']")} instead.`, {
+                    showStackTrace: true,
+                    onlyOnce: true
+                });
+                return headers['user-agent'];
+            },
+            enumerable: false
+        });
         let pageContext;
         try {
             pageContext = await (0, renderPage_js_1.renderPage)(pageContextInit);

package/dist/cjs/node/prerender/runPrerender.js

@@ -44,7 +44,7 @@ const helpers_js_1 = require("../../shared/page-configs/helpers.js");
 const getConfigValue_js_1 = require("../../shared/page-configs/getConfigValue.js");
 const loadConfigValues_js_1 = require("../../shared/page-configs/loadConfigValues.js");
 const error_page_js_1 = require("../../shared/error-page.js");
-const addUrlComputedProps_js_1 = require("../../shared/addUrlComputedProps.js");
+const getPageContextUrlComputed_js_1 = require("../../shared/getPageContextUrlComputed.js");
 const abort_js_1 = require("../../shared/route/abort.js");
 const loadUserFilesServerSide_js_1 = require("../runtime/renderPage/loadUserFilesServerSide.js");
 const getHook_js_1 = require("../../shared/hooks/getHook.js");
@@ -52,6 +52,7 @@ const noRouteMatch_js_1 = require("../../shared/route/noRouteMatch.js");
 const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
 const logErrorHint_js_1 = require("../runtime/renderPage/logErrorHint.js");
 const executeHook_js_1 = require("../../shared/hooks/executeHook.js");
+const getConfigValueBuildTime_js_1 = require("../../shared/page-configs/getConfigValueBuildTime.js");
 async function runPrerenderFromAPI(options = {}) {
     await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
@@ -142,7 +143,7 @@ async function collectDoNoPrerenderList(renderContext, pageConfigs, doNotPrerend
     // V1 design
     pageConfigs.forEach((pageConfig) => {
         const configName = 'prerender';
-        const configValue = (0, getConfigValue_js_1.getConfigValue)(pageConfig, configName, 'boolean');
+        const configValue = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, configName, 'boolean');
         if (configValue?.value === false) {
             const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue.definedAtData);
             (0, utils_js_1.assert)(configValueFilePathToShowToUser);
@@ -245,7 +246,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, renderContext,
         if (doNotPrerenderList.find((p) => p.pageId === pageId)) {
             return;
         }
-        const prerenderResult = await (0, executeHook_js_1.executeHook)(() => hookFn(), { hookName, hookFilePath, hookTimeout });
+        const prerenderResult = await (0, executeHook_js_1.executeHook)(() => hookFn(), { hookName, hookFilePath, hookTimeout }, null);
         const result = normalizeOnPrerenderHookResult(prerenderResult, hookFilePath, hookName);
         result.forEach(({ url, pageContext }) => {
             {
@@ -268,9 +269,9 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, renderContext,
             prerenderContext.pageContexts.push(pageContextNew);
             if (pageContext) {
                 (0, utils_js_1.objectAssign)(pageContextNew, {
-                    _pageContextAlreadyProvidedByOnPrerenderHook: true,
-                    ...pageContext
+                    _pageContextAlreadyProvidedByOnPrerenderHook: true
                 });
+                (0, utils_js_1.objectAssign)(pageContextNew, pageContext);
             }
         });
     })));
@@ -328,14 +329,11 @@ function createPageContext(urlOriginal, renderContext, prerenderContext) {
         _prerenderContext: prerenderContext
     };
     const pageContextInit = {
-        urlOriginal,
-        ...prerenderContext.pageContextInit
+        urlOriginal
     };
+    (0, utils_js_1.objectAssign)(pageContextInit, prerenderContext.pageContextInit);
     {
-        const pageContextInitEnhanced = (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit, renderContext, {
-            // We set `enumerable` to `false` to avoid computed URL properties from being iterated & copied in a onPrerenderStart() hook, e.g. /examples/i18n/
-            urlComputedPropsNonEnumerable: true
-        });
+        const pageContextInitEnhanced = (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit, renderContext);
         (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
     }
     return pageContext;
@@ -410,6 +408,8 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
         pageContext._urlOriginalBeforeHook = pageContext.urlOriginal;
     });
     const docLink = 'https://vike.dev/i18n#pre-rendering';
+    // Set `enumerable` to `false` to avoid computed URL properties from being iterated & copied in onPrerenderStart() hook, e.g. /examples/i18n/
+    const { restoreEnumerable, addPageContextComputedUrl } = makePageContextComputedUrlNonEnumerable(prerenderContext.pageContexts);
     let result = await (0, executeHook_js_1.executeHook)(() => hookFn({
         pageContexts: prerenderContext.pageContexts,
         // TODO/v1-release: remove warning
@@ -420,7 +420,8 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
             });
             return prerenderContext.pageContexts;
         }
-    }), onPrerenderStartHook);
+    }), onPrerenderStartHook, null);
+    restoreEnumerable();
     if (result === null || result === undefined) {
         return;
     }
@@ -458,9 +459,8 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
                 hookName
             };
         }
-        // Restore as URL computed props are lost when user makes a pageContext copy
-        (0, addUrlComputedProps_js_1.addUrlComputedProps)(pageContext);
     });
+    addPageContextComputedUrl(prerenderContext.pageContexts);
 }
 async function routeAndPrerender(prerenderContext, concurrencyLimit, onComplete) {
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
@@ -502,7 +502,7 @@ async function routeAndPrerender(prerenderContext, concurrencyLimit, onComplete)
             if (pageContext._pageConfigs.length > 0) {
                 const pageConfig = pageContext._pageConfigs.find((p) => p.pageId === pageId);
                 (0, utils_js_1.assert)(pageConfig);
-                usesClientRouter = (0, getConfigValue_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
+                usesClientRouter = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
             }
             else {
                 usesClientRouter = globalContext.pluginManifest.usesClientRouter;
@@ -743,3 +743,23 @@ function assertIsNotAbort(err, urlOr404) {
     (0, utils_js_1.assert)(abortCall);
     (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOr404} but ${picocolors_1.default.cyan(abortCaller)} isn't supported for pre-rendered pages`);
 }
+function makePageContextComputedUrlNonEnumerable(pageContexts) {
+    change(false);
+    return { restoreEnumerable, addPageContextComputedUrl };
+    function restoreEnumerable() {
+        change(true);
+    }
+    function addPageContextComputedUrl(pageContexts) {
+        // Add URL computed props to the user-generated pageContext copies
+        pageContexts.forEach((pageContext) => {
+            const pageContextUrlComputed = (0, getPageContextUrlComputed_js_1.getPageContextUrlComputed)(pageContext);
+            (0, utils_js_1.objectAssign)(pageContext, pageContextUrlComputed);
+        });
+    }
+    function change(enumerable) {
+        pageContexts.forEach((pageContext) => {
+            (0, utils_js_1.changeEnumerable)(pageContext, 'urlPathname', enumerable);
+            (0, utils_js_1.changeEnumerable)(pageContext, 'urlParsed', enumerable);
+        });
+    }
+}

package/dist/cjs/node/prerender/utils.js

@@ -31,3 +31,4 @@ __exportStar(require("../../utils/assertNodeEnv.js"), exports);
 __exportStar(require("../../utils/pLimit.js"), exports);
 __exportStar(require("../../utils/assertPathFilesystemAbsolute.js"), exports);
 __exportStar(require("../../utils/isArray.js"), exports);
+__exportStar(require("../../utils/changeEnumerable.js"), exports);

package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js

@@ -112,7 +112,7 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
         });
     }
     // The JavaScript entry <script> tag
-    const scriptEntry = await mergeScriptEntries(pageAssets, isProduction);
+    const scriptEntry = await mergeScriptEntries(pageAssets);
     if (scriptEntry) {
         htmlTags.push({
             htmlTag: scriptEntry,
@@ -134,11 +134,11 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     return htmlTags;
 }
 exports.getHtmlTags = getHtmlTags;
-async function mergeScriptEntries(pageAssets, isProduction) {
+async function mergeScriptEntries(pageAssets) {
     const scriptEntries = pageAssets.filter((pageAsset) => pageAsset.isEntry && pageAsset.assetType === 'script');
     const viteScripts = await (0, getViteDevScripts_js_1.getViteDevScripts)();
     const scriptTagsHtml = `${viteScripts}${scriptEntries.map((asset) => (0, inferHtmlTags_js_1.inferAssetTag)(asset)).join('')}`;
-    const scriptTag = (0, mergeScriptTags_js_1.mergeScriptTags)(scriptTagsHtml, isProduction);
+    const scriptTag = (0, mergeScriptTags_js_1.mergeScriptTags)(scriptTagsHtml);
     return scriptTag;
 }
 function getPageContextJsonScriptTag(pageContext) {

package/dist/cjs/node/runtime/html/injectAssets/getViteDevScripts.js

@@ -21,7 +21,8 @@ async function getViteDevScripts() {
     (0, utils_js_1.assertUsage)(!fakeHtml.startsWith(fakeHtmlBegin.replace(' ', '')), 'Vite plugins that minify the HTML are not supported by vike, see https://github.com/vikejs/vike/issues/224');
     (0, utils_js_1.assertUsage)(fakeHtml.startsWith(fakeHtmlBegin) && fakeHtml.endsWith(fakeHtmlEnd), 'You are using a Vite Plugin that transforms the HTML in a way that conflicts with vike. Create a new GitHub ticket to discuss a solution.');
     const viteInjection = fakeHtml.slice(fakeHtmlBegin.length, -1 * fakeHtmlEnd.length);
-    (0, utils_js_1.assert)(viteInjection.includes('script'), { viteInjection });
+    (0, utils_js_1.assert)(viteInjection.includes('script'));
+    (0, utils_js_1.assertWarning)(!viteInjection.includes('import('), 'Unexpected Vite HMR code. Reach out to a Vike maintainer on GitHub.', { onlyOnce: true });
     const scriptTags = viteInjection;
     return scriptTags;
 }

package/dist/cjs/node/runtime/html/injectAssets/mergeScriptTags.js

@@ -6,7 +6,7 @@ const inferHtmlTags_js_1 = require("./inferHtmlTags.js");
 const scriptRE = /(<script\b(?:\s[^>]*>|>))(.*?)<\/script>/gims;
 const srcRE = /\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
 const typeRE = /\btype\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
-function mergeScriptTags(scriptTagsHtml, isProduction) {
+function mergeScriptTags(scriptTagsHtml) {
     let scriptTag = '';
     const scripts = parseScripts(scriptTagsHtml);
     // We need to merge module scripts to ensure execution order
@@ -21,13 +21,7 @@ function mergeScriptTags(scriptTagsHtml, isProduction) {
                 const hasInnerHtml = !!innerHtml.trim();
                 if (src) {
                     (0, utils_js_1.assert)(!hasInnerHtml);
-                    if (isProduction) {
-                        contents.push(`import ${JSON.stringify(src)};`);
-                    }
-                    else {
-                        // Ensure HMR preamble code is executed before client entries
-                        contents.push(`import(${JSON.stringify(src)});`);
-                    }
+                    contents.push(`import ${JSON.stringify(src)};`);
                 }
                 else if (hasInnerHtml) {
                     innerHtml = innerHtml.split('\n').filter(Boolean).join('\n');

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

@@ -170,35 +170,44 @@ async function renderTemplate(templateContent, pageContext) {
             setStream(templateVar);
             continue;
         }
-        const getErrMsg = (typeText, end) => {
+        const getErrMsg = (msg) => {
             const { hookName, hookFilePath } = pageContext._renderHook;
             const nth = (i === 0 && '1st') || (i === 1 && '2nd') || (i === 2 && '3rd') || `${i}-th`;
-            return [`The ${nth} HTML variable is ${typeText}, see ${hookName}() hook defined by ${hookFilePath}.`, end]
+            return [
+                `The ${nth} HTML variable is ${msg}`,
+                `The HTML was provided by the ${hookName}() hook at ${hookFilePath}.`
+            ]
                 .filter(Boolean)
                 .join(' ');
         };
-        (0, utils_js_1.assertUsage)(!(0, utils_js_1.isPromise)(templateVar), getErrMsg('a promise', `Did you forget to ${picocolors_1.default.cyan('await')} the promise?`));
+        (0, utils_js_1.assertUsage)(!(0, utils_js_1.isPromise)(templateVar), getErrMsg(`a promise, did you forget to ${picocolors_1.default.cyan('await')} the promise?`));
         if (templateVar === undefined || templateVar === null) {
-            (0, utils_js_1.assertWarning)(false, getErrMsg(`${picocolors_1.default.cyan(String(templateVar))} which will be converted to an empty string`, `Pass the empty string ${picocolors_1.default.cyan("''")} instead of ${picocolors_1.default.cyan(String(templateVar))} to remove this warning.`), { onlyOnce: false });
+            const msgVal = picocolors_1.default.cyan(String(templateVar));
+            const msgEmptyString = picocolors_1.default.cyan("''");
+            const msg = `${msgVal} which will be converted to an empty string. Pass the empty string ${msgEmptyString} instead of ${msgVal} to remove this warning.`;
+            (0, utils_js_1.assertWarning)(false, getErrMsg(msg), { onlyOnce: false });
             templateVar = '';
         }
         {
             const varType = typeof templateVar;
-            const streamNote = ['boolean', 'number', 'bigint', 'symbol'].includes(varType)
-                ? null
-                : '(See https://vike.dev/streaming for HTML streaming.)';
-            (0, utils_js_1.assertUsage)(varType === 'string', getErrMsg(picocolors_1.default.cyan(`typeof htmlVar === "${varType}"`), streamNote));
+            if (varType !== 'string') {
+                const msgType = picocolors_1.default.cyan(`typeof htmlVariable === "${varType}"`);
+                const msg = `${msgType} but a string or stream (https://vike.dev/streaming) is expected instead.`;
+                (0, utils_js_1.assertUsage)(false, getErrMsg(msg));
+            }
         }
         {
             const { isProduction } = (0, globalContext_js_1.getGlobalContext)();
             if ((0, utils_js_1.isHtml)(templateVar) &&
                 // We don't show this warning in production because it's expected that some users may (un)willingly do some XSS injection: we avoid flooding the production logs.
                 !isProduction) {
-                (0, utils_js_1.assertWarning)(false, getErrMsg(`${picocolors_1.default.cyan(templateVar)} which seems to be HTML code`, 'Did you forget to wrap the value with dangerouslySkipEscape()?'), { onlyOnce: false });
+                const msgVal = picocolors_1.default.cyan(String(templateVar));
+                const msg = `${msgVal} which seems to be HTML code. Did you forget to wrap the value with dangerouslySkipEscape()?`;
+                (0, utils_js_1.assertWarning)(false, getErrMsg(msg), { onlyOnce: false });
             }
         }
         // Escape untrusted template variable
-        addHtmlPart(escapeHtml(templateVar));
+        addHtmlPart((0, utils_js_1.escapeHtml)(templateVar));
     }
     (0, utils_js_1.assert)(templateStrings.length === templateVariables.length + 1);
     addHtmlPart(templateStrings[templateStrings.length - 1]);
@@ -214,16 +223,6 @@ async function renderTemplate(templateContent, pageContext) {
         htmlPartsEnd
     };
 }
-function escapeHtml(unsafeString) {
-    // Source: https://stackoverflow.com/questions/6234773/can-i-escape-html-special-chars-in-javascript/6234804#6234804
-    const safe = unsafeString
-        .replace(/&/g, '&')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
-        .replace(/'/g, '&#039;');
-    return safe;
-}
 async function getHtmlString(htmlRender) {
     if (typeof htmlRender === 'string') {
         return htmlRender;

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

@@ -35,7 +35,7 @@ function serializePageContextClientSide(pageContext) {
         pageContextClient[prop] = pageContext[prop];
     });
     if (Object.keys(pageContext._pageContextInit).some((p) => passToClient.includes(p))) {
-        pageContextClient._pageContextInitIsPassedToClient = true;
+        pageContextClient[pageContextInitIsPassedToClient_js_1.pageContextInitIsPassedToClient] = true;
     }
     let pageContextSerialized;
     try {

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

@@ -762,17 +762,17 @@ async function loadStreamNodeModule() {
     const { Readable, Writable } = streamModule;
     return { Readable, Writable };
 }
-function getStreamName(type, standard) {
-    let standardName = (0, utils_js_1.capitalizeFirstLetter)(standard);
-    if (standardName === 'Node') {
-        standardName = 'Node.js';
+function getStreamName(kind, type) {
+    let typeName = (0, utils_js_1.capitalizeFirstLetter)(type);
+    if (typeName === 'Node') {
+        typeName = 'Node.js';
     }
-    const typeName = (0, utils_js_1.capitalizeFirstLetter)(type);
-    if (type !== 'pipe') {
-        return `a ${typeName} ${standardName} Stream`;
+    const kindName = (0, utils_js_1.capitalizeFirstLetter)(kind);
+    if (kind !== 'pipe') {
+        return `a ${kindName} ${typeName} Stream`;
     }
-    if (type === 'pipe') {
-        return `a ${standardName} Stream Pipe`;
+    if (kind === 'pipe') {
+        return `a ${typeName} Stream Pipe`;
     }
     (0, utils_js_1.assert)(false);
 }

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

@@ -6,12 +6,16 @@ const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyze
 const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const analyzeClientSide_js_1 = require("../../../shared/getPageFiles/analyzeClientSide.js");
 const globalContext_js_1 = require("../globalContext.js");
-const getClientEntry_js_1 = require("../../shared/getClientEntry.js");
+const getConfigValue_js_1 = require("../../../shared/page-configs/getConfigValue.js");
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
         const { isClientSideRenderable, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
-        const clientFilePath = (0, getClientEntry_js_1.getClientEntry)(pageConfig);
-        const clientEntry = !isClientSideRenderable ? clientFilePath : (0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting);
+        const clientEntries = [];
+        const clientFilePath = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'client', 'string')?.value ?? null;
+        if (clientFilePath)
+            clientEntries.push(clientFilePath);
+        if (isClientSideRenderable)
+            clientEntries.push((0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
             id: (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageConfig.pageId, true),
@@ -43,15 +47,13 @@ function analyzePage(pageFilesAll, pageConfig, pageId) {
           }
         })
         */
-        const clientEntries = [];
-        if (clientEntry) {
+        clientEntries.forEach((clientEntry) => {
             clientDependencies.push({
                 id: clientEntry,
                 onlyAssets: false,
                 eagerlyImported: false
             });
-            clientEntries.push(clientEntry);
-        }
+        });
         return {
             isHtmlOnly: !isClientSideRenderable,
             isClientRouting,