vike 0.4.218 → 0.4.220

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

@@ -3,13 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.onLoad = onLoad;
 const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
 const assertNodeVersion_js_1 = require("../../utils/assertNodeVersion.js");
+const assert_js_1 = require("../../utils/assert.js");
 const require_shim_1 = require("@brillout/require-shim");
-const utils_js_1 = require("./utils.js");
 const isErrorDebug_js_1 = require("../shared/isErrorDebug.js");
 function onLoad() {
     (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
     (0, assertNodeVersion_js_1.assertNodeVersion)();
-    (0, require_shim_1.installRequireShim)();
     if ((0, isErrorDebug_js_1.isErrorDebug)())
-        (0, utils_js_1.setAlwaysShowStackTrace)();
+        (0, assert_js_1.setAlwaysShowStackTrace)();
+    addEcosystemStamp();
+    (0, require_shim_1.installRequireShim)();
+}
+// Used by:
+// - Telefunc (to detect the user's stack https://github.com/brillout/telefunc/blob/8288310e88e06a42b710d39c39fb502364ca6d30/telefunc/utils/isVikeApp.ts#L4)
+function addEcosystemStamp() {
+    const g = globalThis;
+    g._isVikeApp =
+        /* Don't set to true so that consumers do `!!globalThis._isVikeApp` instead of `globalThis._isVikeApp === true`.
+        true
+        */
+        // We use an object so that we can eventually, in the future, add helpful information as needed. (E.g. the Vike version, or global settings.)
+        {};
+    // We keep the old stamp for older Telefunc versions
+    g._isVitePluginSsr = true;
 }

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

@@ -1,5 +1,3 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const getPageFiles_js_1 = require("../../../shared/getPageFiles.js");
-const getPageFilesExports_js_1 = require("./getPageFilesExports.js");
-(0, getPageFiles_js_1.setPageFilesAsync)(getPageFilesExports_js_1.getPageFilesExports);
+// TODO/v1-release: remove
+// This doesn't do anything anymore. (It's kept to avoid introducing a breaking change.)

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

@@ -6,12 +6,12 @@ const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyze
 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 getConfigValue_js_1 = require("../../../shared/page-configs/getConfigValue.js");
+const getConfigValueRuntime_js_1 = require("../../../shared/page-configs/getConfigValueRuntime.js");
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
         const { isClientRuntimeLoaded, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
         const clientEntries = [];
-        const clientFilePath = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'client', 'string')?.value ?? null;
+        const clientFilePath = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'client', 'string')?.value ?? null;
         if (clientFilePath)
             clientEntries.push(clientFilePath);
         if (isClientRuntimeLoaded)

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCacheControl = getCacheControl;
 const helpers_js_1 = require("../../../../shared/page-configs/helpers.js");
-const getConfigValue_js_1 = require("../../../../shared/page-configs/getConfigValue.js");
+const getConfigValueRuntime_js_1 = require("../../../../shared/page-configs/getConfigValueRuntime.js");
 const defaultValue = 'no-store, max-age=0';
 function getCacheControl(pageId, pageConfigs, statusCode) {
     // TODO/v1-release: remove
@@ -11,7 +11,7 @@ function getCacheControl(pageId, pageConfigs, statusCode) {
     if (statusCode > 499)
         return defaultValue;
     const pageConfig = (0, helpers_js_1.getPageConfig)(pageId, pageConfigs);
-    const configValue = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'cacheControl', 'string');
+    const configValue = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'cacheControl', 'string');
     const value = configValue?.value;
     if (value)
         return value;

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

@@ -101,7 +101,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.getPageContextExports)(pageFilesServerSide, pageConfigLoaded);
+    const pageContextExports = (0, getPageFiles_js_1.getPageConfigUserFriendly)(pageFilesServerSide, pageConfigLoaded);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

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

@@ -7,10 +7,8 @@ exports.renderPageAlreadyRouted = renderPageAlreadyRouted;
 exports.prerenderPage = prerenderPage;
 exports.prerender404Page = prerender404Page;
 exports.getPageContextInitEnhanced = getPageContextInitEnhanced;
