vike 0.4.161-commit-b829fee → 0.4.162-commit-49fe40c

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,11 +65,11 @@ 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;
 }
@@ -82,8 +81,8 @@ async function isV1Design(config, isDev) {
     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) => {
@@ -109,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/**
@@ -124,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);
             });
         }),
@@ -191,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;
@@ -232,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)
@@ -408,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);
@@ -716,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/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

@@ -558,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) {
@@ -674,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/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/getPageAssets/assertClientEntryId.js

@@ -6,7 +6,6 @@ const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-fil
 function assertClientEntryId(id) {
     (0, utils_js_1.assertPosixPath)(id);
     (0, utils_js_1.assert)(!id.startsWith('/@fs'), id);
-    const isPkg = (0, utils_js_1.isNpmPackageImport)(id);
     (0, utils_js_1.assert)(
     // Client entry
     id.startsWith('@@vike/') ||
@@ -14,7 +13,7 @@ function assertClientEntryId(id) {
         id.startsWith('/') ||
         // Page code importer
         (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id) ||
-        // Stem packages
-        isPkg, id);
+        // Import
+        (0, utils_js_1.isNpmPackageImport)(id), id);
 }
 exports.assertClientEntryId = assertClientEntryId;

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

@@ -49,7 +49,6 @@ __exportStar(require("../../utils/debug.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);
 __exportStar(require("../../shared/hooks/executeHook.js"), exports);
-__exportStar(require("../../utils/isStemPackageName.js"), exports);
 __exportStar(require("../../utils/freezePartial.js"), exports);
 __exportStar(require("../../utils/isNpmPackage.js"), exports);
 __exportStar(require("../../utils/isNotNullish.js"), exports);
@@ -61,7 +60,7 @@ __exportStar(require("../../utils/getFileExtension.js"), exports);
 __exportStar(require("../../utils/assertIsNotProductionRuntime.js"), exports);
 __exportStar(require("../../utils/virtual-files.js"), exports);
 __exportStar(require("../../utils/path-shim.js"), exports);
-__exportStar(require("../../utils/nodeEnv.js"), exports);
+__exportStar(require("../../utils/assertNodeEnv.js"), exports);
 __exportStar(require("../../utils/isHtml.js"), exports);
 __exportStar(require("../../utils/warnIfErrorIsNotObject.js"), exports);
 __exportStar(require("../../utils/stripAnsi.js"), exports);

package/dist/cjs/node/shared/virtual-files/virtualFileImportUserCode.js

@@ -15,6 +15,7 @@ function isVirtualFileIdImportUserCode(id) {
         return false;
     (0, utils_js_1.assert)(
     // prettier-ignore
+    // biome-ignore format:
     [
         virtualFileIdImportUserCodeServer,
         virtualFileIdImportUserCodeClientCR,

package/dist/cjs/shared/hooks/getHook.js

@@ -56,7 +56,7 @@ function getHookFromPageConfigGlobal(pageConfigGlobal, hookName) {
     // hook isn't a computed nor a cumulative config => definedAt should always be defined
     (0, utils_js_1.assert)(hookFilePath);
     assertHookFn(hookFn, { hookName, hookFilePath });
-    // We could use the global value of config.hooksTimeout but it requires some non-trivial refactoring
+    // We could use the global value of configooksTimeout but it requires some non-trivial refactoring
     const hookTimeout = getHookTimeoutDefault(hookName);
     return { hookFn, hookName, hookFilePath, hookTimeout };
 }

package/dist/cjs/shared/page-configs/helpers/getConfigValue.js

@@ -8,6 +8,7 @@ const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getConfigDefinedAtString_js_1 = require("./getConfigDefinedAtString.js");
 // prettier-ignore
+// biome-ignore format:
 function getConfigValue(pageConfig, configName, type) {
     const configValue = getConfigValueEntry(pageConfig, configName);
     if (configValue === null)

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

@@ -78,7 +78,7 @@ function assertIsNotNull(configValue, configName, importPath) {
      *  - for cumulative values in the future: we don't need this for now because, currently, cumulative values are never imported.
     assertUsage(
       configValue !== null,
-      `Set ${pc.cyan(configName)} to ${pc.cyan('null')} in a +config.h.js file instead of ${importPath}`
+      `Set ${pc.cyan(configName)} to ${pc.cyan('null')} in a +config.js file instead of ${importPath}`
     )
     */
 }

package/dist/cjs/shared/route/abort.js

@@ -164,6 +164,7 @@ function assertNoInfiniteLoop(pageContextsFromRewrite) {
 function assertNoInfiniteAbortLoop(rewriteCount, redirectCount) {
     const abortCalls = [
         // prettier-ignore
+        // biome-ignore format:
         rewriteCount > 0 && picocolors_1.default.cyan("throw render('/some-url')"),
         redirectCount > 0 && picocolors_1.default.cyan("throw redirect('/some-url')")
     ]

package/dist/cjs/shared/route/resolvePrecedence.js

@@ -9,6 +9,7 @@ const resolveRouteString_js_2 = require("./resolveRouteString.js");
 // See https://vike.dev/route-function#precedence
 function resolvePrecendence(routeMatches) {
     // prettier-ignore
+    // biome-ignore format:
     routeMatches
         .sort(sortMatches)
         .sort((0, utils_js_2.makeFirst)((routeMatch) => routeMatch.routeType === 'FUNCTION' && !!routeMatch.precedence && routeMatch.precedence < 0))

package/dist/cjs/utils/{nodeEnv.js → assertNodeEnv.js}

@@ -1,4 +1,7 @@
 "use strict";
+// Utils to manage process.env.NODE_ENV and, most notably, to assert correct usage, which is crucial:
+//  - https://github.com/vikejs/vike/issues/1469#issuecomment-1919518096
+//  - https://github.com/vitejs/vite/blob/76f30ae23b92f9af910ec02d98e2baaefa12141f/packages/vite/src/node/config.ts#L567
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/cjs/utils/formatHintLog.js

@@ -9,6 +9,7 @@ function formatHintLog(msg) {
     const sep = '─'.repeat(msgLength);
     return [
         // prettier-ignore
+        // biome-ignore format:
         `┌─${sep}─┐`,
         `│ ${msg} │`,
         `└─${sep}─┘`

package/dist/cjs/utils/hasProp.js

@@ -6,6 +6,7 @@ exports.hasProp = void 0;
 const isCallable_js_1 = require("./isCallable.js");
 const isObject_js_1 = require("./isObject.js");
 // prettier-ignore
+// biome-ignore format:
 function hasProp(obj, prop, type = 'unknown') {
     if (!(0, isObject_js_1.isObject)(obj))
         return false;