vike 0.4.228-commit-c2f6e1f → 0.4.228-commit-8d90991

package/dist/cjs/__internal/index.js

@@ -17,10 +17,10 @@ const assertSetup_js_1 = require("../utils/assertSetup.js");
 async function getPagesAndRoutes() {
     (0, assertSetup_js_1.setNodeEnvProduction)();
     await (0, globalContext_js_2.initGlobalContext_getPagesAndRoutes)();
-    const globalContext = await (0, globalContext_js_2.getGlobalContextInternal)();
+    const { globalContext } = await (0, globalContext_js_2.getGlobalContextInternal)();
     const { 
     //
-    pageRoutes, pageFilesAll, pageConfigs, allPageIds } = globalContext;
+    _pageRoutes: pageRoutes, _pageFilesAll: pageFilesAll, _pageConfigs: pageConfigs, _allPageIds: allPageIds } = globalContext;
     return {
         pageRoutes,
         pageFilesAll,

package/dist/cjs/client/client-routing-runtime/globalContext.js

@@ -0,0 +1,49 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGlobalContext = void 0;
+const createGetGlobalContext_js_1 = require("../shared/createGetGlobalContext.js");
+const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
+// @ts-ignore
+const virtualFileExports = __importStar(require("virtual:vike:importUserCode:client:client-routing"));
+const getGlobalContext = (0, createGetGlobalContext_js_1.createGetGlobalContext)(virtualFileExports, true, addGlobalContext);
+exports.getGlobalContext = getGlobalContext;
+async function addGlobalContext(globalContext) {
+    const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
+    return {
+        _pageRoutes: pageRoutes,
+        _onBeforeRouteHook: onBeforeRouteHook
+    };
+}

package/dist/cjs/client/server-routing-runtime/globalContext.js

@@ -0,0 +1,41 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGlobalContext = void 0;
+const createGetGlobalContext_js_1 = require("../shared/createGetGlobalContext.js");
+// @ts-ignore
+const virtualFileExports = __importStar(require("virtual:vike:importUserCode:client:server-routing"));
+const getGlobalContext = (0, createGetGlobalContext_js_1.createGetGlobalContext)(virtualFileExports, false);
+exports.getGlobalContext = getGlobalContext;

package/dist/cjs/client/shared/createGetGlobalContext.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createGetGlobalContext = createGetGlobalContext;
+const createGlobalContextShared_js_1 = require("../../shared/createGlobalContextShared.js");
+const getJsonSerializedInHtml_js_1 = require("./getJsonSerializedInHtml.js");
+const utils_js_1 = require("./utils.js");
+const globalObject = (0, utils_js_1.getGlobalObject)('createGetGlobalContext.ts', {});
+function createGetGlobalContext(virtualFileExports, isClientRouting, addGlobalContext) {
+    (0, utils_js_1.assert)(globalObject.isClientRouting === undefined || globalObject.isClientRouting === isClientRouting);
+    globalObject.isClientRouting = isClientRouting;
+    // Eagerly call onCreateGlobalContext() hook
+    getGlobalContext();
+    return getGlobalContext;
+    async function getGlobalContext() {
+        // Cache
+        if (globalObject.globalContext &&
+            // Don't break HMR
+            globalObject.globalContext._virtualFileExports !== virtualFileExports) {
+            return globalObject.globalContext;
+        }
+        // Create
+        const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, async (globalContext) => {
+            const globalContextAddendum = {};
+            (0, utils_js_1.objectAssign)(globalContextAddendum, (0, getJsonSerializedInHtml_js_1.getGlobalContextSerializedInHtml)());
+            (0, utils_js_1.objectAssign)(globalContextAddendum, await addGlobalContext?.(globalContext));
+            return globalContextAddendum;
+        });
+        // Return
+        return globalContext;
+    }
+}