-exports.getRenderContext = getRenderContext;
 const error_page_js_1 = require("../../../shared/error-page.js");
 const renderHtml_js_1 = require("../html/renderHtml.js");
-const getPageFiles_js_1 = require("../../../shared/getPageFiles.js");
 const utils_js_1 = require("../utils.js");
 const serializePageContextClientSide_js_1 = require("../html/serializePageContextClientSide.js");
 const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUrlComputed.js");
@@ -23,10 +21,8 @@ const loggerRuntime_js_1 = require("./loggerRuntime.js");
 const isNewError_js_1 = require("./isNewError.js");
 const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePageContextForUserConsumptionServerSide.js");
 const executeGuardHook_js_1 = require("../../../shared/route/executeGuardHook.js");
-const loadPageRoutes_js_1 = require("../../../shared/route/loadPageRoutes.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isServerSideError_js_1 = require("../../../shared/misc/isServerSideError.js");
-const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext.pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -89,8 +85,9 @@ async function prerenderPage(pageContext) {
         return { documentHtml, pageContextSerialized, pageContext };
     }
 }
-async function prerender404Page(renderContext, pageContextInit_) {
-    const errorPageId = (0, error_page_js_1.getErrorPageId)(renderContext.pageFilesAll, renderContext.pageConfigs);
+async function prerender404Page(pageContextInit_) {
+    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+    const errorPageId = (0, error_page_js_1.getErrorPageId)(globalContext.pageFilesAll, globalContext.pageConfigs);
     if (!errorPageId) {
         return null;
     }
@@ -109,13 +106,13 @@ async function prerender404Page(renderContext, pageContextInit_) {
     };
     (0, utils_js_1.objectAssign)(pageContextInit, pageContextInit_);
     {
-        const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit, renderContext);
+        const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit);
         (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, renderContext, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
+function getPageContextInitEnhanced(pageContextInit, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
     urlRewrite: null,
     urlHandler: null,
     isClientSideNavigation: false
@@ -131,12 +128,12 @@ function getPageContextInitEnhanced(pageContextInit, renderContext, { ssr: { url
         _baseAssets: globalContext.baseAssets,
         _includeAssetsImportedByServer: globalContext.includeAssetsImportedByServer,
         // TODO: use GloablContext instead
-        _pageFilesAll: renderContext.pageFilesAll,
-        _pageConfigs: renderContext.pageConfigs,
-        _pageConfigGlobal: renderContext.pageConfigGlobal,
-        _allPageIds: renderContext.allPageIds,
-        _pageRoutes: renderContext.pageRoutes,
-        _onBeforeRouteHook: renderContext.onBeforeRouteHook,
+        _pageFilesAll: globalContext.pageFilesAll,
+        _pageConfigs: globalContext.pageConfigs,
+        _pageConfigGlobal: globalContext.pageConfigGlobal,
+        _allPageIds: globalContext.allPageIds,
+        _pageRoutes: globalContext.pageRoutes,
+        _onBeforeRouteHook: globalContext.onBeforeRouteHook,
         _pageContextInit: pageContextInit,
         _urlRewrite: urlRewrite,
         _urlHandler: urlHandler,
@@ -164,22 +161,3 @@ function getPageContextInitEnhanced(pageContextInit, renderContext, { ssr: { url
     }
     return pageContextInitEnhanced;
 }
-// TODO: remove getRenderContext() in favor of getGlobalObject() + reloadGlobalContext()
-// TODO: impl GlobalNodeContext + GlobalClientContext + GloablContext, and use GlobalContext instead of RenderContext
-async function getRenderContext() {
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
-    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal } = await (0, getPageFiles_js_1.getPageFilesAll)(false, globalContext.isProduction);
-    const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
-    (0, assertV1Design_js_1.assertV1Design)(
-    // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
-    pageConfigs.length > 0, pageFilesAll);
-    const renderContext = {
-        pageFilesAll: pageFilesAll,
-        pageConfigs,
-        pageConfigGlobal,
-        allPageIds: allPageIds,
-        pageRoutes,
-        onBeforeRouteHook
-    };
-    return renderContext;
-}

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

@@ -13,7 +13,8 @@ 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 })]';
-function resolveRedirects(redirects, urlPathname) {
+function resolveRedirects(redirectsAll, urlPathname) {
+    const redirects = merge(redirectsAll);
     for (const [urlSource, urlTarget] of Object.entries(redirects)) {
         const urlResolved = resolveRouteStringRedirect(urlSource, urlTarget, urlPathname);
         if (urlResolved)
@@ -44,3 +45,10 @@ function assertParams(urlSource, urlTarget) {
         }
     });
 }
+function merge(objs) {
+    const obj = {};
+    objs.forEach((e) => {
+        Object.assign(obj, e);
+    });
+    return obj;
+}

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

@@ -66,10 +66,8 @@ async function renderPageAndPrepare(pageContextInit, httpRequestId) {
         }
     }
     // Prepare context
-    let renderContext;
     try {
         await (0, globalContext_js_1.initGlobalContext_renderPage)();
-        renderContext = await (0, renderPageAlreadyRouted_js_1.getRenderContext)();
     }
     catch (err) {
         // Errors are expected since assertUsage() is used in both initGlobalContext_renderPage() and getRenderContext().
@@ -83,7 +81,7 @@ async function renderPageAndPrepare(pageContextInit, httpRequestId) {
         return handleInvalidConfig(isConfigInvalid_js_1.isConfigInvalid.err);
     }
     else {
-        // From now on, renderContext.pageConfigs contains all the configuration data; getVikeConfig() isn't called anymore for this request
+        // From now on, gloablContext contains all the configuration data; getVikeConfig() isn't called anymore for this request
     }
     // Check Base URL
     assertBaseUrl(pageContextInit);
@@ -99,9 +97,9 @@ async function renderPageAndPrepare(pageContextInit, httpRequestId) {
         if (pageContextHttpResponse)
             return pageContextHttpResponse;
     }
-    return await renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderContext, []);
+    return await renderPageAlreadyPrepared(pageContextInit, httpRequestId, []);
 }
-async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderContext, pageContextsFromRewrite) {
+async function renderPageAlreadyPrepared(pageContextInit, 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
@@ -113,7 +111,7 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderC
         (0, utils_js_1.objectAssign)(pageContextNominalPageInit, pageContextFromAllRewrites);
     }
     {
-        const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, renderContext, pageContextNominalPageInit._urlRewrite, httpRequestId);
+        const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, pageContextNominalPageInit._urlRewrite, httpRequestId);
         (0, utils_js_1.objectAssign)(pageContextNominalPageInit, pageContextInitEnhanced);
     }
     let errNominalPage;
