vike 0.4.217 → 0.4.218-commit-ed9b3d4

package/dist/cjs/node/prerender/runPrerender.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;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -30,7 +40,6 @@ exports.runPrerenderFromAPI = runPrerenderFromAPI;
 exports.runPrerenderFromCLIPrerenderCommand = runPrerenderFromCLIPrerenderCommand;
 exports.runPrerenderFromAutoRun = runPrerenderFromAutoRun;
 exports.runPrerender_forceExit = runPrerender_forceExit;
-require("../runtime/page-files/setup.js");
 const path_1 = __importDefault(require("path"));
 const index_js_1 = require("../../shared/route/index.js");
 const utils_js_1 = require("./utils.js");
@@ -43,7 +52,7 @@ const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
 const getPageContextRequestUrl_js_1 = require("../../shared/getPageContextRequestUrl.js");
 const resolveRouteString_js_1 = require("../../shared/route/resolveRouteString.js");
 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 loadConfigValues_js_1 = require("../../shared/page-configs/loadConfigValues.js");
 const error_page_js_1 = require("../../shared/error-page.js");
 const getPageContextUrlComputed_js_1 = require("../../shared/getPageContextUrlComputed.js");
@@ -74,7 +83,7 @@ async function runPrerenderFromCLIPrerenderCommand() {
     }
     runPrerender_forceExit();
 }
-async function runPrerenderFromAutoRun(viteConfig, forceExit) {
+async function runPrerenderFromAutoRun(viteConfig) {
     try {
         await runPrerender({ viteConfig });
     }
@@ -83,8 +92,6 @@ async function runPrerenderFromAutoRun(viteConfig, forceExit) {
         (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
-    if (forceExit)
-        runPrerender_forceExit();
 }
 async function runPrerender(options = {}, standaloneTrigger) {
     checkOutdatedOptions(options);
@@ -96,8 +103,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
         console.log(`${picocolors_1.default.cyan(`vike v${utils_js_1.projectInfo.projectVersion}`)} ${picocolors_1.default.green('pre-rendering HTML...')}`);
     }
     await disableReactStreaming();
-    const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'vike pre-rendering', 'production');
-    assertLoadedConfig(viteConfig, options);
+    const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'build', 'production');
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig);
     const { outDirClient } = (0, utils_js_1.getOutDirs)(viteConfig);
     const { root } = viteConfig;
