vike 0.4.220-commit-5c7810f → 0.4.220-commit-af5c91f

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

@@ -33,9 +33,10 @@ async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
 function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, isDev) {
     const lines = [];
     const importStatements = [];
+    const filesEnv = new Map();
     const isClientRouting = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
     lines.push('export const configValuesSerialized = {');
-    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '', false));
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '', false));
     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))}'`);

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

@@ -14,17 +14,18 @@ async function getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRou
 function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting) {
     const lines = [];
     const importStatements = [];
+    const filesEnv = new Map();
     lines.push('export const pageConfigsSerialized = [');
-    lines.push(getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, isDev, importStatements));
+    lines.push(getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, isDev, importStatements, filesEnv));
     lines.push('];');
     lines.push('export const pageConfigGlobalSerialized = {');
-    lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements));
+    lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements, filesEnv));
     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, isDev, importStatements) {
+function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, isDev, importStatements, filesEnv) {
     const lines = [];
     pageConfigs.forEach((pageConfig) => {
         const { pageId, routeFilesystem, isErrorPage } = pageConfig;
@@ -36,17 +37,17 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
         const load = `() => ({ moduleId: ${virtualFileId}, moduleExports: import(${virtualFileId}) })`;
         lines.push(`    loadConfigValuesAll: ${load},`);
         lines.push(`    configValuesSerialized: {`);
-        lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', true));
+        lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', true));
         lines.push(`    },`);
         lines.push(`  },`);
     });
     const code = lines.join('\n');
     return code;
 }
