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

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

@@ -4,7 +4,7 @@ export { runPrerenderFromAutoRun };
 export { runPrerender_forceExit };
 import path from 'path';
 import { route } from '../../shared/route/index.js';
-import { assert, assertUsage, assertWarning, hasProp, objectAssign, isObjectWithKeys, isCallable, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, pLimit, isArray, onSetupPrerender, makePublicCopy, PROJECT_VERSION, preservePropertyGetters } from './utils.js';
+import { assert, assertUsage, assertWarning, hasProp, objectAssign, isObjectWithKeys, isCallable, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, pLimit, isArray, onSetupPrerender, getPublicProxy, PROJECT_VERSION, preservePropertyGetters } from './utils.js';
 import { prerenderPage } from '../runtime/renderPage/renderPageAlreadyRouted.js';
 import { createPageContextServerSide } from '../runtime/renderPage/createPageContextServerSide.js';
 import pc from '@brillout/picocolors';
@@ -94,26 +94,26 @@ async function runPrerender(options = {}, standaloneTrigger) {
     }
     const concurrencyLimit = pLimit(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? cpus().length : parallel);
     await initGlobalContext_runPrerender();
-    const globalContext = await getGlobalContextInternal();
-    globalContext.pageFilesAll.forEach(assertExportNames);
+    const { globalContext, globalContext_public } = await 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);
@@ -123,15 +123,15 @@ async function runPrerender(options = {}, standaloneTrigger) {
         prerenderedCount++;
         const { pageId } = htmlFile.pageContext;
         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(`${pc.green(`✓`)} ${prerenderedCount} HTML documents pre-rendered.`);
     }
-    await warnMissingPages(prerenderContext.prerenderedPageContexts, globalContext, doNotPrerenderList, partial);
+    await warnMissingPages(prerenderContext._prerenderedPageContexts, globalContext, doNotPrerenderList, partial);
     const prerenderContextPublic = makePublic(prerenderContext);
     objectAssign(vike.prerenderContext, prerenderContextPublic);
     if (prerenderConfigGlobal.isPrerenderingEnabledForAllPages && !prerenderConfigGlobal.keepDistServer) {
@@ -158,7 +158,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'))
@@ -170,8 +170,8 @@ async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, default
         assert(p.loadFile);
         await p.loadFile();
     })));