package/dist/cjs/client/shared/getJsonSerializedInHtml.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPageContextSerializedInHtml = getPageContextSerializedInHtml;
+exports.getGlobalContextSerializedInHtml = getGlobalContextSerializedInHtml;
+const parse_1 = require("@brillout/json-serializer/parse");
+const utils_js_1 = require("./utils.js");
+const htmlElementIds_js_1 = require("../../shared/htmlElementIds.js");
+// elements should exist because:
+// 1. <script id="vike_pageContext" type="application/json"> appears before the <script> that loads Vike's client runtime (which includes this file)
+// 2. <script id="vike_pageContext" type="application/json"> is neither async nor defer
+// See https://github.com/vikejs/vike/pull/1271
+function getPageContextSerializedInHtml() {
+    const pageContextSerializedInHtml = findAndParseJson(htmlElementIds_js_1.htmlElementId_pageContext);
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextSerializedInHtml, 'pageId', 'string'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextSerializedInHtml, 'routeParams', 'string{}'));
+    return pageContextSerializedInHtml;
+}
+function getGlobalContextSerializedInHtml() {
+    const globalContextSerializedInHtml = findAndParseJson(htmlElementIds_js_1.htmlElementId_globalContext);
+    return globalContextSerializedInHtml;
+}
+function findAndParseJson(id) {
+    const elem = document.getElementById(id);
+    (0, utils_js_1.assertUsage)(elem, 
+    // It seems like it can be missing when HTML is malformed: https://github.com/vikejs/vike/issues/913
+    `Couldn't find #${id} (which Vike automatically injects in the HTML): make sure it exists (i.e. don't remove it and make sure your HTML isn't malformed)`);
+    const jsonStr = elem.textContent;
+    (0, utils_js_1.assert)(jsonStr);
+    const json = (0, parse_1.parse)(jsonStr);
+    return json;
+}

package/dist/cjs/client/shared/utils.js

@@ -0,0 +1,21 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("../../utils/assert.js"), exports);
+__exportStar(require("../../utils/parseUrl.js"), exports);
+__exportStar(require("../../utils/getGlobalObject.js"), exports);
+__exportStar(require("../../utils/objectAssign.js"), exports);
+__exportStar(require("../../utils/hasProp.js"), exports);

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

@@ -31,6 +31,7 @@ function pluginModuleBanner() {
                 id = (0, virtual_files_js_1.removeVirtualIdTag)(id);
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
+                id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377
                 const s = new magic_string_1.default(code);
                 // Use legal comment so that esbuild doesn't remove it.
                 // - Terser still removes the comment, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.

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

@@ -24,6 +24,11 @@ const configDefinitionsBuiltIn = {
         global: true,
         cumulative: true
     },
+    onCreateGlobalContext: {
+        env: { server: true, client: true },
+        global: true,
+        cumulative: true
+    },
     onBeforeRender: {
         env: { server: true }
     },

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

@@ -132,26 +132,26 @@ async function runPrerender(options = {}, standaloneTrigger) {
     }
     const concurrencyLimit = (0, utils_js_1.pLimit)(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? (0, os_1.cpus)().length : parallel);
     await (0, globalContext_js_1.initGlobalContext_runPrerender)();
-    const globalContext = await (0, globalContext_js_1.getGlobalContextInternal)();
-    globalContext.pageFilesAll.forEach(assertExportNames);
+    const { globalContext, globalContext_public } = await (0, globalContext_js_1.getGlobalContextInternal)();
+    globalContext._pageFilesAll.forEach(assertExportNames);
     const prerenderContext = {
-        noExtraDir,
         pageContexts: [],
-        pageContextInit: options.pageContextInit ?? null,
-        prerenderedPageContexts: {},
-        output: []
+        output: [],
+        _noExtraDir: noExtraDir,
+        _pageContextInit: options.pageContextInit ?? null,
+        _prerenderedPageContexts: {}
     };
     const doNotPrerenderList = [];
     await collectDoNoPrerenderList(vikeConfig.pageConfigs, doNotPrerenderList, defaultLocalValue, concurrencyLimit, globalContext);
     // Allow user to create `pageContext` for parameterized routes and/or bulk data fetching
     // https://vike.dev/onBeforePrerenderStart
-    await callOnBeforePrerenderStartHooks(prerenderContext, globalContext, concurrencyLimit, doNotPrerenderList);
+    await callOnBeforePrerenderStartHooks(prerenderContext, globalContext, globalContext_public, concurrencyLimit, doNotPrerenderList);
     // Create `pageContext` for each page with a static route
     const urlList = getUrlListFromPagesWithStaticRoute(globalContext, doNotPrerenderList);
-    await createPageContexts(urlList, prerenderContext, globalContext, concurrencyLimit, false);
+    await createPageContexts(urlList, prerenderContext, globalContext, globalContext_public, concurrencyLimit, false);
     // Create `pageContext` for 404 page
     const urlList404 = getUrlList404(globalContext);
-    await createPageContexts(urlList404, prerenderContext, globalContext, concurrencyLimit, true);
+    await createPageContexts(urlList404, prerenderContext, globalContext, globalContext_public, concurrencyLimit, true);
     // Allow user to duplicate the list of `pageContext` for i18n
     // https://vike.dev/onPrerenderStart
     await callOnPrerenderStartHook(prerenderContext, globalContext, concurrencyLimit);
@@ -161,15 +161,15 @@ async function runPrerender(options = {}, standaloneTrigger) {
         prerenderedCount++;
         const { pageId } = htmlFile.pageContext;
         (0, utils_js_1.assert)(pageId);
-        prerenderContext.prerenderedPageContexts[pageId] = htmlFile.pageContext;
+        prerenderContext._prerenderedPageContexts[pageId] = htmlFile.pageContext;
         await writeFiles(htmlFile, root, outDirClient, options.onPagePrerender, prerenderContext.output, logLevel);
     };
     await prerenderPages(prerenderContext, concurrencyLimit, onComplete);
-    warnContradictoryNoPrerenderList(prerenderContext.prerenderedPageContexts, doNotPrerenderList);
+    warnContradictoryNoPrerenderList(prerenderContext._prerenderedPageContexts, doNotPrerenderList);
     if (logLevel === 'info') {
         console.log(`${picocolors_1.default.green(`✓`)} ${prerenderedCount} HTML documents pre-rendered.`);
     }
-    await warnMissingPages(prerenderContext.prerenderedPageContexts, globalContext, doNotPrerenderList, partial);
+    await warnMissingPages(prerenderContext._prerenderedPageContexts, globalContext, doNotPrerenderList, partial);
     const prerenderContextPublic = makePublic(prerenderContext);
     (0, utils_js_1.objectAssign)(vike.prerenderContext, prerenderContextPublic);
     if (prerenderConfigGlobal.isPrerenderingEnabledForAllPages && !prerenderConfigGlobal.keepDistServer) {
@@ -196,7 +196,7 @@ async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, default
     });
     // Old design
     // TODO/v1-release: remove
