vike 0.4.257 → 0.4.258-commit-24a5c2b

package/dist/node/api/dev.js

@@ -5,12 +5,9 @@ import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { createServer } from 'vite';
 import { assert } from '../../utils/assert.js';
 import { assertIsNotProductionRuntime } from '../../utils/assertSetup.js';
-import { colorVike } from '../../utils/colorsClient.js';
-import { colorVite } from '../../utils/colorsServer.js';
-import { PROJECT_VERSION } from '../../utils/PROJECT_VERSION.js';
 import pc from '@brillout/picocolors';
-import { processStartupLog } from '../vite/shared/loggerVite.js';
 import './assertEnvApiDev.js';
+import { getStartupLogFirstLine } from './getStartupLogFirstLine.js';
 assertIsNotProductionRuntime();
 /**
  * Programmatically trigger `$ vike dev`
@@ -42,22 +39,15 @@ async function dev(options = {}) {
         viteVersion,
     };
 }
-const startTime = performance.now();
 async function startupLog(resolvedUrls, viteServer) {
     const viteConfig = viteServer.config;
-    const viteVersion = viteConfig._viteVersionResolved;
-    assert(viteVersion);
-    const startupDurationString = pc.dim(`ready in ${pc.reset(pc.bold(String(Math.ceil(performance.now() - startTime))))} ms`);
-    const sep = pc.dim('·');
-    const firstLine = `\n  ${colorVike('Vike')} ${pc.yellow(`v${PROJECT_VERSION}`)} ${sep} ${colorVite('Vite')} ${pc.cyan(`v${viteVersion}`)} ${sep} ${startupDurationString}\n`;
-    const ret = processStartupLog(firstLine, viteConfig);
-    console.log(ret.firstLine);
-    const { isCompact } = ret;
+    const { startupLogFirstLine, isStartupLogCompact } = getStartupLogFirstLine(viteConfig);
+    console.log(startupLogFirstLine);
     // We don't call viteServer.printUrls() because Vite throws an error if `resolvedUrls` is missing:
     // https://github.com/vitejs/vite/blob/df5a30d2690a2ebc4824a79becdcef30538dc602/packages/vite/src/node/server/index.ts#L745
     printServerUrls(resolvedUrls, viteConfig.server.host);
     viteServer.bindCLIShortcuts({ print: true });
-    if (!isCompact)
+    if (!isStartupLogCompact)
         console.log();
 }
 // Copied & adapted from Vite

package/dist/node/api/getStartupLogFirstLine.d.ts

@@ -0,0 +1,7 @@
+export { getStartupLogFirstLine };
+import type { ResolvedConfig } from 'vite';
+import './assertEnvApiDevAndProd.js';
+declare function getStartupLogFirstLine(viteConfig: ResolvedConfig, veryCompact?: boolean): {
+    startupLogFirstLine: string;
+    isStartupLogCompact: boolean;
+};

package/dist/node/api/getStartupLogFirstLine.js

@@ -0,0 +1,20 @@
+export { getStartupLogFirstLine };
+import { colorVike } from '../../utils/colorsClient.js';
+import { colorVite } from '../../utils/colorsServer.js';
+import { PROJECT_VERSION } from '../../utils/PROJECT_VERSION.js';
+import pc from '@brillout/picocolors';
+import { assert } from '../../utils/assert.js';
+import { processStartupLog } from '../vite/shared/loggerVite.js';
+import './assertEnvApiDevAndProd.js';
+const startTime = performance.now();
+function getStartupLogFirstLine(viteConfig, veryCompact) {
+    const viteVersion = viteConfig._viteVersionResolved;
+    assert(viteVersion);
+    const startupDurationString = pc.dim(`ready in ${pc.reset(pc.bold(String(Math.ceil(performance.now() - startTime))))} ms`);
+    const sep = pc.dim('·');
+    const firstLine = `${veryCompact ? '' : '\n  '}${colorVike('Vike')} ${pc.yellow(`v${PROJECT_VERSION}`)} ${sep} ${colorVite('Vite')} ${pc.cyan(`v${viteVersion}`)} ${sep} ${startupDurationString}${veryCompact ? '' : '\n'}`;
+    const ret = processStartupLog(firstLine, viteConfig, veryCompact);
+    const startupLogFirstLine = ret.firstLine;
+    const { isCompact } = ret;
+    return { startupLogFirstLine, isStartupLogCompact: isCompact };
+}

package/dist/node/api/preview.js

@@ -3,7 +3,7 @@ import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { preview as previewVite } from 'vite';
 import { importServerProductionIndex } from '@brillout/vite-plugin-server-entry/runtime';
 import { getOutDirs } from '../vite/shared/getOutDirs.js';
-import { assertUsage, assertWarning } from '../../utils/assert.js';
+import { assert, assertInfo, assertUsage } from '../../utils/assert.js';
 import { onSetupPreview } from '../../utils/assertSetup.js';
 import { isCallable } from '../../utils/isCallable.js';
 import pc from '@brillout/picocolors';
@@ -11,6 +11,7 @@ import path from 'node:path';
 import { getVikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
 import { isUniversalDeployVitePreview } from '../vite/plugins/pluginUniversalDeploy/getServerConfig.js';
 import './assertEnvApiDev.js';
+import { getStartupLogFirstLine } from './getStartupLogFirstLine.js';
 /**
  * Programmatically trigger `$ vike preview`
  *
@@ -23,19 +24,29 @@ async function preview(options = {}) {
     const cliPreviewConfig = await resolveCliPreviewConfig(vikeConfig);
     assertUsage(cliPreviewConfig !== false, `${pc.cyan('$ vike preview')} isn't supported`);
     const isUDVitePreview = isUniversalDeployVitePreview(vikeConfig, viteConfigResolved);
-    const useVitePreviewServer = cliPreviewConfig === 'vite' ||
-        (cliPreviewConfig === undefined &&
-            // dist/server/index.mjs exists when using @brillout/vite-plugin-server-entry inject mode; otherwise it's missing -> we must use Vite's preview server
-            (!viteConfigResolved.vitePluginServerEntry?.inject ||
-                // dist/server/index.mjs doesn't exist with some deployment plugins such as vite-plugin-vercel -> we must use Vite's preview server
-                isUDVitePreview));
+    const useVitePreviewServer = (() => {
+        // === +cli.preview => manual overriding
+        if (cliPreviewConfig === 'vite')
+            return true;
+        if (cliPreviewConfig === true)
+            return false;
+        assert(cliPreviewConfig === undefined);
+        // === Universal Deploy
+        // dist/server/index.mjs doesn't exist with some deployment plugins such as vite-plugin-vercel -> we must use Vite's preview server
+        if (isUDVitePreview !== null)
+            return isUDVitePreview;
+        // === @brillout/vite-plugin-server-entry
+        // dist/server/index.mjs exists when using @brillout/vite-plugin-server-entry inject mode; otherwise it's missing -> we must use Vite's preview server
+        return !viteConfigResolved.vitePluginServerEntry?.inject;
+    })();
+    const { startupLogFirstLine, isStartupLogCompact } = getStartupLogFirstLine(viteConfigResolved, !useVitePreviewServer);
+    console.log(startupLogFirstLine);
     if (!useVitePreviewServer) {
         // Dynamically import() server production entry dist/server/index.js
         const outDir = getOutDirs(viteConfigResolved, undefined).outDirRoot;
         const { outServerIndex } = await importServerProductionIndex({ outDir });
         const outServerIndexRelative = path.relative(viteConfigResolved.root, outServerIndex);
-        // TODO/after-PR-merge: always show a warning
-        assertWarning(false, `Never run ${pc.cyan('$ vike preview')} in production, run ${pc.cyan(`$ node ${outServerIndexRelative}`)} instead (or Bun/Deno).`, { onlyOnce: true });
+        logHint(`, run ${pc.cyan(`$ node ${outServerIndexRelative}`)} instead (or Bun/Deno).`, isStartupLogCompact);
         return {
             viteConfig: viteConfigResolved,
         };
@@ -43,12 +54,22 @@ async function preview(options = {}) {
     else {
         // Use Vite's preview server
         const server = await previewVite(viteConfigFromUserResolved);
+        logHint(vikeConfig.prerenderContext.isPrerenderingEnabledForAllPages
+            ? ' — your app is fully pre-rendered and can be statically deployed.'
+            : '', isStartupLogCompact);
         return {
             viteServer: server,
             viteConfig: server.config,
         };
     }
 }
+function logHint(hint = '', isStartupLogCompact) {
+    setTimeout(() => {
+        if (!isStartupLogCompact)
+            console.log();
+        assertInfo(false, `Don't use ${pc.cyan('$ vike preview')} for production${hint}`, { onlyOnce: true });
+    }, 0);
+}
 async function resolveCliPreviewConfig(vikeConfig) {
     const val = vikeConfig.config.cli?.preview;
     if (!isCallable(val)) {

package/dist/node/vite/plugins/build/pluginDistFileNames.js

@@ -11,6 +11,7 @@ import crypto from 'node:crypto';
 import { getAssetsDir } from '../../shared/getAssetsDir.js';
 import { assertModuleId, getFilePathToShowToUserModule } from '../../shared/getFilePath.js';
 import '../../assertEnvVite.js';
+import { isVersionMatch } from '../../../../utils/assertVersion.js';
 function pluginDistFileNames() {
     return [
         {
@@ -41,65 +42,8 @@ function pluginDistFileNames() {
                             //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
                             assertUsage(rollupOutput.assetFileNames.isTheOneSetByVike, "Setting Vite's configuration build.rollupOptions.output.assetFileNames is currently forbidden. Reach out if you need to use it.");
                         }
-                        {
-                            const manualChunksOriginal = rollupOutput.manualChunks;
-                            rollupOutput.manualChunks = function (id, ...args) {
-                                if (manualChunksOriginal) {
-                                    if (isCallable(manualChunksOriginal)) {
-                                        const result = manualChunksOriginal.call(this, id, ...args);
-                                        if (result !== undefined)
-                                            return result;
-                                    }
-                                    else {
-                                        assertUsage(false, "The Vite's configuration build.rollupOptions.output.manualChunks must be a function. Reach out if you need to set it to another value.");
-                                    }
-                                }
-                                // Disable CSS bundling to workaround https://github.com/vikejs/vike/issues/1815
-                                // TO-DO/eventually: let's bundle CSS again once Rolldown replaces Rollup
-                                if (id.endsWith('.css')) {
-                                    const userRootDir = config.root;
-                                    if (id.startsWith(userRootDir)) {
-                                        assertPosixPath(id);
-                                        assertModuleId(id);
-                                        let name;
-                                        const isNodeModules = id.match(/node_modules\/([^\/]+)\/(?!.*node_modules)/);
-                                        if (isNodeModules) {
-                                            name = isNodeModules[1];
-                                        }
-                                        else {
-                                            const filePath = getFilePathToShowToUserModule(id, config);
-                                            name = filePath;
-                                            name = name.split('.').slice(0, -1).join('.'); // remove file extension
-                                            name = name.split('/').filter(Boolean).join('_');
-                                        }
-                                        // Make fileHash the same between local development and CI
-                                        const idStable = path.posix.relative(userRootDir, id);
-                                        // Don't remove `?` queries because each `id` should belong to a unique bundle.
-                                        const hash = getIdHash(idStable);
-                                        return `${name}-${hash}`;
-                                    }
-                                    else {
-                                        let name;
-                                        const isVirtualModule = id.match(/virtual:([^:]+):/);
-                                        if (isVirtualModule) {
-                                            name = isVirtualModule[1];
-                                            assert(name);
-                                        }
-                                        else if (
-                                        // https://github.com/vikejs/vike/issues/1818#issuecomment-2298478321
-                                        id.startsWith('/__uno')) {
-                                            name = 'uno';
-                                        }
-                                        else {
-                                            name = 'style';
-                                        }
-                                        const hash = getIdHash(id);
-                                        return `${name}-${hash}`;
-                                    }
-                                }
-                            };
-                        }
                     });
+                    disableCSSBundling(config);
                 },
             },
         },
@@ -243,6 +187,115 @@ function workaroundGlob(name) {
     name = name.replace(/\.page$/, '-page');
     return name;
 }
+// Workaround for Vite CSS duplication bug: https://github.com/vikejs/vike/issues/1815
+function disableCSSBundling(config) {
+    if (isVite8OrAbove(config)) {
+        for (const output of getRolldownOutputs(config)) {
+            assert(output);
+            const { codeSplitting } = output;
+            // `codeSplitting: false` => single-bundle mode; respect the user's choice.
+            if (codeSplitting === false)
+                continue;
+            // `codeSplitting` set as an object => Rolldown ignores `manualChunks`, so inject a group into `codeSplitting.groups` instead.
+            if (codeSplitting && typeof codeSplitting === 'object') {
+                if (codeSplittingHasWorkaround.has(codeSplitting))
+                    continue;
+                codeSplittingHasWorkaround.add(codeSplitting);
+                codeSplitting.groups ?? (codeSplitting.groups = []);
+                codeSplitting.groups.push({
+                    test: /\.css$/,
+                    name: (moduleId) => getCssChunkName(moduleId, config) ?? null,
+                    /*
+                    // Default priority — user-defined groups with the same priority appear earlier in the array and win the match.
+                    // https://rolldown.rs/options/output-advanced-chunks
+                    priority: 0
+                    */
+                });
+                continue;
+            }
+            // `codeSplitting` unset / `true` => wrap `manualChunks` (Rolldown auto-converts it to a group).
+            // - Rolldown supports `manualChunks` whenever `codeSplitting` isn't an object (despite what the migration guide implies).
+            wrapManualChunks(output, config, 'rolldownOptions');
+        }
+    }
+    else {
+        for (const output of getRollupOutputs(config)) {
+            assert(output);
+            wrapManualChunks(output, config, 'rollupOptions');
+        }
+    }
+}
+const codeSplittingHasWorkaround = new WeakSet();
+function wrapManualChunks(output, config, optsName) {
+    const manualChunksOriginal = output.manualChunks;
+    // Sometimes applied twice => skip if we already wrapped — same rationale as `isTheOneSetByVike` for assetFileNames above.
+    if (manualChunksOriginal?.isTheOneSetByVike)
+        return;
+    output.manualChunks = function (id, ...args) {
+        if (manualChunksOriginal) {
+            if (isCallable(manualChunksOriginal)) {
+                const result = manualChunksOriginal.call(this, id, 
+                // @ts-ignore
+                ...args);
+                if (result !== undefined)
+                    return result;
+            }
+            else {
+                assertUsage(false, `The Vite's configuration build.${optsName}.output.manualChunks must be a function. Reach out if you need to set it to another value.`);
+            }
+        }
+        return getCssChunkName(id, config);
+    };
+    output.manualChunks.isTheOneSetByVike = true;
+}
+function getCssChunkName(id, config) {
+    if (!id.endsWith('.css'))
+        return undefined;
+    const userRootDir = config.root;
+    if (id.startsWith(userRootDir)) {
+        assertPosixPath(id);
+        assertModuleId(id);
+        let name;
+        const isNodeModules = id.match(/node_modules\/([^\/]+)\/(?!.*node_modules)/);
+        if (isNodeModules) {
+            name = isNodeModules[1];
+        }
+        else {
+            const filePath = getFilePathToShowToUserModule(id, config);
+            name = filePath;
+            name = name.split('.').slice(0, -1).join('.'); // remove file extension
+            name = name.split('/').filter(Boolean).join('_');
+        }
+        // Make fileHash the same between local development and CI
+        const idStable = path.posix.relative(userRootDir, id);
+        // Don't remove `?` queries because each `id` should belong to a unique bundle.
+        const hash = getIdHash(idStable);
+        return `${name}-${hash}`;
+    }
+    else {
+        let name;
+        const isVirtualModule = id.match(/virtual:([^:]+):/);
+        if (isVirtualModule) {
+            name = isVirtualModule[1];
+            assert(name);
+        }
+        else if (
+        // https://github.com/vikejs/vike/issues/1818#issuecomment-2298478321
+        id.startsWith('/__uno')) {
+            name = 'uno';
+        }
+        else {
+            name = 'style';
+        }
+        const hash = getIdHash(id);
+        return `${name}-${hash}`;
+    }
+}
+function isVite8OrAbove(config) {
+    const viteVersion = config._viteVersionResolved;
+    assert(viteVersion);
+    return isVersionMatch(viteVersion, ['8.0.0']);
+}
 function getRollupOutputs(config) {
     var _a, _b;
     // @ts-expect-error is read-only
@@ -255,3 +308,18 @@ function getRollupOutputs(config) {
     }
     return output;
 }
