vike 0.4.237 → 0.4.238-commit-5762291

package/dist/cjs/shared/createGlobalContextShared.js

@@ -3,19 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalContextSyncErrMsg = void 0;
 exports.createGlobalContextShared = createGlobalContextShared;
 const utils_js_1 = require("./utils.js");
-const parseVirtualFileExports_js_1 = require("./getPageFiles/parseVirtualFileExports.js");
+const parseVirtualFileExportsGlobalEntry_js_1 = require("./getPageFiles/parseVirtualFileExportsGlobalEntry.js");
 const resolveVikeConfigPublic_js_1 = require("./page-configs/resolveVikeConfigPublic.js");
 const execHook_js_1 = require("./hooks/execHook.js");
 const prepareGlobalContextForPublicUsage_js_1 = require("./prepareGlobalContextForPublicUsage.js");
 const getHook_js_1 = require("./hooks/getHook.js");
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 exports.getGlobalContextSyncErrMsg = getGlobalContextSyncErrMsg;
-const globalObject_ = (0, utils_js_1.getGlobalObject)('shared/createGlobalContextShared.ts', {});
 // TO-DO/eventually use flat globalContext — like flat pageContext
-async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext, 
+async function createGlobalContextShared(virtualFileExportsGlobalEntry, globalObject, addGlobalContext, 
 // TO-DO/next-major-release: we'll be able to remove addGlobalContextTmp after loadPageRoutes() is sync (it will be sync after we remove the old design)
 addGlobalContextTmp, addGlobalContextAsync) {
-    const { previousCallPromise } = globalObject_;
+    const { previousCreateGlobalContextPromise } = globalObject;
     const { promise, resolve } = (0, utils_js_1.genPromise)({
         // Avoid this Cloudflare Worker error:
         // ```console
@@ -23,9 +22,12 @@ addGlobalContextTmp, addGlobalContextAsync) {
         // ```
         timeout: null,
     });
-    globalObject_.previousCallPromise = promise;
-    await previousCallPromise;
-    const globalContext = createGlobalContextBase(virtualFileExports);
+    globalObject.previousCreateGlobalContextPromise = promise;
+    if (previousCreateGlobalContextPromise) {
+        (0, utils_js_1.assert)(globalObject.globalContext);
+        await previousCreateGlobalContextPromise;
+    }
+    const globalContext = createGlobalContextBase(virtualFileExportsGlobalEntry);
     let isNewGlobalContext;
     if (!globalObject.globalContext) {
         // We set globalObject.globalContext early and before any async operations, so that getGlobalContextSync() can be used early.
@@ -37,7 +39,7 @@ addGlobalContextTmp, addGlobalContextAsync) {
         isNewGlobalContext = true;
     }
     if (addGlobalContext &&
-        // TODO/next-major-release: remove
+        // TO-DO/next-major-release: remove
         globalContext._pageConfigs.length > 0) {
         const globalContextAdded = addGlobalContext?.(globalContext);
         (0, utils_js_1.objectAssign)(globalContext, globalContextAdded);
@@ -70,8 +72,8 @@ addGlobalContextTmp, addGlobalContextAsync) {
     resolve();
     return globalObject.globalContext;
 }
-function createGlobalContextBase(virtualFileExports) {
-    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, vikeConfigPublicGlobal, vikeConfigPublicPagesEager, } = getConfigsAll(virtualFileExports);
+function createGlobalContextBase(virtualFileExportsGlobalEntry) {
+    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, vikeConfigPublicGlobal, vikeConfigPublicPagesEager, } = getConfigsAll(virtualFileExportsGlobalEntry);
     const globalContext = {
         /**
          * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
@@ -80,7 +82,7 @@ function createGlobalContextBase(virtualFileExports) {
          */
         isGlobalContext: true,
         _isOriginalObject: true,
-        _virtualFileExports: virtualFileExports,
+        _virtualFileExportsGlobalEntry: virtualFileExportsGlobalEntry,
         _pageFilesAll: pageFilesAll,
         _pageConfigs: pageConfigs,
         _pageConfigGlobal: pageConfigGlobal,
@@ -92,14 +94,14 @@ function createGlobalContextBase(virtualFileExports) {
     (0, utils_js_1.changeEnumerable)(globalContext, '_isOriginalObject', false);
     return globalContext;
 }
-function getConfigsAll(virtualFileExports) {
-    const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseVirtualFileExports_js_1.parseVirtualFileExports)(virtualFileExports);
+function getConfigsAll(virtualFileExportsGlobalEntry) {
+    const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseVirtualFileExportsGlobalEntry_js_1.parseVirtualFileExportsGlobalEntry)(virtualFileExportsGlobalEntry);
     const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
     const vikeConfigPublicGlobal = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicGlobal)({
         pageConfigGlobalValues: pageConfigGlobal.configValues,
     });
     const vikeConfigPublicPagesEager = Object.fromEntries(pageConfigs.map((pageConfig) => {
-        return (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageEager)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
+        return (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageEagerLoaded)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
     }));
     return {
         pageFilesAll,

package/dist/cjs/shared/getPageFiles/{parseVirtualFileExports.js → parseVirtualFileExportsGlobalEntry.js}

@@ -1,35 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseVirtualFileExports = parseVirtualFileExports;
-// TODO/now: rename parseVirtualFileExportsEntryGlobal
-// TODO/now: merge or collocate following both files?
-// ```filesystem
-// vike/packages/vike/shared/getPageFiles/parseVirtualFileExports.ts
-// vike/shared/page-configs/serialize/parsePageConfigs.ts
-// ```
+exports.parseVirtualFileExportsGlobalEntry = parseVirtualFileExportsGlobalEntry;
 // TO-DO/next-major-release: remove old design code, and remove all assertions.
 const utils_js_1 = require("../utils.js");
 const assert_exports_old_design_js_1 = require("./assert_exports_old_design.js");
 const getPageFileObject_js_1 = require("./getPageFileObject.js");
 const fileTypes_js_1 = require("./fileTypes.js");
-const parsePageConfigs_js_1 = require("../page-configs/serialize/parsePageConfigs.js");
-function parseVirtualFileExports(virtualFileExports) {
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesLazy', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesEager', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesExportNamesLazy', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesExportNamesEager', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports.pageFilesLazy, '.page'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports.pageFilesLazy, '.page.client') ||
-        (0, utils_js_1.hasProp)(virtualFileExports.pageFilesLazy, '.page.server'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesList', 'string[]'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageConfigsSerialized'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageConfigGlobalSerialized'));
-    const { pageConfigsSerialized, pageConfigGlobalSerialized } = virtualFileExports;
+const parsePageConfigsSerialized_js_1 = require("../page-configs/serialize/parsePageConfigsSerialized.js");
+function parseVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry) {
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry, 'pageFilesLazy', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry, 'pageFilesEager', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry, 'pageFilesExportNamesLazy', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry, 'pageFilesExportNamesEager', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry.pageFilesLazy, '.page'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry.pageFilesLazy, '.page.client') ||
+        (0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry.pageFilesLazy, '.page.server'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry, 'pageFilesList', 'string[]'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry, 'pageConfigsSerialized'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExportsGlobalEntry, 'pageConfigGlobalSerialized'));
+    const { pageConfigsSerialized, pageConfigGlobalSerialized } = virtualFileExportsGlobalEntry;
     assertPageConfigsSerialized(pageConfigsSerialized);
     assertPageConfigGlobalSerialized(pageConfigGlobalSerialized);
-    const { pageConfigs, pageConfigGlobal } = (0, parsePageConfigs_js_1.parsePageConfigs)(pageConfigsSerialized, pageConfigGlobalSerialized);
+    const { pageConfigs, pageConfigGlobal } = (0, parsePageConfigsSerialized_js_1.parsePageConfigsSerialized)(pageConfigsSerialized, pageConfigGlobalSerialized);
     const pageFilesMap = {};
-    parseGlobResult(virtualFileExports.pageFilesLazy).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExportsGlobalEntry.pageFilesLazy).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const loadModule = globValue;
         assertLoadModule(loadModule);
