vike 0.4.231 → 0.4.232-commit-134207d

package/dist/cjs/node/runtime/index-deprecated.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// TODO/soon: point package.json#exports['./server'] to this file.
+// TO-DO/soon: point package.json#exports['./server'] to this file.
 // - Write migration guide, see comment below.
 __exportStar(require("./index.js"), exports);
 const utils_js_1 = require("./utils.js");
@@ -26,8 +26,8 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
     'You have outdated imports:',
     picocolors_1.default.bold(picocolors_1.default.red("  import { something } from 'vike/server'")),
     'Replace them with:',
-    picocolors_1.default.bold(picocolors_1.default.green("  import { something } from 'vike'"))
-    /* Add migration guide, with migration scritps such as `$ rename vike/server vike`
+    picocolors_1.default.bold(picocolors_1.default.green("  import { something } from 'vike'")),
+    /* Add migration guide, with migration scripts such as `$ rename vike/server vike`
     `See ${pc.underline('https://vike.dev/migration/0.4.xxx')}`
     */
 ].join('\n'), { showStackTrace: true, onlyOnce: true });

package/dist/cjs/node/runtime/index.js

@@ -67,7 +67,7 @@ const RenderErrorPage = (...args) => {
         picocolors_1.default.red("  import { RenderErrorPage } from 'vike'"),
         'With:',
         picocolors_1.default.green("  import { render } from 'vike/abort'"),
-        'See https://vike.dev/render'
+        'See https://vike.dev/render',
     ].join('\n'), { onlyOnce: true, showStackTrace: true });
     return (0, abort_js_1.RenderErrorPage)(...args);
 };

package/dist/cjs/node/runtime/{renderPage/loggerRuntime.js → loggerRuntime.js}

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.logRuntimeInfo = exports.logRuntimeError = void 0;
 exports.overwriteRuntimeProductionLogger = overwriteRuntimeProductionLogger;
 exports.logRuntimeInfo = null; // logInfo is null in production
-const loggerProd_js_1 = require("./loggerProd.js");
+const loggerProd_js_1 = require("./renderPage/loggerProd.js");
 // Set production logger (which is overwritten by loggerNotProd.ts in non-production environments such as development and during pre-rendering)
 exports.logRuntimeError =
     // @ts-expect-error

package/dist/cjs/node/runtime/renderPage/analyzePage.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.analyzePage = analyzePage;
 const determineClientEntry_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide/determineClientEntry.js");
 const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const virtualFilePageConfigLazy_js_1 = require("../../shared/virtualFiles/virtualFilePageConfigLazy.js");
 const analyzeClientSide_js_1 = require("../../../shared/getPageFiles/analyzeClientSide.js");
 const getConfigValueRuntime_js_1 = require("../../../shared/page-configs/getConfigValueRuntime.js");
 async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