+function getRolldownOutputs(config) {
+    var _a, _b;
+    // @ts-expect-error is read-only
+    config.build ?? (config.build = {});
+    // @ts-ignore
+    (_a = config.build).rolldownOptions ?? (_a.rolldownOptions = {});
+    // @ts-ignore
+    (_b = config.build.rolldownOptions).output ?? (_b.output = {});
+    // @ts-ignore
+    const { output } = config.build.rolldownOptions;
+    if (!isArray(output)) {
+        return [output];
+    }
+    return output;
+}

package/dist/node/vite/plugins/build/pluginModuleBanner.js

@@ -1,5 +1,6 @@
 export { pluginModuleBanner };
 import { assert } from '../../../../utils/assert.js';
+import { isVersionMatch } from '../../../../utils/assertVersion.js';
 import { removeVirtualFileIdPrefix } from '../../../../utils/virtualFileId.js';
 import { getMagicString } from '../../shared/getMagicString.js';
 import '../../assertEnvVite.js';
@@ -56,10 +57,18 @@ function pluginModuleBanner() {
 function checkIsEnabled(config) {
     const { minify } = config.build;
     assert(minify === false || minify, { minify });
-    const isEnabled = !minify;
+    const isEnabled = !minify && !hasNativeModuleRegions(config);
     // Avoid the legal comments inserted in the transform() hook to be removed.
     // https://github.com/vitejs/vite/issues/21085#issuecomment-3502781005
     if (isEnabled && config.esbuild)
         config.esbuild.legalComments = 'inline';
     return isEnabled;
 }
+// Vite 8 / Rolldown already emits native `//#region /path/...` markers for non-minified builds.
+// - https://github.com/vitejs/vite/issues/21228#issuecomment-3627899741
+// - TO-DO/eventually: remove this file once Vike requires Vite 8 or above
+function hasNativeModuleRegions(config) {
+    const viteVersion = config._viteVersionResolved;
+    assert(viteVersion);
+    return isVersionMatch(viteVersion, ['8.0.0']);
+}

package/dist/node/vite/plugins/pluginUniversalDeploy/getServerConfig.d.ts

@@ -8,4 +8,4 @@ declare function getServerConfig(vikeConfig: VikeConfigInternal): {
     serverEntryVike: string;
     serverFilePath: string | null;
 } | undefined;
-declare function isUniversalDeployVitePreview(vikeConfig: VikeConfigInternal, viteConfigResolved: ResolvedConfig): boolean;
+declare function isUniversalDeployVitePreview(vikeConfig: VikeConfigInternal, viteConfigResolved: ResolvedConfig): boolean | null;

package/dist/node/vite/plugins/pluginUniversalDeploy/getServerConfig.js

@@ -41,9 +41,9 @@ function getServerConfig(vikeConfig) {
 function isUniversalDeployVitePreview(vikeConfig, viteConfigResolved) {
     const isServerConfig = getServerConfig(vikeConfig);
     if (!isServerConfig)
-        return false;
+        return null; // not UD
     // @universal-deploy/node -> real preview
     // else -> vite preview
-    const udNodePlugin = viteConfigResolved.plugins.find((p) => p.name.startsWith('ud:node:emit'));
+    const udNodePlugin = viteConfigResolved.plugins.find((p) => p.name.match(/^ud:node:(?!.*:disabled$)/));
     return !udNodePlugin;
 }

package/dist/node/vite/shared/loggerVite.d.ts

@@ -7,7 +7,7 @@ export { swallowViteLogConnected_clean };
 import type { ResolvedConfig } from 'vite';
 import '../assertEnvVite.js';
 declare function interceptViteLogs(config: ResolvedConfig): void;
-declare function processStartupLog(firstLine: string, config: ResolvedConfig): {
+declare function processStartupLog(firstLine: string, config: ResolvedConfig, veryCompact?: boolean): {
     firstLine: string;
     isCompact: boolean;
 };

package/dist/node/vite/shared/loggerVite.js

@@ -65,7 +65,7 @@ function intercept(loggerType, config) {
 }
 // - Clears screen if zero previous log
 // - Manages new lines
-function processStartupLog(firstLine, config) {
+function processStartupLog(firstLine, config, veryCompact) {
     const shouldClear = processStartupLog_shouldClear(config);
     if (shouldClear) {
         config.logger.clearScreen('info');
@@ -74,7 +74,7 @@ function processStartupLog(firstLine, config) {
         // Remove leading new line (for both Vite and Vike's startup log)
         firstLine = removeEmptyLines(firstLine);
     }
-    return { firstLine, isCompact: !shouldClear };
+    return { firstLine, isCompact: veryCompact || !shouldClear };
 }
 function processStartupLog_shouldClear(config) {
     const hasLoggedBefore = process.stdout.bytesWritten !== 0 || process.stderr.bytesWritten !== 0;

package/dist/node/vite/shared/resolveVikeConfigInternal/getPlusFilesByLocationId.js

@@ -1,6 +1,6 @@
 export { getPlusFilesByLocationId };
 import { assert } from '../../../../utils/assert.js';
-import { configDefinitionsBuiltIn } from './configDefinitionsBuiltIn.js';
+import { metaBuiltIn } from './metaBuiltIn.js';
 import { getLocationId } from './filesystemRouting.js';
 import { crawlPlusFilePaths, getPlusFileValueConfigName } from './crawlPlusFilePaths.js';
 import { getConfigFileExport } from './getConfigFileExport.js';
@@ -64,7 +64,7 @@ async function getPlusFilesByLocationId(userRootDir, esbuildCache) {
             // We don't have access to the custom config definitions defined by the user yet.
             //  - If `configDef` is `undefined` => we load the file +{configName}.js later.
             //  - We already need to load +meta.js here (to get the custom config definitions defined by the user)
-            await loadValueFile(plusFile, configDefinitionsBuiltIn, userRootDir, esbuildCache);
+            await loadValueFile(plusFile, metaBuiltIn, userRootDir, esbuildCache);
         }
     }));
     // Make lists element order deterministic

package/dist/node/vite/shared/resolveVikeConfigInternal/loadFileAtConfigTime.d.ts

@@ -7,7 +7,7 @@ import type { FilePathResolved } from '../../../../types/FilePath.js';
 import { type EsbuildCache } from './transpileAndExecuteFile.js';
 import type { PlusFileValue } from './getPlusFilesByLocationId.js';
 import { PointerImport } from './resolvePointerImport.js';
-import type { ConfigDefinitionsInternal } from './configDefinitionsBuiltIn.js';
+import type { ConfigDefinitionsInternal } from './metaBuiltIn.js';
 import '../../assertEnvVite.js';
 type ConfigFile = {
     fileExports: Record<string, unknown>;

package/dist/node/vite/shared/resolveVikeConfigInternal/{configDefinitionsBuiltIn.d.ts → metaBuiltIn.d.ts}

@@ -1,4 +1,4 @@
-export { configDefinitionsBuiltIn };
+export { metaBuiltIn };
 export type { ConfigDefinition };
 export type { ConfigDefinitions };
 export type { ConfigDefinitionsInternal };
@@ -93,4 +93,4 @@ ConfigDefinition>;
 type ConfigDefinitionsInternal = Record<string, // configName
 ConfigDefinitionInternal>;
 type ConfigDefinitionsBuiltIn = Record<ConfigNameBuiltIn | ConfigNameGlobal, ConfigDefinitionInternal>;
-declare const configDefinitionsBuiltIn: ConfigDefinitionsBuiltIn;
+declare const metaBuiltIn: ConfigDefinitionsBuiltIn;

package/dist/node/vite/shared/resolveVikeConfigInternal/{configDefinitionsBuiltIn.js → metaBuiltIn.js}

@@ -1,11 +1,10 @@
-export { configDefinitionsBuiltIn };
+export { metaBuiltIn };
 import { assert, assertUsage } from '../../../../utils/assert.js';
 import { getConfigDefinedAt, } from '../../../../shared-server-client/page-configs/getConfigDefinedAt.js';
 import { getConfigValueSourceRelevantAnyEnv, getConfigValueSourcesRelevant, isConfigSourceValueNull, } from '../../plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js';
 import { getFileSuffixes } from '../../../../shared-server-node/getFileSuffixes.js';
 import '../../assertEnvVite.js';
-// TODO/after-PR-merge: rename_full configDefinitionsBuiltIn metaBuiltIn
-const configDefinitionsBuiltIn = {
+const metaBuiltIn = {
     onRenderHtml: {
         env: { server: true },
     },

package/dist/node/vite/shared/resolveVikeConfigInternal/pointerImports.d.ts

@@ -17,10 +17,13 @@ declare function transformPointerImports(code: string, filePathToShowToUser2: st
  * We discard the import name `someImport` because we don't need it.
  */
 type PointerImportData = {
+    importStringWasGenerated: boolean;
+    /** For example: `import:./some-file:someExport` */
+    importString: string;
+    /** For example: `./some-file` */
     importPath: string;
+    /** For example: `someExport` */
     exportName: string;
-    importString: string;
-    importStringWasGenerated: boolean;
 };
 declare function parsePointerImportData(importString: string): null | PointerImportData;
 declare function assertPointerImportPath(importPath: string): boolean;

package/dist/node/vite/shared/resolveVikeConfigInternal/resolvePointerImport.js

@@ -78,7 +78,15 @@ function resolveImportPathWithNode(pointerImportData, importerFilePath, userRoot
         userRootDir,
     });
     if (!filePathAbsoluteFilesystem) {
-        assert(!isImportPathRelative(pointerImportData.importPath));
+        if (isImportPathRelative(pointerImportData.importPath)) {
+            const { importPath, importStringWasGenerated, importString } = pointerImportData;
+            const { filePathToShowToUserResolved } = importerFilePath;
+            assert(filePathToShowToUserResolved);
+            const errIntro = importStringWasGenerated
+                ? `The import path ${pc.cyan(importPath)} in ${filePathToShowToUserResolved}`
+                : `The import ${pc.cyan(importString)} defined by ${filePathToShowToUserResolved}`;
+            assertUsage(false, `${errIntro} couldn't be resolved: does ${pc.cyan(importPath)} point to an existing file?`);
+        }
         /* This assertion fails if the npm package has a wrongly defined package.json#exports
         // Libraries don't use path aliases => filePathAbsoluteFilesystem should be defined
         assert(!importerFilePathAbsolute.includes('node_modules'))

package/dist/node/vite/shared/resolveVikeConfigInternal.d.ts

@@ -12,7 +12,7 @@ export { getVikeConfigFromCliOrEnv };
 export type { VikeConfigInternal };
 export type { PageConfigBuildTimeBeforeComputed };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../types/PageConfig.js';
-import { type ConfigDefinitionsInternal, type ConfigDefinitionInternal } from './resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
+import { type ConfigDefinitionsInternal, type ConfigDefinitionInternal } from './resolveVikeConfigInternal/metaBuiltIn.js';
 import { type GlobalConfigPublic } from '../../../shared-server-client/page-configs/resolveVikeConfigPublic.js';
 import { type PlusFile } from './resolveVikeConfigInternal/getPlusFilesByLocationId.js';
 import type { PrerenderContextPublic } from '../../prerender/runPrerender.js';

package/dist/node/vite/shared/resolveVikeConfigInternal.js

@@ -31,7 +31,7 @@ import { objectAssign } from '../../../utils/objectAssign.js';
 import { makeFirst, lowerFirst } from '../../../utils/sorter.js';
 import { unique } from '../../../utils/unique.js';
 import { assertPosixPath } from '../../../utils/path.js';
-import { configDefinitionsBuiltIn, } from './resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
+import { metaBuiltIn, } from './resolveVikeConfigInternal/metaBuiltIn.js';
 import { getFileSuffixes } from '../../../shared-server-node/getFileSuffixes.js';
 import { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, applyFilesystemRoutingRootEffect, } from './resolveVikeConfigInternal/filesystemRouting.js';
 import { getViteDevServer, vikeConfigErrorRecoverMsg } from '../../../server/runtime/globalContext.js';
@@ -504,8 +504,8 @@ function getVikeConfigFromCliOrEnv() {
     };
 }
 function getSourceNonConfigFile(configName, value, definedAt) {
-    assert(includes(objectKeys(configDefinitionsBuiltIn), configName));
-    const configDef = configDefinitionsBuiltIn[configName];
+    assert(includes(objectKeys(metaBuiltIn), configName));
+    const configDef = metaBuiltIn[configName];
     const source = {
         valueIsLoaded: true,
         value,
@@ -773,7 +773,7 @@ function getConfigNamesSetByPlusFile(plusFile) {
     }
 }
 function getConfigDefinitions(plusFilesRelevant, filter) {
-    let configDefinitions = { ...configDefinitionsBuiltIn };
+    let configDefinitions = { ...metaBuiltIn };
     // Add user-land meta configs
     plusFilesRelevant
         .slice()

package/dist/server/runtime/renderPageServer/createHttpResponse.js

@@ -18,6 +18,7 @@ import { stringify } from '@brillout/json-serializer/stringify';
 import '../../assertEnvServer.js';
 const contentTypeJson = 'application/json';
 const contentTypeHtml = 'text/html;charset=utf-8';
+const htmlFallbackLog = 'This HTML was generated by Vike.';
 async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     let statusCode = pageContext.abortStatusCode;
     if (!statusCode) {
@@ -39,7 +40,7 @@ async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     return createHttpResponse(statusCode, contentTypeHtml, headers, htmlRender, earlyHints, renderHook);
 }
 function createHttpResponse404(errMsg404) {
-    const httpResponse = createHttpResponse(404, contentTypeHtml, [], `<p>${errMsg404}.</p><script>console.log('This HTML was generated by Vike.')</script>`);
+    const httpResponse = createHttpResponse(404, contentTypeHtml, [], getHtmlFallback(`<p>${errMsg404}.</p>`));
     return httpResponse;
 }
 function createHttpResponseBaseIsMissing(urlOriginal, baseServer) {
@@ -81,7 +82,7 @@ function createHttpResponseErrorFallback_noGlobalContext() {
     return createHttpResponseError_('no error page (https://vike.dev/error-page) could be rendered');
 }
 function createHttpResponseError_(reason) {
-    const httpResponse = createHttpResponse(500, contentTypeHtml, [], `<p>An error occurred.</p><script>console.log(${JSON.stringify(`This HTML was generated by Vike. Vike returned this HTML because ${reason}.`)})</script>`);
+    const httpResponse = createHttpResponse(500, contentTypeHtml, [], getHtmlFallback('<p>An error occurred.</p>', `${htmlFallbackLog} Vike returned this HTML because ${reason}.`));
     return httpResponse;
 }
 function createHttpResponseErrorFallbackJson() {
@@ -101,15 +102,16 @@ function createHttpResponseRedirect({ url, statusCode }, pageContextInit) {
     return createHttpResponse(statusCode, contentTypeHtml, headers, 
     // For bots / programmatic crawlig: show what's going on.
     // For users: showing a blank page is probably better than a flickering text.
-    `<p style="display: none">Redirecting to ${escapeHtml(url)}</p><script>console.log('This HTML was generated by Vike.')</script>`);
+    getHtmlFallback(`<p style="display: none">Redirecting to ${escapeHtml(url)}</p>`));
 }
 function createHttpResponseFromUniversalMiddleware(response, earlyHints) {
-    // @brillout TODO/after-PR-merge: dedupe such HTML responses generated by Vike
-    const body = response.body ??
-        `<p style="display: none">No HTTP response body.</p><script>console.log('This HTML was generated by Vike.')</script>`;
+    const body = response.body ?? getHtmlFallback('<p style="display: none">No HTTP response body.</p>');
     const httpResponse = createHttpResponseCommon(response.status, Array.from(response.headers.entries()), body, earlyHints);
     return httpResponse;
 }
+function getHtmlFallback(bodyHtml, logText = htmlFallbackLog) {
+    return `${bodyHtml}<script>console.log(${JSON.stringify(logText)})</script>`;
+}
 function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints, renderHook) {
     headers.push(['Content-Type', contentType]);
     assert(renderHook || typeof htmlRender === 'string');

package/dist/shared-server-client/page-configs/loadAndParseVirtualFilePageEntry.js

@@ -21,10 +21,13 @@ async function loadAndParseVirtualFilePageEntry(pageConfig, isDev) {
         configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry);
     }
     catch (e) {
-        if (!(e instanceof ReferenceError))
+        // Safari WebKit bug: dynamic import() may resolve before the module body executes.
+        if (
+        // Throwing ReferenceError (TDZ): https://github.com/vikejs/vike/issues/3121
+        !(e instanceof ReferenceError) &&
+            // Or TypeError (undefined exports) on some WebKit builds: https://github.com/vikejs/vike/issues/3199
+            !(e instanceof TypeError))
             throw e;
-        // Safari WebKit bug: dynamic import() may resolve before the module body executes,
-        // https://github.com/vikejs/vike/issues/3121
         await new Promise((resolve) => setTimeout(resolve));
         configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry);
     }

package/dist/types/Config.d.ts

@@ -36,7 +36,7 @@ export type { OnRenderHtmlSync };
 export type { RouteAsync };
 export type { RouteSync };
 import type { PrefetchSetting, PrefetchStaticAssets } from '../client/runtime-client-routing/prefetch/PrefetchSetting.js';
-import type { ConfigDefinition } from '../node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
+import type { ConfigDefinition } from '../node/vite/shared/resolveVikeConfigInternal/metaBuiltIn.js';
 import type { DocumentHtml } from '../server/runtime/renderPageServer/html/renderHtml.js';
 import type { InjectFilterEntry } from './index.js';
 import type { VikeVitePluginOptions } from '../node/vite/index.js';

package/dist/types/FilePath.d.ts

@@ -15,11 +15,11 @@ type FilePathResolved = FilePathCommon & {
      */
     filePathAbsoluteFilesystem: string;
     /**
-     * The file's path, shown to the user in logs.
+     * The file path shown to the user in logs.
      *
-     * Resolved: it always shows a file path. (It never shows an import path such as `vike-react/config`.)
+     * Its value is: `filePath.filePathAbsoluteUserRootDir ?? filePath.filePathAbsoluteFilesystem`.
      *
-     * Its value is equivalent to `filePath.filePathAbsoluteUserRootDir ?? filePath.filePathAbsoluteFilesystem`.
+     * Note that it always shows a file path. (It never shows an import path such as `vike-react/config`.)
      */
     filePathToShowToUserResolved: string;
     /**
@@ -52,11 +52,11 @@ type FilePathAbsoluteUserRootDir = {
 };
 type FilePathCommon = {
     /**
-     * The file's path, shown to the user in logs.
+     * The file or import path shown to the user in logs.
      *
-     * Unresolved: it may show an import path instead of a file path such as `vike-react/config`.
+     * Its value is: `filePath.filePathAbsoluteUserRootDir ?? filePath.importPathAbsolute`.
      *
-     * Its value is equivalent to `filePath.filePathAbsoluteUserRootDir ?? filePath.importPathAbsolute`.
+     * Note that if `filePath.filePathAbsoluteUserRootDir` isn't defined then it shows the import path (e.g. `vike-react/config`) instead of a file path.
      */
     filePathToShowToUser: string;
     /**

package/dist/types/PageConfig.d.ts

@@ -24,7 +24,7 @@ export type { VirtualFileExportsPageEntry };
 import type { ConfigValueSerialized } from '../shared-server-client/page-configs/serialize/PageConfigSerialized.js';
 import type { LocationId } from '../node/vite/shared/resolveVikeConfigInternal/filesystemRouting.js';
 import type { FilePath } from './FilePath.js';
-import type { ConfigDefinitionsInternal } from '../node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
+import type { ConfigDefinitionsInternal } from '../node/vite/shared/resolveVikeConfigInternal/metaBuiltIn.js';
 import type { PlusFile } from '../node/vite/shared/resolveVikeConfigInternal/getPlusFilesByLocationId.js';
 import type { ApiOperation } from '../node/api/types.js';
 type PageConfigCommon = {

package/dist/types/index.d.ts

@@ -9,7 +9,7 @@ export type { ImportString } from '../node/vite/shared/importString.js';
 export type { DataAsync, DataSync, GuardAsync, GuardSync, OnBeforePrerenderStartAsync, OnBeforePrerenderStartSync, OnBeforeRenderAsync, OnBeforeRenderSync, OnBeforeRouteAsync, OnBeforeRouteSync, OnHydrationEndAsync, OnHydrationEndSync, OnPageTransitionEndAsync, OnPageTransitionEndSync, OnPageTransitionStartAsync, OnPageTransitionStartSync, OnPrerenderStartAsync, OnPrerenderStartSync, OnRenderClientAsync, OnRenderClientSync, OnRenderHtmlAsync, OnRenderHtmlSync, RouteAsync, RouteSync, } from './Config.js';
 export type { ConfigResolved } from './Config/ConfigResolved.js';
 export type { ConfigEnv } from './PageConfig.js';
-export type { ConfigDefinition, ConfigEffect, } from '../node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
+export type { ConfigDefinition, ConfigEffect, } from '../node/vite/shared/resolveVikeConfigInternal/metaBuiltIn.js';
 export type { ConfigEntries } from '../shared-server-client/page-configs/resolveVikeConfigPublic.js';
 export type { VikeConfig } from '../node/vite/shared/resolveVikeConfigInternal.js';
 export type { UrlPublic as Url } from '../utils/parseUrl.js';
@@ -24,7 +24,7 @@ import type { ConfigEnv } from './PageConfig.js';
  */
 type Env = ConfigEnv;
 export type { Env };
-import type { ConfigEffect } from '../node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
+import type { ConfigEffect } from '../node/vite/shared/resolveVikeConfigInternal/metaBuiltIn.js';
 /** @deprecated Replace:
  *   `import type { Effect } from 'vike/types'`
  * With:

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.257";
+export declare const PROJECT_VERSION: "0.4.258-commit-24a5c2b";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.257';
+export const PROJECT_VERSION = '0.4.258-commit-24a5c2b';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.257",
+  "version": "0.4.258-commit-24a5c2b",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -129,11 +129,11 @@
     "@babel/core": "^7.28.5",
     "@babel/types": "^7.28.5",
     "@brillout/import": "^0.2.6",
-    "@brillout/json-serializer": "^0.5.22",
+    "@brillout/json-serializer": "^0.5.23",
     "@brillout/picocolors": "^1.0.30",
     "@brillout/vite-plugin-server-entry": "0.7.18",
     "@universal-deploy/store": "^0.2.1",
-    "@universal-deploy/vite": "^0.1.6",
+    "@universal-deploy/vite": "^0.1.7",
     "@universal-middleware/core": "^0.4.17",
     "@universal-middleware/node": "^0.1.0",
     "cac": "^6.0.0",
@@ -262,7 +262,7 @@
     "./fetch.js"
   ],
   "devDependencies": {
-    "@brillout/release-me": "^0.4.13",
+    "@brillout/release-me": "^0.4.15",
     "@types/babel__core": "^7.20.5",
     "@types/estree": "^1.0.5",
     "@types/node": "^20.10.5",
@@ -271,6 +271,7 @@
     "@types/source-map-support": "^0.5.10",
     "react-streaming": "^0.4.17",
     "rimraf": "^6.1.3",
+    "rolldown": "1.0.0-rc.17",
     "typescript": "^5.9.3",
     "vite": "^7.2.6"
   },