vike 0.4.226-commit-a0035ee → 0.4.226

package/dist/cjs/node/plugin/plugins/build/pluginAutoFullBuild.js

@@ -95,7 +95,7 @@ async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
         // The server bulid is already called by builder.buildApp()
     }
     if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig)) {
-        const res = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline);
+        const res = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, config);
         forceExit = res.forceExit;
     }
 }

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

@@ -19,8 +19,6 @@ const context_js_2 = require("../../prerender/context.js");
 const resolvePrerenderConfig_js_1 = require("../../prerender/resolvePrerenderConfig.js");
 const pluginName = 'vike:commonConfig';
 function commonConfig(vikeVitePluginOptions) {
-    // We cache it => makes sure we only generate one object => we can mutate it at runPrerender()
-    let prerenderContext;
     return [
         {
             name: `${pluginName}:pre`,
@@ -33,9 +31,6 @@ function commonConfig(vikeVitePluginOptions) {
                     const root = configFromUser.root ? (0, prepareViteApiCall_js_1.normalizeViteRoot)(configFromUser.root) : await (0, prepareViteApiCall_js_1.getViteRoot)(operation);
                     (0, utils_js_1.assert)(root);
                     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig2)(root, isDev, vikeVitePluginOptions);
-                    const { isPrerenderingEnabled } = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
-                    prerenderContext ?? (prerenderContext = { isPrerenderingEnabled, output: null, pageContexts: null });
-                    (0, utils_js_1.assert)(prerenderContext.isPrerenderingEnabled === isPrerenderingEnabled);
                     return {
                         _isDev: isDev,
                         _root: root,
@@ -43,12 +38,11 @@ function commonConfig(vikeVitePluginOptions) {
                         _vikeConfigObject: vikeConfig,
                         _vike: {
                             pages: vikeConfig.pages,
-                            config: vikeConfig.global.config,
-                            prerenderContext
+                            config: vikeConfig.global.config
                         },
                         // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({
-                            prerender: isPrerenderingEnabled
+                            prerender: (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig).isPrerenderingEnabled
                         })
                     };
                 }

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

@@ -12,7 +12,6 @@ const getFilePath_js_1 = require("../shared/getFilePath.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 function fileEnv() {
     let config;
     let viteDevServer;
@@ -22,8 +21,6 @@ function fileEnv() {
             // In build, we use generateBundle() instead of the load() hook. Using load() works for dynamic imports in dev thanks to Vite's lazy transpiling, but it doesn't work in build because Rollup transpiles any dynamically imported module even if it's never actually imported.
             if (!viteDevServer)
                 return;
-            if (!(0, getVikeConfig_js_1.isV1Design)(config))
-                return;
             if (skip(id))
                 return;
             // For `.vue` files: https://github.com/vikejs/vike/issues/1912#issuecomment-2394981475

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

@@ -88,9 +88,11 @@ async function runPrerenderFromCLIPrerenderCommand() {
     runPrerender_forceExit();
     (0, utils_js_1.assert)(false);
 }
-async function runPrerenderFromAutoRun(viteConfig) {
+async function runPrerenderFromAutoRun(viteConfig, config) {
+    let prerenderContextPublic;
     try {
-        await runPrerender({ viteConfig });
+        const ret = await runPrerender({ viteConfig });
+        prerenderContextPublic = ret.prerenderContextPublic;
     }
     catch (err) {
         // Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
@@ -98,6 +100,8 @@ async function runPrerenderFromAutoRun(viteConfig) {
         (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
+    const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
+    vike.prerenderContext = prerenderContextPublic;
     const forceExit = (0, context_js_2.isVikeCli)() || (0, isViteCliCall_js_1.isViteCliCall)();
     return { forceExit };
 }
@@ -114,8 +118,6 @@ async function runPrerender(options = {}, standaloneTrigger) {
     await disableReactStreaming();
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'build', 'production');
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig);
-    const vike = (0, commonConfig_js_1.getVikeConfigPublic)(viteConfig);
-    (0, utils_js_1.assert)(vike.prerenderContext.isPrerenderingEnabled);
     const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(viteConfig);
     const { root } = viteConfig;
     const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
@@ -159,8 +161,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
     }
     await warnMissingPages(prerenderContext.prerenderedPageContexts, globalContext, doNotPrerenderList, partial);
     const prerenderContextPublic = makePublic(prerenderContext);
-    (0, utils_js_1.objectAssign)(vike.prerenderContext, prerenderContextPublic);
-    return { viteConfig };
+    return { viteConfig, prerenderContextPublic };
 }
 async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, defaultLocalValue, concurrencyLimit, globalContext) {
     // V1 design

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.226-commit-a0035ee';
+exports.PROJECT_VERSION = '0.4.226';

package/dist/cjs/utils/assertSingleInstance.js

@@ -16,24 +16,13 @@ const PROJECT_VERSION_js_1 = require("./PROJECT_VERSION.js");
 /* Use original assertWarning() after all CJS is removed from node_modules/vike/dist/
 import { assertWarning } from './assert.js'
 */
-let globalObject;
-// getGlobalObjectSafe() can be called before this line
-globalObject ?? (globalObject = genGlobalConfig());
-function genGlobalConfig() {
-    return (0, getGlobalObject_js_1.getGlobalObject)('utils/assertSingleInstance.ts', {
-        instances: [],
-        alreadyLogged: new Set()
-    });
-}
-// We need getGlobalObjectSafe() because globalObject is `undefined` when exported functions are called before globalObject is initialized
-function getGlobalObjectSafe() {
-    globalObject ?? (globalObject = genGlobalConfig());
-    return globalObject;
-}
+const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/assertSingleInstance.ts', {
+    instances: [],
+    alreadyLogged: new Set()
+});
 const clientRuntimesClonflict = 'Client runtime of both Server Routing and Client Routing loaded https://vike.dev/client-runtimes-conflict';
 const clientNotSingleInstance = 'Client runtime loaded twice https://vike.dev/client-runtime-duplicated';
 function assertSingleInstance() {
-    const globalObject = getGlobalObjectSafe();
     {
         const versions = (0, unique_js_1.unique)(globalObject.instances);
         assertWarning(versions.length <= 1, 
@@ -50,7 +39,6 @@ function assertSingleInstance() {
     }
 }
 function assertSingleInstance_onClientEntryServerRouting(isProduction) {
-    const globalObject = getGlobalObjectSafe();
     assertWarning(globalObject.isClientRouting !== true, clientRuntimesClonflict, {
         onlyOnce: true,
         showStackTrace: true
@@ -65,7 +53,6 @@ function assertSingleInstance_onClientEntryServerRouting(isProduction) {
     assertSingleInstance();
 }
 function assertSingleInstance_onClientEntryClientRouting(isProduction) {
-    const globalObject = getGlobalObjectSafe();
     assertWarning(globalObject.isClientRouting !== false, clientRuntimesClonflict, {
         onlyOnce: true,
         showStackTrace: true
@@ -81,12 +68,10 @@ function assertSingleInstance_onClientEntryClientRouting(isProduction) {
 }
 // Called by utils/assert.ts which is (most certainly) loaded by all entries. That way we don't have to call a callback for every entry. (There are a lot of entries: `client/router/`, `client/`, `node/runtime/`, `node/plugin/`, `node/cli`.)
 function assertSingleInstance_onAssertModuleLoad() {
-    const globalObject = getGlobalObjectSafe();
     globalObject.instances.push(PROJECT_VERSION_js_1.PROJECT_VERSION);
     assertSingleInstance();
 }
 function assertWarning(condition, errorMessage, { onlyOnce, showStackTrace }) {
-    const globalObject = getGlobalObjectSafe();
     if (condition) {
         return;
     }

package/dist/esm/node/plugin/plugins/build/pluginAutoFullBuild.js

@@ -90,7 +90,7 @@ async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
         // The server bulid is already called by builder.buildApp()
     }
     if (isPrerenderAutoRunEnabled(vikeConfig)) {
-        const res = await runPrerenderFromAutoRun(configInline);
+        const res = await runPrerenderFromAutoRun(configInline, config);
         forceExit = res.forceExit;
     }
 }

package/dist/esm/node/plugin/plugins/commonConfig.d.ts

@@ -20,13 +20,8 @@ declare module 'vite' {
 type VikeConfigPublic = {
     config: VikeConfigObject['global']['config'];
     pages: VikeConfigObject['pages'];
-    prerenderContext: PrerenderContext;
+    prerenderContext?: PrerenderContextPublic;
 };
-type PrerenderContext = {
-    isPrerenderingEnabled: boolean;
-} & ({
-    [K in keyof PrerenderContextPublic]: null;
-} | PrerenderContextPublic);
 declare function commonConfig(vikeVitePluginOptions: unknown): Plugin[];
 /**
  * Get all the information Vike knows about the app in your Vite plugin.

package/dist/esm/node/plugin/plugins/commonConfig.js

@@ -14,8 +14,6 @@ import { temp_disablePrerenderAutoRun } from '../../prerender/context.js';
 import { resolvePrerenderConfigGlobal } from '../../prerender/resolvePrerenderConfig.js';
 const pluginName = 'vike:commonConfig';
 function commonConfig(vikeVitePluginOptions) {
-    // We cache it => makes sure we only generate one object => we can mutate it at runPrerender()
-    let prerenderContext;
     return [
         {
             name: `${pluginName}:pre`,
@@ -28,9 +26,6 @@ function commonConfig(vikeVitePluginOptions) {
                     const root = configFromUser.root ? normalizeViteRoot(configFromUser.root) : await getViteRoot(operation);
                     assert(root);
                     const vikeConfig = await getVikeConfig2(root, isDev, vikeVitePluginOptions);
-                    const { isPrerenderingEnabled } = resolvePrerenderConfigGlobal(vikeConfig);
-                    prerenderContext ?? (prerenderContext = { isPrerenderingEnabled, output: null, pageContexts: null });
-                    assert(prerenderContext.isPrerenderingEnabled === isPrerenderingEnabled);
                     return {
                         _isDev: isDev,
                         _root: root,
@@ -38,12 +33,11 @@ function commonConfig(vikeVitePluginOptions) {
                         _vikeConfigObject: vikeConfig,
                         _vike: {
                             pages: vikeConfig.pages,
-                            config: vikeConfig.global.config,
-                            prerenderContext
+                            config: vikeConfig.global.config
                         },
                         // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({
-                            prerender: isPrerenderingEnabled
+                            prerender: resolvePrerenderConfigGlobal(vikeConfig).isPrerenderingEnabled
                         })
                     };
                 }

package/dist/esm/node/plugin/plugins/fileEnv.js

@@ -7,7 +7,6 @@ import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
 import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import { getExportNames } from '../shared/parseEsModule.js';
 import { normalizeId } from '../shared/normalizeId.js';
-import { isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 function fileEnv() {
     let config;
     let viteDevServer;
@@ -17,8 +16,6 @@ function fileEnv() {
             // In build, we use generateBundle() instead of the load() hook. Using load() works for dynamic imports in dev thanks to Vite's lazy transpiling, but it doesn't work in build because Rollup transpiles any dynamically imported module even if it's never actually imported.
             if (!viteDevServer)
                 return;
-            if (!isV1Design(config))
-                return;
             if (skip(id))
                 return;
             // For `.vue` files: https://github.com/vikejs/vike/issues/1912#issuecomment-2394981475

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

@@ -46,7 +46,7 @@ declare function runPrerenderFromAPI(options?: PrerenderOptions): Promise<{
     viteConfig: ResolvedConfig;
 }>;
 declare function runPrerenderFromCLIPrerenderCommand(): Promise<void>;
-declare function runPrerenderFromAutoRun(viteConfig: InlineConfig | undefined): Promise<{
+declare function runPrerenderFromAutoRun(viteConfig: InlineConfig | undefined, config: ResolvedConfig): Promise<{
     forceExit: boolean;
 }>;
 declare function runPrerender_forceExit(): void;

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

@@ -50,9 +50,11 @@ async function runPrerenderFromCLIPrerenderCommand() {
     runPrerender_forceExit();
     assert(false);
 }
-async function runPrerenderFromAutoRun(viteConfig) {
+async function runPrerenderFromAutoRun(viteConfig, config) {
+    let prerenderContextPublic;
     try {
-        await runPrerender({ viteConfig });
+        const ret = await runPrerender({ viteConfig });
+        prerenderContextPublic = ret.prerenderContextPublic;
     }
     catch (err) {
         // Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
@@ -60,6 +62,8 @@ async function runPrerenderFromAutoRun(viteConfig) {
         logErrorHint(err);
         process.exit(1);
     }
+    const vike = getVikeConfigPublic(config);
+    vike.prerenderContext = prerenderContextPublic;
     const forceExit = isVikeCli() || isViteCliCall();
     return { forceExit };
 }
@@ -76,8 +80,6 @@ async function runPrerender(options = {}, standaloneTrigger) {
     await disableReactStreaming();
     const viteConfig = await resolveConfig(options.viteConfig || {}, 'build', 'production');
     const vikeConfig = await getVikeConfig(viteConfig);
-    const vike = getVikeConfigPublic(viteConfig);
-    assert(vike.prerenderContext.isPrerenderingEnabled);
     const { outDirClient } = getOutDirs(viteConfig);
     const { root } = viteConfig;
     const prerenderConfigGlobal = resolvePrerenderConfigGlobal(vikeConfig);
@@ -121,8 +123,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
     }
     await warnMissingPages(prerenderContext.prerenderedPageContexts, globalContext, doNotPrerenderList, partial);
     const prerenderContextPublic = makePublic(prerenderContext);
-    objectAssign(vike.prerenderContext, prerenderContextPublic);
-    return { viteConfig };
+    return { viteConfig, prerenderContextPublic };
 }
 async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, defaultLocalValue, concurrencyLimit, globalContext) {
     // V1 design

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.226-commit-a0035ee";
+export declare const PROJECT_VERSION: "0.4.226";

package/dist/esm/utils/PROJECT_VERSION.js

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

package/dist/esm/utils/assertSingleInstance.js

@@ -11,24 +11,13 @@ import { PROJECT_VERSION } from './PROJECT_VERSION.js';
 /* Use original assertWarning() after all CJS is removed from node_modules/vike/dist/
 import { assertWarning } from './assert.js'
 */
-let globalObject;
-// getGlobalObjectSafe() can be called before this line
-globalObject ?? (globalObject = genGlobalConfig());
-function genGlobalConfig() {
-    return getGlobalObject('utils/assertSingleInstance.ts', {
-        instances: [],
-        alreadyLogged: new Set()
-    });
-}
-// We need getGlobalObjectSafe() because globalObject is `undefined` when exported functions are called before globalObject is initialized
-function getGlobalObjectSafe() {
-    globalObject ?? (globalObject = genGlobalConfig());
-    return globalObject;
-}
+const globalObject = getGlobalObject('utils/assertSingleInstance.ts', {
+    instances: [],
+    alreadyLogged: new Set()
+});
 const clientRuntimesClonflict = 'Client runtime of both Server Routing and Client Routing loaded https://vike.dev/client-runtimes-conflict';
 const clientNotSingleInstance = 'Client runtime loaded twice https://vike.dev/client-runtime-duplicated';
 function assertSingleInstance() {
-    const globalObject = getGlobalObjectSafe();
     {
         const versions = unique(globalObject.instances);
         assertWarning(versions.length <= 1, 
@@ -45,7 +34,6 @@ function assertSingleInstance() {
     }
 }
 function assertSingleInstance_onClientEntryServerRouting(isProduction) {
-    const globalObject = getGlobalObjectSafe();
     assertWarning(globalObject.isClientRouting !== true, clientRuntimesClonflict, {
         onlyOnce: true,
         showStackTrace: true
@@ -60,7 +48,6 @@ function assertSingleInstance_onClientEntryServerRouting(isProduction) {
     assertSingleInstance();
 }
 function assertSingleInstance_onClientEntryClientRouting(isProduction) {
-    const globalObject = getGlobalObjectSafe();
     assertWarning(globalObject.isClientRouting !== false, clientRuntimesClonflict, {
         onlyOnce: true,
         showStackTrace: true
@@ -76,12 +63,10 @@ function assertSingleInstance_onClientEntryClientRouting(isProduction) {
 }
 // Called by utils/assert.ts which is (most certainly) loaded by all entries. That way we don't have to call a callback for every entry. (There are a lot of entries: `client/router/`, `client/`, `node/runtime/`, `node/plugin/`, `node/cli`.)
 function assertSingleInstance_onAssertModuleLoad() {
-    const globalObject = getGlobalObjectSafe();
     globalObject.instances.push(PROJECT_VERSION);
     assertSingleInstance();
 }
 function assertWarning(condition, errorMessage, { onlyOnce, showStackTrace }) {
-    const globalObject = getGlobalObjectSafe();
     if (condition) {
         return;
     }

package/package.json

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