@@ -17,16 +17,16 @@ async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
             clientEntries.push((0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
-            id: (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageConfig.pageId, true),
+            id: (0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageConfig.pageId, true),
             onlyAssets: isClientRuntimeLoaded ? false : true,
-            eagerlyImported: false
+            eagerlyImported: false,
         });
         // In production we inject the import of the server virtual module with ?extractAssets inside the client virtual module
         if (!globalContext._isProduction) {
             clientDependencies.push({
-                id: (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageConfig.pageId, false),
+                id: (0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageConfig.pageId, false),
                 onlyAssets: true,
-                eagerlyImported: false
+                eagerlyImported: false,
             });
         }
         /* Remove?
@@ -50,7 +50,7 @@ async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
             clientDependencies.push({
                 id: clientEntry,
                 onlyAssets: false,
-                eagerlyImported: false
+                eagerlyImported: false,
             });
         });
         return {
@@ -60,7 +60,7 @@ async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
             clientDependencies,
             // pageFilesClientSide and pageFilesServerSide are only used for debugging
             pageFilesClientSide: [],
-            pageFilesServerSide: []
+            pageFilesServerSide: [],
         };
     }
     else {

package/dist/cjs/node/runtime/renderPage/assertArguments.js

@@ -12,7 +12,7 @@ function assertArguments(...args) {
     (0, utils_js_1.assertUsage)(pageContextInit !== undefined && pageContextInit !== null, prefix + ` argument ${picocolors_1.default.cyan('pageContextInit')} is missing`, { showStackTrace: true });
     const len = args.length;
     (0, utils_js_1.assertUsage)(len === 1, `${prefix} called with ${len} arguments but renderPage() accepts only one argument.'`, {
-        showStackTrace: true
+        showStackTrace: true,
     });
     (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(pageContextInit), `${prefix} called with ${picocolors_1.default.code(`typeof pageContextInit === ${JSON.stringify(typeof pageContextInit)}`)} but ${picocolors_1.default.code('pageContextInit')} should be an object.`, { showStackTrace: true });
     // TODO/v1-release: remove

package/dist/cjs/node/runtime/renderPage/createHttpResponse/assertNoInfiniteHttpRedirect.js

@@ -7,7 +7,7 @@ exports.assertNoInfiniteHttpRedirect = assertNoInfiniteHttpRedirect;
 const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const globalObject = (0, utils_js_1.getGlobalObject)('createHttpResponse/assertNoInfiniteHttpRedirect.ts', {
-    redirectGraph: {}
+    redirectGraph: {},
 });
 function assertNoInfiniteHttpRedirect(
 // The exact URL that the user will be redirected to.

package/dist/cjs/node/runtime/renderPage/createHttpResponse.js

@@ -16,7 +16,7 @@ const assertNoInfiniteHttpRedirect_js_1 = require("./createHttpResponse/assertNo
 async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     let statusCode = pageContext.abortStatusCode;
     if (!statusCode) {
-        const isError = !pageContext.pageId || (0, error_page_js_1.isErrorPage)(pageContext.pageId, pageContext._pageConfigs);
+        const isError = !pageContext.pageId || (0, error_page_js_1.isErrorPage)(pageContext.pageId, pageContext._globalContext._pageConfigs);
         if (pageContext.errorWhileRendering) {
             (0, utils_js_1.assert)(isError);
         }
@@ -31,14 +31,14 @@ async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     }
     const earlyHints = (0, getEarlyHints_js_1.getEarlyHints)(await pageContext.__getPageAssets());
     const headers = [];
-    const cacheControl = (0, getCacheControl_js_1.getCacheControl)(pageContext.pageId, pageContext._pageConfigs, statusCode);
+    const cacheControl = (0, getCacheControl_js_1.getCacheControl)(pageContext.pageId, pageContext._globalContext._pageConfigs, statusCode);
     if (cacheControl) {
         headers.push(['Cache-Control', cacheControl]);
     }
     return createHttpResponse(statusCode, 'text/html;charset=utf-8', headers, htmlRender, earlyHints, renderHook);
 }
 function createHttpResponse404(errMsg404) {
-    const httpResponse = createHttpResponse(404, 'text/html;charset=utf-8', [], `<p>${errMsg404}.</p><script>console.log('This HTTP response was generated by Vike.')</script>`);
+    const httpResponse = createHttpResponse(404, 'text/html;charset=utf-8', [], `<p>${errMsg404}.</p><script>console.log('This HTML was generated by Vike.')</script>`);
     return httpResponse;
 }
 function createHttpResponseBaseIsMissing(urlOriginal, baseServer) {
@@ -66,7 +66,7 @@ function createHttpResponseBaseIsMissing(urlOriginal, baseServer) {
 }
 function createHttpResponseError(pageContext) {
     const reason = (() => {
-        const errorPageId = (0, error_page_js_1.getErrorPageId)(pageContext._pageFilesAll, pageContext._pageConfigs);
+        const errorPageId = (0, error_page_js_1.getErrorPageId)(pageContext._globalContext._pageFilesAll, pageContext._globalContext._pageConfigs);
         if (errorPageId) {
             return "the error page (https://vike.dev/error-page) couldn't be rendered (for example if an error occurred while rendering the error page)";
         }
@@ -77,11 +77,10 @@ function createHttpResponseError(pageContext) {
     return createHttpResponseError_(reason);
 }
 function createHttpResponseErrorWithoutGlobalContext() {
-    const reason = 'no error page (https://vike.dev/error-page) could be rendered';
-    return createHttpResponseError_(reason);
+    return createHttpResponseError_('no error page (https://vike.dev/error-page) could be rendered');
 }
 function createHttpResponseError_(reason) {
-    const httpResponse = createHttpResponse(500, 'text/html;charset=utf-8', [], `<p>An error occurred.</p><script>console.log(${JSON.stringify(`This HTTP response was generated by Vike. Vike returned this response because ${reason}.`)})</script>`);
+    const httpResponse = createHttpResponse(500, 'text/html;charset=utf-8', [], `<p>An error occurred.</p><script>console.log(${JSON.stringify(`This HTML was generated by Vike. Vike returned this HTML because ${reason}.`)})</script>`);
     return httpResponse;
 }
 async function createHttpResponsePageContextJson(pageContextSerialized) {
@@ -97,7 +96,7 @@ function createHttpResponseRedirect({ url, statusCode }, pageContextInit) {
     return createHttpResponse(statusCode, 'text/html;charset=utf-8', 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 ${(0, utils_js_1.escapeHtml)(url)}</p><script>console.log('This HTTP response was generated by Vike.')</script>`);
+    `<p style="display: none">Redirecting to ${(0, utils_js_1.escapeHtml)(url)}</p><script>console.log('This HTML was generated by Vike.')</script>`);
 }
 function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints = [], renderHook = null) {
     headers.push(['Content-Type', contentType]);
@@ -114,6 +113,6 @@ function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyH
         get body() {
             return (0, getHttpResponseBody_js_1.getHttpResponseBody)(htmlRender, renderHook);
         },
-        ...(0, getHttpResponseBody_js_1.getHttpResponseBodyStreamHandlers)(htmlRender, renderHook)
+        ...(0, getHttpResponseBody_js_1.getHttpResponseBodyStreamHandlers)(htmlRender, renderHook),
     };
 }

package/dist/cjs/node/runtime/renderPage/createPageContextServerSide.js

@@ -7,30 +7,22 @@ const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUr
 const createPageContextShared_js_1 = require("../../../shared/createPageContextShared.js");
 async function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
     urlHandler: null,
-    isClientSideNavigation: false
-} }) {
+    isClientSideNavigation: false,
+}, }) {
     (0, utils_js_1.assert)(pageContextInit.urlOriginal);
     const pageContextCreated = createPageContext(pageContextInit, isPrerendering);
     (0, utils_js_1.objectAssign)(pageContextCreated, {
         _globalContext: globalContext,
-        // The following is defined on `pageContext` because we can eventually make these non-global
+        _pageFilesAll: globalContext._pageFilesAll, // TODO/v1-release: remove
+        // We use pageContext._baseServer and pageContext._baseAssets instead of pageContext._globalContext.baseServer and pageContext._globalContext.baseAssets because the Base URLs can (eventually one day if needed) be made non-global
         _baseServer: globalContext.baseServer,
         _baseAssets: globalContext.baseAssets,
-        // TODO/now: add meta.default
-        _includeAssetsImportedByServer: globalContext.config.includeAssetsImportedByServer ?? true,
-        // TODO/soon: use GloablContext instead
-        _pageFilesAll: globalContext._pageFilesAll,
-        _pageConfigs: globalContext._pageConfigs,
-        _pageConfigGlobal: globalContext._pageConfigGlobal,
-        _allPageIds: globalContext._allPageIds,
-        _pageRoutes: globalContext._pageRoutes,
-        _onBeforeRouteHook: globalContext._onBeforeRouteHook,
         _pageContextInit: pageContextInit,
         _urlRewrite: null,
         _urlHandler: urlHandler,
-        isClientSideNavigation
+        isClientSideNavigation,
     });
-    (0, utils_js_1.objectAssign)(pageContextCreated, globalContext._userFriendlyConfigsGlobal);
+    (0, utils_js_1.objectAssign)(pageContextCreated, globalContext._vikeConfigPublicGlobal);
     // pageContext.urlParsed
     const pageContextUrlComputed = (0, getPageContextUrlComputed_js_1.getPageContextUrlComputed)(pageContextCreated);
     (0, utils_js_1.objectAssign)(pageContextCreated, pageContextUrlComputed);
@@ -51,7 +43,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
         }
         (0, utils_js_1.objectAssign)(pageContextCreated, { headers });
     }
-    const pageContextAugmented = await (0, createPageContextShared_js_1.createPageContextShared)(pageContextCreated, globalContext._pageConfigGlobal, globalContext._userFriendlyConfigsGlobal);
+    const pageContextAugmented = await (0, createPageContextShared_js_1.createPageContextShared)(pageContextCreated, globalContext._pageConfigGlobal, globalContext._vikeConfigPublicGlobal);
     (0, utils_js_1.augmentType)(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }
@@ -63,7 +55,7 @@ function createPageContext(pageContextInit, isPrerendering) {
     const pageContext = (0, createPageContextShared_js_1.createPageContextObject)();
     (0, utils_js_1.objectAssign)(pageContext, {
         isClientSide: false,
-        isPrerendering
+        isPrerendering,
     });
     (0, utils_js_1.objectAssign)(pageContext, pageContextInit);
     return pageContext;

package/dist/cjs/node/runtime/renderPage/debugPageFiles.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.debugPageFiles = debugPageFiles;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../utils.js");
-function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, pageFilesLoaded, pageFilesServerSide, pageFilesClientSide, clientEntries, clientDependencies }) {
+function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, pageFilesLoaded, pageFilesServerSide, pageFilesClientSide, clientEntries, clientDependencies, }) {
     const debug = (0, utils_js_1.createDebugger)('vike:pageFiles', { serialization: { emptyArray: 'None' } });
     const padding = '   - ';
-    debug('All page files:', printPageFiles(pageContext._pageFilesAll, true)); // TODO
+    debug('All page files:', printPageFiles(pageContext._globalContext._pageFilesAll, true));
     debug(`URL:`, pageContext.urlOriginal);
     debug.options({ serialization: { emptyArray: 'No match' } })(`Routing:`, printRouteMatches(pageContext._debugRouteMatches));
     debug(`pageId:`, pageContext.pageId);

package/dist/cjs/node/runtime/renderPage/execHookServer.js

@@ -4,8 +4,5 @@ exports.execHookServer = execHookServer;
 const execHook_js_1 = require("../../../shared/hooks/execHook.js");
 const preparePageContextForPublicUsageServer_js_1 = require("./preparePageContextForPublicUsageServer.js");
 async function execHookServer(hookName, pageContext) {
-    return await (0, execHook_js_1.execHook)(hookName, pageContext, (p) => {
-        (0, preparePageContextForPublicUsageServer_js_1.preparePageContextForPublicUsageServer)(p);
-        return p;
-    });
+    return await (0, execHook_js_1.execHook)(hookName, pageContext, preparePageContextForPublicUsageServer_js_1.preparePageContextForPublicUsageServer);
 }

package/dist/cjs/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.js

@@ -12,7 +12,7 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
     if (dataHook) {
         // Note: hookReturn can be anything (e.g. an object) and is to be assigned to pageContext.data
         const pageContextFromHook = {
-            data: dataHook.hookReturn
+            data: dataHook.hookReturn,
         };
         Object.assign(pageContext, pageContextFromHook);
         // Execute +onData

package/dist/cjs/node/runtime/renderPage/executeOnRenderHtmlHook.js

@@ -11,7 +11,7 @@ const stream_js_1 = require("../html/stream.js");
 const assertPageContextProvidedByUser_js_1 = require("../../../shared/assertPageContextProvidedByUser.js");
 const preparePageContextForPublicUsageServer_js_1 = require("./preparePageContextForPublicUsageServer.js");
 const assertHookReturnedObject_js_1 = require("../../../shared/assertHookReturnedObject.js");
-const loggerRuntime_js_1 = require("./loggerRuntime.js");
+const loggerRuntime_js_1 = require("../loggerRuntime.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const execHook_js_1 = require("../../../shared/hooks/execHook.js");
 async function executeOnRenderHtmlHook(pageContext) {
@@ -57,9 +57,9 @@ function getRenderHook(pageContext) {
         }
     }
     if (!hookFound) {
-        const hookName = pageContext._pageConfigs.length > 0 ? 'onRenderHtml' : 'render';
+        const hookName = pageContext._globalContext._pageConfigs.length > 0 ? 'onRenderHtml' : 'render';
         (0, utils_js_1.assertUsage)(false, [
-            `No ${hookName}() hook found, see https://vike.dev/${hookName}`
+            `No ${hookName}() hook found, see https://vike.dev/${hookName}`,
             /*
             'See https://vike.dev/render-modes for more information.',
             [
@@ -87,7 +87,7 @@ function processHookReturnValue(hookReturnValue, renderHook) {
         (0, utils_js_1.assertWarning)(false, [
             errPrefix,
             `returned a plain JavaScript string which is ${picocolors_1.default.red(picocolors_1.default.bold('dangerous'))}: it should instead return`,
-            errSuffix
+            errSuffix,
         ].join(' '), { onlyOnce: true });
         hookReturnValue = (0, renderHtml_js_1.dangerouslySkipEscape)(hookReturnValue);
     }
@@ -106,7 +106,7 @@ function processHookReturnValue(hookReturnValue, renderHook) {
             (0, utils_js_1.assertWarning)(false, [
                 errBegin,
                 `is a plain JavaScript string which is ${picocolors_1.default.bold(picocolors_1.default.red('dangerous'))}: ${picocolors_1.default.cyan('documentHtml')} should be`,
-                errSuffix
+                errSuffix,
             ].join(' '), { onlyOnce: true });
             val = (0, renderHtml_js_1.dangerouslySkipEscape)(val);
         }

package/dist/cjs/node/runtime/renderPage/getEarlyHints.js

@@ -12,7 +12,7 @@ function getEarlyHints(assets) {
                 return;
             earlyHints.push({
                 ...asset,
-                earlyHintLink: (0, inferHtmlTags_js_1.inferEarlyHintLink)(asset)
+                earlyHintLink: (0, inferHtmlTags_js_1.inferEarlyHintLink)(asset),
             });
         });
     }

package/dist/cjs/node/runtime/renderPage/getHttpResponseBody.js

@@ -98,7 +98,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             if (!success) {
                 (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'pipeToNodeWritable()'));
             }
-        }
+        },
     };
     function getFixMsg(kind, type) {
         const streamName = (0, stream_js_1.getStreamName)(kind, type);

package/dist/cjs/node/runtime/renderPage/getPageAssets/getManifestEntry.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getManifestEntry = getManifestEntry;
 const utils_js_1 = require("../../utils.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
 const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
 function getManifestEntry(id, assetsManifest) {
     const debugInfo = getDebugInfo(id, assetsManifest);
@@ -14,7 +14,7 @@ function getManifestEntry(id, assetsManifest) {
         return { manifestEntry, manifestKey };
     }
     // Page code importer
-    if ((0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id)) {
+    if ((0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(id)) {
         {
             const manifestKey = id;
             const manifestEntry = assetsManifest[manifestKey];
@@ -24,10 +24,10 @@ function getManifestEntry(id, assetsManifest) {
         }
         // Workaround for what seems to be a Vite bug when process.cwd() !== config.root
         //  - Manifest key is:
-        //       ../../virtual:vike:pageConfigValuesAll:client:/pages/index
+        //       ../../virtual:vike:pageConfigLazy:client:/pages/index
         //    But it should be this instead:
-        //      virtual:vike:pageConfigValuesAll:client:/pages/index
-        //  - This workaround was implemented to support Vitest runnung /tests/*
+        //      virtual:vike:pageConfigLazy:client:/pages/index
+        //  - This workaround was implemented to support Vitest running /tests/*
         //    - I don't know whether end users actually need this workaround? (I'm not sure what the bug actually is.)
         const manifestKeyEnd = id;
         const { manifestKey, manifestEntry } = getEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);

package/dist/cjs/node/runtime/renderPage/getPageAssets/retrieveAssetsProd.js

@@ -18,7 +18,7 @@ function retrieveAssetsProd(clientDependencies, assetsManifest, includeAssetsImp
             // We assume that all npm packages have already built their files: bundlers (Rollup, esbuild, tsup, ...) extract the CSS out of JavaScript => we can assume JavaScript to not import any CSS/assets.
             !(0, utils_js_1.isImportPathNpmPackage)(id, {
                 // I presume Vite already resolves path aliases when Vite sets the module's id
-                cannotBePathAlias: true
+                cannotBePathAlias: true,
             })) {
             id = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(id);
         }

package/dist/cjs/node/runtime/renderPage/getPageAssets.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPageAssets = getPageAssets;
 exports.setResolveClientEntriesDev = setResolveClientEntriesDev;
+exports.resolveIncludeAssetsImportedByServer = resolveIncludeAssetsImportedByServer;
 const utils_js_1 = require("../utils.js");
 const retrieveAssetsDev_js_1 = require("./getPageAssets/retrieveAssetsDev.js");
 const retrieveAssetsProd_js_1 = require("./getPageAssets/retrieveAssetsProd.js");
@@ -9,7 +10,7 @@ const inferMediaType_js_1 = require("./inferMediaType.js");
 const getManifestEntry_js_1 = require("./getPageAssets/getManifestEntry.js");
 const sortPageAssetsForEarlyHintsHeader_js_1 = require("./getPageAssets/sortPageAssetsForEarlyHintsHeader.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('renderPage/getPageAssets.ts', {
-    resolveClientEntriesDev: null
+    resolveClientEntriesDev: null,
 });
 async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = pageContext._globalContext;
@@ -25,7 +26,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     else {
         const { assetsManifest } = globalContext;
         clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
-        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, assetsManifest, pageContext._includeAssetsImportedByServer);
+        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, assetsManifest, resolveIncludeAssetsImportedByServer(pageContext._globalContext.config));
     }
     let pageAssets = [];
     (0, utils_js_1.unique)([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
@@ -46,7 +47,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
             src,
             assetType,
             mediaType,
-            isEntry
+            isEntry,
         });
     });
     pageAssets.forEach(({ src }) => {
@@ -70,3 +71,6 @@ function resolveClientEntriesProd(clientEntry, assetsManifest) {
 function setResolveClientEntriesDev(resolveClientEntriesDev) {
     globalObject.resolveClientEntriesDev = resolveClientEntriesDev;
 }
+function resolveIncludeAssetsImportedByServer(config) {
+    return config.includeAssetsImportedByServer ?? true;
+}

package/dist/cjs/node/runtime/renderPage/handleErrorWithoutErrorPage.js

@@ -13,7 +13,7 @@ async function handleErrorWithoutErrorPage(pageContext) {
     (0, utils_js_1.assert)(pageContext.pageId === null);
     (0, utils_js_1.assert)(pageContext.errorWhileRendering || pageContext.is404);
     {
-        const isV1 = pageContext._pageConfigs.length > 0;
+        const isV1 = pageContext._globalContext._pageConfigs.length > 0;
         await warnMissingErrorPage(isV1, pageContext._globalContext._isProduction);
     }
     if (!pageContext.isClientSideNavigation) {
@@ -34,7 +34,7 @@ async function warnMissingErrorPage(isV1, isProduction) {
         const msg = [
             `No ${isV1 ? 'error page' : picocolors_1.default.cyan('_error.page.js')} found,`,
             'we recommend defining one',
-            'https://vike.dev/error-page'
+            'https://vike.dev/error-page',
         ].join(' ');
         (0, utils_js_1.assertWarning)(false, msg, { onlyOnce: true });
     }

package/dist/cjs/node/runtime/renderPage/handlePageContextRequestUrl.js

@@ -13,7 +13,7 @@ function handlePageContextRequestUrl(url) {
 function hasSuffix(url) {
     const { pathnameOriginal, pathname } = (0, utils_js_1.parseUrl)(url, utils_js_1.baseServer);
     (0, utils_js_1.assert)(pathnameOriginal.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension) === pathname.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension), {
-        url
+        url,
     });
     return pathnameOriginal.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension);
 }

package/dist/cjs/node/runtime/renderPage/isFontFallback.js

@@ -6,12 +6,12 @@ function isFontFallback(asset, pageAssets) {
     if (asset.assetType !== 'font') {
         return false;
     }
-    const fontUrlBase = removeFileExtentionAndHash(asset.src);
+    const fontUrlBase = removeFileExtensionAndHash(asset.src);
     return pageAssets.some((assetOther) => {
-        return assetOther.assetType === 'font' && removeFileExtentionAndHash(assetOther.src) === fontUrlBase;
+        return assetOther.assetType === 'font' && removeFileExtensionAndHash(assetOther.src) === fontUrlBase;
     });
 }
-function removeFileExtentionAndHash(assetUrl) {
+function removeFileExtensionAndHash(assetUrl) {
     (0, assert_js_1.assert)(!assetUrl.includes('\\'));
     // The logic below doesn't work for '/assets/chunk-0e184ced.js'
     (0, assert_js_1.assert)(!assetUrl.endsWith('.js'));

package/dist/cjs/node/runtime/renderPage/isNewError.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNewError = isNewError;
 exports.setAlreadyLogged = setAlreadyLogged;
+exports.hasAlreadyLogged = hasAlreadyLogged;
 const utils_js_1 = require("../utils.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('renderPage/isNewError.ts', {
-    wasAlreadyLogged: new WeakSet()
+    wasAlreadyLogged: new WeakSet(),
 });
 function isNewError(errErrorPage, errNominalPage) {
     (0, utils_js_1.warnIfErrorIsNotObject)(errErrorPage);

package/dist/cjs/node/runtime/renderPage/loadPageConfigsLazyServerSide.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPageConfigsLazyServerSide = loadPageConfigsLazyServerSide;
 const getPageFiles_js_1 = require("../../../shared/getPageFiles.js");
-const getUserFriendlyConfigs_js_1 = require("../../../shared/page-configs/getUserFriendlyConfigs.js");
+const resolveVikeConfigPublic_js_1 = require("../../../shared/page-configs/resolveVikeConfigPublic.js");
 const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide.js");
 const utils_js_1 = require("../utils.js");
 const getPageAssets_js_1 = require("./getPageAssets.js");
@@ -11,13 +11,15 @@ const findPageConfig_js_1 = require("../../../shared/page-configs/findPageConfig
 const analyzePage_js_1 = require("./analyzePage.js");
 const loadConfigValues_js_1 = require("../../../shared/page-configs/loadConfigValues.js");
 async function loadPageConfigsLazyServerSide(pageContext) {
-    const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
+    const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._globalContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig ?
     const globalContext = pageContext._globalContext;
     const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
-        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
-        (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._pageFilesAll, pageContext.pageId, { sharedPageFilesAlreadyLoaded: true })
+        loadPageUserFiles(pageContext._globalContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
+        (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._globalContext._pageFilesAll, pageContext.pageId, {
+            sharedPageFilesAlreadyLoaded: true,
+        }),
     ]);
-    const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
+    const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._globalContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
     const isV1Design = !!pageConfig;
     const passToClient = [];
     const errMsg = ' should be an array of strings.';
@@ -43,7 +45,7 @@ async function loadPageConfigsLazyServerSide(pageContext) {
         Page: pageContextExports.exports.Page,
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
-        _pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath)
+        _pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath),
     });
     (0, utils_js_1.objectAssign)(pageContextAddendum, {
         __getPageAssets: async () => {
@@ -55,14 +57,14 @@ async function loadPageConfigsLazyServerSide(pageContext) {
                 (0, utils_js_1.objectAssign)(pageContext, { _pageAssets: pageAssets });
                 return pageContext._pageAssets;
             }
-        }
+        },
     });
     // TODO/v1-release: remove
     Object.assign(pageContextAddendum, {
         _getPageAssets: async () => {
             (0, utils_js_1.assertWarning)(false, 'pageContext._getPageAssets() deprecated, see https://vike.dev/preloading', {
                 onlyOnce: true,
-                showStackTrace: true
+                showStackTrace: true,
             });
             const pageAssetsOldFormat = [];
             (await pageContextAddendum.__getPageAssets()).forEach((p) => {
@@ -71,18 +73,18 @@ async function loadPageConfigsLazyServerSide(pageContext) {
                         src: p.src,
                         preloadType: null,
                         assetType: 'script',
-                        mediaType: p.mediaType
+                        mediaType: p.mediaType,
                     });
                 }
                 pageAssetsOldFormat.push({
                     src: p.src,
                     preloadType: p.assetType,
                     assetType: p.assetType === 'style' ? 'style' : 'preload',
-                    mediaType: p.mediaType
+                    mediaType: p.mediaType,
                 });
             });
             return pageAssetsOldFormat;
-        }
+        },
     });
     {
         (0, debugPageFiles_js_1.debugPageFiles)({
@@ -93,7 +95,7 @@ async function loadPageConfigsLazyServerSide(pageContext) {
             pageFilesClientSide,
             pageFilesServerSide,
             clientEntries,
-            clientDependencies
+            clientDependencies,
         });
     }
     return pageContextAddendum;
@@ -102,9 +104,9 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pag
     const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = (0, getUserFriendlyConfigs_js_1.getUserFriendlyConfigsPageLazy)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageLazy)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
         pageContextExports,
-        pageFilesLoaded: pageFilesServerSide
+        pageFilesLoaded: pageFilesServerSide,
     };
 }

package/dist/cjs/node/runtime/renderPage/log404/index.js

@@ -10,12 +10,8 @@ const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 async function log404(pageContext) {
     const { urlPathname } = pageContext;
-    const pageRoutes = pageContext._pageRoutes;
-    (0, utils_js_1.assertUsage)(pageRoutes.length > 0, 'No page found.'
-    /* TODO/v1-release: use this
-    'No page found. Create at least one /pages/some-page/+Page.js file.'
-    */
-    );
+    const pageRoutes = pageContext._globalContext._pageRoutes;
+    (0, utils_js_1.assertUsage)(pageRoutes.length > 0, 'No page found.');
     const globalContext = pageContext._globalContext;
     if (!globalContext._isProduction && !isFileRequest(urlPathname) && !pageContext.isClientSideNavigation) {
         const routesInfo = getRoutesInfo(pageRoutes);
@@ -72,9 +68,9 @@ function getRoutesInfo(pageRoutes) {
         {
             routeStr: 'ROUTE',
             routeTypeSrc: 'TYPE',
-            routeDefinedBy: 'DEFINED BY'
+            routeDefinedBy: 'DEFINED BY',
         },
-        ...entries
+        ...entries,
     ];
     const terminalWidth = (0, utils_js_1.getTerminalWidth)() || 134;
     let width2 = Math.max(...linesContent.map(({ routeTypeSrc }) => (0, utils_js_1.stripAnsi)(routeTypeSrc).length));
@@ -120,7 +116,7 @@ function getRoutesInfo(pageRoutes) {
         lines[0],
         picocolors_1.default.dim(`├${'─'.repeat(width1)}┼${'─'.repeat(width2)}┼${'─'.repeat(width3)}┤`),
         ...lines.slice(1),
-        picocolors_1.default.dim(`└${'─'.repeat(width1)}┴${'─'.repeat(width2)}┴${'─'.repeat(width3)}┘`)
+        picocolors_1.default.dim(`└${'─'.repeat(width1)}┴${'─'.repeat(width2)}┴${'─'.repeat(width3)}┘`),
     ];
     lines.forEach((line) => {
         (0, utils_js_1.assert)((0, utils_js_1.stripAnsi)(line).length <= terminalWidth);

package/dist/cjs/node/runtime/renderPage/logErrorHint/errors.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.errror_cannot_use_import_outside_of_module = void 0;
+exports.error_cannot_use_import_outside_of_module = void 0;
 // https://github.com/vikejs/vike/discussions/571#discussioncomment-6137618
-exports.errror_cannot_use_import_outside_of_module = `
+exports.error_cannot_use_import_outside_of_module = `
 import{useRunner as e}from"react-runner";export*from"react-runner";import t,{useState as r,useEffect as n,Fragment as a,useCallback as l,useRef as o,useMemo as c,createContext as s,useContext as i}from"react";import p from"react-simple-code-editor";import m,{Prism as u}from"prism-react-renderer";function g(){return g=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e},g.apply(this,arguments)}function y(e,t){if(null==e)return{};var r,n,a={},l=Object.keys(e);for(n=0;n<l.length;n++)t.indexOf(r=l[n])>=0||(a[r]=e[r]);return a}const d=["initialCode","transformCode"],h=t=>{let{initialCode:a="",transformCode:l}=t,o=y(t,d);const[c,s]=r(a),{element:i,error:p}=e(g({code:l?l(c):c},o));return n(()=>{s(a)},[a]),{element:i,error:p,code:c,onChange:s}},f={plain:{color:"#ffffff",backgroundColor:"#282c34"},styles:[{types:["comment","block-comment","prolog","doctype","cdata"],style:{color:"#b2b2b2"}},{types:["property","number","function-name","constant","symbol","deleted"],style:{color:"#5a9bcf"}},{types:["boolean"],style:{color:"#ff8b50"}},{types:["tag"],style:{color:"#fc929e"}},{types:["string","attr-value"],style:{color:"#8dc891"}},{types:["punctuation"],style:{color:"#88c6Be"}},{types:["selector","char","builtin","inserted"],style:{color:"#d8dee9"}},{types:["function"],style:{color:"#79b6f2"}},{types:["operator","entity","url","variable"],style:{color:"#d7deea"}},{types:["keyword"],style:{color:"#c5a5c5"}},{types:["atrule","class-name"],style:{color:"#fac863"}},{types:["important"],style:{fontWeight:"400"}},{types:["bold"],style:{fontWeight:"700"}},{types:["italic"],style:{fontStyle:"italic"}},{types:["entity"],style:{cursor:"help"}},{types:["namespace"],style:{opacity:.7}}]},b=["children","language","theme","Prism","padding","noWrapper","noWrap","className","style"],C=e=>{let{children:r,language:n="jsx",theme:l=f,Prism:o=u,padding:c=10,noWrapper:s,noWrap:i,className:p,style:d}=e,h=y(e,b);/*#__PURE__*/return t.createElement(m,{code:r||"",language:n,Prism:o,theme:l},({className:e,style:r,tokens:n,getLineProps:l,getTokenProps:o})=>{const m=n.map((e,r)=>/*#__PURE__*/t.createElement(a,{key:r},/*#__PURE__*/t.createElement("span",l({line:e}),e.map((e,r)=>/*#__PURE__*/t.createElement("span",o({token:e,key:r})))),"\\n"));return s?m:/*#__PURE__*/t.createElement("pre",g({className:p?:e,style:g({},r,{margin:0,padding:c,whiteSpace:i?"pre":"pre-wrap"},d)},h),m)})},v=["defaultValue","value","language","theme","Prism","highlight","padding","onChange"],E=e=>{let{defaultValue:n,value:a,language:s="jsx",theme:i=f,Prism:m,highlight:u,padding:d=10,onChange:h}=e,b=y(e,v);const[E,P]=r(n||""),k=void 0!==a,W=l(e=>/*#__PURE__*/t.createElement(C,{language:s,theme:i,Prism:m,noWrapper:!0},e),[s,i,m]),j=o(h);j.current=h;const x=l(e=>{k||P(e),null==j.current||j.current(e)},[k]),O=c(()=>g({},i.plain,b.style),[i.plain,b.style]);/*#__PURE__*/return t.createElement(p,g({},b,{highlight:u||W,padding:d,value:k?a:E,onValueChange:x,style:O}))},P=s({}),k=()=>i(P),W=["children","code","language","theme"],j=e=>{let{children:r,code:n="",language:a="jsx",theme:l=f}=e,o=y(e,W);const{element:c,error:s,code:i,onChange:p}=h(g({initialCode:n},o));/*#__PURE__*/return t.createElement(P.Provider,{value:{element:c,error:s,code:i,onChange:p,language:a,theme:l}},r)},x=e=>{const{code:r,language:n,theme:a,onChange:l}=k();/*#__PURE__*/return t.createElement(E,g({value:r,language:n,theme:a,onChange:l},e))},O=["Component"],w=e=>{let{Component:r="div"}=e,n=y(e,O);const{element:a}=k();/*#__PURE__*/return t.createElement(r,n,a)},N=e=>{const{error:r}=k();return r?/*#__PURE__*/t.createElement("pre",e,r):/*#__PURE__*/t.createElement(t.Fragment,null)};export{C as CodeBlock,E as CodeEditor,P as LiveContext,x as LiveEditor,N as LiveError,w as LivePreview,j as LiveProvider,f as defaultTheme,k as useLiveContext,h as useLiveRunner};
 ^^^^^^