vike 0.4.220 → 0.4.221-commit-8577456

package/dist/cjs/node/runtime/html/renderHtml.js

@@ -12,7 +12,6 @@ const utils_js_1 = require("../utils.js");
 const injectAssets_js_1 = require("./injectAssets.js");
 const stream_js_1 = require("./stream.js");
 const react_streaming_js_1 = require("./stream/react-streaming.js");
-const globalContext_js_1 = require("../globalContext.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 function isDocumentHtml(something) {
     if (isTemplateWrapped(something) || isEscapedString(something) || (0, stream_js_1.isStream)(something)) {
@@ -36,7 +35,7 @@ async function renderDocumentHtml(documentHtml, pageContext, onErrorWhileStreami
     }
     if (isTemplateWrapped(documentHtml)) {
         const templateContent = documentHtml._template;
-        const render = await renderTemplate(templateContent, pageContext);
+        const render = renderTemplate(templateContent, pageContext);
         if (!('htmlStream' in render)) {
             (0, utils_js_1.objectAssign)(pageContext, { _isStream: false });
             const { htmlPartsAll } = render;
@@ -125,7 +124,7 @@ function _dangerouslySkipEscape(arg) {
     });
     return { _escaped: String(arg) };
 }
-async function renderTemplate(templateContent, pageContext) {
+function renderTemplate(templateContent, pageContext) {
     const htmlPartsBegin = [];
     const htmlPartsEnd = [];
     let htmlStream = null;
@@ -156,7 +155,7 @@ async function renderTemplate(templateContent, pageContext) {
         // Process `escapeInject` fragments
         if (isTemplateWrapped(templateVar)) {
             const templateContentInner = templateVar._template;
-            const result = await renderTemplate(templateContentInner, pageContext);
+            const result = renderTemplate(templateContentInner, pageContext);
             if (!('htmlStream' in result)) {
                 result.htmlPartsAll.forEach(addHtmlPart);
             }
@@ -198,7 +197,7 @@ async function renderTemplate(templateContent, pageContext) {
             }
         }
         {
-            const { isProduction } = (0, globalContext_js_1.getGlobalContext)();
+            const { isProduction } = pageContext._globalContext;
             if ((0, utils_js_1.isHtml)(templateVar) &&
                 // We don't show this warning in production because it's expected that some users may (un)willingly do some XSS injection: we avoid flooding the production logs.
                 !isProduction) {

package/dist/cjs/node/runtime/page-files/setup.js

@@ -1,3 +1,3 @@
 "use strict";
-// TODO/v1-release: remove
+// TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
 // This doesn't do anything anymore. (It's kept to avoid introducing a breaking change.)

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

@@ -5,9 +5,8 @@ const determineClientEntry_js_1 = require("../../../shared/getPageFiles/analyzeP
 const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const analyzeClientSide_js_1 = require("../../../shared/getPageFiles/analyzeClientSide.js");
-const globalContext_js_1 = require("../globalContext.js");
 const getConfigValueRuntime_js_1 = require("../../../shared/page-configs/getConfigValueRuntime.js");
-function analyzePage(pageFilesAll, pageConfig, pageId) {
+async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
     if (pageConfig) {
         const { isClientRuntimeLoaded, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
         const clientEntries = [];
@@ -23,7 +22,7 @@ function analyzePage(pageFilesAll, pageConfig, pageId) {
             eagerlyImported: false
         });
         // In production we inject the import of the server virtual module with ?extractAssets inside the client virtual module
-        if (!(0, globalContext_js_1.getGlobalContext)().isProduction) {
+        if (!globalContext.isProduction) {
             clientDependencies.push({
                 id: (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageConfig.pageId, false),
                 onlyAssets: true,

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

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEarlyHints = getEarlyHints;
+const isFontFallback_js_1 = require("./isFontFallback.js");
 const inferHtmlTags_js_1 = require("../html/injectAssets/inferHtmlTags.js");
-const utils_js_1 = require("../utils.js");
 function getEarlyHints(assets) {
     const earlyHints = [];
     {
         assets.forEach((asset) => {
             // Don't early hint fallback fonts, https://github.com/vikejs/vike/issues/624
-            if (isFontFallback(asset, earlyHints))
+            if ((0, isFontFallback_js_1.isFontFallback)(asset, earlyHints))
                 return;
             earlyHints.push({
                 ...asset,
@@ -18,28 +18,3 @@ function getEarlyHints(assets) {
     }
     return earlyHints;
 }
-function isFontFallback(asset, earlyHints) {
-    if (asset.assetType !== 'font') {
-        return false;
-    }
-    const fontUrlBase = removeFileExtentionAndHash(asset.src);
-    return earlyHints.some((hint) => {
-        return hint.assetType === 'font' && removeFileExtentionAndHash(hint.src) === fontUrlBase;
-    });
-}
-function removeFileExtentionAndHash(assetUrl) {
-    (0, utils_js_1.assert)(!assetUrl.includes('\\'));
-    // The logic below doesn't work for '/assets/chunk-0e184ced.js'
-    (0, utils_js_1.assert)(!assetUrl.endsWith('.js'));
-    const paths = assetUrl.split('/');
-    {
-        const filename = paths[paths.length - 1];
-        const filenameParts = filename.split('.');
-        (0, utils_js_1.assert)(filenameParts.length >= 2);
-        // User may set config.build.rollupOptions.output.assetFileNames => we can't assume the filename to be `*.${hash}.${ext}`
-        const filenameBase = filenameParts.slice(0, filenameParts.length === 2 ? -1 : -2);
-        (0, utils_js_1.assert)(filenameBase.length >= 1);
-        paths[paths.length - 1] = filenameBase.join('.');
-    }
-    return paths.join('/');
-}

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

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sortPageAssetsForEarlyHintsHeader = sortPageAssetsForEarlyHintsHeader;
-const globalContext_js_1 = require("../../globalContext.js");
 const utils_js_1 = require("../../utils.js");
-function sortPageAssetsForEarlyHintsHeader(pageAssets) {
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+async function sortPageAssetsForEarlyHintsHeader(pageAssets, isProduction) {
     pageAssets.sort((0, utils_js_1.higherFirst)(({ assetType }) => {
         // In dev, we load scripts first in order to parallelize I/O and CPU
-        if (!globalContext.isProduction && assetType === 'script') {
+        if (!isProduction && assetType === 'script') {
             return 1;
         }
         let priority = 0;

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

@@ -8,13 +8,13 @@ const retrieveAssetsProd_js_1 = require("./getPageAssets/retrieveAssetsProd.js")
 const inferMediaType_js_1 = require("./inferMediaType.js");
 const getManifestEntry_js_1 = require("./getPageAssets/getManifestEntry.js");
 const sortPageAssetsForEarlyHintsHeader_js_1 = require("./getPageAssets/sortPageAssetsForEarlyHintsHeader.js");
-const globalContext_js_1 = require("../globalContext.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('getPageAssets.ts', {
     resolveClientEntriesDev: null
 });
 async function getPageAssets(pageContext, clientDependencies, clientEntries) {
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
-    const isDev = !globalContext.isProduction;
+    const globalContext = pageContext._globalContext;
+    const { isProduction } = globalContext;
+    const isDev = !isProduction;
     let assetUrls;
     let clientEntriesSrc;
     if (isDev) {
@@ -57,7 +57,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
         pageAsset.src = (0, utils_js_1.prependBase)((0, utils_js_1.toPosixPath)(pageAsset.src), baseServerAssets);
         return pageAsset;
     });
-    (0, sortPageAssetsForEarlyHintsHeader_js_1.sortPageAssetsForEarlyHintsHeader)(pageAssets);
+    await (0, sortPageAssetsForEarlyHintsHeader_js_1.sortPageAssetsForEarlyHintsHeader)(pageAssets, isProduction);
     return pageAssets;
 }
 function resolveClientEntriesProd(clientEntry, assetsManifest) {

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

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleErrorWithoutErrorPage = handleErrorWithoutErrorPage;
 const stringify_1 = require("@brillout/json-serializer/stringify");
-const globalContext_js_1 = require("../globalContext.js");
 const utils_js_1 = require("../utils.js");
 const createHttpResponse_js_1 = require("./createHttpResponse.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
@@ -15,7 +14,7 @@ async function handleErrorWithoutErrorPage(pageContext) {
     (0, utils_js_1.assert)(pageContext.errorWhileRendering || pageContext.is404);
     {
         const isV1 = pageContext._pageConfigs.length > 0;
-        warnMissingErrorPage(isV1);
+        await warnMissingErrorPage(isV1, pageContext._globalContext.isProduction);
     }
     if (!pageContext.isClientSideNavigation) {
         const httpResponse = (0, createHttpResponse_js_1.createHttpResponseError)(pageContext);
@@ -30,9 +29,8 @@ async function handleErrorWithoutErrorPage(pageContext) {
         return pageContext;
     }
 }
-function warnMissingErrorPage(isV1) {
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
-    if (!globalContext.isProduction) {
+async function warnMissingErrorPage(isV1, isProduction) {
+    if (!isProduction) {
         const msg = [
             `No ${isV1 ? 'error page' : picocolors_1.default.cyan('_error.page.js')} found,`,
             'we recommend defining one',

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

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isFontFallback = isFontFallback;
+const assert_js_1 = require("../../../utils/assert.js");
+function isFontFallback(asset, pageAssets) {
+    if (asset.assetType !== 'font') {
+        return false;
+    }
+    const fontUrlBase = removeFileExtentionAndHash(asset.src);
+    return pageAssets.some((assetOther) => {
+        return assetOther.assetType === 'font' && removeFileExtentionAndHash(assetOther.src) === fontUrlBase;
+    });
+}
+function removeFileExtentionAndHash(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'));
+    const paths = assetUrl.split('/');
+    {
+        const filename = paths[paths.length - 1];
+        const filenameParts = filename.split('.');
+        (0, assert_js_1.assert)(filenameParts.length >= 2);
+        // User may set config.build.rollupOptions.output.assetFileNames => we can't assume the filename to be `*.${hash}.${ext}`
+        const filenameBase = filenameParts.slice(0, filenameParts.length === 2 ? -1 : -2);
+        (0, assert_js_1.assert)(filenameBase.length >= 1);
+        paths[paths.length - 1] = filenameBase.join('.');
+    }
+    return paths.join('/');
+}

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

@@ -2,21 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadUserFilesServerSide = loadUserFilesServerSide;
 const getPageFiles_js_1 = require("../../../shared/getPageFiles.js");
+const getPageConfigUserFriendly_js_1 = require("../../../shared/page-configs/getPageConfigUserFriendly.js");
 const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide.js");
 const utils_js_1 = require("../utils.js");
 const getPageAssets_js_1 = require("./getPageAssets.js");
 const debugPageFiles_js_1 = require("./debugPageFiles.js");
 const findPageConfig_js_1 = require("../../../shared/page-configs/findPageConfig.js");
 const analyzePage_js_1 = require("./analyzePage.js");
-const globalContext_js_1 = require("../globalContext.js");
 const loadConfigValues_js_1 = require("../../../shared/page-configs/loadConfigValues.js");
 async function loadUserFilesServerSide(pageContext) {
     const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
+    const globalContext = pageContext._globalContext;
     const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
-        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext.pageId, !(0, globalContext_js_1.getGlobalContext)().isProduction),
+        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext.pageId, !globalContext.isProduction),
         (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._pageFilesAll, pageContext.pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
-    const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = (0, analyzePage_js_1.analyzePage)(pageContext._pageFilesAll, pageConfig, pageContext.pageId);
+    const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
     const isV1Design = !!pageConfig;
     const passToClient = [];
     const errMsg = ' should be an array of strings.';
@@ -101,7 +102,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
     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, getPageFiles_js_1.getPageConfigUserFriendly)(pageFilesServerSide, pageConfigLoaded);
+    const pageContextExports = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyOld)(pageFilesServerSide, pageConfigLoaded);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.log404 = log404;
 exports.getRoutesInfo = getRoutesInfo;
 const noRouteMatch_js_1 = require("../../../../shared/route/noRouteMatch.js");
-const globalContext_js_1 = require("../../globalContext.js");
 const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 async function log404(pageContext) {
@@ -17,7 +16,7 @@ async function log404(pageContext) {
     'No page found. Create at least one /pages/some-page/+Page.js file.'
     */
     );
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+    const globalContext = pageContext._globalContext;
     if (!globalContext.isProduction && !isFileRequest(urlPathname) && !pageContext.isClientSideNavigation) {
         const routesInfo = getRoutesInfo(pageRoutes);
         let msg = `URL ${picocolors_1.default.cyan(urlPathname)} ${noRouteMatch_js_1.noRouteMatch}`;

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

@@ -12,7 +12,6 @@ const renderHtml_js_1 = require("../html/renderHtml.js");
 const utils_js_1 = require("../utils.js");
 const serializePageContextClientSide_js_1 = require("../html/serializePageContextClientSide.js");
 const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUrlComputed.js");
-const globalContext_js_1 = require("../globalContext.js");
 const createHttpResponse_js_1 = require("./createHttpResponse.js");
 const loadUserFilesServerSide_js_1 = require("./loadUserFilesServerSide.js");
 const executeOnRenderHtmlHook_js_1 = require("./executeOnRenderHtmlHook.js");
@@ -23,6 +22,7 @@ const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePa
 const executeGuardHook_js_1 = require("../../../shared/route/executeGuardHook.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isServerSideError_js_1 = require("../../../shared/misc/isServerSideError.js");
+const resolveBase_js_1 = require("../../shared/resolveBase.js");
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext.pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -85,8 +85,7 @@ async function prerenderPage(pageContext) {
         return { documentHtml, pageContextSerialized, pageContext };
     }
 }
-async function prerender404Page(pageContextInit_) {
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+async function prerender404Page(pageContextInit_, globalContext) {
     const errorPageId = (0, error_page_js_1.getErrorPageId)(globalContext.pageFilesAll, globalContext.pageConfigs);
     if (!errorPageId) {
         return null;
@@ -106,34 +105,39 @@ async function prerender404Page(pageContextInit_) {
     };
     (0, utils_js_1.objectAssign)(pageContextInit, pageContextInit_);
     {
-        const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit);
+        const pageContextInitEnhanced = await getPageContextInitEnhanced(pageContextInit, globalContext);
         (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
     }
     (0, utils_js_1.objectAssign)(pageContext, await (0, loadUserFilesServerSide_js_1.loadUserFilesServerSide)(pageContext));
     return prerenderPage(pageContext);
 }
-function getPageContextInitEnhanced(pageContextInit, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
+async function getPageContextInitEnhanced(pageContextInit, globalContext, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
     urlRewrite: null,
     urlHandler: null,
     isClientSideNavigation: false
 } } = {}) {
     (0, utils_js_1.assert)(pageContextInit.urlOriginal);
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+    const { baseServer, baseAssets } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
     const pageContextInitEnhanced = {};
     (0, utils_js_1.objectAssign)(pageContextInitEnhanced, pageContextInit);
     (0, utils_js_1.objectAssign)(pageContextInitEnhanced, {
         _objectCreatedByVike: true,
         // The following is defined on `pageContext` because we can eventually make these non-global
-        _baseServer: globalContext.baseServer,
-        _baseAssets: globalContext.baseAssets,
-        _includeAssetsImportedByServer: globalContext.includeAssetsImportedByServer,
-        // TODO: use GloablContext instead
+        _baseServer: baseServer,
+        _baseAssets: 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,
+        _globalContext: globalContext,
+        // TODO/now: add PageContext['globalContext']
+        /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
+        globalContext: globalContext.globalContext_public,
         _pageContextInit: pageContextInit,
         _urlRewrite: urlRewrite,
         _urlHandler: urlHandler,

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

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.redirectsErrPrefix = void 0;
 exports.resolveRedirects = resolveRedirects;
 exports.resolveRouteStringRedirect = resolveRouteStringRedirect;
 const assertIsNotBrowser_js_1 = require("../../../utils/assertIsNotBrowser.js");
@@ -11,8 +12,8 @@ const resolveUrlPathname_js_1 = require("../../../shared/route/resolveUrlPathnam
 const resolveRouteString_js_1 = require("../../../shared/route/resolveRouteString.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)(); // Don't bloat the client
-// TODO/next-major-release: update
-const configSrc = '[vite.config.js > vike({ redirects })]';
+const redirectsErrPrefix = '[+redirects]';
+exports.redirectsErrPrefix = redirectsErrPrefix;
 function resolveRedirects(redirectsAll, urlPathname) {
     const redirects = merge(redirectsAll);
     for (const [urlSource, urlTarget] of Object.entries(redirects)) {
@@ -23,9 +24,9 @@ function resolveRedirects(redirectsAll, urlPathname) {
     return null;
 }
 function resolveRouteStringRedirect(urlSource, urlTarget, urlPathname) {
-    (0, resolveRouteString_js_1.assertRouteString)(urlSource, `${configSrc} Invalid`);
+    (0, resolveRouteString_js_1.assertRouteString)(urlSource, `${redirectsErrPrefix} Invalid`);
     // Is allowing any protocol a safety issue? https://github.com/vikejs/vike/pull/1292#issuecomment-1828043917
-    (0, utils_js_1.assertUsageUrlRedirectTarget)(urlTarget, `${configSrc} The URL redirection target`, true);
+    (0, utils_js_1.assertUsageUrlRedirectTarget)(urlTarget, `${redirectsErrPrefix} The URL redirection target`, true);
     assertParams(urlSource, urlTarget);
     const match = (0, resolveRouteString_js_1.resolveRouteString)(urlSource, urlPathname);
     if (!match)
@@ -41,7 +42,7 @@ function assertParams(urlSource, urlTarget) {
     routeSegments.forEach((routeSegment) => {
         if (routeSegment.startsWith('@') || routeSegment.startsWith('*')) {
             const segments = urlSource.split('/');
-            (0, utils_js_1.assertUsage)(segments.includes(routeSegment), `${configSrc} The redirection source URL ${picocolors_1.default.string(urlSource)} is missing the URL parameter ${picocolors_1.default.string(routeSegment)} used by the redirection target URL ${picocolors_1.default.string(urlTarget)}`);
+            (0, utils_js_1.assertUsage)(segments.includes(routeSegment), `${redirectsErrPrefix} The redirection source URL ${picocolors_1.default.string(urlSource)} is missing the URL parameter ${picocolors_1.default.string(routeSegment)} used by the redirection target URL ${picocolors_1.default.string(urlTarget)}`);
         }
     });
 }

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

@@ -23,6 +23,7 @@ const error_page_js_1 = require("../../shared/error-page.js");
 const handleErrorWithoutErrorPage_js_1 = require("./renderPage/handleErrorWithoutErrorPage.js");
 const loadUserFilesServerSide_js_1 = require("./renderPage/loadUserFilesServerSide.js");
 const resolveRedirects_js_1 = require("./renderPage/resolveRedirects.js");
+const resolveBase_js_1 = require("../shared/resolveBase.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', {
     httpRequestsCount: 0
 });
@@ -81,25 +82,26 @@ async function renderPageAndPrepare(pageContextInit, httpRequestId) {
         return handleInvalidConfig(isConfigInvalid_js_1.isConfigInvalid.err);
     }
     else {
-        // From now on, gloablContext contains all the configuration data; getVikeConfig() isn't called anymore for this request
+        // From now on, globalContext contains all the configuration data; getVikeConfig() isn't called anymore for this request
     }
+    const globalContext = await (0, globalContext_js_1.getGlobalContextInternal)();
     // Check Base URL
-    assertBaseUrl(pageContextInit);
+    await assertBaseUrl(pageContextInit, globalContext);
     // Normalize URL
     {
-        const pageContextHttpResponse = normalizeUrl(pageContextInit, httpRequestId);
+        const pageContextHttpResponse = await normalizeUrl(pageContextInit, globalContext, httpRequestId);
         if (pageContextHttpResponse)
             return pageContextHttpResponse;
     }
     // Permanent redirects (HTTP status code `301`)
     {
-        const pageContextHttpResponse = getPermanentRedirect(pageContextInit, httpRequestId);
+        const pageContextHttpResponse = await getPermanentRedirect(pageContextInit, globalContext, httpRequestId);
         if (pageContextHttpResponse)
             return pageContextHttpResponse;
     }
-    return await renderPageAlreadyPrepared(pageContextInit, httpRequestId, []);
+    return await renderPageAlreadyPrepared(pageContextInit, globalContext, httpRequestId, []);
 }
-async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, pageContextsFromRewrite) {
+async function renderPageAlreadyPrepared(pageContextInit, globalContext, httpRequestId, pageContextsFromRewrite) {
     (0, abort_js_1.assertNoInfiniteAbortLoop)(pageContextsFromRewrite.length, 
     // There doesn't seem to be a way to count the number of HTTP redirects (vike don't have access to the HTTP request headers/cookies)
     // https://stackoverflow.com/questions/9683007/detect-infinite-http-redirect-loop-on-server-side
@@ -111,7 +113,7 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, pageCon
         (0, utils_js_1.objectAssign)(pageContextNominalPageInit, pageContextFromAllRewrites);
     }
     {
-        const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, pageContextNominalPageInit._urlRewrite, httpRequestId);
+        const pageContextInitEnhanced = await getPageContextInitEnhancedSSR(pageContextInit, globalContext, pageContextNominalPageInit._urlRewrite, httpRequestId);
         (0, utils_js_1.objectAssign)(pageContextNominalPageInit, pageContextInitEnhanced);
     }
     let errNominalPage;
@@ -143,10 +145,10 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, pageCon
         (0, utils_js_1.assert)(pageContextNominalPageSuccess === undefined);
         (0, utils_js_1.assert)(pageContextNominalPageInit);
         (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextNominalPageInit, 'urlOriginal', 'string'));
-        const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPageInit, httpRequestId);
+        const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextInit, globalContext, errNominalPage, pageContextNominalPageInit, httpRequestId);
         // Handle `throw redirect()` and `throw render()` while rendering nominal page
         if ((0, abort_js_1.isAbortError)(errNominalPage)) {
-            const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit);
+            const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalContext);
             if (handled.pageContextReturn) {
                 // - throw redirect()
                 // - throw render(url)
@@ -159,7 +161,6 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, pageCon
             Object.assign(pageContextErrorPageInit, handled.pageContextAbort);
         }
         {
-            const globalContext = (0, globalContext_js_1.getGlobalContext)();
             const errorPageId = (0, error_page_js_1.getErrorPageId)(globalContext.pageFilesAll, globalContext.pageConfigs);
             if (!errorPageId) {
                 (0, utils_js_1.objectAssign)(pageContextErrorPageInit, { pageId: null });
@@ -176,7 +177,7 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, pageCon
         catch (errErrorPage) {
             // Handle `throw redirect()` and `throw render()` while rendering error page
             if ((0, abort_js_1.isAbortError)(errErrorPage)) {
-                const handled = await handleAbortError(errErrorPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit);
+                const handled = await handleAbortError(errErrorPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalContext);
                 // throw render(abortStatusCode)
                 if (!handled.pageContextReturn) {
                     const pageContextAbort = errErrorPage._pageContextAbort;
@@ -292,8 +293,8 @@ async function renderPageNominal(pageContext) {
     (0, utils_js_1.assert)(pageContext === pageContextAfterRender);
     return pageContextAfterRender;
 }
-async function getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPagePartial, httpRequestId) {
-    const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, null, httpRequestId);
+async function getPageContextErrorPageInit(pageContextInit, globalContext, errNominalPage, pageContextNominalPagePartial, httpRequestId) {
+    const pageContextInitEnhanced = await getPageContextInitEnhancedSSR(pageContextInit, globalContext, null, httpRequestId);
     (0, utils_js_1.assert)(errNominalPage);
     const pageContext = {};
     (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
@@ -308,9 +309,9 @@ async function getPageContextErrorPageInit(pageContextInit, errNominalPage, page
     (0, utils_js_1.assert)(pageContext.errorWhileRendering);
     return pageContext;
 }
-function getPageContextInitEnhancedSSR(pageContextInit, urlRewrite, httpRequestId) {
+async function getPageContextInitEnhancedSSR(pageContextInit, globalContext, urlRewrite, httpRequestId) {
     const { isClientSideNavigation, _urlHandler } = handlePageContextUrl(pageContextInit.urlOriginal);
-    const pageContextInitEnhanced = (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit, {
+    const pageContextInitEnhanced = await (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit, globalContext, {
         ssr: {
             urlRewrite,
             urlHandler: _urlHandler,
@@ -341,15 +342,16 @@ function assertIsNotViteRequest(urlPathname, urlOriginal) {
         return;
     (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.code('renderPage(pageContextInit)')} called with ${picocolors_1.default.code(`pageContextInit.urlOriginal===${JSON.stringify(urlOriginal)}`)} which is unexpected because the URL ${picocolors_1.default.bold(urlOriginal)} should have already been handled by the development middleware: make sure the ${picocolors_1.default.cyan('createDevMiddleware()')} middleware is executed *before* the ${picocolors_1.default.cyan('renderPage()')} middleware, see ${picocolors_1.default.underline('https://vike.dev/renderPage')}`);
 }
-function normalizeUrl(pageContextInit, httpRequestId) {
-    const { trailingSlash, disableUrlNormalization, baseServer } = (0, globalContext_js_1.getGlobalContext)();
+async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
+    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
+    const { trailingSlash, disableUrlNormalization } = globalContext.config;
     if (disableUrlNormalization)
         return null;
     const { urlOriginal } = pageContextInit;
     const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
     if (isPageContextRequest)
         return null;
-    const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash, baseServer);
+    const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash ?? false, baseServer);
     if (!urlNormalized)
         return null;
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`URL normalized from ${picocolors_1.default.cyan(urlOriginal)} to ${picocolors_1.default.cyan(urlNormalized)} (https://vike.dev/url-normalization)`, httpRequestId, 'info');
@@ -358,13 +360,13 @@ function normalizeUrl(pageContextInit, httpRequestId) {
     (0, utils_js_1.objectAssign)(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
-function getPermanentRedirect(pageContextInit, httpRequestId) {
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
-    const urlWithoutBase = (0, utils_js_1.removeBaseServer)(pageContextInit.urlOriginal, globalContext.baseServer);
+async function getPermanentRedirect(pageContextInit, globalContext, httpRequestId) {
+    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
+    const urlWithoutBase = (0, utils_js_1.removeBaseServer)(pageContextInit.urlOriginal, baseServer);
     let origin = null;
     let urlTargetExternal = null;
     let urlTarget = (0, utils_js_1.modifyUrlPathname)(urlWithoutBase, (urlPathname) => {
-        const urlTarget = (0, resolveRedirects_js_1.resolveRedirects)(globalContext.vikeConfig.global.config.redirects ?? [], urlPathname);
+        const urlTarget = (0, resolveRedirects_js_1.resolveRedirects)(globalContext.config.redirects ?? [], urlPathname);
         if (urlTarget === null)
             return null;
         if (!(0, utils_js_1.isUrl)(urlTarget)) {
@@ -391,8 +393,9 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
         }
         if (normalize(urlTarget) === normalize(urlWithoutBase))
             return null;
+        const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
         if (!originChanged)
-            urlTarget = (0, utils_js_1.prependBase)(urlTarget, globalContext.baseServer);
+            urlTarget = (0, utils_js_1.prependBase)(urlTarget, baseServer);
         (0, utils_js_1.assert)(urlTarget !== pageContextInit.urlOriginal);
     }
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`Permanent redirection defined by config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
@@ -406,13 +409,12 @@ function normalize(url) {
 }
 async function handleAbortError(errAbort, pageContextsFromRewrite, pageContextInit, 
 // handleAbortError() creates a new pageContext object and we don't merge pageContextNominalPageInit to it: we only use some pageContextNominalPageInit information.
-pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit) {
-    (0, abort_js_1.logAbortErrorHandled)(errAbort, (0, globalContext_js_1.getGlobalContext)().isProduction, pageContextNominalPageInit);
+pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalContext) {
+    (0, abort_js_1.logAbortErrorHandled)(errAbort, globalContext.isProduction, pageContextNominalPageInit);
     const pageContextAbort = errAbort._pageContextAbort;
     let pageContextSerialized;
     if (pageContextNominalPageInit.isClientSideNavigation) {
         if (pageContextAbort.abortStatusCode) {
-            const globalContext = (0, globalContext_js_1.getGlobalContext)();
             const errorPageId = (0, error_page_js_1.getErrorPageId)(globalContext.pageFilesAll, globalContext.pageConfigs);
             const abortCall = pageContextAbort._abortCall;
             (0, utils_js_1.assert)(abortCall);
@@ -433,7 +435,7 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit) {
         return { pageContextReturn };
     }
     if (pageContextAbort._urlRewrite) {
-        const pageContextReturn = await renderPageAlreadyPrepared(pageContextInit, httpRequestId, [
+        const pageContextReturn = await renderPageAlreadyPrepared(pageContextInit, globalContext, httpRequestId, [
             ...pageContextsFromRewrite,
             pageContextAbort
         ]);
@@ -456,8 +458,8 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit) {
     (0, utils_js_1.assert)(pageContextAbort.abortStatusCode);
     return { pageContextAbort };
 }
-function assertBaseUrl(pageContextInit) {
-    const { baseServer } = (0, globalContext_js_1.getGlobalContext)();
+async function assertBaseUrl(pageContextInit, globalContext) {
+    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
     const { urlOriginal } = pageContextInit;
     const { urlWithoutPageContextRequestSuffix } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
     const { hasBaseServer } = (0, utils_js_1.parseUrl)(urlWithoutPageContextRequestSuffix, baseServer);

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

@@ -35,14 +35,13 @@ __exportStar(require("../../utils/projectInfo.js"), exports);
 __exportStar(require("../../utils/isArray.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);
 __exportStar(require("../../utils/objectAssign.js"), exports);
+__exportStar(require("../../utils/objectAssignSafe.js"), exports);
 __exportStar(require("../../utils/objectReplace.js"), exports);
 __exportStar(require("../../utils/PromiseType.js"), exports);
 __exportStar(require("../../utils/compareString.js"), exports);
 __exportStar(require("../../utils/isObjectWithKeys.js"), exports);
 __exportStar(require("../../utils/stringifyStringArray.js"), exports);
 __exportStar(require("../../utils/unique.js"), exports);
-__exportStar(require("../../utils/filesystemPathHandling.js"), exports);
-__exportStar(require("../../utils/getOutDirs.js"), exports);
 __exportStar(require("../../utils/capitalizeFirstLetter.js"), exports);
 __exportStar(require("../../utils/debugGlob.js"), exports);
 __exportStar(require("../../utils/isSameErrorMessage.js"), exports);
@@ -61,7 +60,7 @@ __exportStar(require("../../utils/objectEntries.js"), exports);
 __exportStar(require("../../utils/objectFromEntries.js"), exports);
 __exportStar(require("../../utils/getFileExtension.js"), exports);
 __exportStar(require("../../utils/assertSetup.js"), exports);
-__exportStar(require("../../utils/path-shim.js"), exports);
+__exportStar(require("../../utils/path.js"), exports);
 __exportStar(require("../../utils/isHtml.js"), exports);
 __exportStar(require("../../utils/warnIfErrorIsNotObject.js"), exports);
 __exportStar(require("../../utils/stripAnsi.js"), exports);
@@ -76,3 +75,4 @@ __exportStar(require("../../utils/isVikeReactApp.js"), exports);
 __exportStar(require("../../utils/getPropAccessNotation.js"), exports);
 __exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
 __exportStar(require("../../utils/genPromise.js"), exports);
+__exportStar(require("../../utils/makePublicCopy.js"), exports);

package/dist/cjs/node/runtime-dev/createDevMiddleware.js

@@ -3,13 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDevMiddleware = createDevMiddleware;
 const vite_1 = require("vite");
 const prepareViteApiCall_js_1 = require("../api/prepareViteApiCall.js");
+const globalContext_js_1 = require("../runtime/globalContext.js");
 /*
  * Create server middleware for development with HMR and lazy-transpiling.
  *
  * https://vike.dev/createDevMiddleware
  */
 async function createDevMiddleware(options = {}) {
-    const viteConfig = {
+    (0, globalContext_js_1.setGlobalContext_isProduction)(false);
+    const viteConfigFromOptions = {
         ...options.viteConfig,
         server: {
             ...options.viteConfig?.server,
@@ -17,8 +19,8 @@ async function createDevMiddleware(options = {}) {
         }
     };
     if (options.root)
-        viteConfig.root = options.root;
-    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(viteConfig, 'dev');
+        viteConfigFromOptions.root = options.root;
+    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(viteConfigFromOptions, 'dev');
     const server = await (0, vite_1.createServer)(viteConfigEnhanced);
     const devMiddleware = server.middlewares;
     return { devMiddleware, viteServer: server, viteConfig: server.config };