@@ -40,7 +34,7 @@ function parseVirtualFileExports(virtualFileExports) {
             }
         };
     });
-    parseGlobResult(virtualFileExports.pageFilesExportNamesLazy).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExportsGlobalEntry.pageFilesExportNamesLazy).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const loadModule = globValue;
         assertLoadModule(loadModule);
@@ -53,20 +47,20 @@ function parseVirtualFileExports(virtualFileExports) {
         };
     });
     // `pageFilesEager` contains `.page.route.js` files
-    parseGlobResult(virtualFileExports.pageFilesEager).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExportsGlobalEntry.pageFilesEager).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const moduleExports = globValue;
         (0, utils_js_1.assert)((0, utils_js_1.isObject)(moduleExports));
         pageFile.fileExports = moduleExports;
     });
-    parseGlobResult(virtualFileExports.pageFilesExportNamesEager).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExportsGlobalEntry.pageFilesExportNamesEager).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const moduleExports = globValue;
         (0, utils_js_1.assert)((0, utils_js_1.isObject)(moduleExports));
         (0, utils_js_1.assert)((0, utils_js_1.hasProp)(moduleExports, 'exportNames', 'string[]'), pageFile.filePath);
         pageFile.exportNames = moduleExports.exportNames;
     });
-    virtualFileExports.pageFilesList.forEach((filePath) => {
+    virtualFileExportsGlobalEntry.pageFilesList.forEach((filePath) => {
         pageFilesMap[filePath] = pageFilesMap[filePath] ?? (0, getPageFileObject_js_1.getPageFileObject)(filePath);
     });
     const pageFilesAll = Object.values(pageFilesMap);

package/dist/cjs/shared/page-configs/loadAndParseVirtualFilePageEntry.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadAndParseVirtualFilePageEntry = loadAndParseVirtualFilePageEntry;
+const utils_js_1 = require("../utils.js");
+const parsePageConfigsSerialized_js_1 = require("./serialize/parsePageConfigsSerialized.js");
+async function loadAndParseVirtualFilePageEntry(pageConfig, isDev) {
+    if ('isPageEntryLoaded' in pageConfig &&
+        // We don't need to cache in dev, since Vite already caches the virtual module
+        !isDev) {
+        return pageConfig;
+    }
+    const { moduleId, moduleExportsPromise } = pageConfig.loadVirtualFilePageEntry();
+    const virtualFileExportsPageEntry = await moduleExportsPromise;
+    // `configValuesLoaded` is sometimes `undefined` https://github.com/vikejs/vike/discussions/2092
+    if (!virtualFileExportsPageEntry)
+        (0, utils_js_1.assert)(false, { moduleExportsPromise, virtualFileExportsPageEntry, moduleId });
+    const configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry);
+    Object.assign(pageConfig.configValues, configValues);
+    (0, utils_js_1.objectAssign)(pageConfig, { isPageEntryLoaded: true });
+    return pageConfig;
+}
+function parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry) {
+    const configValues = (0, parsePageConfigsSerialized_js_1.parseConfigValuesSerialized)(virtualFileExportsPageEntry.configValuesSerialized);
+    return configValues;
+}