-    await Promise.all(globalContext.pageFilesAll
+    await Promise.all(globalContext._pageFilesAll
         .filter((p) => {
         assertExportNames(p);
         if (!p.exportNames?.includes('doNotPrerender'))
@@ -208,8 +208,8 @@ async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, default
         (0, utils_js_1.assert)(p.loadFile);
         await p.loadFile();
     })));
-    globalContext.allPageIds.forEach((pageId) => {
-        const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(globalContext.pageFilesAll, pageId);
+    globalContext._allPageIds.forEach((pageId) => {
+        const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(globalContext._pageFilesAll, pageId);
         for (const p of pageFilesServerSide) {
             if (!p.exportNames?.includes('doNotPrerender'))
                 continue;
@@ -233,10 +233,10 @@ function assertExportNames(pageFile) {
     const { exportNames, fileType } = pageFile;
     (0, utils_js_1.assert)(exportNames || fileType === '.page.route' || fileType === '.css', pageFile.filePath);
 }
-async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext, concurrencyLimit, doNotPrerenderList) {
+async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext, globalContext_public, concurrencyLimit, doNotPrerenderList) {
     const onBeforePrerenderStartHooks = [];
     // V1 design
-    await Promise.all(globalContext.pageConfigs.map((pageConfig) => concurrencyLimit(async () => {
+    await Promise.all(globalContext._pageConfigs.map((pageConfig) => concurrencyLimit(async () => {
         const hookName = 'onBeforePrerenderStart';
         const pageConfigLoaded = await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, false);
         const hook = (0, getHook_js_1.getHookFromPageConfig)(pageConfigLoaded, hookName);
@@ -252,7 +252,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext,
         });
     })));
     // 0.4 design
-    await Promise.all(globalContext.pageFilesAll
+    await Promise.all(globalContext._pageFilesAll
         .filter((p) => {
         assertExportNames(p);
         if (!p.exportNames?.includes('prerender'))
@@ -296,7 +296,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext,
             }
             // Add result
             const providedByHook = { hookFilePath, hookName };
-            const pageContextNew = await createPageContextPrerendering(url, prerenderContext, globalContext, false, undefined, providedByHook);
+            const pageContextNew = await createPageContextPrerendering(url, prerenderContext, globalContext, globalContext_public, false, undefined, providedByHook);
             prerenderContext.pageContexts.push(pageContextNew);
             if (pageContext) {
                 (0, utils_js_1.objectAssign)(pageContextNew, { _pageContextAlreadyProvidedByOnPrerenderHook: true });
@@ -307,7 +307,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext,
 }
 function getUrlListFromPagesWithStaticRoute(globalContext, doNotPrerenderList) {
     const urlList = [];
-    globalContext.pageRoutes.map((pageRoute) => {
+    globalContext._pageRoutes.map((pageRoute) => {
         const { pageId } = pageRoute;
         if (doNotPrerenderList.find((p) => p.pageId === pageId))
             return;
@@ -332,7 +332,7 @@ function getUrlListFromPagesWithStaticRoute(globalContext, doNotPrerenderList) {
 }
 function getUrlList404(globalContext) {
     const urlList = [];
-    const errorPageId = (0, error_page_js_1.getErrorPageId)(globalContext.pageFilesAll, globalContext.pageConfigs);
+    const errorPageId = (0, error_page_js_1.getErrorPageId)(globalContext._pageFilesAll, globalContext._pageConfigs);
     if (errorPageId) {
         urlList.push({
             // A URL is required for `viteDevServer.transformIndexHtml(url,html)`
@@ -342,28 +342,30 @@ function getUrlList404(globalContext) {
     }
     return urlList;
 }
-async function createPageContexts(urlList, prerenderContext, globalContext, concurrencyLimit, is404) {
+async function createPageContexts(urlList, prerenderContext, globalContext, globalContext_public, concurrencyLimit, is404) {
     await Promise.all(urlList.map(({ urlOriginal, pageId }) => concurrencyLimit(async () => {
         // Already included in a onBeforePrerenderStart() hook
         if (prerenderContext.pageContexts.find((pageContext) => isSameUrl(pageContext.urlOriginal, urlOriginal))) {
             return;
         }
-        const pageContext = await createPageContextPrerendering(urlOriginal, prerenderContext, globalContext, is404, pageId, null);
+        const pageContext = await createPageContextPrerendering(urlOriginal, prerenderContext, globalContext, globalContext_public, is404, pageId, null);
         prerenderContext.pageContexts.push(pageContext);
     })));
 }
-async function createPageContextPrerendering(urlOriginal, prerenderContext, globalContext, is404, pageId, providedByHook) {
+async function createPageContextPrerendering(urlOriginal, prerenderContext, globalContext, globalContext_public, is404, pageId, providedByHook) {
     const pageContextInit = {
         urlOriginal,
-        ...prerenderContext.pageContextInit
+        ...prerenderContext._pageContextInit
     };
-    const pageContext = await (0, createPageContextServerSide_js_1.createPageContextServerSide)(pageContextInit, globalContext, { isPrerendering: true });
+    const pageContext = await (0, createPageContextServerSide_js_1.createPageContextServerSide)(pageContextInit, globalContext, globalContext_public, {
+        isPrerendering: true
+    });
     (0, utils_js_1.assert)(pageContext.isPrerendering === true);
     (0, utils_js_1.objectAssign)(pageContext, {
         _urlHandler: null,
         _httpRequestId: null,
         _urlRewrite: null,
-        _noExtraDir: prerenderContext.noExtraDir,
+        _noExtraDir: prerenderContext._noExtraDir,
         _prerenderContext: prerenderContext,
         _providedByHook: providedByHook,
         _urlOriginalModifiedByHook: null,
@@ -389,14 +391,14 @@ async function createPageContextPrerendering(urlOriginal, prerenderContext, glob
     {
         const { pageId } = pageContext;
         (0, utils_js_1.assert)(pageId);
-        (0, utils_js_1.assert)(globalContext.isPrerendering);
-        if (globalContext.pageConfigs.length > 0) {
-            const pageConfig = globalContext.pageConfigs.find((p) => p.pageId === pageId);
+        (0, utils_js_1.assert)(globalContext._isPrerendering);
+        if (globalContext._pageConfigs.length > 0) {
+            const pageConfig = globalContext._pageConfigs.find((p) => p.pageId === pageId);
             (0, utils_js_1.assert)(pageConfig);
             usesClientRouter = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
         }
         else {
-            usesClientRouter = globalContext.usesClientRouter;
+            usesClientRouter = globalContext._usesClientRouter;
         }
     }
     (0, utils_js_1.objectAssign)(pageContext, { _usesClientRouter: usesClientRouter });
@@ -433,9 +435,9 @@ function assertRouteMatch(pageContextFromRoute, pageContext) {
 async function callOnPrerenderStartHook(prerenderContext, globalContext, concurrencyLimit) {
     let onPrerenderStartHook;
     // V1 design
-    if (globalContext.pageConfigs.length > 0) {
+    if (globalContext._pageConfigs.length > 0) {
         const hookName = 'onPrerenderStart';
-        const hook = (0, getHook_js_1.getHookFromPageConfigGlobal)(globalContext.pageConfigGlobal, hookName);
+        const hook = (0, getHook_js_1.getHookFromPageConfigGlobal)(globalContext._pageConfigGlobal, hookName);
         if (hook) {
             (0, utils_js_1.assert)(hook.hookName === 'onPrerenderStart');
             onPrerenderStartHook = {
@@ -447,9 +449,9 @@ async function callOnPrerenderStartHook(prerenderContext, globalContext, concurr
     }
     // Old design
     // TODO/v1-release: remove
-    if (globalContext.pageConfigs.length === 0) {
+    if (globalContext._pageConfigs.length === 0) {
         const hookTimeout = (0, getHook_js_1.getHookTimeoutDefault)('onBeforePrerender');
-        const pageFilesWithOnBeforePrerenderHook = globalContext.pageFilesAll.filter((p) => {
+        const pageFilesWithOnBeforePrerenderHook = globalContext._pageFilesAll.filter((p) => {
             assertExportNames(p);
             if (!p.exportNames?.includes('onBeforePrerender'))
                 return false;
@@ -589,7 +591,7 @@ async function prerenderPages(prerenderContext, concurrencyLimit, onComplete) {
             pageContext,
             htmlString: documentHtml,
             pageContextSerialized,
-            doNotCreateExtraDirectory: prerenderContext.noExtraDir ?? pageContext.is404
+            doNotCreateExtraDirectory: prerenderContext._noExtraDir ?? pageContext.is404
         });
     })));
 }
@@ -606,16 +608,16 @@ function warnContradictoryNoPrerenderList(prerenderedPageContexts, doNotPrerende
     });
 }
 async function warnMissingPages(prerenderedPageContexts, globalContext, doNotPrerenderList, partial) {
-    const isV1 = globalContext.pageConfigs.length > 0;
+    const isV1 = globalContext._pageConfigs.length > 0;
     const hookName = isV1 ? 'onBeforePrerenderStart' : 'prerender';
     /* TODO/after-v1-design-release: document setting `prerender: false` as an alternative to using prerender.partial (both in the warnings and the docs)
     const optOutName = isV1 ? 'prerender' : 'doNotPrerender'
     const msgAddendum = `Explicitly opt-out by setting the config ${optOutName} to ${isV1 ? 'false' : 'true'} or use the option prerender.partial`
     */
-    globalContext.allPageIds
+    globalContext._allPageIds
         .filter((pageId) => !prerenderedPageContexts[pageId])
         .filter((pageId) => !doNotPrerenderList.find((p) => p.pageId === pageId))
-        .filter((pageId) => !(0, error_page_js_1.isErrorPage)(pageId, globalContext.pageConfigs))
+        .filter((pageId) => !(0, error_page_js_1.isErrorPage)(pageId, globalContext._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#partial) to suppress this warning.`, { onlyOnce: true });
@@ -768,7 +770,7 @@ function assertIsNotAbort(err, urlOriginal) {
     (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOriginal} but ${picocolors_1.default.cyan(abortCaller)} isn't supported for pre-rendered pages`);
 }
 function makePublic(prerenderContext) {
-    const prerenderContextPublic = (0, utils_js_1.makePublicCopy)(prerenderContext, 'prerenderContext', [
+    const prerenderContextPublic = (0, utils_js_1.getPublicProxy)(prerenderContext, 'prerenderContext', [
         'output', // vite-plugin-vercel
         'pageContexts' // https://vike.dev/i18n#pre-rendering
     ]);

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

@@ -31,6 +31,6 @@ __exportStar(require("../../utils/pLimit.js"), exports);
 __exportStar(require("../../utils/isFilePathAbsoluteFilesystem.js"), exports);
 __exportStar(require("../../utils/isArray.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);
-__exportStar(require("../../utils/makePublicCopy.js"), exports);
+__exportStar(require("../../utils/getPublicProxy.js"), exports);
 __exportStar(require("../../utils/isNullish.js"), exports);
 __exportStar(require("../../utils/preservePropertyGetters.js"), exports);