@@ -145,10 +143,10 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderC
         (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, renderContext, httpRequestId);
+        const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextInit, 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, renderContext, pageContextErrorPageInit);
+            const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit);
             if (handled.pageContextReturn) {
                 // - throw redirect()
                 // - throw render(url)
@@ -161,7 +159,8 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderC
             Object.assign(pageContextErrorPageInit, handled.pageContextAbort);
         }
         {
-            const errorPageId = (0, error_page_js_1.getErrorPageId)(renderContext.pageFilesAll, renderContext.pageConfigs);
+            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 });
                 return (0, handleErrorWithoutErrorPage_js_1.handleErrorWithoutErrorPage)(pageContextErrorPageInit);
@@ -177,7 +176,7 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderC
         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, renderContext, pageContextErrorPageInit);
+                const handled = await handleAbortError(errErrorPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit);
                 // throw render(abortStatusCode)
                 if (!handled.pageContextReturn) {
                     const pageContextAbort = errErrorPage._pageContextAbort;
@@ -293,8 +292,8 @@ async function renderPageNominal(pageContext) {
     (0, utils_js_1.assert)(pageContext === pageContextAfterRender);
     return pageContextAfterRender;
 }
-async function getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPagePartial, renderContext, httpRequestId) {
-    const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, renderContext, null, httpRequestId);
+async function getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPagePartial, httpRequestId) {
+    const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, null, httpRequestId);
     (0, utils_js_1.assert)(errNominalPage);
     const pageContext = {};
     (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
@@ -309,9 +308,9 @@ async function getPageContextErrorPageInit(pageContextInit, errNominalPage, page
     (0, utils_js_1.assert)(pageContext.errorWhileRendering);
     return pageContext;
 }
-function getPageContextInitEnhancedSSR(pageContextInit, renderContext, urlRewrite, httpRequestId) {
+function getPageContextInitEnhancedSSR(pageContextInit, urlRewrite, httpRequestId) {
     const { isClientSideNavigation, _urlHandler } = handlePageContextUrl(pageContextInit.urlOriginal);
-    const pageContextInitEnhanced = (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit, renderContext, {
+    const pageContextInitEnhanced = (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit, {
         ssr: {
             urlRewrite,
             urlHandler: _urlHandler,
@@ -360,12 +359,12 @@ function normalizeUrl(pageContextInit, httpRequestId) {
     return pageContextHttpResponse;
 }
 function getPermanentRedirect(pageContextInit, httpRequestId) {
-    const { redirects, baseServer } = (0, globalContext_js_1.getGlobalContext)();
-    const urlWithoutBase = (0, utils_js_1.removeBaseServer)(pageContextInit.urlOriginal, baseServer);
+    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+    const urlWithoutBase = (0, utils_js_1.removeBaseServer)(pageContextInit.urlOriginal, globalContext.baseServer);
     let origin = null;
     let urlTargetExternal = null;
     let urlTarget = (0, utils_js_1.modifyUrlPathname)(urlWithoutBase, (urlPathname) => {
-        const urlTarget = (0, resolveRedirects_js_1.resolveRedirects)(redirects, urlPathname);
+        const urlTarget = (0, resolveRedirects_js_1.resolveRedirects)(globalContext.vikeConfig.global.config.redirects ?? [], urlPathname);
         if (urlTarget === null)
             return null;
         if (!(0, utils_js_1.isUrl)(urlTarget)) {
@@ -393,7 +392,7 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
         if (normalize(urlTarget) === normalize(urlWithoutBase))
             return null;
         if (!originChanged)
-            urlTarget = (0, utils_js_1.prependBase)(urlTarget, baseServer);
+            urlTarget = (0, utils_js_1.prependBase)(urlTarget, globalContext.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');
@@ -407,13 +406,14 @@ 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, renderContext, pageContextErrorPageInit) {
+pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit) {
     (0, abort_js_1.logAbortErrorHandled)(errAbort, (0, globalContext_js_1.getGlobalContext)().isProduction, pageContextNominalPageInit);
     const pageContextAbort = errAbort._pageContextAbort;
     let pageContextSerialized;
     if (pageContextNominalPageInit.isClientSideNavigation) {
         if (pageContextAbort.abortStatusCode) {
-            const errorPageId = (0, error_page_js_1.getErrorPageId)(renderContext.pageFilesAll, renderContext.pageConfigs);
+            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);
             (0, utils_js_1.assertUsage)(errorPageId, `You called ${picocolors_1.default.cyan(abortCall)} but you didn't define an error page, make sure to define one https://vike.dev/error-page`);
@@ -421,7 +421,6 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
             (0, utils_js_1.objectAssign)(pageContext, { pageId: errorPageId });
             (0, utils_js_1.objectAssign)(pageContext, pageContextAbort);
             (0, utils_js_1.objectAssign)(pageContext, pageContextErrorPageInit);
-            (0, utils_js_1.objectAssign)(pageContext, renderContext);
             (0, utils_js_1.objectAssign)(pageContext, await (0, loadUserFilesServerSide_js_1.loadUserFilesServerSide)(pageContext));
             // We include pageContextInit: we don't only serialize pageContextAbort because the error page may need to access pageContextInit
             pageContextSerialized = (0, serializePageContextClientSide_js_1.serializePageContextClientSide)(pageContext);
@@ -434,7 +433,7 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
         return { pageContextReturn };
     }
     if (pageContextAbort._urlRewrite) {
-        const pageContextReturn = await renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderContext, [
+        const pageContextReturn = await renderPageAlreadyPrepared(pageContextInit, httpRequestId, [
             ...pageContextsFromRewrite,
             pageContextAbort
         ]);

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

@@ -35,6 +35,7 @@ __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/objectReplace.js"), exports);
 __exportStar(require("../../utils/PromiseType.js"), exports);
 __exportStar(require("../../utils/compareString.js"), exports);
 __exportStar(require("../../utils/isObjectWithKeys.js"), exports);

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

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDevMiddleware = void 0;
 const createDevMiddleware_ = async (...args) => {

package/dist/cjs/node/shared/assertRuntimeManifest.js

@@ -10,8 +10,6 @@ function assertRuntimeManifest(obj) {
     (0, utils_js_1.assert)((0, utils_js_1.isBaseServer)(obj.baseServer));
     (0, utils_js_1.assert)((0, utils_js_1.isBaseAssets)(obj.baseAssets));
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(obj, 'includeAssetsImportedByServer', 'boolean'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(obj, 'redirects', 'object'));
-    (0, utils_js_1.castType)(obj);
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(obj, 'trailingSlash', 'boolean'));
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(obj, 'disableUrlNormalization', 'boolean'));
     (0, utils_js_1.checkType)(obj);

package/dist/cjs/shared/getPageFiles/analyzeClientSide.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.analyzeClientSide = analyzeClientSide;
-const getConfigValue_js_1 = require("../page-configs/getConfigValue.js");
+const getConfigValueRuntime_js_1 = require("../page-configs/getConfigValueRuntime.js");
 const analyzePageClientSide_js_1 = require("./analyzePageClientSide.js");
 function analyzeClientSide(pageConfig, pageFilesAll, pageId) {
     // V1 design
     if (pageConfig) {
-        const isClientRouting = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
-        const isClientRuntimeLoaded = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'isClientRuntimeLoaded', 'boolean')?.value ?? false;
+        const isClientRouting = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
+        const isClientRuntimeLoaded = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'isClientRuntimeLoaded', 'boolean')?.value ?? false;
         return { isClientRuntimeLoaded, isClientRouting };
     }
     else {

package/dist/cjs/shared/getPageFiles/{setPageFiles.js → getPageFiles.js}

@@ -1,18 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPageFilesAll = getPageFilesAll;
 exports.setPageFiles = setPageFiles;
 exports.setPageFilesAsync = setPageFilesAsync;
-exports.getPageFilesAll = getPageFilesAll;
 const utils_js_1 = require("../utils.js");
 const parseGlobResults_js_1 = require("./parseGlobResults.js");
 const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
+const getPageConfigUserFriendly_js_1 = require("../page-configs/getPageConfigUserFriendly.js");
 const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('setPageFiles.ts', {});
-// TODO:v1-design-release: rename setPageFiles() getPageFilesAll() parseGlobResult()
 function setPageFiles(pageFilesExports) {
     const { pageFiles, pageConfigs, pageConfigGlobal } = (0, parseGlobResults_js_1.parseGlobResults)(pageFilesExports);
     globalObject.pageFilesAll = pageFiles;
     globalObject.pageConfigs = pageConfigs;
     globalObject.pageConfigGlobal = pageConfigGlobal;
+    // TODO/now: re-use this call, instead of calling it twice
+    globalObject.globalConfig = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)(pageConfigGlobal);
 }
 function setPageFilesAsync(getPageFilesExports) {
     globalObject.pageFilesGetter = async () => {
@@ -25,18 +27,18 @@ async function getPageFilesAll(isClientSide, isProduction) {
         (0, utils_js_1.assert)(isProduction === undefined);
     }
     else {
-        (0, utils_js_1.assert)(globalObject.pageFilesGetter);
         (0, utils_js_1.assert)(typeof isProduction === 'boolean');
         if (!globalObject.pageFilesAll ||
             // We reload all glob imports in dev to make auto-reload work
             !isProduction) {
+            (0, utils_js_1.assert)(globalObject.pageFilesGetter);
             await globalObject.pageFilesGetter();
         }
     }
-    const { pageFilesAll, pageConfigs, pageConfigGlobal } = globalObject;
-    (0, utils_js_1.assert)(pageFilesAll && pageConfigs && pageConfigGlobal);
+    const { pageFilesAll, pageConfigs, pageConfigGlobal, globalConfig } = globalObject;
+    (0, utils_js_1.assert)(pageFilesAll && pageConfigs && pageConfigGlobal && globalConfig);
     const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
-    return { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal };
+    return { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig };
 }
 function getAllPageIds(allPageFiles, pageConfigs) {
     const fileIds = allPageFiles.filter(({ isDefaultPageFile }) => !isDefaultPageFile).map(({ pageId }) => pageId);

package/dist/cjs/shared/getPageFiles.js

@@ -1,15 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPageContextExports = exports.getPageFilesServerSide = exports.getPageFilesClientSide = exports.setPageFilesAsync = exports.setPageFiles = exports.getPageFilesAll = void 0;
-var setPageFiles_js_1 = require("./getPageFiles/setPageFiles.js");
-Object.defineProperty(exports, "getPageFilesAll", { enumerable: true, get: function () { return setPageFiles_js_1.getPageFilesAll; } });
-var setPageFiles_js_2 = require("./getPageFiles/setPageFiles.js");
-Object.defineProperty(exports, "setPageFiles", { enumerable: true, get: function () { return setPageFiles_js_2.setPageFiles; } });
-var setPageFiles_js_3 = require("./getPageFiles/setPageFiles.js");
-Object.defineProperty(exports, "setPageFilesAsync", { enumerable: true, get: function () { return setPageFiles_js_3.setPageFilesAsync; } });
+exports.getPageConfigUserFriendly = exports.getPageFilesServerSide = exports.getPageFilesClientSide = void 0;
 var getAllPageIdFiles_js_1 = require("./getPageFiles/getAllPageIdFiles.js");
 Object.defineProperty(exports, "getPageFilesClientSide", { enumerable: true, get: function () { return getAllPageIdFiles_js_1.getPageFilesClientSide; } });
 var getAllPageIdFiles_js_2 = require("./getPageFiles/getAllPageIdFiles.js");
 Object.defineProperty(exports, "getPageFilesServerSide", { enumerable: true, get: function () { return getAllPageIdFiles_js_2.getPageFilesServerSide; } });
-var getExports_js_1 = require("./getPageFiles/getExports.js");
-Object.defineProperty(exports, "getPageContextExports", { enumerable: true, get: function () { return getExports_js_1.getPageContextExports; } });
+var getPageConfigUserFriendly_js_1 = require("./page-configs/getPageConfigUserFriendly.js");
+Object.defineProperty(exports, "getPageConfigUserFriendly", { enumerable: true, get: function () { return getPageConfigUserFriendly_js_1.getPageConfigUserFriendly; } });

package/dist/cjs/shared/hooks/getHook.js

@@ -11,7 +11,7 @@ exports.getHook_setIsPrerenderering = getHook_setIsPrerenderering;
 exports.getHookTimeoutDefault = getHookTimeoutDefault;
 const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
 const helpers_js_1 = require("../page-configs/helpers.js");
-const getConfigValue_js_1 = require("../page-configs/getConfigValue.js");
+const getConfigValueRuntime_js_1 = require("../page-configs/getConfigValueRuntime.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('getHook.ts', {});
@@ -33,8 +33,8 @@ function getHook(pageContext, hookName) {
     return { hookFn, hookName, hookFilePath, hookTimeout };
 }
 function getHookFromPageConfig(pageConfig, hookName) {
-    const configValue = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, hookName);
-    const hooksTimeout = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'hooksTimeout')?.value;
+    const configValue = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, hookName);
+    const hooksTimeout = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'hooksTimeout')?.value;
     if (!configValue)
         return null;
     const hookFn = configValue.value;