package/dist/cjs/shared/page-configs/resolveVikeConfigPublic.js

@@ -1,17 +1,23 @@
 "use strict";
+// TODO/now: rename PageConfig names
+// - Use `Internal` suffix, i.e. {Page,Global}ConfigInternal
+//   - While keeping {Page,Global}ConfigPublic or remove Public suffix and rename it to {Page,Global}Config ?
+// - rename EagerLoaded EagerlyLoaded
+// - remove `LazyLoaded` suffix
+// TODO/now: rename VikeConfigPublicPageLazyLoaded PageContextSomething (for `pageContext: PageContextSomething` usage)
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveVikeConfigPublicGlobal = resolveVikeConfigPublicGlobal;
-exports.resolveVikeConfigPublicPageEager = resolveVikeConfigPublicPageEager;
-exports.resolveVikeConfigPublicPageLazy = resolveVikeConfigPublicPageLazy;
+exports.resolveVikeConfigPublicPageEagerLoaded = resolveVikeConfigPublicPageEagerLoaded;
+exports.resolveVikeConfigPublicPageLazyLoaded = resolveVikeConfigPublicPageLazyLoaded;
 const assert_exports_old_design_js_1 = require("../getPageFiles/assert_exports_old_design.js");
 const getConfigDefinedAt_js_1 = require("./getConfigDefinedAt.js");
 const helpers_js_1 = require("./helpers.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function resolveVikeConfigPublicPageEager(pageConfigGlobalValues, pageConfig, pageConfigValues) {
+function resolveVikeConfigPublicPageEagerLoaded(pageConfigGlobalValues, pageConfig, pageConfigValues) {
     const vikeConfigPublicPage_ = resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues });
     const vikeConfigPublicPage = getPublicCopy(vikeConfigPublicPage_);
     let page;