-    globalContext.allPageIds.forEach((pageId) => {
-        const pageFilesServerSide = getPageFilesServerSide(globalContext.pageFilesAll, pageId);
+    globalContext._allPageIds.forEach((pageId) => {
+        const pageFilesServerSide = getPageFilesServerSide(globalContext._pageFilesAll, pageId);
         for (const p of pageFilesServerSide) {
             if (!p.exportNames?.includes('doNotPrerender'))
                 continue;
@@ -195,10 +195,10 @@ function assertExportNames(pageFile) {
     const { exportNames, fileType } = pageFile;
     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 loadConfigValues(pageConfig, false);
         const hook = getHookFromPageConfig(pageConfigLoaded, hookName);
@@ -214,7 +214,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'))
@@ -258,7 +258,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) {
                 objectAssign(pageContextNew, { _pageContextAlreadyProvidedByOnPrerenderHook: true });
@@ -269,7 +269,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;
@@ -294,7 +294,7 @@ function getUrlListFromPagesWithStaticRoute(globalContext, doNotPrerenderList) {
 }
 function getUrlList404(globalContext) {
     const urlList = [];
-    const errorPageId = getErrorPageId(globalContext.pageFilesAll, globalContext.pageConfigs);
+    const errorPageId = getErrorPageId(globalContext._pageFilesAll, globalContext._pageConfigs);
     if (errorPageId) {
         urlList.push({
             // A URL is required for `viteDevServer.transformIndexHtml(url,html)`
@@ -304,28 +304,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 createPageContextServerSide(pageContextInit, globalContext, { isPrerendering: true });
+    const pageContext = await createPageContextServerSide(pageContextInit, globalContext, globalContext_public, {
+        isPrerendering: true
+    });
     assert(pageContext.isPrerendering === true);
     objectAssign(pageContext, {
         _urlHandler: null,
         _httpRequestId: null,
         _urlRewrite: null,
-        _noExtraDir: prerenderContext.noExtraDir,
+        _noExtraDir: prerenderContext._noExtraDir,
         _prerenderContext: prerenderContext,
         _providedByHook: providedByHook,
         _urlOriginalModifiedByHook: null,
@@ -351,14 +353,14 @@ async function createPageContextPrerendering(urlOriginal, prerenderContext, glob
     {
         const { pageId } = pageContext;
         assert(pageId);
-        assert(globalContext.isPrerendering);
-        if (globalContext.pageConfigs.length > 0) {
-            const pageConfig = globalContext.pageConfigs.find((p) => p.pageId === pageId);
+        assert(globalContext._isPrerendering);
+        if (globalContext._pageConfigs.length > 0) {
+            const pageConfig = globalContext._pageConfigs.find((p) => p.pageId === pageId);
             assert(pageConfig);
             usesClientRouter = getConfigValueRuntime(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
         }
         else {
-            usesClientRouter = globalContext.usesClientRouter;
+            usesClientRouter = globalContext._usesClientRouter;
         }
     }
     objectAssign(pageContext, { _usesClientRouter: usesClientRouter });
@@ -395,9 +397,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 = getHookFromPageConfigGlobal(globalContext.pageConfigGlobal, hookName);
+        const hook = getHookFromPageConfigGlobal(globalContext._pageConfigGlobal, hookName);
         if (hook) {
             assert(hook.hookName === 'onPrerenderStart');
             onPrerenderStartHook = {
@@ -409,9 +411,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 = getHookTimeoutDefault('onBeforePrerender');
-        const pageFilesWithOnBeforePrerenderHook = globalContext.pageFilesAll.filter((p) => {
+        const pageFilesWithOnBeforePrerenderHook = globalContext._pageFilesAll.filter((p) => {
             assertExportNames(p);
             if (!p.exportNames?.includes('onBeforePrerender'))
                 return false;
@@ -551,7 +553,7 @@ async function prerenderPages(prerenderContext, concurrencyLimit, onComplete) {
             pageContext,
             htmlString: documentHtml,
             pageContextSerialized,
-            doNotCreateExtraDirectory: prerenderContext.noExtraDir ?? pageContext.is404
+            doNotCreateExtraDirectory: prerenderContext._noExtraDir ?? pageContext.is404
         });
     })));
 }
@@ -568,16 +570,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) => !isErrorPage(pageId, globalContext.pageConfigs))
+        .filter((pageId) => !isErrorPage(pageId, globalContext._pageConfigs))
         .forEach((pageId) => {
         const pageAt = isV1 ? pageId : `\`${pageId}.page.*\``;
         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 });
@@ -730,7 +732,7 @@ function assertIsNotAbort(err, urlOriginal) {
     assertUsage(false, `${pc.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOriginal} but ${pc.cyan(abortCaller)} isn't supported for pre-rendered pages`);
 }
 function makePublic(prerenderContext) {
-    const prerenderContextPublic = makePublicCopy(prerenderContext, 'prerenderContext', [
+    const prerenderContextPublic = getPublicProxy(prerenderContext, 'prerenderContext', [
         'output', // vite-plugin-vercel
         'pageContexts' // https://vike.dev/i18n#pre-rendering
     ]);

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

@@ -13,6 +13,6 @@ export * from '../../utils/pLimit.js';
 export * from '../../utils/isFilePathAbsoluteFilesystem.js';
 export * from '../../utils/isArray.js';
 export * from '../../utils/isObject.js';
-export * from '../../utils/makePublicCopy.js';
+export * from '../../utils/getPublicProxy.js';
 export * from '../../utils/isNullish.js';
 export * from '../../utils/preservePropertyGetters.js';

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

@@ -15,6 +15,6 @@ export * from '../../utils/pLimit.js';
 export * from '../../utils/isFilePathAbsoluteFilesystem.js';
 export * from '../../utils/isArray.js';
 export * from '../../utils/isObject.js';
-export * from '../../utils/makePublicCopy.js';
+export * from '../../utils/getPublicProxy.js';
 export * from '../../utils/isNullish.js';
 export * from '../../utils/preservePropertyGetters.js';