@@ -506,10 +512,10 @@ async function routeAndPrerender(prerenderContext, concurrencyLimit, onComplete)
             if (pageContext._pageConfigs.length > 0) {
                 const pageConfig = pageContext._pageConfigs.find((p) => p.pageId === pageId);
                 (0, utils_js_1.assert)(pageConfig);
-                usesClientRouter = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
+                usesClientRouter = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
             }
             else {
-                usesClientRouter = globalContext.pluginManifest.usesClientRouter;
+                usesClientRouter = globalContext.usesClientRouter;
             }
         }
         (0, utils_js_1.objectAssign)(pageContext, {
@@ -700,25 +706,6 @@ async function disableReactStreaming() {
     const { disable } = mod;
     disable();
 }
-function assertLoadedConfig(viteConfig, options) {
-    if (viteConfig.plugins.some((p) => p.name.startsWith('vike'))) {
-        return;
-    }
-    const { configFile } = viteConfig;
-    if (configFile) {
-        (0, utils_js_1.assertUsage)(false, `${configFile} doesn't install the vike plugin`);
-    }
-    else {
-        if (!options.viteConfig) {
-            (0, utils_js_1.assertUsage)(false, `[prerender()] No vite.config.js file found at ${process.cwd()}. Use the option ${picocolors_1.default.cyan('prerender({ viteConfig })')}.`, { showStackTrace: true });
-        }
-        else {
-            (0, utils_js_1.assertUsage)(false, `[prerender()] The Vite config ${picocolors_1.default.cyan('prerender({ viteConfig })')} is missing the vike plugin.`, {
-                showStackTrace: true
-            });
-        }
-    }
-}
 function isSameUrl(url1, url2) {
     return normalizeUrl(url1) === normalizeUrl(url2);
 }

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

@@ -17,23 +17,24 @@ exports.setGlobalContext_viteConfig = setGlobalContext_viteConfig;
 exports.setGlobalContext_vikeConfig = setGlobalContext_vikeConfig;
 exports.setGlobalContext_isViteDev = setGlobalContext_isViteDev;
 exports.setGlobalContext_isPrerendering = setGlobalContext_isPrerendering;
+exports.setGlobalContext_buildEntry = setGlobalContext_buildEntry;
+exports.clearGlobalContext = clearGlobalContext;
 const utils_js_1 = require("./utils.js");
-const loadImportBuild_js_1 = require("./globalContext/loadImportBuild.js");
-const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
+const runtime_1 = require("@brillout/vite-plugin-server-entry/runtime");
+const virtualFileImportUserCode_js_1 = require("../shared/virtual-files/virtualFileImportUserCode.js");
+const getPageFiles_js_1 = require("../../shared/getPageFiles/getPageFiles.js");
 const assertPluginManifest_js_1 = require("../shared/assertPluginManifest.js");
 const assertRuntimeManifest_js_1 = require("../shared/assertRuntimeManifest.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const getPageFilesExports_js_1 = require("./page-files/getPageFilesExports.js");
 const resolveBase_js_1 = require("../shared/resolveBase.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', (() => {
-    const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = (0, utils_js_1.genPromise)();
-    return {
-        viteDevServerPromise,
-        viteDevServerPromiseResolve
-    };
-})());
+const debug = (0, utils_js_1.createDebugger)('vike:globalContext');
+const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', getInitialGlobalContext());
+initDevEntry();
 function getGlobalContext() {
-    (0, utils_js_1.assert)(globalObject.globalContext);
+    if (!globalObject.globalContext) {
+        debug('getGlobalContext()', new Error().stack);
+        (0, utils_js_1.assert)(false);
+    }
     return globalObject.globalContext;
 }
 /** @experimental https://vike.dev/getGlobalContext */
@@ -112,9 +113,11 @@ function getViteConfig() {
     return globalObject.viteConfig ?? null;
 }
 async function initGlobalContext_renderPage() {
+    debug('initGlobalContext_renderPage()');
     await initGlobalContext(!globalObject.isViteDev);
 }
 async function initGlobalContext_runPrerender() {
+    debug('initGlobalContext_runPrerender()');
     if (globalObject.initGlobalContext_runPrerender_alreadyCalled)
         return;
     globalObject.initGlobalContext_runPrerender_alreadyCalled = true;
@@ -128,6 +131,7 @@ async function initGlobalContext_runPrerender() {
     await initGlobalContext(true);
 }
 async function initGlobalContext_getGlobalContextAsync(isProduction) {
+    debug('initGlobalContext_getGlobalContextAsync()');
     if (!isProduction) {
         const waitFor = 20;
         const timeout = setTimeout(() => {
@@ -155,13 +159,11 @@ async function initGlobalContext(isProduction) {
         (0, utils_js_1.assert)(vikeConfig);
         (0, utils_js_1.assert)(viteDevServer);
         (0, utils_js_1.assert)(!isPrerendering);
-        const vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
-        const pluginManifest = getRuntimeManifest(vikeConfigGlobal, viteConfig);
+        const pluginManifest = getRuntimeManifest(vikeConfig.vikeConfigGlobal, viteConfig);
         globalObject.globalContext = {
             isProduction: false,
             isPrerendering: false,
             assetsManifest: null,
-            pluginManifest: null,
             viteDevServer,
             viteConfig,
             vikeConfig,
@@ -174,22 +176,21 @@ async function initGlobalContext(isProduction) {
         };
     }
     else {
-        const buildEntries = await (0, loadImportBuild_js_1.loadImportBuild)(globalObject.outDirRoot);
-        assertBuildEntries(buildEntries, isPrerendering ?? false);
-        const { pageFiles, assetsManifest, pluginManifest } = buildEntries;
-        (0, getPageFiles_js_1.setPageFiles)(pageFiles);
+        const buildEntry = await getBuildEntry(globalObject.outDirRoot);
+        const { assetsManifest, pluginManifest } = buildEntry;
+        (0, getPageFiles_js_1.setPageFiles)(buildEntry.pageFiles);
         assertViteManifest(assetsManifest);
         (0, assertPluginManifest_js_1.assertPluginManifest)(pluginManifest);
         const globalContext = {
             isProduction: true,
             assetsManifest,
-            pluginManifest,
             viteDevServer: null,
             baseServer: pluginManifest.baseServer,
             baseAssets: pluginManifest.baseAssets,
             includeAssetsImportedByServer: pluginManifest.includeAssetsImportedByServer,
             redirects: pluginManifest.redirects,
             trailingSlash: pluginManifest.trailingSlash,
+            usesClientRouter: pluginManifest.usesClientRouter,
             disableUrlNormalization: pluginManifest.disableUrlNormalization
         };
         if (isPrerendering) {
@@ -223,15 +224,6 @@ function getRuntimeManifest(vikeConfigGlobal, viteConfig) {
     (0, assertRuntimeManifest_js_1.assertRuntimeManifest)(manifest);
     return manifest;
 }
-function assertBuildEntries(buildEntries, isPreRendering) {
-    const errMsg = [
-        `You are tyring to run`,
-        isPreRendering ? 'pre-rendering' : 'the server for production',
-        `but your app isn't built yet. Run ${picocolors_1.default.cyan('$ vike build')} before `,
-        isPreRendering ? 'pre-rendering.' : 'running the server.'
-    ].join(' ');
-    (0, utils_js_1.assertUsage)(buildEntries, errMsg);
-}
 function assertViteManifest(manifest) {
     (0, utils_js_1.assert)((0, utils_js_1.isPlainObject)(manifest));
     /* We should include these assertions but we don't as a workaround for PWA manifests: https://github.com/vikejs/vike/issues/769
@@ -248,5 +240,60 @@ function assertViteManifest(manifest) {
 function eagerlyLoadUserFiles() {
     // Other than here, the getPageFilesExports() function is only called only upon calling the renderPage() function.
     // We call it as early as possible here for better performance.
-    (0, getPageFilesExports_js_1.getPageFilesExports)();
+    getPageFilesExports();
+}
+async function getBuildEntry(outDir) {
+    debug('getBuildEntry()');
+    if (!globalObject.buildEntry) {
+        debug('importServerProductionEntry()');
+        await (0, runtime_1.importServerProductionEntry)({ outDir });
+        if (!globalObject.buildEntry) {
+            debug('globalObject.buildEntryPrevious');
+            // Needed, for example, when calling the API prerender() then preview() because both trigger a importServerProductionEntry() call but only the first only is applied because of the import() cache. (A proper implementation would be to clear the import() cache, but it probably isn't possible on platforms such as Cloudflare Workers.)
+            globalObject.buildEntry = globalObject.buildEntryPrevious;
+        }
+        (0, utils_js_1.assert)(globalObject.buildEntry);
+    }
+    const { buildEntry } = globalObject;
+    (0, utils_js_1.assert)((0, utils_js_1.isObject)(buildEntry));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'pageFiles', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'assetsManifest', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'pluginManifest', 'object'));
+    return buildEntry;
+}
+function setGlobalContext_buildEntry(buildEntry) {
+    debug('setGlobalContext_buildEntry()');
+    globalObject.buildEntry = buildEntry;
+    globalObject.buildEntryPrevious = buildEntry;
+}
+function initDevEntry() {
+    (0, getPageFiles_js_1.setPageFilesAsync)(getPageFilesExports);
+}
+async function getPageFilesExports() {
+    const viteDevServer = getViteDevServer();
+    (0, utils_js_1.assert)(viteDevServer);
+    let moduleExports;
+    try {
+        moduleExports = await viteDevServer.ssrLoadModule(virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer);
+    }
+    catch (err) {
+        (0, utils_js_1.debugGlob)(`Glob error: ${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer} transpile error: `, err);
+        throw err;
+    }
+    moduleExports = moduleExports.default || moduleExports;
+    (0, utils_js_1.debugGlob)('Glob result: ', moduleExports);
+    (0, utils_js_1.assert)((0, utils_js_1.isObject)(moduleExports));
+    return moduleExports;
+}
+function clearGlobalContext() {
+    debug('clearGlobalContext()');
+    (0, utils_js_1.objectReplace)(globalObject, getInitialGlobalContext(), ['buildEntryPrevious']);
+}
+function getInitialGlobalContext() {
+    debug('getInitialGlobalContext()');
+    const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = (0, utils_js_1.genPromise)();
+    return {
+        viteDevServerPromise,
+        viteDevServerPromiseResolve
+    };
 }

package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js

@@ -10,7 +10,7 @@ const sanitizeJson_js_1 = require("./sanitizeJson.js");
 const inferHtmlTags_js_1 = require("./inferHtmlTags.js");
 const mergeScriptTags_js_1 = require("./mergeScriptTags.js");
 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 globalContext_js_1 = require("../../globalContext.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getConfigDefinedAt_js_1 = require("../../../../shared/page-configs/getConfigDefinedAt.js");
@@ -218,7 +218,7 @@ function getInjectScriptsAt(pageId, pageConfigs) {
     if (pageConfigs.length === 0)
         return null; // only support V1 design
     const pageConfig = (0, helpers_js_1.getPageConfig)(pageId, pageConfigs);
-    const configValue = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'injectScriptsAt');
+    const configValue = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'injectScriptsAt');
     if (!configValue)
         return null;
     const injectScriptsAt = configValue.value;

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

@@ -24,18 +24,3 @@ Object.defineProperty(exports, "_injectAssets", { enumerable: true, get: functio
 // TODO/v1-release: remove
 var createPageRenderer_js_1 = require("../createPageRenderer.js");
 Object.defineProperty(exports, "createPageRenderer", { enumerable: true, get: function () { return createPageRenderer_js_1.createPageRenderer; } });
-addEcosystemStamp();
-require("./page-files/setup.js");
-// 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/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/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

@@ -10,7 +10,7 @@ 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 getPageFiles_js_1 = require("../../../shared/getPageFiles/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");
@@ -174,10 +174,10 @@ async function getRenderContext() {
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     pageConfigs.length > 0, pageFilesAll);
     const renderContext = {
-        pageFilesAll: pageFilesAll,
+        pageFilesAll,
         pageConfigs,
         pageConfigGlobal,
-        allPageIds: allPageIds,
+        allPageIds,
         pageRoutes,
         onBeforeRouteHook
     };

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/resolveBase.js

@@ -9,12 +9,12 @@ const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
     let baseViteOriginal = config._baseViteOriginal;
-    if (baseViteOriginal === '/__UNSET__')
-        baseViteOriginal = null;
     (0, utils_js_1.assert)(baseViteOriginal === null || typeof baseViteOriginal == 'string');
     return resolveBase(baseViteOriginal, baseServer, baseAssets);
 }
 function resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved) {
+    if (baseViteOriginal === '/__UNSET__')
+        baseViteOriginal = null;
     {
         const wrongBase = (val) => `should start with ${picocolors_1.default.cyan('/')}, ${picocolors_1.default.cyan('http://')}, or ${picocolors_1.default.cyan('https://')} (it's ${picocolors_1.default.cyan(val)} instead)`;
         (0, utils_js_1.assertUsage)(baseViteOriginal === null || (0, utils_js_1.isBaseAssets)(baseViteOriginal), `vite.config.js#base ${wrongBase(baseViteOriginal)}`);

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,13 +1,12 @@
 "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 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;
@@ -25,11 +24,11 @@ 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();
         }
     }

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;