@@ -46,7 +52,7 @@ function resolveVikeConfigPublicGlobal({ pageConfigGlobalValues, }) {
     const vikeConfigPublicGlobal = resolveVikeConfigPublic_V1Design({ configValues: pageConfigGlobalValues });
     return getPublicCopy(vikeConfigPublicGlobal);
 }
-function resolveVikeConfigPublicPageLazy(pageFiles, // V0.4 design
+function resolveVikeConfigPublicPageLazyLoaded(pageFiles, // V0.4 design
 pageConfig, // V1 design
 pageConfigGlobal) {
     const config = {};

package/dist/cjs/shared/page-configs/serialize/{parsePageConfigs.js → parsePageConfigsSerialized.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parsePageConfigs = parsePageConfigs;
+exports.parsePageConfigsSerialized = parsePageConfigsSerialized;
 exports.parseConfigValuesSerialized = parseConfigValuesSerialized;
 const utils_js_1 = require("../../utils.js");
 const getConfigDefinedAt_js_1 = require("../getConfigDefinedAt.js");
 const parse_1 = require("@brillout/json-serializer/parse");
 const assertPlusFileExport_js_1 = require("../assertPlusFileExport.js");
-function parsePageConfigs(pageConfigsSerialized, pageConfigGlobalSerialized) {
+function parsePageConfigsSerialized(pageConfigsSerialized, pageConfigGlobalSerialized) {
     // pageConfigs
     const pageConfigs = pageConfigsSerialized.map((pageConfigSerialized) => {
         const configValues = parseConfigValuesSerialized(pageConfigSerialized.configValuesSerialized);

package/dist/cjs/shared/page-configs/serialize/serializeConfigValues.js

@@ -16,9 +16,9 @@ const getConfigValueSourcesRelevant_js_1 = require("../../../node/vite/plugins/p
 const stringifyOptions = { forbidReactElements: true };
 const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
 const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
-// This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with parsePageConfigs()
-// - vike/shared/page-configs/serialize/parsePageConfigs.ts
-// - parsePageConfigs() is loaded on both the client- and server-side.
+// This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with parsePageConfigsSerialized()
+// - vike/shared/page-configs/serialize/parsePageConfigsSerialized.ts
+// - parsePageConfigsSerialized() is loaded on both the client- and server-side.
 (0, utils_js_1.assertIsNotBrowser)();
 (0, assertSetup_js_1.assertIsNotProductionRuntime)();
 function serializeConfigValues(pageConfig, importStatements, filesEnv, runtimeEnv, tabspace, isEager) {

package/dist/cjs/shared/route/execHookOnBeforeRoute.js

@@ -28,7 +28,6 @@ async function execHookOnBeforeRoute(pageContext) {
             }
             (0, utils_js_1.objectAssign)(pageContextFromOnBeforeRouteHook, {
                 _routingProvidedByOnBeforeRouteHook: true,
-                _debugRouteMatches: 'CUSTOM_ROUTING',
             });
             return pageContextFromOnBeforeRouteHook;
         }

package/dist/cjs/shared/route/index.js

@@ -86,7 +86,6 @@ async function route(pageContext, skipOnBeforeRouteHook) {
     (0, resolvePrecedence_js_1.resolvePrecedence)(routeMatches);
     const winner = routeMatches[0] ?? null;
     (0, debug_js_1.debug)(`Route matches for URL ${picocolors_1.default.cyan(urlPathname)} (in precedence order):`, routeMatches);
-    (0, utils_js_1.objectAssign)(pageContextFromRoute, { _debugRouteMatches: routeMatches });
     // For vite-plugin-vercel https://github.com/magne4000/vite-plugin-vercel/blob/main/packages/vike-integration/vike.ts#L173
     (0, utils_js_1.objectAssign)(pageContextFromRoute, { _routeMatch: winner });
     if (!winner) {

package/dist/cjs/types/VikeGlobalInternal.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.237';
+exports.PROJECT_VERSION = '0.4.238-commit-5762291';

package/dist/cjs/utils/assertSetup.js

@@ -17,6 +17,7 @@ const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 const debug_js_1 = require("./debug.js");
 const getGlobalObject_js_1 = require("./getGlobalObject.js");
+const isNonRunnableDev_js_1 = require("./isNonRunnableDev.js");
 const isVitest_js_1 = require("./isVitest.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
@@ -29,8 +30,6 @@ function assertIsNotProductionRuntime() {
     setup.shouldNotBeProduction = true;
 }
 function onSetupRuntime() {
-    if (true)
-        return; // TODO/now refactor this
     if (debug.isActivated)
         debug('assertSetup()', new Error().stack);
     if (isTest())
@@ -38,7 +37,7 @@ function onSetupRuntime() {
     assertNodeEnvIsNotUndefinedString();
     if (!setup.viteDevServer && setup.isViteDev === undefined) {
         // TO-DO/eventually: make it assertUsage() again once https://github.com/vikejs/vike/issues/1528 is implemented.
-        (0, assert_js_1.assertWarning)(!isNodeEnvDev(), `The ${getEnvDescription()}, which is contradictory because the environment seems to be a production environment (Vite isn't loaded), see ${picocolors_1.default.underline('https://vike.dev/NODE_ENV')} and ${picocolors_1.default.underline('https://vike.dev/warning/setup')}`, { onlyOnce: true });
+        (0, assert_js_1.assertWarning)(!isNodeEnvDev() || (0, isNonRunnableDev_js_1.isNonRunnableDev)(), `The ${getEnvDescription()}, which is contradictory because the environment seems to be a production environment (Vite isn't loaded), see ${picocolors_1.default.underline('https://vike.dev/NODE_ENV')} and ${picocolors_1.default.underline('https://vike.dev/warning/setup')}`, { onlyOnce: true });
         (0, assert_js_1.assertUsage)(!setup.vikeVitePlugin, `Vike's Vite plugin (the ${picocolors_1.default.cyan('vike/plugin')} module) shouldn't be loaded in production, see ${picocolors_1.default.underline('https://vike.dev/warning/setup')}`);
         // This assert() one of the main goal of this file: it ensures assertIsNotProductionRuntime()
         (0, assert_js_1.assert)(!setup.shouldNotBeProduction);

package/dist/cjs/utils/assertVersion.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertVersion = assertVersion;
 exports.isVersionOrAbove = isVersionOrAbove;
 const assert_js_1 = require("./assert.js");
+const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 function assertVersion(dependencyName, versionActual, versionExpected) {
     (0, assert_js_1.assert)(versionActual);
     (0, assert_js_1.assert)(versionExpected);

package/dist/cjs/utils/debug.js

@@ -5,17 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDebugger = createDebugger;
 exports.isDebugActivated = isDebugActivated;
-const isBrowser_js_1 = require("./isBrowser.js");
 const isCallable_js_1 = require("./isCallable.js");
 const objectAssign_js_1 = require("./objectAssign.js");
 const assert_js_1 = require("./assert.js");
 const checkType_js_1 = require("./checkType.js");
-const getTerminWidth_js_1 = require("./getTerminWidth.js");
+const getTerminalWidth_js_1 = require("./getTerminalWidth.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isArray_js_1 = require("./isArray.js");
 const isObject_js_1 = require("./isObject.js");
 const debug_js_1 = require("../shared/route/debug.js");
-(0, assert_js_1.assert)(!(0, isBrowser_js_1.isBrowser)());
+const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 (0, debug_js_1.setCreateDebugger)(createDebugger); // for isomorphic code
 const flags = [
     'vike:crawl',
@@ -117,7 +117,7 @@ function formatMsg(info, options, padding, position) {
     return str;
 }
 function pad(str, padding) {
-    const terminalWidth = (0, getTerminWidth_js_1.getTerminalWidth)();
+    const terminalWidth = (0, getTerminalWidth_js_1.getTerminalWidth)();
     const lines = [];
     str.split('\n').forEach((line) => {
         if (!terminalWidth) {

package/dist/cjs/utils/getGlobalObject.js

@@ -1,22 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalObject = getGlobalObject;
-exports.assertIsSingleModuleInstance = assertIsSingleModuleInstance;
-const assert_js_1 = require("./assert.js");
 /** Share information across module instances. */
-function getGlobalObject(key, defaultValue) {
-    const globalObjects = getGlobalObjects();
-    const globalObject = (globalObjects[key] = globalObjects[key] || defaultValue);
+function getGlobalObject(moduleId, defaultValue) {
+    const globals = getGlobals();
+    const globalObject = (globals[moduleId] ?? (globals[moduleId] = defaultValue));
     return globalObject;
 }
-/** Assert that the module is instantiated only once. */
-function assertIsSingleModuleInstance(key) {
-    const globalObjects = getGlobalObjects();
-    (0, assert_js_1.assert)(!(key in globalObjects));
-}
-function getGlobalObjects() {
-    const projectKey = '_vike';
-    // @ts-ignore
-    const globalObjects = (globalThis[projectKey] = globalThis[projectKey] || {});
-    return globalObjects;
+function getGlobals() {
+    var _a;
+    globalThis._vike ?? (globalThis._vike = {});
+    (_a = globalThis._vike).globals ?? (_a.globals = {});
+    return globalThis._vike.globals;
 }

package/dist/cjs/utils/isNonRunnableDev.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isNonRunnableDev = isNonRunnableDev;
+const assert_js_1 = require("./assert.js");
+const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
+function isNonRunnableDev() {
+    if (typeof __VIKE__IS_NON_RUNNABLE_DEV === 'undefined')
+        return false;
+    (0, assert_js_1.assert)(__VIKE__IS_NON_RUNNABLE_DEV === true);
+    return true;
+}

package/dist/cjs/utils/isScriptFile.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scriptFileExtensionList = exports.scriptFileExtensionPattern = void 0;
+exports.scriptFileExtensionPattern = exports.scriptFileExtensionList = void 0;
 exports.isScriptFile = isScriptFile;
 exports.isPlainScriptFile = isPlainScriptFile;
 exports.isTemplateFile = isTemplateFile;

package/dist/cjs/utils/path.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pathJoin = pathJoin;
 exports.pathIsRelative = pathIsRelative;
+exports.pathIsAbsolute = pathIsAbsolute;
 exports.toPosixPath = toPosixPath;
 exports.assertPosixPath = assertPosixPath;
 // Utilities for handling file paths.
@@ -22,12 +23,11 @@ function pathJoin(path1, path2) {
         joined = '/' + joined;
     return joined;
 }
-/* https://github.com/brillout/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
-const IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/
-function pathIsAbsolute(filePath: string) {
-  return IS_ABSOLUTE_RE.test(filePath)
+// https://github.com/brillout/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
+const IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
+function pathIsAbsolute(filePath) {
+    return IS_ABSOLUTE_RE.test(filePath);
 }
-//*/
 /**********************/
 /****** UTILS *********/
 /**********************/

package/dist/cjs/utils/requireResolve.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireResolveOptional = requireResolveOptional;
 exports.requireResolveOptionalDir = requireResolveOptionalDir;
 exports.requireResolveNpmPackage = requireResolveNpmPackage;
-exports.requireResolveVikeDistFile = requireResolveVikeDistFile;
-exports.getVikeNodeModulesRoot = getVikeNodeModulesRoot;
+exports.requireResolveDistFile = requireResolveDistFile;
+exports.getPackageNodeModulesDirectory = getPackageNodeModulesDirectory;
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 const assertSetup_js_1 = require("./assertSetup.js");
@@ -109,11 +109,11 @@ function requireResolveNpmPackage({ importPathNpmPackage, userRootDir, }) {
         throw res.err;
     return res.importPathResolvedFilePath;
 }
-function requireResolveVikeDistFile(vikeDistFile) {
-    const vikeNodeModulesRoot = getVikeNodeModulesRoot();
-    (0, path_js_1.assertPosixPath)(vikeNodeModulesRoot);
-    (0, path_js_1.assertPosixPath)(vikeDistFile);
-    const importPathResolvedFilePath = makeNodeFriendly(node_path_1.default.posix.join(vikeNodeModulesRoot, vikeDistFile));
+function requireResolveDistFile(distFile) {
+    const packageNodeModulesDirectory = getPackageNodeModulesDirectory();
+    (0, path_js_1.assertPosixPath)(packageNodeModulesDirectory);
+    (0, path_js_1.assertPosixPath)(distFile);
+    const importPathResolvedFilePath = makeNodeFriendly(node_path_1.default.posix.join(packageNodeModulesDirectory, distFile));
     // Double check
     {
         const res = requireResolve_(importPathResolvedFilePath, 
@@ -171,11 +171,12 @@ function addFileExtensionsToRequireResolve(require_) {
         }
     });
 }
-function getVikeNodeModulesRoot() {
-    // [RELATIVE_PATH_FROM_DIST] Current file: vike/dist/esm/utils/requireResolve.js
-    (0, assert_js_1.assert)(importMetaUrl.includes('/dist/esm/') || importMetaUrl.includes('/dist/cjs/'));
-    const vikeNodeModulesRoot = node_path_1.default.posix.join(removeFilePrefix(importMetaUrl), '../../../../');
-    return vikeNodeModulesRoot;
+function getPackageNodeModulesDirectory() {
+    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/${packageName}/dist/esm/utils/requireResolve.js
+    (0, assert_js_1.assert)(importMetaUrl.includes('/dist/esm/utils/') || importMetaUrl.includes('/dist/cjs/utils/'));
+    const packageNodeModulesDirectory = node_path_1.default.posix.join(removeFilePrefix(node_path_1.default.dirname(importMetaUrl)), '../../../');
+    // Return `node_modules/${packageName}/`
+    return packageNodeModulesDirectory;
 }
 function getFakeImporterFile(dirPath) {
     (0, path_js_1.assertPosixPath)(dirPath);

package/dist/cjs/utils/{augmentType.js → updateType.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.augmentType = augmentType;
+exports.updateType = updateType;
 const assert_js_1 = require("./assert.js");
-/** Help TypeScript augment the type of objects. */
-function augmentType(thing, clone) {
+/** Help TypeScript update the type of dynamically modified objects. */
+function updateType(thing, clone) {
     // @ts-ignore
     (0, assert_js_1.assert)(thing === clone);
 }

package/dist/esm/__internal/index.d.ts

@@ -1,4 +1,4 @@
-export { setGlobalContext_buildEntry } from '../node/runtime/globalContext.js';
+export { setGlobalContext_prodBuildEntry } from '../node/runtime/globalContext.js';
 export { route, getPagesAndRoutes };
 export type { PageRoutes, PageFile, PageConfigRuntime as PageConfig };
 import { route as routeInternal, type PageRoutes } from '../shared/route/index.js';
@@ -16,5 +16,5 @@ declare function getPagesAndRoutes(): Promise<{
     allPageIds: string[];
 }>;
 declare function route(pageContext: Parameters<typeof routeInternal>[0]): Promise<{
-    pageContextAddendum: import("../shared/route/index.js").PageContextFromRoute;
+    pageContextAddendum: import("../shared/route/index.js").PageContextAfterRoute;
 }>;

package/dist/esm/__internal/index.js

@@ -1,6 +1,6 @@
-// Needed by Vike
-export { setGlobalContext_buildEntry } from '../node/runtime/globalContext.js';
-// Needed by vite-plugin-vercel
+// Used by vike:build:pluginProdBuildEntry
+export { setGlobalContext_prodBuildEntry } from '../node/runtime/globalContext.js';
+// Used by vite-plugin-vercel
 export { route, getPagesAndRoutes };
 import { route as routeInternal } from '../shared/route/index.js';
 import { getGlobalContextServerInternal, initGlobalContext_getPagesAndRoutes } from '../node/runtime/globalContext.js';

package/dist/esm/client/runtime-client-routing/createPageContextClientSide.d.ts

@@ -10,7 +10,7 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
     _globalContext: {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -23,7 +23,7 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & {
         isClientSide: true;

package/dist/esm/client/runtime-client-routing/createPageContextClientSide.js

@@ -3,7 +3,7 @@ import { createPageContextObject, createPageContextShared } from '../../shared/c
 import { getPageContextUrlComputed } from '../../shared/getPageContextUrlComputed.js';
 import { getBaseServer } from './getBaseServer.js';
 import { getGlobalContextClientInternal } from './globalContext.js';
-import { assert, augmentType, isBaseServer, objectAssign } from './utils.js';
+import { assert, updateType, isBaseServer, objectAssign } from './utils.js';
 async function createPageContextClientSide(urlOriginal) {
     const globalContext = await getGlobalContextClientInternal();
     const baseServer = getBaseServer();
@@ -22,6 +22,6 @@ async function createPageContextClientSide(urlOriginal) {
     const pageContextUrlComputed = getPageContextUrlComputed(pageContextCreated);
     objectAssign(pageContextCreated, pageContextUrlComputed);
     const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal);
-    augmentType(pageContextCreated, pageContextAugmented);
+    updateType(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }

package/dist/esm/client/runtime-client-routing/getPageContextCurrent.d.ts

@@ -1,7 +1,7 @@
 export { setPageContextCurrent };
 export { getPageContextCurrent };
-import type { VikeConfigPublicPageLazy } from '../../shared/getPageFiles.js';
-type PageContextCurrent = VikeConfigPublicPageLazy & {
+import type { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
+type PageContextCurrent = VikeConfigPublicPageLazyLoaded & {
     urlPathname: string;
 };
 declare function getPageContextCurrent(): null | PageContextCurrent;