-function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements) {
+function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements, filesEnv) {
     const lines = [];
     lines.push(`  configValuesSerialized: {`);
-    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfigGlobal, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', null));
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfigGlobal, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', null));
     lines.push(`  },`);
     const code = lines.join('\n');
     return code;

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

@@ -10,7 +10,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageJsonFile = packageJsonFile;
 const rollupIsEsm_js_1 = require("../shared/rollupIsEsm.js");
-const utils_js_1 = require("../utils.js");
+const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
 function packageJsonFile() {
     let config;
     return {
@@ -20,7 +20,7 @@ function packageJsonFile() {
             config = config_;
         },
         generateBundle(options, bundle) {
-            if (!(0, utils_js_1.viteIsSSR)(config))
+            if (!(0, viteIsSSR_js_1.viteIsSSR)(config))
                 return;
             const isEsm = (0, rollupIsEsm_js_1.rollupIsEsm)(options);
             const fileName = 'package.json';

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

@@ -10,6 +10,7 @@ const path_1 = __importDefault(require("path"));
 const addSsrMiddleware_js_1 = require("../shared/addSsrMiddleware.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const index_js_1 = require("./devConfig/index.js");
+const getOutDirs_js_1 = require("../shared/getOutDirs.js");
 function previewConfig() {
     let config;
     // let vikeConfig: VikeConfigObject
@@ -20,7 +21,7 @@ function previewConfig() {
             return {
                 appType: 'custom',
                 build: {
-                    outDir: (0, utils_js_1.resolveOutDir)(config)
+                    outDir: (0, getOutDirs_js_1.resolveOutDir)(config)
                 }
             };
         },
@@ -48,13 +49,13 @@ function previewConfig() {
         }
     };
     function assertDist() {
-        let { outDirRoot, outDirClient, outDirServer } = (0, utils_js_1.getOutDirs)(config);
+        let { outDirRoot, outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
         [outDirRoot, outDirClient, outDirServer].forEach((outDirAny) => {
             (0, utils_js_1.assertUsage)(fs_1.default.existsSync(outDirAny), `Cannot run ${picocolors_1.default.cyan('$ vike preview')}: your app isn't built (the build directory ${picocolors_1.default.cyan(outDirAny)} is missing). Make sure to run ${picocolors_1.default.cyan('$ vike build')} before running ${picocolors_1.default.cyan('$ vike preview')}.`);
         });
     }
     function addStatic404Middleware(middlewares) {
-        const { outDirClient } = (0, utils_js_1.getOutDirs)(config);
+        const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(config);
         middlewares.use(config.base, (_, res, next) => {
             const file = path_1.default.posix.join(outDirClient, './404.html');
             if (fs_1.default.existsSync(file)) {

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

@@ -4,6 +4,7 @@ exports.setGlobalContext = setGlobalContext;
 const globalContext_js_1 = require("../../runtime/globalContext.js");
 const utils_js_1 = require("../utils.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
+const getOutDirs_js_1 = require("../shared/getOutDirs.js");
 function setGlobalContext() {
     return [
         {
@@ -34,7 +35,7 @@ function setGlobalContext() {
             configResolved: {
                 order: 'post',
                 async handler(config) {
-                    const { outDirRoot } = (0, utils_js_1.getOutDirs)(config);
+                    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
                     (0, utils_js_1.assertFilePathAbsoluteFilesystem)(outDirRoot); // Needed for `importServerProductionEntry({ outDir })` of @brillout/vite-plugin-server-entry
                     (0, globalContext_js_1.setGlobalContext_viteConfig)(config, outDirRoot);
                     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);

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

@@ -7,9 +7,10 @@ exports.findPageFiles = findPageFiles;
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const getOutDirs_js_1 = require("./getOutDirs.js");
 async function findPageFiles(config, fileTypes, isDev) {
     const cwd = config.root;
-    const { outDirRoot } = (0, utils_js_1.getOutDirs)(config);
+    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
     const timeBase = new Date().getTime();
     let pageFiles = await (0, fast_glob_1.default)(fileTypes.map((fileType) => `**/*${fileType}.${utils_js_1.scriptFileExtensions}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false });
     pageFiles = pageFiles.map((p) => '/' + (0, utils_js_1.toPosixPath)(p));

package/dist/cjs/node/plugin/{getOutDirs.js → shared/getOutDirs.js}

@@ -5,13 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOutDirs = getOutDirs;
 exports.resolveOutDir = resolveOutDir;
-const viteIsSSR_js_1 = require("../../utils/viteIsSSR.js");
-const assert_js_1 = require("../../utils/assert.js");
-const path_shim_js_1 = require("../../utils/path-shim.js");
-const toPosixPath_js_1 = require("../../utils/toPosixPath.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const debug_js_1 = require("../../utils/debug.js");
-const debug = (0, debug_js_1.createDebugger)('vike:outDir');
+const utils_js_1 = require("../utils.js");
+const viteIsSSR_js_1 = require("./viteIsSSR.js");
+const debug = (0, utils_js_1.createDebugger)('vike:outDir');
 function getOutDirs(config) {
     debug('getOutDirs()', new Error().stack);
     let outDirRoot;
@@ -22,8 +19,8 @@ function getOutDirs(config) {
         }
         else {
             assertOutDirResolved(outDir, config);
-            (0, assert_js_1.assert)(outDir.endsWith('/server') || outDir.endsWith('/client'));
-            (0, assert_js_1.assert)('/client'.length === '/server'.length);
+            (0, utils_js_1.assert)(outDir.endsWith('/server') || outDir.endsWith('/client'));
+            (0, utils_js_1.assert)('/client'.length === '/server'.length);
             outDirRoot = outDir.slice(0, -1 * '/client'.length);
         }
     }
@@ -55,20 +52,20 @@ function resolveOutDir(config) {
     }
 }
 function determineOutDirs(outDirRoot) {
-    (0, toPosixPath_js_1.assertPosixPath)(outDirRoot);
-    (0, assert_js_1.assert)(!outDirRoot.endsWith('/'));
-    (0, assert_js_1.assert)(isOutDirRoot(outDirRoot));
-    const outDirClient = (0, path_shim_js_1.pathJoin)(outDirRoot, 'client');
-    const outDirServer = (0, path_shim_js_1.pathJoin)(outDirRoot, 'server');
+    (0, utils_js_1.assertPosixPath)(outDirRoot);
+    (0, utils_js_1.assert)(!outDirRoot.endsWith('/'));
+    (0, utils_js_1.assert)(isOutDirRoot(outDirRoot));
+    const outDirClient = (0, utils_js_1.pathJoin)(outDirRoot, 'client');
+    const outDirServer = (0, utils_js_1.pathJoin)(outDirRoot, 'server');
     assertIsNotOutDirRoot(outDirClient);
     assertIsNotOutDirRoot(outDirServer);
     return { outDirClient, outDirServer };
 }
 function getOutDirsAll(outDirRoot, root) {
     if (!outDirIsAbsolutePath(outDirRoot)) {
-        (0, toPosixPath_js_1.assertPosixPath)(outDirRoot);
-        (0, toPosixPath_js_1.assertPosixPath)(root);
-        outDirRoot = (0, path_shim_js_1.pathJoin)(root, outDirRoot);
+        (0, utils_js_1.assertPosixPath)(outDirRoot);
+        (0, utils_js_1.assertPosixPath)(root);
+        outDirRoot = (0, utils_js_1.pathJoin)(root, outDirRoot);
     }
     let { outDirClient, outDirServer } = determineOutDirs(outDirRoot);
     outDirRoot = outDirRoot + '/';
@@ -80,10 +77,10 @@ function getOutDirsAll(outDirRoot, root) {
     return { outDirRoot, outDirClient, outDirServer };
 }
 function assertNormalization(outDirAny) {
-    (0, toPosixPath_js_1.assertPosixPath)(outDirAny);
-    (0, assert_js_1.assert)(outDirIsAbsolutePath(outDirAny));
-    (0, assert_js_1.assert)(outDirAny.endsWith('/'));
-    (0, assert_js_1.assert)(!outDirAny.endsWith('//'));
+    (0, utils_js_1.assertPosixPath)(outDirAny);
+    (0, utils_js_1.assert)(outDirIsAbsolutePath(outDirAny));
+    (0, utils_js_1.assert)(outDirAny.endsWith('/'));
+    (0, utils_js_1.assert)(!outDirAny.endsWith('//'));
 }
 function isOutDirRoot(outDirRot) {
     const p = outDirRot.split('/').filter(Boolean);
@@ -91,20 +88,20 @@ function isOutDirRoot(outDirRot) {
     return lastDir !== 'client' && lastDir !== 'server';
 }
 function assertIsNotOutDirRoot(outDir) {
-    (0, assert_js_1.assert)(outDir.endsWith('/client') || outDir.endsWith('/server'));
+    (0, utils_js_1.assert)(outDir.endsWith('/client') || outDir.endsWith('/server'));
 }
 /** `outDir` ends with `/server` or `/client` */
 function assertOutDirResolved(outDir, config) {
-    (0, toPosixPath_js_1.assertPosixPath)(outDir);
+    (0, utils_js_1.assertPosixPath)(outDir);
     assertIsNotOutDirRoot(outDir);
-    (0, assert_js_1.assert)('/client'.length === '/server'.length);
+    (0, utils_js_1.assert)('/client'.length === '/server'.length);
     const outDirCorrected = outDir.slice(0, -1 * '/client'.length);
     const wrongUsage = `You've set Vite's config.build.outDir to ${picocolors_1.default.cyan(outDir)} but you should set it to ${picocolors_1.default.cyan(outDirCorrected)} instead.`;
     if ((0, viteIsSSR_js_1.viteIsSSR)(config)) {
-        (0, assert_js_1.assertUsage)(outDir.endsWith('/server'), wrongUsage);
+        (0, utils_js_1.assertUsage)(outDir.endsWith('/server'), wrongUsage);
     }
     else {
-        (0, assert_js_1.assertUsage)(outDir.endsWith('/client'), wrongUsage);
+        (0, utils_js_1.assertUsage)(outDir.endsWith('/client'), wrongUsage);
     }
 }
 function getOutDirFromViteUserConfig(config) {
@@ -116,12 +113,12 @@ function getOutDirFromViteUserConfig(config) {
 }
 function getOutDirFromViteResolvedConfig(config) {
     let outDir = config.build.outDir;
-    (0, assert_js_1.assert)(outDir);
+    (0, utils_js_1.assert)(outDir);
     outDir = normalize(outDir);
     return outDir;
 }
 function normalize(outDir) {
-    outDir = (0, toPosixPath_js_1.toPosixPath)(outDir);
+    outDir = (0, utils_js_1.toPosixPath)(outDir);
     outDir = outDir.replace(/\/+$/, ''); // remove trailing slashes
     return outDir;
 }

package/dist/cjs/node/plugin/{resolveClientEntriesDev.js → shared/resolveClientEntriesDev.js}

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveClientEntriesDev = resolveClientEntriesDev;
-const utils_js_1 = require("./utils.js");
+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;
@@ -34,13 +31,13 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
             (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')));
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/plugin/shared/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/')));
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/shared/resolveClientEntriesDev.js
+                filePath = (0, utils_js_1.toPosixPath)(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
             }
         }
         else {

package/dist/cjs/{utils → node/plugin/shared}/viteIsSSR.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.viteIsSSR = viteIsSSR;
 exports.viteIsSSR_options = viteIsSSR_options;
-const assert_js_1 = require("./assert.js");
-const isObject_js_1 = require("./isObject.js");
+const assert_js_1 = require("../../../utils/assert.js");
+const isObject_js_1 = require("../../../utils/isObject.js");
 function viteIsSSR(config) {
     return !!config?.build?.ssr;
 }

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

@@ -21,7 +21,6 @@ const onLoad_js_1 = require("./onLoad.js");
 // It's common practice for Vike's Vite plugin to import from Vike's sever runtime
 __exportStar(require("../runtime/utils.js"), exports);
 // Utils only needed by `plugin/*`
-__exportStar(require("../../utils/viteIsSSR.js"), exports);
 __exportStar(require("../../utils/requireResolve.js"), exports);
 __exportStar(require("../../utils/includes.js"), exports);
 __exportStar(require("../../utils/isDev.js"), exports);

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPrerenderEnabled = isPrerenderEnabled;
 exports.isPrerenderAutoRunEnabled = isPrerenderAutoRunEnabled;
 exports.temp_disablePrerenderAutoRun = temp_disablePrerenderAutoRun;
 exports.isPrerendering = isPrerendering;
@@ -7,10 +8,14 @@ exports.setContextIsPrerendering = setContextIsPrerendering;
 const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
 const resolvePrerenderConfig_js_1 = require("./resolvePrerenderConfig.js");
 const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('prerender/context.ts', {});
+function isPrerenderEnabled(vikeConfig) {
+    const prerenderConfig = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig);
+    return !!prerenderConfig;
+}
 function isPrerenderAutoRunEnabled(vikeConfig) {
-    const prerenderConfig = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig.global.config.prerender);
-    return (prerenderConfig &&
-        !prerenderConfig.disableAutoRun &&
+    const prerenderConfig = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig);
+    return (isPrerenderEnabled(vikeConfig) &&
+        !(prerenderConfig || {}).disableAutoRun &&
         !globalObject.isDisabled &&
         vikeConfig.global.config.disableAutoFullBuild !== 'prerender');
 }

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

@@ -1,14 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePrerenderConfig = resolvePrerenderConfig;
+exports.resolvePrerenderConfigLocal = resolvePrerenderConfigLocal;
+const utils_js_1 = require("./utils.js");
+const getConfigValueBuildTime_js_1 = require("../../shared/page-configs/getConfigValueBuildTime.js");
+const helpers_js_1 = require("../../shared/page-configs/helpers.js");
 // TODO/now:
 // - prerender.value
-// - correct isPrerendering
-function resolvePrerenderConfig(prerenderConfigs) {
-    if (!prerenderConfigs || prerenderConfigs.every((configVal) => !configVal)) {
+function resolvePrerenderConfig(vikeConfig) {
+    const prerenderConfigs = vikeConfig.global.config.prerender;
+    if (!prerenderConfigs &&
+        !vikeConfig.pageConfigs.some((pageConfig) => resolvePrerenderConfigLocal(pageConfig)?.value)) {
         return false;
     }
-    const prerenderSettings = prerenderConfigs.filter(isObject2);
+    let prerenderSettings = prerenderConfigs || [];
+    // Needed because of backwards compatibility of `vike({prerender:true})` in `vite.config.js`; after we remove it we can remove this line.
+    prerenderSettings = prerenderSettings.filter(isObject2);
+    (0, utils_js_1.assert)(prerenderSettings.every(isObject2));
     const prerenderConfig = {
         partial: pickFirst(prerenderSettings.map((c) => c.partial)) ?? false,
         noExtraDir: pickFirst(prerenderSettings.map((c) => c.noExtraDir)) ?? false,
@@ -17,8 +25,21 @@ function resolvePrerenderConfig(prerenderConfigs) {
     };
     return prerenderConfig;
 }
+function resolvePrerenderConfigLocal(pageConfig) {
+    const configValue = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, 'prerender');
+    if (!configValue)
+        return null;
+    const values = configValue.value;
+    (0, utils_js_1.assert)((0, utils_js_1.isArray)(values));
+    const value = values[0];
+    (0, utils_js_1.assert)(typeof value === 'boolean');
+    (0, utils_js_1.assert)((0, utils_js_1.isArray)(configValue.definedAtData));
+    const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue.definedAtData[0]);
+    (0, utils_js_1.assert)(configValueFilePathToShowToUser);
+    return { value, configValueFilePathToShowToUser };
+}
 function isObject2(p) {
-    return typeof p === 'object';
+    return typeof p === 'object' && p !== null;
 }
 function pickFirst(arr) {
     return arr.filter((v) => v !== undefined)[0];

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

@@ -51,7 +51,6 @@ const vite_1 = require("vite");
 const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
 const getPageContextRequestUrl_js_1 = require("../../shared/getPageContextRequestUrl.js");
 const resolveRouteString_js_1 = require("../../shared/route/resolveRouteString.js");
-const helpers_js_1 = require("../../shared/page-configs/helpers.js");
 const getConfigValueRuntime_js_1 = require("../../shared/page-configs/getConfigValueRuntime.js");
 const loadConfigValues_js_1 = require("../../shared/page-configs/loadConfigValues.js");
 const error_page_js_1 = require("../../shared/error-page.js");
@@ -63,10 +62,10 @@ 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");
 const prepareViteApiCall_js_1 = require("../api/prepareViteApiCall.js");
 const context_js_1 = require("./context.js");
 const resolvePrerenderConfig_js_1 = require("./resolvePrerenderConfig.js");
+const getOutDirs_js_1 = require("../plugin/shared/getOutDirs.js");
 async function runPrerenderFromAPI(options = {}) {
     return 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.
@@ -111,9 +110,9 @@ async function runPrerender(options = {}, standaloneTrigger) {
     await disableReactStreaming();
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'build', 'production');
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig);
-    const { outDirClient } = (0, utils_js_1.getOutDirs)(viteConfig);
+    const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(viteConfig);
     const { root } = viteConfig;
-    const prerenderConfig = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig.global.config.prerender);
+    const prerenderConfig = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig);
     validatePrerenderConfig(prerenderConfig);
     if (!prerenderConfig) {
         (0, utils_js_1.assert)(standaloneTrigger);
@@ -160,15 +159,11 @@ async function runPrerender(options = {}, standaloneTrigger) {
 async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, concurrencyLimit) {
     // V1 design
     pageConfigs.forEach((pageConfig) => {
-        const configName = 'prerender';
-        const configValue = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, configName);
+        const configValue = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigLocal)(pageConfig);
         if (!configValue)
             return;
-        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(configValue, 'value', 'array'));
-        if (configValue.value[0] === false) {
-            (0, utils_js_1.assert)((0, utils_js_1.isArray)(configValue.definedAtData));
-            const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue.definedAtData[0]);
-            (0, utils_js_1.assert)(configValueFilePathToShowToUser);
+        const { value, configValueFilePathToShowToUser } = configValue;
+        if (value === false) {
             doNotPrerenderList.push({
                 pageId: pageConfig.pageId,
                 setByConfigName: 'prerender',

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

@@ -22,9 +22,8 @@ __exportStar(require("../../utils/projectInfo.js"), exports);
 __exportStar(require("../../utils/objectAssign.js"), exports);
 __exportStar(require("../../utils/isObjectWithKeys.js"), exports);
 __exportStar(require("../../utils/isCallable.js"), exports);
-__exportStar(require("../plugin/getOutDirs.js"), exports);
 __exportStar(require("../../utils/isPropertyGetter.js"), exports);
-__exportStar(require("../../utils/toPosixPath.js"), exports);
+__exportStar(require("../../utils/path.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../utils/isPlainObject.js"), exports);
 __exportStar(require("../../utils/assertSetup.js"), exports);

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

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHtmlTags = getHtmlTags;
+const isFontFallback_js_1 = require("../../renderPage/isFontFallback.js");
 const utils_js_1 = require("../../utils.js");
 const serializePageContextClientSide_js_1 = require("../serializePageContextClientSide.js");
 const sanitizeJson_js_1 = require("./sanitizeJson.js");
@@ -20,7 +21,8 @@ function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter,
     const isHtmlOnly = pageContext._isHtmlOnly;
     const { isProduction } = (0, globalContext_js_1.getGlobalContext)();
     const injectScriptsAt = getInjectScriptsAt(pageContext.pageId, pageContext._pageConfigs);
-    const injectFilterEntries = pageAssets
+    const injectFilterEntries = [];
+    pageAssets
         .filter((asset) => {
         if (asset.isEntry && asset.assetType === 'script') {
             // We could allow the user to change the position of <script> but we currently don't:
@@ -31,15 +33,18 @@ function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter,
         }
         return true;
     })
-        .map((asset) => {
+        .forEach((asset) => {
         const inject = (() => {
             if (!isProduction) {
                 // In development, we should always load assets as soon as possible, in order to eagerly process assets (e.g. applying the transform() hooks of Vite plugins) which are lazily discovered.
                 return 'HTML_BEGIN';
             }
-            if (asset.assetType === 'style' || asset.assetType === 'font') {
+            if (asset.assetType === 'style') {
                 return 'HTML_BEGIN';
             }
+            if (asset.assetType === 'font') {
+                return !(0, isFontFallback_js_1.isFontFallback)(asset, injectFilterEntries) ? 'HTML_BEGIN' : false;
+            }
             if (asset.assetType === 'script') {
                 if (isHtmlOnly)
                     return false;
@@ -53,7 +58,7 @@ function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter,
             // @ts-ignore
             [stamp]: true
         };
-        return entry;
+        injectFilterEntries.push(entry);
     });
     assertInjectFilterEntries(injectFilterEntries);
     // ==============

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

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEarlyHints = getEarlyHints;
+const isFontFallback_js_1 = require("./isFontFallback.js");
 const inferHtmlTags_js_1 = require("../html/injectAssets/inferHtmlTags.js");
-const utils_js_1 = require("../utils.js");
 function getEarlyHints(assets) {
     const earlyHints = [];
     {
         assets.forEach((asset) => {
             // Don't early hint fallback fonts, https://github.com/vikejs/vike/issues/624
-            if (isFontFallback(asset, earlyHints))
+            if ((0, isFontFallback_js_1.isFontFallback)(asset, earlyHints))
                 return;
             earlyHints.push({
                 ...asset,
@@ -18,28 +18,3 @@ function getEarlyHints(assets) {
     }
     return earlyHints;
 }
-function isFontFallback(asset, earlyHints) {
-    if (asset.assetType !== 'font') {
-        return false;
-    }
-    const fontUrlBase = removeFileExtentionAndHash(asset.src);
-    return earlyHints.some((hint) => {
-        return hint.assetType === 'font' && removeFileExtentionAndHash(hint.src) === fontUrlBase;
-    });
-}
-function removeFileExtentionAndHash(assetUrl) {
-    (0, utils_js_1.assert)(!assetUrl.includes('\\'));
-    // The logic below doesn't work for '/assets/chunk-0e184ced.js'
-    (0, utils_js_1.assert)(!assetUrl.endsWith('.js'));
-    const paths = assetUrl.split('/');
-    {
-        const filename = paths[paths.length - 1];
-        const filenameParts = filename.split('.');
-        (0, utils_js_1.assert)(filenameParts.length >= 2);
-        // User may set config.build.rollupOptions.output.assetFileNames => we can't assume the filename to be `*.${hash}.${ext}`
-        const filenameBase = filenameParts.slice(0, filenameParts.length === 2 ? -1 : -2);
-        (0, utils_js_1.assert)(filenameBase.length >= 1);
-        paths[paths.length - 1] = filenameBase.join('.');
-    }
-    return paths.join('/');
-}

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

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isFontFallback = isFontFallback;
+const assert_js_1 = require("../../../utils/assert.js");
+function isFontFallback(asset, pageAssets) {
+    if (asset.assetType !== 'font') {
+        return false;
+    }
+    const fontUrlBase = removeFileExtentionAndHash(asset.src);
+    return pageAssets.some((assetOther) => {
+        return assetOther.assetType === 'font' && removeFileExtentionAndHash(assetOther.src) === fontUrlBase;
+    });
+}
+function removeFileExtentionAndHash(assetUrl) {
+    (0, assert_js_1.assert)(!assetUrl.includes('\\'));
+    // The logic below doesn't work for '/assets/chunk-0e184ced.js'
+    (0, assert_js_1.assert)(!assetUrl.endsWith('.js'));
+    const paths = assetUrl.split('/');
+    {
+        const filename = paths[paths.length - 1];
+        const filenameParts = filename.split('.');
+        (0, assert_js_1.assert)(filenameParts.length >= 2);
+        // User may set config.build.rollupOptions.output.assetFileNames => we can't assume the filename to be `*.${hash}.${ext}`
+        const filenameBase = filenameParts.slice(0, filenameParts.length === 2 ? -1 : -2);
+        (0, assert_js_1.assert)(filenameBase.length >= 1);
+        paths[paths.length - 1] = filenameBase.join('.');
+    }
+    return paths.join('/');
+}

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

@@ -41,8 +41,6 @@ __exportStar(require("../../utils/compareString.js"), exports);
 __exportStar(require("../../utils/isObjectWithKeys.js"), exports);
 __exportStar(require("../../utils/stringifyStringArray.js"), exports);
 __exportStar(require("../../utils/unique.js"), exports);
-__exportStar(require("../../utils/toPosixPath.js"), exports);
-__exportStar(require("../plugin/getOutDirs.js"), exports);
 __exportStar(require("../../utils/capitalizeFirstLetter.js"), exports);
 __exportStar(require("../../utils/debugGlob.js"), exports);
 __exportStar(require("../../utils/isSameErrorMessage.js"), exports);
@@ -61,7 +59,7 @@ __exportStar(require("../../utils/objectEntries.js"), exports);
 __exportStar(require("../../utils/objectFromEntries.js"), exports);
 __exportStar(require("../../utils/getFileExtension.js"), exports);
 __exportStar(require("../../utils/assertSetup.js"), exports);
-__exportStar(require("../../utils/path-shim.js"), exports);
+__exportStar(require("../../utils/path.js"), exports);
 __exportStar(require("../../utils/isHtml.js"), exports);
 __exportStar(require("../../utils/warnIfErrorIsNotObject.js"), exports);
 __exportStar(require("../../utils/stripAnsi.js"), exports);

package/dist/cjs/shared/getPageFiles/fileTypes.js

@@ -21,7 +21,6 @@ function isValidFileType(filePath) {
     return ['.js', '.mjs', '.cjs', '.css'].some((ext) => filePath.endsWith(ext));
 }
 function determineFileType(filePath) {
-    (0, utils_js_1.assertPosixPath)(filePath);
     {
         const isCSS = filePath.endsWith('.css');
         if (isCSS) {

package/dist/cjs/shared/getPageFiles/getAllPageIdFiles.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPageFilesClientSide = getPageFilesClientSide;
 exports.getPageFilesServerSide = getPageFilesServerSide;
 const utils_js_1 = require("../utils.js");
-const assertPageFilePath_js_1 = require("../assertPageFilePath.js");
 function getPageFilesClientSide(pageFilesAll, pageId) {
     return determine(pageFilesAll, pageId, true);
 }
@@ -88,8 +87,6 @@ function getPageFilesSorter(envIsClient, pageId) {
     };
 }
 function getPathDistance(pathA, pathB) {
-    (0, assertPageFilePath_js_1.assertPageFilePath)(pathA);
-    (0, assertPageFilePath_js_1.assertPageFilePath)(pathB);
     // Index of first different character
     let idx = 0;
     for (; idx < pathA.length && idx < pathB.length; idx++) {