vike 0.4.253-commit-d6e725f → 0.4.253-commit-1d110cc

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

@@ -8,5 +8,5 @@ import './assertEnvApiDevAndProd.js';
  * https://vike.dev/api#prerender
  */
 declare function prerender(options?: PrerenderOptions): Promise<{
-    viteConfig: ResolvedConfig;
+    viteConfig: null | ResolvedConfig;
 }>;

package/dist/node/prerender/runPrerender.d.ts

@@ -4,7 +4,6 @@ export type { PrerenderContextPublic };
 export type { PrerenderTrigger };
 import type { PageFile } from '../../shared-server-client/getPageFiles.js';
 import { type GlobalContextServerInternal } from '../../server/runtime/globalContext.js';
-import { type ResolvedConfig } from 'vite';
 import type { ApiOptions } from '../api/types.js';
 type ProvidedByHook = null | {
     hookFilePath: string;
@@ -30,6 +29,8 @@ type PrerenderContext = {
     _noExtraDir: boolean | null;
     _prerenderedPageContexts: PrerenderedPageContexts;
     _requestIdCounter: number;
+    _userRootDir: string;
+    _outDirClient: string;
 };
 type Output<PageContext = PageContextPrerendered> = {
     filePath: string;
@@ -62,9 +63,7 @@ type PrerenderOptions = ApiOptions & {
     base?: string;
 };
 type PrerenderTrigger = '$ vike prerender' | 'prerender()' | 'auto-run';
-declare function runPrerender(options: PrerenderOptions | undefined, trigger: PrerenderTrigger): Promise<{
-    viteConfig: ResolvedConfig;
-}>;
+declare function runPrerender(options: PrerenderOptions | undefined, trigger: PrerenderTrigger): Promise<void>;
 declare function createPageContextPrerendering(urlOriginal: string, prerenderContext: PrerenderContext, globalContext: GlobalContextServerInternal, is404: boolean, pageId: string | undefined, providedByHook: ProvidedByHook): Promise<{
     _isOriginalObject: true;
     isPageContext: true;
@@ -124,13 +123,13 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _isPrerendering: false;
         assetsManifest: null;
         _viteDevServer: import("vite").ViteDevServer | undefined;
-        viteConfig: ResolvedConfig | undefined;
+        viteConfig: import("vite").ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: true;
-        viteConfig: ResolvedConfig;
+        viteConfig: import("vite").ResolvedConfig;
         _isProduction: true;
         assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;

package/dist/node/prerender/runPrerender.js

@@ -25,7 +25,6 @@ import { createPageContextServer } from '../../server/runtime/renderPageServer/c
 import pc from '@brillout/picocolors';
 import { cpus } from 'node:os';
 import { getGlobalContextServerInternal, initGlobalContext_runPrerender, setGlobalContext_isPrerendering, setGlobalContext_prerenderContext, } from '../../server/runtime/globalContext.js';
-import { resolveConfig as resolveViteConfig } from 'vite';
 import { getPageFilesServerSide } from '../../shared-server-client/getPageFiles.js';
 import { getPageContextRequestUrl } from '../../shared-server-client/getPageContextRequestUrl.js';
 import { getUrlFromRouteString } from '../../shared-server-client/route/resolveRouteString.js';
@@ -40,7 +39,7 @@ import { getVikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.
 import { execHookSingleWithoutPageContext, isUserHookError } from '../../shared-server-client/hooks/execHook.js';
 import { setWasPrerenderRun } from './context.js';
 import { resolvePrerenderConfigGlobal, resolvePrerenderConfigLocal } from './resolvePrerenderConfig.js';
-import { getOutDirs } from '../vite/shared/getOutDirs.js';
+import { getOutDirsAllFromRootNormalized } from '../vite/shared/getOutDirs.js';
 import fs from 'node:fs';
 import { getPublicProxy } from '../../shared-server-client/getPublicProxy.js';
 import { getStaticRedirectsForPrerender } from '../../server/runtime/renderPageServer/resolveRedirects.js';
@@ -57,9 +56,11 @@ async function runPrerender(options = {}, trigger) {
         console.log(`${pc.cyan(`vike v${PROJECT_VERSION}`)} ${pc.green('pre-rendering HTML...')}`);
     }
     await disableReactStreaming();
-    const viteConfig = await resolveViteConfig(options.viteConfig || {}, 'build', 'production');
+    await initGlobalContext_runPrerender();
+    const { globalContext } = await getGlobalContextServerInternal();
+    // TO-DO/eventually: remove getVikeConfigInternal() to completely remove Vite dependency
+    // https://github.com/vikejs/vike/issues/3113
     const vikeConfig = await getVikeConfigInternal();
-    const { outDirServer } = getOutDirs(viteConfig, undefined);
     const prerenderConfigGlobal = await resolvePrerenderConfigGlobal(vikeConfig);
     const { partial, noExtraDir, parallel, defaultLocalValue, isPrerenderingEnabled } = prerenderConfigGlobal;
     if (!isPrerenderingEnabled) {
@@ -72,12 +73,12 @@ async function runPrerender(options = {}, trigger) {
           `You're executing ${pc.cyan(standaloneTrigger)} but you didn't enable pre-rendering. Use the ${pc.cyan('prerender')} setting (${pc.underline('https://vike.dev/prerender')}) to enable pre-rendering for at least one page.`
         )
         */
-        return { viteConfig };
+        return;
     }
     const concurrencyLimit = pLimit(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? cpus().length : parallel);
-    await initGlobalContext_runPrerender();
-    const { globalContext } = await getGlobalContextServerInternal();
     globalContext._pageFilesAll.forEach(assertExportNames);
+    const { root, build: { outDir: outDirRoot }, } = globalContext.viteConfigRuntime;
+    const { outDirServer, outDirClient } = getOutDirsAllFromRootNormalized(outDirRoot, root);
     const prerenderContext = {
         pageContexts: [],
         output: [],
@@ -85,6 +86,8 @@ async function runPrerender(options = {}, trigger) {
         _pageContextInit: options.pageContextInit ?? null,
         _prerenderedPageContexts: {},
         _requestIdCounter: 0,
+        _userRootDir: root,
+        _outDirClient: outDirClient,
     };
     const doNotPrerenderList = [];
     await collectDoNoPrerenderList(vikeConfig._pageConfigs, doNotPrerenderList, defaultLocalValue, concurrencyLimit, globalContext);
@@ -109,7 +112,7 @@ async function runPrerender(options = {}, trigger) {
         if (pageId) {
             prerenderContext._prerenderedPageContexts[pageId] = htmlFile.pageContext;
         }
-        await writeFiles(htmlFile, viteConfig, options.onPagePrerender, prerenderContext, logLevel);
+        await writeFiles(htmlFile, prerenderContext, options.onPagePrerender, logLevel);
     };
     await prerenderPages(prerenderContext, concurrencyLimit, onComplete);
     warnContradictoryNoPrerenderList(prerenderContext._prerenderedPageContexts, doNotPrerenderList);
@@ -127,7 +130,6 @@ async function runPrerender(options = {}, trigger) {
     if (!prerenderConfigGlobal.keepDistServer) {
         fs.rmSync(outDirServer, { recursive: true });
     }
-    return { viteConfig };
 }
 async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, defaultLocalValue, concurrencyLimit, globalContext) {
     // V1 design
@@ -181,6 +183,7 @@ async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, default
         }
     });
 }
+// TO-DO/next-major-release: remove
 function assertExportNames(pageFile) {
     const { exportNames, fileType } = pageFile;
     assert(exportNames || fileType === '.page.route' || fileType === '.css', pageFile.filePath);
@@ -558,18 +561,16 @@ async function warnMissingPages(prerenderedPageContexts, globalContext, doNotPre
         assertWarning(partial, `Cannot pre-render page ${pageAt} because it has a non-static route, while there isn't any ${hookName}() hook returning an URL matching the page's route. You must use a ${hookName}() hook (https://vike.dev/${hookName}) for providing the list of URLs to be pre-rendered for that page. If you want to skip pre-rendering that page, you can remove this warning by setting +prerender to false at ${pageAt} (https://vike.dev/pre-rendering#partial) or by setting +prerender.partial to true (https://vike.dev/prerender#partial).`, { onlyOnce: true });
     });
 }
