vike 0.4.161 → 0.4.162-commit-8995471

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

@@ -13,62 +13,55 @@ const utils_js_1 = require("../../../../utils.js");
 const transformFileImports_js_1 = require("./transformFileImports.js");
 const getVikeConfig_js_1 = require("../getVikeConfig.js");
 require("source-map-support/register.js");
-const getConfigFileExport_js_1 = require("../getConfigFileExport.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-async function transpileAndExecuteFile(filePath, transformImports, userRootDir, doNotTranspile = false) {
-    if (doNotTranspile) {
-        (0, utils_js_1.assert)(!transformImports);
-        const fileExports = await executeFile(filePath.filePathAbsoluteFilesystem, filePath);
-        if (isHeaderFile(filePath.filePathAbsoluteFilesystem)) {
-            const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
-            (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser2} is a JavaScript header file (.h.js), but JavaScript header files don't apply to the config files of extensions`, { onlyOnce: true });
-        }
+const debug = (0, utils_js_1.createDebugger)('vike:pointer-imports');
+async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile) {
+    const { filePathAbsoluteFilesystem } = filePath;
+    const fileExtension = getFileExtension(filePathAbsoluteFilesystem);
+    const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
+    (0, utils_js_1.assertUsage)((0, utils_js_1.isJavaScriptFile)(filePathAbsoluteFilesystem), `${filePathToShowToUser2} has file extension .${fileExtension} but a config file can only be a JavaScript/TypeScript file`);
+    const isHeader = isHeaderFile(filePathAbsoluteFilesystem);
+    if (isHeader) {
+        (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('.h.js')} files are deprecated: simply renaming ${filePathToShowToUser2} to ${removeHeaderFileExtension(filePathToShowToUser2)} is usually enough, although you may occasionally need to use ${picocolors_1.default.cyan("with { type: 'pointer' }")} as explained at https://vike.dev/config#pointer-imports`, { onlyOnce: true });
+    }
+    if (isConfigFile === 'is-extension-config' && !isHeader && fileExtension.endsWith('js')) {
+        // This doesn't track dependencies => we should never use this for user land configs
+        const fileExports = await executeFile(filePathAbsoluteFilesystem, filePath);
         return { fileExports };
     }
     else {
-        const { code, fileImportsTransformed } = await transpileFile(filePath, transformImports, userRootDir);
-        const fileExports = await executeTranspiledFile(filePath, code, fileImportsTransformed);
+        const transformImports = isConfigFile && (isHeader ? 'all' : true);
+        const code = await transpileFile(filePath, transformImports, userRootDir);
+        const fileExports = await executeTranspiledFile(filePath, code);
         return { fileExports };
     }
 }
 exports.transpileAndExecuteFile = transpileAndExecuteFile;
 async function transpileFile(filePath, transformImports, userRootDir) {
-    const { filePathAbsoluteFilesystem } = filePath;
     const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
+    const { filePathAbsoluteFilesystem } = filePath;
     (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
     getVikeConfig_js_1.vikeConfigDependencies.add(filePathAbsoluteFilesystem);
-    let code = await transpileWithEsbuild(filePath, userRootDir, transformImports);
-    let fileImportsTransformed = null;
+    if (debug.isEnabled)
+        debug('transpile', filePathToShowToUser2);
+    let { code, pointerImports } = await transpileWithEsbuild(filePath, userRootDir, transformImports);
+    if (debug.isEnabled)
+        debug(`code, post esbuild (${filePathToShowToUser2})`, code);
+    let isImportTransformed = false;
     if (transformImports) {
-        const res = transformFileImports_(code, filePath);
-        if (res) {
-            code = res.code;
-            fileImportsTransformed = res.fileImportsTransformed;
+        const codeMod = (0, transformFileImports_js_1.transformFileImports)(code, filePathToShowToUser2, pointerImports);
+        if (codeMod) {
+            code = codeMod;
+            isImportTransformed = true;
+            if (debug.isEnabled)
+                debug(`code, post transformImports() (${filePathToShowToUser2})`, code);
         }
     }
-    else {
-        if (isHeaderFile(filePathAbsoluteFilesystem)) {
-            (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser2} is a JavaScript header file (.h.js), but JavaScript header files only apply to +config.h.js, see https://vike.dev/header-file`, { onlyOnce: true });
-        }
+    if (!isImportTransformed) {
+        if (debug.isEnabled)
+            debug(`code, no transformImports() (${filePathToShowToUser2})`);
     }
-    return { code, fileImportsTransformed };
-}
-function transformFileImports_(codeOriginal, filePath) {
-    const { filePathAbsoluteFilesystem } = filePath;
-    const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
-    // Replace import statements with import strings
-    const res = (0, transformFileImports_js_1.transformFileImports)(codeOriginal, filePathToShowToUser2);
-    if (res.noTransformation) {
-        return null;
-    }
-    const { code, fileImportsTransformed } = res;
-    if (!isHeaderFile(filePathAbsoluteFilesystem)) {
-        const filePathCorrect = appendHeaderFileExtension(filePathToShowToUser2);
-        (0, utils_js_1.assertWarning)(false, `Rename ${filePathToShowToUser2} to ${filePathCorrect}, see https://vike.dev/header-file`, {
-            onlyOnce: true
-        });
-    }
-    return { code, fileImportsTransformed };
+    return code;
 }
 async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
     const entryFilePath = filePath.filePathAbsoluteFilesystem;
@@ -91,14 +84,63 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
         // Esbuild still sometimes removes unused imports because of TypeScript: https://github.com/evanw/esbuild/issues/3034
         treeShaking: false,
         minify: false,
-        metafile: !transformImports,
-        // We cannot bundle imports that are meant to be transformed
-        bundle: !transformImports
+        metafile: transformImports !== 'all',
+        bundle: transformImports !== 'all'
     };
-    // Track dependencies
-    if (!transformImports) {
+    let pointerImports;
+    if (transformImports === 'all') {
+        pointerImports = 'all';
         options.packages = 'external';
+    }
+    else {
+        const pointerImports_ = (pointerImports = {});
         options.plugins = [
+            // Determine what import should be externalized (and then transformed to a pointer/fake import)
+            {
+                name: 'vike:externalize-heuristic',
+                setup(build) {
+                    // https://github.com/evanw/esbuild/issues/3095#issuecomment-1546916366
+                    const useEsbuildResolver = 'useEsbuildResolver';
+                    // https://github.com/brillout/esbuild-playground
+                    build.onResolve({ filter: /.*/ }, async (args) => {
+                        if (args.kind !== 'import-statement')
+                            return;
+                        if (args.pluginData?.[useEsbuildResolver])
+                            return;
+                        const isImportAbsolute = !args.path.startsWith('.');
+                        const { path, ...opts } = args;
+                        opts.pluginData = { [useEsbuildResolver]: true };
+                        const resolved = await build.resolve(path, opts);
+                        // vike-{react,vue,solid} follow the convention that their config export resolves to a file named +config.js
+                        //  - This is temporary, see comment below.
+                        const isVikeExtensionConfigImport = resolved.path.endsWith('+config.js');
+                        const isPointerImport = 
+                        // .jsx, .vue, .svg, ... => obviously not config code
+                        !(0, utils_js_1.isJavaScriptFile)(resolved.path) ||
+                            // Import of a Vike extension config => make it a pointer import because we want to show nice error messages (that can display whether a configas been set by the user or by a Vike extension).
+                            //  - We should have Node.js directly load vike-{react,vue,solid} while enforcing Vike extensions to set 'name' in their +config.js file.
+                            //    - vike@0.4.162 already started soft-requiring Vike extensions to set the name config
+                            isVikeExtensionConfigImport ||
+                            // Cannot be resolved by esbuild => take a leap of faith and make it a pointer import.
+                            //  - For example if esbuild cannot resolve a path alias while Vite can.
+                            //    - When tsconfig.js#compilerOptions.paths is set, then esbuild is able to resolve the path alias.
+                            resolved.errors.length > 0;
+                        pointerImports_[args.path] = isPointerImport;
+                        const isExternal = isPointerImport ||
+                            // npm package imports that aren't pointer imports (e.g. Vite plugin import)
+                            isImportAbsolute;
+                        if (debug.isEnabled)
+                            debug('onResolved()', { args, resolved, isPointerImport, isExternal });
+                        if (isExternal) {
+                            return { external: true, path: args.path };
+                        }
+                        else {
+                            return resolved;
+                        }
+                    });
+                }
+            },
+            // Track dependencies
             {
                 name: 'vike:dependency-tracker',
                 setup(b) {
@@ -131,7 +173,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
         throw err;
     }
     // Track dependencies
-    if (!transformImports) {
+    if (transformImports !== 'all') {
         (0, utils_js_1.assert)(result.metafile);
         Object.keys(result.metafile.inputs).forEach((filePathRelative) => {
             filePathRelative = (0, utils_js_1.toPosixPath)(filePathRelative);
@@ -142,10 +184,10 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
     }
     const code = result.outputFiles[0].text;
     (0, utils_js_1.assert)(typeof code === 'string');
-    return code;
+    return { code, pointerImports };
 }
-async function executeTranspiledFile(filePath, code, fileImportsTransformed) {
-    const { filePathAbsoluteFilesystem, filePathRelativeToUserRootDir } = filePath;
+async function executeTranspiledFile(filePath, code) {
+    const { filePathAbsoluteFilesystem } = filePath;
     // Alternative to using a temporary file: https://github.com/vitejs/vite/pull/13269
     //  - But seems to break source maps, so I don't think it's worth it
     const filePathTmp = getFilePathTmp(filePathAbsoluteFilesystem);
@@ -158,11 +200,6 @@ async function executeTranspiledFile(filePath, code, fileImportsTransformed) {
     finally {
         clean();
     }
-    if (fileImportsTransformed) {
-        (0, utils_js_1.assert)(filePathRelativeToUserRootDir !== undefined);
-        const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
-        assertImportsAreReExported(fileImportsTransformed, fileExports, filePathToShowToUser2);
-    }
     return fileExports;
 }
 async function executeFile(filePathToExecuteAbsoluteFilesystem, filePathSourceFile) {
@@ -228,59 +265,27 @@ function isTmpFile(filePath) {
     return fileName.startsWith(tmpPrefix);
 }
 exports.isTmpFile = isTmpFile;
-function assertImportsAreReExported(fileImportsTransformed, fileExports, filePathToShowToUser2) {
-    const fileExport = (0, getConfigFileExport_js_1.getConfigFileExport)(fileExports, filePathToShowToUser2);
-    const exportedStrings = getExportedStrings(fileExport);
-    Object.values(exportedStrings).forEach((exportVal) => {
-        if (typeof exportVal !== 'string')
-            return;
-        if (!(0, transformFileImports_js_1.isImportData)(exportVal))
-            return;
-        const importString = exportVal;
-        fileImportsTransformed.forEach((fileImport) => {
-            if (fileImport.importString === importString) {
-                fileImport.isReExported = true;
-            }
-        });
-    });
-    const fileImportsTransformedUnused = fileImportsTransformed.filter((fi) => !fi.isReExported);
-    if (fileImportsTransformedUnused.length === 0)
-        return;
-    const importStatements = (0, utils_js_1.unique)(fileImportsTransformedUnused.map((fi) => fi.importStatementCode));
-    const importNamesUnused = fileImportsTransformedUnused.map((fi) => picocolors_1.default.cyan(fi.importLocalName)).join(', ');
-    const singular = fileImportsTransformedUnused.length === 1;
-    (0, utils_js_1.assertWarning)(fileImportsTransformedUnused.length === 0, [
-        `${filePathToShowToUser2} imports the following:`,
-        ...importStatements.map((s) => picocolors_1.default.cyan(`  ${s}`)),
-        `But the import${singular ? '' : 's'} ${importNamesUnused} ${singular ? "isn't" : "aren't"} re-exported at ${picocolors_1.default.cyan('export default { ... }')} and therefore ${singular ? 'has' : 'have'} no effect, see explanation at https://vike.dev/header-file`
-    ].join('\n'), { onlyOnce: true });
-}
-function getExportedStrings(obj) {
-    const exportedStrings = [];
-    Object.values(obj).forEach((val) => {
-        if (typeof val === 'string') {
-            exportedStrings.push(val);
-        }
-        else if (Array.isArray(val)) {
-            val.forEach((v) => {
-                if (typeof v === 'string') {
-                    exportedStrings.push(v);
-                }
-            });
-        }
-    });
-    return exportedStrings;
-}
 function isHeaderFile(filePath) {
     (0, utils_js_1.assertPosixPath)(filePath);
-    const basenameParts = path_1.default.posix.basename(filePath).split('.');
-    return basenameParts.includes('h');
+    const fileExtensions = getFileExtensions(filePath);
+    return fileExtensions.includes('h');
 }
-function appendHeaderFileExtension(filePath) {
-    const basenameParts = path_1.default.posix.basename(filePath).split('.');
-    basenameParts.splice(-1, 0, 'h');
-    const basenameCorrect = basenameParts.join('.');
-    return path_1.default.posix.join(path_1.default.posix.dirname(filePath), basenameCorrect);
+function getFileExtensions(filePath) {
+    const fileExtensions = path_1.default.posix.basename(filePath).split('.').slice(1);
+    return fileExtensions;
+}
+function getFileExtension(filePath) {
+    const fileExtensions = path_1.default.posix.basename(filePath).split('.').slice(1);
+    return fileExtensions.pop();
+}
+function removeHeaderFileExtension(filePath) {
+    (0, utils_js_1.assertPosixPath)(filePath);
+    const fileName = path_1.default.posix.basename(filePath);
+    const fileNameParts = fileName.split('.');
+    const fileNamePartsMod = fileNameParts.filter((p) => p !== 'h');
+    (0, utils_js_1.assert)(fileNamePartsMod.length < fileNameParts.length);
+    const fileNameMod = fileNamePartsMod.join('.');
+    return path_1.default.posix.join(path_1.default.posix.dirname(filePath), fileNameMod);
 }
 // Needed for the npm package 'source-map-support'. The Error.prepareStackTrace() hook of 'source-map-support' needs to be called before the file containing the source map is removed. The clean() call above removes the transpiled file from disk but it contains the inline source map.
 function triggerPrepareStackTrace(err) {

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

@@ -15,7 +15,6 @@ const loggerNotProd_js_1 = require("../../../shared/loggerNotProd.js");
 const removeSuperfluousViteLog_js_1 = require("../../../shared/loggerVite/removeSuperfluousViteLog.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const helpers_js_1 = require("../../../../../shared/page-configs/helpers.js");
-const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
 const getConfigValuesSerialized_js_1 = require("./getConfigValuesSerialized.js");
 const crawlPlusFiles_js_1 = require("./getVikeConfig/crawlPlusFiles.js");
 const getConfigFileExport_js_1 = require("./getConfigFileExport.js");
@@ -28,10 +27,10 @@ let wasConfigInvalid = null;
 let vikeConfigPromise = null;
 const vikeConfigDependencies = new Set();
 exports.vikeConfigDependencies = vikeConfigDependencies;
-function reloadVikeConfig(userRootDir, outDirRoot, extensions) {
+function reloadVikeConfig(userRootDir, outDirRoot) {
     vikeConfigDependencies.clear();
     (0, resolveImportPath_js_1.clearFilesEnvMap)();
-    vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, true, extensions, true);
+    vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, true, true);
     handleReloadSideEffects();
 }
 exports.reloadVikeConfig = reloadVikeConfig;
@@ -66,22 +65,24 @@ async function handleReloadSideEffects() {
         }
     }
 }
-async function getVikeConfig(config, isDev, tolerateInvalidConfig = false, extensions) {
+async function getVikeConfig(config, isDev, tolerateInvalidConfig = false) {
     const { outDirRoot } = (0, utils_js_1.getOutDirs)(config);
     const userRootDir = config.root;
     if (!vikeConfigPromise) {
-        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, extensions ?? (await (0, getConfigVike_js_1.getConfigVike)(config)).extensions, tolerateInvalidConfig);
+        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, tolerateInvalidConfig);
     }
     return await vikeConfigPromise;
 }
 exports.getVikeConfig = getVikeConfig;
 async function isV1Design(config, isDev) {
-    const isV1Design = (await getVikeConfig(config, isDev)).pageConfigs.length > 0;
+    const vikeConfig = await getVikeConfig(config, isDev);
+    const { pageConfigs } = vikeConfig;
+    const isV1Design = pageConfigs.length > 0;
     return isV1Design;
 }
 exports.isV1Design = isV1Design;
-async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
-    const plusFiles = await findPlusFiles(userRootDir, outDirRoot, isDev, extensions);
+async function loadInterfaceFiles(userRootDir, outDirRoot, isDev) {
+    const plusFiles = await findPlusFiles(userRootDir, outDirRoot, isDev);
     const configFiles = [];
     const valueFiles = [];
     plusFiles.forEach((f) => {
@@ -107,14 +108,14 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
             extendsConfigs.forEach((extendsConfig) => {
                 /* We purposely use the same locationId because the Vike extension's config should only apply to where it's being extended from, for example:
                 ```js
-                // /pages/admin/+config.h.js
+                // /pages/admin/+config.js
         
                 import vikeVue from 'vike-vue/config'
                 // Should only apply to /pages/admin/**
                 export default { extends: [vikeVue] }
                 ```
                 ```js
-                // /pages/marketing/+config.h.js
+                // /pages/marketing/+config.js
         
                 import vikeReact from 'vike-react/config'
                 // Should only apply to /pages/marketing/**
@@ -122,6 +123,28 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
                 ```
                 */
                 const interfaceFile = getInterfaceFileFromConfigFile(extendsConfig, true, locationId);
+                {
+                    const alreadyMigrated = [
+                        'vike-react',
+                        'vike-react-query',
+                        'vike-react-zustand',
+                        'vike-vue',
+                        'vike-pinia',
+                        'vike-solid'
+                    ];
+                    const extensionName = extendsConfig.filePath.importPathAbsolute.split('/')[0];
+                    const warnMsg = alreadyMigrated.includes(extensionName)
+                        ? `You're using a deprecated version of the Vike extension ${extensionName}, update ${extensionName} to its latest version.`
+                        : `The config of the Vike extension ${extensionName} should set a ${picocolors_1.default.cyan('name')} value`;
+                    const isNameDefined = interfaceFile.fileExportsByConfigName.name?.configValue;
+                    if (alreadyMigrated) {
+                        // Eventually always make it a assertUsage()
+                        (0, utils_js_1.assertWarning)(isNameDefined, warnMsg, { onlyOnce: true });
+                    }
+                    else {
+                        (0, utils_js_1.assertUsage)(isNameDefined, warnMsg);
+                    }
+                }
                 interfaceFilesByLocationId[locationId].push(interfaceFile);
             });
         }),
@@ -189,12 +212,12 @@ function assertAllConfigsAreKnown(interfaceFilesByLocationId) {
         });
     });
 }
-async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, extensions, tolerateInvalidConfig) {
+async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, tolerateInvalidConfig) {
     let hasError = false;
     let ret;
     let err;
     try {
-        ret = await loadVikeConfig(userRootDir, outDirRoot, isDev, extensions);
+        ret = await loadVikeConfig(userRootDir, outDirRoot, isDev);
     }
     catch (err_) {
         hasError = true;
@@ -230,8 +253,8 @@ async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev,
         }
     }
 }
-async function loadVikeConfig(userRootDir, outDirRoot, isDev, extensions) {
-    const interfaceFilesByLocationId = await loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions);
+async function loadVikeConfig(userRootDir, outDirRoot, isDev) {
+    const interfaceFilesByLocationId = await loadInterfaceFiles(userRootDir, outDirRoot, isDev);
     const importedFilesLoaded = {};
     const { globalVikeConfig, pageConfigGlobal } = await getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded);
     const pageConfigs = await Promise.all((0, utils_js_1.objectEntries)(interfaceFilesByLocationId)
@@ -406,7 +429,7 @@ async function resolveConfigValueSources(configName, configDef, interfaceFilesRe
             // Make this value:
             //   /pages/some-page/+{configName}.js > `export default`
             // override that value:
-            //   /pages/some-page/+config.h.js > `export default { someConfig }`
+            //   /pages/some-page/+config.js > `export default { someConfig }`
             const interfaceFileWinner = interfaceValueFile ?? interfaceConfigFile;
             if (interfaceFileWinner) {
                 const interfaceFilesOverriden = [...interfaceValueFiles, ...interfaceConfigFiles].filter((f) => f !== interfaceFileWinner);
@@ -714,26 +737,9 @@ function getComputed(configValueSources, configDefinitions) {
     });
     return configValuesComputed;
 }
-async function findPlusFiles(userRootDir, outDirRoot, isDev, extensions) {
+async function findPlusFiles(userRootDir, outDirRoot, isDev) {
     const files = await (0, crawlPlusFiles_js_1.crawlPlusFiles)(userRootDir, outDirRoot, isDev);
     const plusFiles = files.map(({ filePathRelativeToUserRootDir }) => (0, resolveFilePath_js_1.resolveFilePathRelativeToUserRootDir)(filePathRelativeToUserRootDir, userRootDir));
-    // TODO/v1-release: remove
-    extensions.forEach((extension) => {
-        extension.pageConfigsDistFiles?.forEach((pageConfigDistFile) => {
-            if (!pageConfigDistFile.importPath.includes('+'))
-                return;
-            (0, utils_js_1.assert)(pageConfigDistFile.importPath.includes('+'));
-            (0, utils_js_1.assert)(path_1.default.posix.basename(pageConfigDistFile.importPath).startsWith('+'));
-            const { importPath, filePath } = pageConfigDistFile;
-            plusFiles.push({
-                filePathRelativeToUserRootDir: null,
-                filePathAbsoluteVite: importPath,
-                filePathAbsoluteFilesystem: filePath,
-                filePathToShowToUser: importPath,
-                importPathAbsolute: importPath
-            });
-        });
-    });
     return plusFiles;
 }
 function getConfigName(filePath) {

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

@@ -11,20 +11,6 @@ function setGlobalContext() {
             handler(viteDevServer) {
                 (0, globalContext_js_1.setGlobalContext_viteDevServer)(viteDevServer);
             }
-        },
-        configurePreviewServer: {
-            order: 'pre',
-            handler(vitePreviewServer) {
-                (0, globalContext_js_1.setGlobalContext_vitePreviewServer)(
-                // Type cast won't be necessary after https://github.com/vitejs/vite/pull/14119 is released in Vite 5
-                vitePreviewServer);
-            }
-        },
-        configResolved: {
-            order: 'pre',
-            handler(config) {
-                (0, globalContext_js_1.setGlobalContext_viteConfig)(config);
-            }
         }
     };
 }

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

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sourceMapPassthrough = exports.sourceMapRemove = void 0;
+// https://rollupjs.org/guide/en/#source-code-transformations
+/** Remove entire source mapping, to save KBs. */
+function sourceMapRemove(code) {
+    return {
+        code,
+        map: { mappings: '' }
+    };
+}
+exports.sourceMapRemove = sourceMapRemove;
+/** Don't provide any source map, pass through current source map instead. */
+function sourceMapPassthrough(code) {
+    return {
+        code,
+        map: null
+    };
+}
+exports.sourceMapPassthrough = sourceMapPassthrough;

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

@@ -23,7 +23,6 @@ __exportStar(require("../runtime/utils.js"), exports);
 // Utils only needed by `plugin/*`
 __exportStar(require("../../utils/viteIsSSR.js"), exports);
 __exportStar(require("../../utils/getFilePathAbsolute.js"), exports);
-__exportStar(require("../../utils/getDependencyPackageJson.js"), exports);
 __exportStar(require("../../utils/requireResolve.js"), exports);
 __exportStar(require("../../utils/arrayIncludes.js"), exports);
 __exportStar(require("../../utils/isDev.js"), exports);

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

@@ -90,6 +90,7 @@ async function runPrerender(options, manuallyTriggered) {
     handleNodeEnv();
     await disableReactStreaming();
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'vike pre-rendering', 'production');
+    (0, globalContext_js_1.setGlobalContext_prerender)(viteConfig);
     assertLoadedConfig(viteConfig, options);
     const configVike = await (0, getConfigVike_js_1.getConfigVike)(viteConfig);
     const { outDirClient, outDirRoot } = (0, utils_js_1.getOutDirs)(viteConfig);
@@ -557,7 +558,7 @@ function warnMissingPages(prerenderedPageContexts, doNotPrerenderList, renderCon
         .filter((pageId) => !(0, error_page_js_1.isErrorPage)(pageId, renderContext.pageConfigs))
         .forEach((pageId) => {
         const pageAt = isV1 ? pageId : `\`${pageId}.page.*\``;
-        (0, utils_js_1.assertWarning)(partial, `Cannot pre-render page ${pageAt} because it has a non-static route, while no ${hookName}() hook returned any URL matching the page's route. You need to use a ${hookName}() hook (https://vike.dev/${hookName}) providing a list of URLs for ${pageAt} that should be pre-rendered. If you don't want to pre-render ${pageAt} then use the option prerender.partial (https://vike.dev/prerender-config#partial) to suppress this warning.`, { onlyOnce: true });
+        (0, utils_js_1.assertWarning)(partial, `Cannot pre-render page ${pageAt} because it has a non-static route, while no ${hookName}() hook returned any URL matching the page's route. You need to use a ${hookName}() hook (https://vike.dev/${hookName}) providing a list of URLs for ${pageAt} that should be pre-rendered. If you don't want to pre-render ${pageAt} then use the option prerender.partial (https://vike.dev/prerender#partial) to suppress this warning.`, { onlyOnce: true });
     });
 }
 async function prerender404(prerenderedPageContexts, renderContext, prerenderContext, onComplete) {
@@ -673,7 +674,7 @@ function checkOutdatedOptions(options) {
     (0, utils_js_1.assertUsage)(options.root === undefined, 'Option `prerender({ root })` deprecated: set `prerender({ viteConfig: { root }})` instead.', { showStackTrace: true });
     (0, utils_js_1.assertUsage)(options.configFile === undefined, 'Option `prerender({ configFile })` deprecated: set `prerender({ viteConfig: { configFile }})` instead.', { showStackTrace: true });
     ['noExtraDir', 'partial', 'parallel'].forEach((prop) => {
-        (0, utils_js_1.assertUsage)(options[prop] === undefined, `[prerender()] Option ${picocolors_1.default.cyan(prop)} is deprecated. Define ${picocolors_1.default.cyan(prop)} in vite.config.js instead. See https://vike.dev/prerender-config`, { showStackTrace: true });
+        (0, utils_js_1.assertUsage)(options[prop] === undefined, `[prerender()] Option ${picocolors_1.default.cyan(prop)} is deprecated. Define ${picocolors_1.default.cyan(prop)} in vite.config.js instead. See https://vike.dev/prerender`, { showStackTrace: true });
     });
     ['base', 'outDir'].forEach((prop) => {
         (0, utils_js_1.assertWarning)(options[prop] === undefined, `[prerender()] Option ${picocolors_1.default.cyan(prop)} is outdated and has no effect (vike now automatically determines ${picocolors_1.default.cyan(prop)})`, {

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

@@ -28,4 +28,4 @@ __exportStar(require("../../utils/filesystemPathHandling.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../shared/hooks/executeHook.js"), exports);
 __exportStar(require("../../utils/isPlainObject.js"), exports);
-__exportStar(require("../../utils/nodeEnv.js"), exports);
+__exportStar(require("../../utils/assertNodeEnv.js"), exports);

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRuntimeManifest = exports.setGlobalContext_viteConfig = exports.setGlobalContext_vitePreviewServer = exports.setGlobalContext_viteDevServer = exports.getViteConfig = exports.getViteDevServer = exports.getGlobalContext = exports.initGlobalContext = void 0;
+exports.getRuntimeManifest = exports.setGlobalContext_prerender = exports.setGlobalContext_viteDevServer = exports.getViteConfig = exports.getViteDevServer = exports.getGlobalContext = exports.initGlobalContext = void 0;
 const utils_js_1 = require("./utils.js");
 const loadImportBuild_js_1 = require("./globalContext/loadImportBuild.js");
 const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
@@ -21,27 +21,22 @@ function setGlobalContext_viteDevServer(viteDevServer) {
     if (globalObject.viteDevServer)
         return;
     (0, utils_js_1.assert)(!globalObject.globalContext);
+    (0, utils_js_1.assert)(!globalObject.globalContext);
+    globalObject.viteConfig = viteDevServer.config;
     globalObject.viteDevServer = viteDevServer;
 }
 exports.setGlobalContext_viteDevServer = setGlobalContext_viteDevServer;
-function setGlobalContext_vitePreviewServer(vitePreviewServer) {
-    if (globalObject.vitePreviewServer)
-        return;
-    (0, utils_js_1.assert)(!globalObject.globalContext);
-    globalObject.vitePreviewServer = vitePreviewServer;
-}
-exports.setGlobalContext_vitePreviewServer = setGlobalContext_vitePreviewServer;
 function getViteDevServer() {
     return globalObject.viteDevServer ?? null;
 }
 exports.getViteDevServer = getViteDevServer;
-function setGlobalContext_viteConfig(viteConfig) {
+function setGlobalContext_prerender(viteConfig) {
     if (globalObject.viteConfig)
         return;
     (0, utils_js_1.assert)(!globalObject.globalContext);
     globalObject.viteConfig = viteConfig;
 }
-exports.setGlobalContext_viteConfig = setGlobalContext_viteConfig;
+exports.setGlobalContext_prerender = setGlobalContext_prerender;
 function getViteConfig() {
     return globalObject.viteConfig ?? null;
 }
@@ -49,13 +44,12 @@ exports.getViteConfig = getViteConfig;
 async function initGlobalContext(isPrerendering = false, outDir) {
     if (globalObject.globalContext)
         return;
-    const { viteDevServer, vitePreviewServer, viteConfig } = globalObject;
+    const { viteDevServer, viteConfig } = globalObject;
     assertNodeEnv(!!viteDevServer);
     const isProduction = !viteDevServer;
     if (!isProduction) {
         (0, utils_js_1.assert)(viteConfig);
         (0, utils_js_1.assert)(!isPrerendering);
-        (0, utils_js_1.assert)(!vitePreviewServer);
         const configVike = await (0, getConfigVike_js_1.getConfigVike)(viteConfig);
         const pluginManifest = getRuntimeManifest(configVike);
         globalObject.globalContext = {
@@ -64,9 +58,7 @@ async function initGlobalContext(isPrerendering = false, outDir) {
             clientManifest: null,
             pluginManifest: null,
             viteDevServer,
-            vitePreviewServer: null,
             viteConfig,
-            configVike,
             baseServer: pluginManifest.baseServer,
             baseAssets: pluginManifest.baseAssets,
             includeAssetsImportedByServer: pluginManifest.includeAssetsImportedByServer,
@@ -87,7 +79,6 @@ async function initGlobalContext(isPrerendering = false, outDir) {
             clientManifest,
             pluginManifest,
             viteDevServer: null,
-            vitePreviewServer: vitePreviewServer ?? null,
             baseServer: pluginManifest.baseServer,
             baseAssets: pluginManifest.baseAssets,
             includeAssetsImportedByServer: pluginManifest.includeAssetsImportedByServer,
@@ -101,16 +92,14 @@ async function initGlobalContext(isPrerendering = false, outDir) {
             (0, utils_js_1.assert)(configVike);
             (0, utils_js_1.objectAssign)(globalContext, {
                 isPrerendering: true,
-                viteConfig,
-                configVike
+                viteConfig
             });
             globalObject.globalContext = globalContext;
         }
         else {
             (0, utils_js_1.objectAssign)(globalContext, {
                 isPrerendering: false,
-                viteConfig: null,
-                configVike: null
+                viteConfig: null
             });
             globalObject.globalContext = globalContext;
         }

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

@@ -105,6 +105,7 @@ function serializePageContextAbort(pageContext) {
     delete pageContext._abortCaller;
     const unknownProps = Object.keys(pageContext).filter((prop) => ![
         // prettier-ignore
+        // biome-ignore format:
         '_abortCall',
         /* Not needed on the client-side
         '_abortCaller',

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

@@ -6,11 +6,11 @@ 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 getClientEntryFilePath_js_1 = require("../../shared/getClientEntryFilePath.js");
+const getClientEntry_js_1 = require("../../shared/getClientEntry.js");
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
         const { isClientSideRenderable, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
-        const clientFilePath = (0, getClientEntryFilePath_js_1.getClientEntryFilePath)(pageConfig);
+        const clientFilePath = (0, getClientEntry_js_1.getClientEntry)(pageConfig);
         const clientEntry = !isClientSideRenderable ? clientFilePath : (0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting);
         const clientDependencies = [];
         clientDependencies.push({