vike 0.4.220 → 0.4.221-commit-ab9e52a

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/{debug.js → virtual-files/debug.js}

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.debug = void 0;
-const utils_js_1 = require("../../../utils.js");
+const utils_js_1 = require("../../../../utils.js");
 exports.debug = (0, utils_js_1.createDebugger)('vike:virtual-files');

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/{getVirtualFilePageConfigValuesAll.js → virtual-files/getVirtualFilePageConfigValuesAll.js}

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVirtualFilePageConfigValuesAll = getVirtualFilePageConfigValuesAll;
-const utils_js_1 = require("../../../utils.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
-const getVikeConfig_js_1 = require("./getVikeConfig.js");
-const extractAssetsQuery_js_1 = require("../../../../shared/extractAssetsQuery.js");
+const utils_js_1 = require("../../../../utils.js");
+const virtualFilePageConfigValuesAll_js_1 = require("../../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const getVikeConfig_js_1 = require("../getVikeConfig.js");
+const extractAssetsQuery_js_1 = require("../../../../../shared/extractAssetsQuery.js");
 const debug_js_1 = require("./debug.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
-const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
-const fixServerAssets_js_1 = require("../../buildConfig/fixServerAssets.js");
-const getConfigValueBuildTime_js_1 = require("../../../../../shared/page-configs/getConfigValueBuildTime.js");
+const serializeConfigValues_js_1 = require("../../../../../../shared/page-configs/serialize/serializeConfigValues.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);
@@ -24,16 +24,19 @@ async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const { pageConfigs } = vikeConfig;
     const pageConfig = pageConfigs.find((pageConfig) => pageConfig.pageId === pageId);
     (0, utils_js_1.assert)(pageConfig, { id, pageId });
-    const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer, isDev);
+    const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, 
+    // TODO/now: add meta.default
+    vikeConfig.global.config.includeAssetsImportedByServer ?? true, isDev);
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }
 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 → virtual-files/getVirtualFilePageConfigs.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVirtualFilePageConfigs = getVirtualFilePageConfigs;
-const virtualFilePageConfigValuesAll_js_1 = require("../../../../shared/virtual-files/virtualFilePageConfigValuesAll.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 getVikeConfig_js_1 = require("../getVikeConfig.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
-const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
+const serializeConfigValues_js_1 = require("../../../../../../shared/page-configs/serialize/serializeConfigValues.js");
 async function getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, config) {
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config, { doNotRestartViteOnError: true });
     const { pageConfigs, pageConfigGlobal } = vikeConfig;
@@ -14,38 +14,40 @@ 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;
-        const virtualFileIdPageConfigValuesAll = (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, isForClientSide);
         lines.push(`  {`);
         lines.push(`    pageId: ${JSON.stringify(pageId)},`);
         lines.push(`    isErrorPage: ${JSON.stringify(isErrorPage)},`);
         lines.push(`    routeFilesystem: ${JSON.stringify(routeFilesystem)},`);
-        lines.push(`    loadConfigValuesAll: () => import(${JSON.stringify(virtualFileIdPageConfigValuesAll)}),`);
+        const virtualFileId = JSON.stringify((0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, isForClientSide));
+        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,9 +10,10 @@ 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 vikeConfigGlobal: VikeConfigGlobal
+    // let vikeConfig: VikeConfigObject
     return {
         name: 'vike:previewConfig',
         apply: utils_js_1.applyPreview,
@@ -20,15 +21,14 @@ function previewConfig() {
             return {
                 appType: 'custom',
                 build: {
-                    outDir: (0, utils_js_1.resolveOutDir)(config)
+                    outDir: (0, getOutDirs_js_1.resolveOutDir)(config)
                 }
             };
         },
         async configResolved(config_) {
             config = config_;
             (0, index_js_1.logDockerHint)(config.preview.host);
-            // const vikeConfig = await getVikeConfig(config)
-            // vikeConfigGlobal = vikeConfig.vikeConfigGlobal
+            // vikeConfig = await getVikeConfig(config)
         },
         configurePreviewServer(server) {
             /* - Couldn't make `appType: 'mpa'` work as of npm:@brillout/vite@5.0.0-beta.14.0426910c
@@ -38,7 +38,7 @@ function previewConfig() {
             return () => {
                 assertDist();
                 /* We don't use this condition (we wrongfully always use the SSR middleware) because of the regression introduced by https://github.com/vitejs/vite/pull/14756 which stops servering .html files when `appType: 'custom'`.
-                if (!vikeConfigGlobal.prerender || vikeConfigGlobal.prerender.partial) {
+                if (!vikeConfig.global.config.prerender || vikeConfig.global.config.prerender.partial) {
                   addSsrMiddleware(server.middlewares, config, true)
                 }
                 /*/
@@ -49,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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 [
         {
@@ -23,7 +23,7 @@ function setGlobalContext() {
                 order: 'pre',
                 handler(_, env) {
                     const isViteDev = (0, utils_js_1.isDevCheck)(env);
-                    (0, globalContext_js_1.setGlobalContext_isViteDev)(isViteDev);
+                    (0, globalContext_js_1.setGlobalContext_isProduction)(!isViteDev);
                     (0, utils_js_1.markSetup_isViteDev)(isViteDev);
                 }
             }
@@ -34,11 +34,9 @@ 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);
-                    (0, globalContext_js_1.setGlobalContext_vikeConfig)(vikeConfig);
                 }
             }
         }

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/shared/getFullBuildInlineConfig.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFullBuildInlineConfig = getFullBuildInlineConfig;
+const isViteCliCall_js_1 = require("./isViteCliCall.js");
+function getFullBuildInlineConfig(config) {
+    const configFromCli = !(0, isViteCliCall_js_1.isViteCliCall)() ? null : (0, isViteCliCall_js_1.getViteConfigFromCli)();
+    if (config._viteConfigEnhanced) {
+        return config._viteConfigEnhanced;
+    }
+    else {
+        return {
+            ...configFromCli,
+            configFile: configFromCli?.configFile || config.configFile,
+            root: config.root,
+            build: {
+                ...configFromCli?.build
+            }
+        };
+    }
+}

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

@@ -5,70 +5,79 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOutDirs = getOutDirs;
 exports.resolveOutDir = resolveOutDir;
-const viteIsSSR_js_1 = require("./viteIsSSR.js");
-const assert_js_1 = require("./assert.js");
-const path_shim_js_1 = require("./path-shim.js");
-const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const debug_js_1 = require("./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);
+    const outDir = getOutDirFromViteResolvedConfig(config);
+    if (!isOutDirRoot(outDir))
+        assertOutDirResolved(outDir, config);
+    const outDirs = getOutDirsAll(outDir, config.root);
+    return outDirs;
+}
+/** Appends `client/` or `server/` to `config.build.outDir` */
+function resolveOutDir(config, isSSR) {
+    debug('resolveOutDir()', new Error().stack);
+    const isServerSide = (0, viteIsSSR_js_1.viteIsSSR)(config) || isSSR;
+    debug('isServerSide', isServerSide);
+    const outDir = getOutDirFromViteUserConfig(config) || 'dist';
+    debug('outDir', outDir);
+    /* outDir may already be resolved when using Telefunc + Vike (because both Telefunc and Vike use this logic)
+    assert(isOutDirRoot(outDir))
+    */
+    const { outDirClient, outDirServer } = getOutDirsAll(outDir);
+    if (isServerSide) {
+        debug('outDirServer', 'outDirServer');
+        return outDirServer;
+    }
+    else {
+        debug('outDirClient', 'outDirClient');
+        return outDirClient;
+    }
+}
+function determineOutDirs(outDirRoot) {
+    (0, utils_js_1.assertPosixPath)(outDirRoot);
+    (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(outDir, root) {
     let outDirRoot;
     {
-        const outDir = getOutDirFromViteResolvedConfig(config);
         if (isOutDirRoot(outDir)) {
             outDirRoot = outDir;
         }
         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);
         }
     }
-    const outDirs = getOutDirsAll(outDirRoot, config.root);
     debug('outDirRoot', outDirRoot);
-    debug('outDirs', outDirs);
-    return outDirs;
-}
-/** Appends `client/` or `server/` to `config.build.outDir` */
-function resolveOutDir(config) {
-    debug('resolveOutDir()', new Error().stack);
-    const outDir = getOutDirFromViteUserConfig(config) || 'dist';
-    debug('outDir', 'outDir');
-    // outDir may already be resolved when using Telefunc + vike (because both Telefunc and vike use this logic)
-    if (!isOutDirRoot(outDir)) {
-        assertOutDirResolved(outDir, config);
-        return outDir;
+    let outDirs;
+    if (root) {
+        outDirs = getOutDirsAllFromRootNormalized(outDirRoot, root);
     }
     else {
-        const { outDirClient, outDirServer } = determineOutDirs(outDir);
-        if ((0, viteIsSSR_js_1.viteIsSSR)(config)) {
-            debug('outDirServer', 'outDirServer');
-            return outDirServer;
-        }
-        else {
-            debug('outDirClient', 'outDirClient');
-            return outDirClient;
-        }
+        outDirs = getOutDirsAllFromRoot(outDirRoot);
     }
+    debug('outDirs', outDirs);
+    return outDirs;
 }
-function determineOutDirs(outDirRoot) {
-    (0, filesystemPathHandling_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');
-    assertIsNotOutDirRoot(outDirClient);
-    assertIsNotOutDirRoot(outDirServer);
-    return { outDirClient, outDirServer };
+function getOutDirsAllFromRoot(outDirRoot) {
+    let { outDirClient, outDirServer } = determineOutDirs(outDirRoot);
+    return { outDirRoot, outDirClient, outDirServer };
 }
-function getOutDirsAll(outDirRoot, root) {
-    if (!outDirIsAbsolutePath(outDirRoot)) {
-        (0, filesystemPathHandling_js_1.assertPosixPath)(outDirRoot);
-        (0, filesystemPathHandling_js_1.assertPosixPath)(root);
-        outDirRoot = (0, path_shim_js_1.pathJoin)(root, outDirRoot);
+function getOutDirsAllFromRootNormalized(outDirRoot, root) {
+    if (root && !outDirIsAbsolutePath(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 +89,10 @@ function getOutDirsAll(outDirRoot, root) {
     return { outDirRoot, outDirClient, outDirServer };
 }
 function assertNormalization(outDirAny) {
-    (0, filesystemPathHandling_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,37 +100,37 @@ 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` */
+/** Assert that `outDir` ends with `/server` or `/client` */
 function assertOutDirResolved(outDir, config) {
-    (0, filesystemPathHandling_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) {
     let outDir = config.build?.outDir;
     if (outDir === undefined)
         return undefined;
-    outDir = normalize(outDir);
+    outDir = normalizeOutDir(outDir);
     return outDir;
 }
 function getOutDirFromViteResolvedConfig(config) {
     let outDir = config.build.outDir;
-    (0, assert_js_1.assert)(outDir);
-    outDir = normalize(outDir);
+    (0, utils_js_1.assert)(outDir);
+    outDir = normalizeOutDir(outDir);
     return outDir;
 }
-function normalize(outDir) {
-    outDir = (0, filesystemPathHandling_js_1.toPosixPath)(outDir);
+function normalizeOutDir(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

@@ -18,10 +18,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // We call onLoad() here so that it's called even when only a subset of the plugin is loaded. (Making the assert() calls inside onLoad() a lot stronger.)
 const onLoad_js_1 = require("./onLoad.js");
 (0, onLoad_js_1.onLoad)();
-// We tolerate the fact that we load all of the runtime utils even though some of it isn't needed
+// 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

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPrerenderEnabled = isPrerenderEnabled;
+exports.isPrerenderAutoRunEnabled = isPrerenderAutoRunEnabled;
+exports.temp_disablePrerenderAutoRun = temp_disablePrerenderAutoRun;
+exports.isPrerendering = isPrerendering;
+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);
+    return (isPrerenderEnabled(vikeConfig) &&
+        !(prerenderConfig || {}).disableAutoRun &&
+        !globalObject.isDisabled &&
+        vikeConfig.global.config.disableAutoFullBuild !== 'prerender');
+}
+// TODO/v1-release: remove
+function temp_disablePrerenderAutoRun() {
+    globalObject.isDisabled = true;
+}
+function isPrerendering() {
+    return !!globalObject.isPrerendering;
+}
+function setContextIsPrerendering() {
+    globalObject.isPrerendering = true;
+}

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

@@ -0,0 +1,46 @@
+"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
+function resolvePrerenderConfig(vikeConfig) {
+    const prerenderConfigs = vikeConfig.global.config.prerender;
+    if (!prerenderConfigs &&
+        !vikeConfig.pageConfigs.some((pageConfig) => resolvePrerenderConfigLocal(pageConfig)?.value)) {
+        return false;
+    }
+    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,
+        parallel: pickFirst(prerenderSettings.map((c) => c.parallel)) ?? true,
+        disableAutoRun: pickFirst(prerenderSettings.map((c) => c.disableAutoRun)) ?? false
+    };
+    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' && p !== null;
+}
+function pickFirst(arr) {
+    return arr.filter((v) => v !== undefined)[0];
+}