-async function writeFiles({ pageContext, htmlString, pageContextSerialized }, viteConfig, onPagePrerender, prerenderContext, logLevel) {
-    const writeJobs = [write(pageContext, 'HTML', htmlString, viteConfig, onPagePrerender, prerenderContext, logLevel)];
+async function writeFiles({ pageContext, htmlString, pageContextSerialized }, prerenderContext, onPagePrerender, logLevel) {
+    const writeJobs = [write(pageContext, 'HTML', htmlString, onPagePrerender, prerenderContext, logLevel)];
     if (pageContextSerialized !== null) {
-        writeJobs.push(write(pageContext, 'JSON', pageContextSerialized, viteConfig, onPagePrerender, prerenderContext, logLevel));
+        writeJobs.push(write(pageContext, 'JSON', pageContextSerialized, onPagePrerender, prerenderContext, logLevel));
     }
     await Promise.all(writeJobs);
 }
-async function write(pageContext, fileType, fileContent, viteConfig, onPagePrerender, prerenderContext, logLevel) {
+async function write(pageContext, fileType, fileContent, onPagePrerender, prerenderContext, logLevel) {
     const { urlOriginal } = pageContext;
     assert(urlOriginal.startsWith('/'));
-    const { outDirClient } = getOutDirs(viteConfig, undefined);
-    const { root } = viteConfig;
     let fileUrl;
     if (fileType === 'HTML') {
         const doNotCreateExtraDirectory = prerenderContext._noExtraDir ?? pageContext.is404;
@@ -585,6 +586,7 @@ async function write(pageContext, fileType, fileContent, viteConfig, onPagePrere
     assert(!filePathRelative.startsWith('/'), 
     // https://github.com/vikejs/vike/issues/1929
     { urlOriginal, fileUrl });
+    const { _outDirClient: outDirClient } = prerenderContext;
     assertPosixPath(outDirClient);
     assertPosixPath(filePathRelative);
     const filePath = path.posix.join(outDirClient, filePathRelative);
@@ -609,9 +611,10 @@ async function write(pageContext, fileType, fileContent, viteConfig, onPagePrere
         await mkdir(path.posix.dirname(filePath), { recursive: true });
         await writeFile(filePath, fileContent);
         if (logLevel === 'info') {
-            assertPosixPath(root);
+            const { _userRootDir: userRootDir } = prerenderContext;
+            assertPosixPath(userRootDir);
             assertPosixPath(outDirClient);
-            let outDirClientRelative = path.posix.relative(root, outDirClient);
+            let outDirClientRelative = path.posix.relative(userRootDir, outDirClient);
             if (!outDirClientRelative.endsWith('/')) {
                 outDirClientRelative = outDirClientRelative + '/';
             }

package/dist/node/prerender/runPrerenderEntry.d.ts

@@ -5,7 +5,7 @@ export { runPrerender_forceExit };
 import type { InlineConfig, ResolvedConfig } from 'vite';
 import { PrerenderOptions } from './runPrerender.js';
 declare function runPrerenderFromAPI(options?: PrerenderOptions): Promise<{
-    viteConfig: ResolvedConfig;
+    viteConfig: null | ResolvedConfig;
 }>;
 declare function runPrerenderFromCLIPrerenderCommand(): Promise<void>;
 declare function runPrerenderFromAutoRun(viteConfig: InlineConfig | undefined): Promise<{

package/dist/node/prerender/runPrerenderEntry.js

@@ -8,10 +8,13 @@ import { isVikeCli } from '../cli/context.js';
 import { isViteCli } from '../vite/shared/isViteCli.js';
 import { runPrerender } from './runPrerender.js';
 import { logErrorServer } from '../../server/runtime/logErrorServer.js';
+import { getGlobalContextServerInternal } from '../../server/runtime/globalContext.js';
 async function runPrerenderFromAPI(options = {}) {
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
     // - We don't use addErrorHint() because we don't have control over what happens with the error. For example, if the user land purposely swallows the error then the hint shouldn't be logged. Also, it's best if the hint is shown to the user *after* the error, but we cannot do/guarentee that.
-    const { viteConfig } = await runPrerender(options, 'prerender()');
+    await runPrerender(options, 'prerender()');
+    const { globalContext } = await getGlobalContextServerInternal();
+    const viteConfig = globalContext.viteConfig ?? null;
     return { viteConfig };
 }
 async function runPrerenderFromCLIPrerenderCommand() {

package/dist/node/vite/index.js

@@ -46,7 +46,7 @@ function plugin(vikeVitePluginOptions = {}) {
     // TO-DO/next-major-release: remove
     const pluginAddendum = { _vikeVitePluginOptions: vikeVitePluginOptions };
     const promise = (async () => {
-        if (skip())
+        if (removeVitePlugin())
             return [];
         const vikeConfig = await getVikeConfigInternalEarly();
         const plugin = [
@@ -89,26 +89,30 @@ function pluginBuild() {
 function pluginNonRunnabeDev() {
     return [...pluginViteRPC(), ...pluginReplaceConstantsNonRunnableDev()];
 }
-function skip() {
+function removeVitePlugin() {
     // Early resolving of user Vite configs
     if (isOnlyResolvingUserConfig()) {
         return true;
     }
+    // *****************/
+    // **** Vitest *****/
+    // *****************/
     // For Vitest, we only add Vike's Vite plugin if Vike's JavaScript API is used.
     // - In the context of running unit tests with Vitest, Vike's Vite plugin doesn't add any value AFAICT.
-    // - If the user calls Vike's JavaScript API inside Vitest (e.g. `build()` inside `beforeAll()`)  => vite.config.js is loaded twice: once by Vitest and once by Vike => problematic because Vitest's environment is `development` whereas Vike's `build()` environment is `production` => the globalContext.ts isProd() function throws an assertion fail (I don't know why the two globalContext.ts instances aren't independent from each other) => that's why we skip Vike's Vite plugin when it's Vitest that loads vite.config.js
-    //   - When calling `$ vitest` Vitest loads vite.config.js if it lives at process.cwd()
-    // - The user is supposed to use Vike's API instead of Vite's API. Vike supports Vite's API only for third parties (e.g. Vitest or Storybook).
+    // - If the user calls Vike's JavaScript API inside Vitest (e.g. `build()` inside `beforeAll()`)
+    //   => vite.config.js is loaded twice: once by Vitest and once by Vike
+    //   => problematic because Vitest's environment is `development` whereas Vike's `build()` environment is `production`
+    //   => globalContext.ts internal logic isProd() is inconsistent and assertion fails.
+    //      I don't know why the two globalContext.ts instances aren't independent from each other.
+    //      https://github.com/vikejs/vike/blob/2d3be474441707f05a7932240f3506517a735f0d/packages/vike/src/server/runtime/globalContext.ts#L746-L753
+    //   => that's why we skip Vike's Vite plugin when it's Vitest that loads vite.config.js
+    // - When running `$ vitest` Vitest loads vite.config.js if it lives at process.cwd()
+    // - The user is supposed to use Vike's API instead of Vite's API. Vike supports Vite's API only for third parties (e.g. Vitest and Storybook).
     // - https://vike.dev/vitest
-    if (
-    /* Maybe also all third party tools such as Storybook?
-    !isViteCli() &&
-    /*/
-    isVitest() &&
-        ///*/
-        !isVikeCliOrApi()) {
+    if (isVitest() && !isVikeCliOrApi()) {
         return true;
     }
+    // TO-DO/eventually: also skip for other third party tools such as Storybook?
     return false;
 }
 // Error upon wrong usage

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

@@ -1,5 +1,6 @@
 export { getOutDirs };
 export { resolveOutDir };
+export { getOutDirsAllFromRootNormalized };
 export type { OutDirs };
 import type { UserConfig, ResolvedConfig } from 'vite';
 import { type ViteEnv } from './isViteServerSide.js';
@@ -15,3 +16,4 @@ type OutDirs = {
 declare function getOutDirs(configGlobal: ResolvedConfig, viteEnv: ViteEnv | undefined): OutDirs;
 /** Appends `client/` or `server/` to `config.build.outDir` */
 declare function resolveOutDir(config: UserConfig, isServerSide: boolean): string;
+declare function getOutDirsAllFromRootNormalized(outDirRoot: string, root: string): OutDirs;

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

@@ -1,5 +1,6 @@
 export { getOutDirs };
 export { resolveOutDir };
+export { getOutDirsAllFromRootNormalized };
 import pc from '@brillout/picocolors';
 import { createDebug } from '../../../utils/debug.js';
 import { pathJoin, toPosixPath } from '../../../utils/path.js';
@@ -76,9 +77,12 @@ function getOutDirsAllFromRootNormalized(outDirRoot, root) {
         outDirRoot = pathJoin(root, outDirRoot);
     }
     let { outDirClient, outDirServer } = determineOutDirs(outDirRoot);
-    outDirRoot = outDirRoot + '/';
-    outDirClient = outDirClient + '/';
-    outDirServer = outDirServer + '/';
+    if (!outDirRoot.endsWith('/'))
+        outDirRoot = outDirRoot + '/';
+    if (!outDirClient.endsWith('/'))
+        outDirClient = outDirClient + '/';
+    if (!outDirServer.endsWith('/'))
+        outDirServer = outDirServer + '/';
     assertNormalization(outDirRoot);
     assertNormalization(outDirClient);
     assertNormalization(outDirServer);

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

@@ -34,6 +34,7 @@ type VikeConfigInternal = GlobalConfigPublic & {
     _pageConfigs: PageConfigBuildTime[];
     _pageConfigGlobal: PageConfigGlobalBuildTime;
     _vikeConfigDependencies: Set<string>;
+    _extensions: PlusFile[];
     prerenderContext: PrerenderContext;
 };
 declare function reloadVikeConfig(): void;

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

@@ -228,12 +228,16 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
         _from: globalConfigPublic._from,
         _pageConfigs: pageConfigs,
     });
+    const _extensions = Object.values(plusFilesByLocationId)
+        .flat()
+        .filter((p) => p.isConfigFile && p.isExtensionConfig);
     const vikeConfig = {
         ...globalConfigPublic,
         prerenderContext,
         _pageConfigs: pageConfigs,
         _pageConfigGlobal: pageConfigGlobal,
         _vikeConfigDependencies: esbuildCache.vikeConfigDependencies,
+        _extensions,
     };
     globalObject.vikeConfigSync = vikeConfig;
     return vikeConfig;
@@ -1194,6 +1198,7 @@ async function getVikeConfigDummy(esbuildCache) {
         ...globalConfigPublicDummy,
         prerenderContext: prerenderContextDummy,
         _vikeConfigDependencies: esbuildCache.vikeConfigDependencies,
+        _extensions: [],
     };
     globalObject.vikeConfigSync = vikeConfigDummy;
     globalObject.isV1Design_ = true;

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

@@ -16,7 +16,18 @@ async function loadAndParseVirtualFilePageEntry(pageConfig, isDev) {
     // Catch @cloudflare/vite-plugin bug
     assertVirtualFileExports(moduleExports, () => 'configValuesSerialized' in moduleExports, moduleId);
     const virtualFileExportsPageEntry = moduleExports;
-    const configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry);
+    let configValues;
+    try {
+        configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry);
+    }
+    catch (e) {
+        if (!(e instanceof ReferenceError))
+            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);
+    }
     Object.assign(pageConfig.configValues, configValues);
     objectAssign(pageConfig, { isPageEntryLoaded: true });
     return pageConfig;

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.253-commit-d6e725f";
+export declare const PROJECT_VERSION: "0.4.253-commit-1d110cc";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.253-commit-d6e725f';
+export const PROJECT_VERSION = '0.4.253-commit-1d110cc';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.253-commit-d6e725f",
+  "version": "0.4.253-commit-1d110cc",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {