vike 0.4.238-commit-5762291 → 0.4.238-commit-4c6aa0d

package/dist/cjs/shared/createGlobalContextShared.js

@@ -73,7 +73,9 @@ addGlobalContextTmp, addGlobalContextAsync) {
     return globalObject.globalContext;
 }
 function createGlobalContextBase(virtualFileExportsGlobalEntry) {
-    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, vikeConfigPublicGlobal, vikeConfigPublicPagesEager, } = getConfigsAll(virtualFileExportsGlobalEntry);
+    const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseVirtualFileExportsGlobalEntry_js_1.parseVirtualFileExportsGlobalEntry)(virtualFileExportsGlobalEntry);
+    const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
+    const globalContextAddendum = (0, resolveVikeConfigPublic_js_1.resolveGlobalContextConfig)(pageConfigs, pageConfigGlobal);
     const globalContext = {
         /**
          * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
@@ -87,31 +89,11 @@ function createGlobalContextBase(virtualFileExportsGlobalEntry) {
         _pageConfigs: pageConfigs,
         _pageConfigGlobal: pageConfigGlobal,
         _allPageIds: allPageIds,
-        _vikeConfigPublicGlobal: vikeConfigPublicGlobal,
-        config: vikeConfigPublicGlobal.config,
-        pages: vikeConfigPublicPagesEager,
+        ...globalContextAddendum,
     };
     (0, utils_js_1.changeEnumerable)(globalContext, '_isOriginalObject', false);
     return globalContext;
 }
-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.resolveVikeConfigPublicPageEagerLoaded)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
-    }));
-    return {
-        pageFilesAll,
-        allPageIds,
-        pageConfigs,
-        pageConfigGlobal,
-        vikeConfigPublicGlobal,
-        vikeConfigPublicPagesEager,
-    };
-}
 function getAllPageIds(pageFilesAll, pageConfigs) {
     const fileIds = pageFilesAll.filter(({ isDefaultPageFile }) => !isDefaultPageFile).map(({ pageId }) => pageId);
     const allPageIds = (0, utils_js_1.unique)(fileIds);

package/dist/cjs/shared/createPageContextShared.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPageContextShared = createPageContextShared;
 exports.createPageContextObject = createPageContextObject;
 const utils_js_1 = require("./utils.js");
-function createPageContextShared(pageContextCreated, vikeConfigPublicGlobal) {
-    (0, utils_js_1.objectAssign)(pageContextCreated, vikeConfigPublicGlobal);
+function createPageContextShared(pageContextCreated, globalConfigPublic) {
+    (0, utils_js_1.objectAssign)(pageContextCreated, globalConfigPublic);
     return pageContextCreated;
 }
 function createPageContextObject() {

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

@@ -1,58 +1,51 @@
 "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.resolveVikeConfigPublicPageEagerLoaded = resolveVikeConfigPublicPageEagerLoaded;
-exports.resolveVikeConfigPublicPageLazyLoaded = resolveVikeConfigPublicPageLazyLoaded;
+exports.resolveGlobalConfigPublic = resolveGlobalConfigPublic;
+exports.resolvePageContextConfig = resolvePageContextConfig;
+exports.resolveGlobalContextConfig = resolveGlobalContextConfig;
 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 resolveVikeConfigPublicPageEagerLoaded(pageConfigGlobalValues, pageConfig, pageConfigValues) {
-    const vikeConfigPublicPage_ = resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues });
-    const vikeConfigPublicPage = getPublicCopy(vikeConfigPublicPage_);
-    let page;
-    if (!pageConfig.isErrorPage) {
-        const route = vikeConfigPublicPage.config.route ?? pageConfig.routeFilesystem.routeString;
-        page = {
-            ...vikeConfigPublicPage,
-            route,
-        };
-    }
-    else {
-        page = {
-            ...vikeConfigPublicPage,
-            isErrorPage: true,
-        };
-    }
+function resolveGlobalConfigPublicPage(pageConfigGlobalValues, pageConfig, pageConfigValues) {
+    const pageConfigPublic_ = resolvePageConfigPublic({ pageConfigGlobalValues, pageConfigValues });
+    const pageConfigPublic = getPublicCopy(pageConfigPublic_);
+    const page = (() => {
+        if (!pageConfig.isErrorPage) {
+            const route = pageConfigPublic.config.route ?? pageConfig.routeFilesystem.routeString;
+            return {
+                ...pageConfigPublic,
+                route,
+            };
+        }
+        else {
+            return {
+                ...pageConfigPublic,
+                isErrorPage: true,
+            };
+        }
+    })();
     return [pageConfig.pageId, page];
 }
-function getPublicCopy(vikeConfigPublic) {
-    return {
-        config: vikeConfigPublic.config,
-        _source: vikeConfigPublic.source,
-        _sources: vikeConfigPublic.sources,
-        _from: vikeConfigPublic.from,
+function getPublicCopy(configInternal) {
+    const configPublic = {
+        config: configInternal.config,
+        // TO-DO/soon/flat-pageContext: expose publicly?
+        _source: configInternal.source,
+        _sources: configInternal.sources,
+        _from: configInternal.from,
     };
+    return configPublic;
 }
-function resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues, }) {
+function resolvePageConfigPublic({ pageConfigGlobalValues, pageConfigValues, }) {
     const configValues = { ...pageConfigGlobalValues, ...pageConfigValues };
-    return resolveVikeConfigPublic_V1Design({ configValues });
+    return resolveConfigPublic_V1Design({ configValues });
 }
-function resolveVikeConfigPublicGlobal({ pageConfigGlobalValues, }) {
-    const vikeConfigPublicGlobal = resolveVikeConfigPublic_V1Design({ configValues: pageConfigGlobalValues });
-    return getPublicCopy(vikeConfigPublicGlobal);
-}
-function resolveVikeConfigPublicPageLazyLoaded(pageFiles, // V0.4 design
+function resolvePageContextConfig(pageFiles, // V0.4 design
 pageConfig, // V1 design
 pageConfigGlobal) {
     const config = {};
@@ -79,7 +72,7 @@ pageConfigGlobal) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = resolveVikeConfigPublic_base({
+        const res = resolvePageConfigPublic({
             pageConfigGlobalValues: pageConfigGlobal.configValues,
             pageConfigValues: pageConfig.configValues,
         });
@@ -114,7 +107,7 @@ pageConfigGlobal) {
     });
     (0, utils_js_1.assert)(!('default' in exports));
     (0, utils_js_1.assert)(!('default' in exportsAll));
-    const configPublicPageLazy = {
+    const pageContextAddendum = {
         config: config,
         from,
         source,
@@ -125,7 +118,7 @@ pageConfigGlobal) {
         exportsAll,
     };
     // TO-DO/next-major-release: remove
-    (0, utils_js_1.objectDefineProperty)(configPublicPageLazy, 'pageExports', {
+    (0, utils_js_1.objectDefineProperty)(pageContextAddendum, 'pageExports', {
         get: () => {
             // We only show the warning in Node.js because when using Client Routing Vue integration uses `Object.assign(pageContextReactive, pageContext)` which will wrongully trigger the warning. There is no cross-browser way to catch whether the property accessor was initiated by an `Object.assign()` call.
             if (!(0, utils_js_1.isBrowser)()) {
@@ -139,10 +132,33 @@ pageConfigGlobal) {
         enumerable: false,
         configurable: true,
     });
-    return configPublicPageLazy;
+    return pageContextAddendum;
+}
+function resolveGlobalContextConfig(pageConfigs, pageConfigGlobal) {
+    const globalContextAddendum = resolveGlobalConfigPublic(pageConfigs, pageConfigGlobal, (c) => c.configValues);
+    return globalContextAddendum;
+}
+function resolveGlobalConfigPublic(pageConfigs, pageConfigGlobal, getConfigValues) {
+    // global
+    const pageConfigGlobalValues = getConfigValues(pageConfigGlobal, true);
+    const globalConfigPublicBase_ = resolveConfigPublic_V1Design({ configValues: pageConfigGlobalValues });
+    const globalConfigPublicBase = getPublicCopy(globalConfigPublicBase_);
+    // pages
+    const pages = Object.fromEntries(pageConfigs.map((pageConfig) => {
+        const pageConfigValues = getConfigValues(pageConfig);
+        return resolveGlobalConfigPublicPage(pageConfigGlobalValues, pageConfig, pageConfigValues);
+    }));
+    const globalConfigPublic = {
+        ...globalConfigPublicBase,
+        pages,
+    };
+    return {
+        ...globalConfigPublic,
+        _globalConfigPublic: globalConfigPublic,
+    };
 }
 // V1 design
-function resolveVikeConfigPublic_V1Design(pageConfig) {
+function resolveConfigPublic_V1Design(pageConfig) {
     const config = {};
     const configEntries = {};
     const exportsAll = {};
@@ -230,6 +246,8 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
         from,
     };
 }
+// V0.4 design
+// TO-DO/next-major-release: remove
 function getExportValues(pageFile) {
     const { filePath, fileExports } = pageFile;
     (0, utils_js_1.assert)(fileExports); // assume pageFile.loadFile() was called

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.238-commit-5762291';
+exports.PROJECT_VERSION = '0.4.238-commit-4c6aa0d';

package/dist/cjs/utils/assert.js

@@ -152,6 +152,7 @@ function addPrefixProjectName(msg, showProjectVersion = false) {
     const prefix = showProjectVersion ? projectTagWithVersion : projectTag;
     return `${prefix}${msg}`;
 }
+// TO-DO/eventually: remove this (refactor the whole log handling)
 function getAssertErrMsg(thing) {
     let errMsg;
     let errStack;
@@ -175,7 +176,21 @@ function getAssertErrMsg(thing) {
             }
         }
         else if (errStack?.includes(tag)) {
-            throw new Error('Internal Vike error');
+            // The following assert can fail, e.g. with following error:
+            // ```
+            // Error: Error running module "/home/rom/code/vike-server/examples/cloudflare-react/cloudflare-entry.js".
+            // Error running module "photon:cloudflare:/home/rom/code/vike-server/examples/cloudflare-react/server.js".
+            // Error running module "/home/rom/code/vike-server/examples/cloudflare-react/server.js".
+            // Error running module "/home/rom/code/vike-server/node_modules/.pnpm/@photonjs+hono@0.0.6_@hattip+core@0.0.49_elysia@1.3.13_exact-mirror@0.1.6_@sinclair+typ_c39d432d43266746f390ace81b426601/node_modules/@photonjs/hono/dist/index.js?v=6ca51a04".
+            // Error running module "/home/rom/code/vike-server/node_modules/.pnpm/@photonjs+hono@0.0.6_@hattip+core@0.0.49_elysia@1.3.13_exact-mirror@0.1.6_@sinclair+typ_c39d432d43266746f390ace81b426601/node_modules/@photonjs/hono/dist/apply.dev.js?v=6ca51a04".
+            // Error running module "photon:get-middlewares:dev:hono".
+            // Error running module "/home/rom/code/vike-server/packages/vike-server/dist/universal.dev.js".
+            // [vike][Wrong Usage] The global context isn't set yet, use getGlobalContextAsync() instead........
+            //     at async ProxyServer.fetch (file:///home/rom/code/vike-server/node_modules/.pnpm/miniflare@4.20250829.0/node_modules/miniflare/src/workers/core/proxy.worker.ts:174:11)
+            // ```
+            /*
+            throw new Error('Internal Vike error')
+            */
         }
         if (errMsg?.startsWith(tag)) {
             const assertMsg = errMsg.slice(tag.length);

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

@@ -8,23 +8,51 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
     isPrerendering: false;
     urlOriginal: string;
     _globalContext: {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        _vikeConfigPublicGlobal: {
+        _globalConfigPublic: {
+            pages: {
+                [k: string]: {
+                    config: import("../../types/index.js").ConfigResolved;
+                    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
         };
-        config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
         };
+        config: import("../../types/index.js").ConfigResolved;
+        _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        isGlobalContext: true;
+        _isOriginalObject: true;
+        _virtualFileExportsGlobalEntry: unknown;
+        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _allPageIds: string[];
     } & {
         isClientSide: true;
     } & {
@@ -39,9 +67,4 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
-} & {
-    config: import("../../types/index.js").ConfigResolved;
-    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
-    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
-    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
-}>;
+} & import("../../shared/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic>;

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

@@ -21,7 +21,7 @@ async function createPageContextClientSide(urlOriginal) {
     });
     const pageContextUrlComputed = getPageContextUrlComputed(pageContextCreated);
     objectAssign(pageContextCreated, pageContextUrlComputed);
-    const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal);
+    const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._globalConfigPublic);
     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 { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
-type PageContextCurrent = VikeConfigPublicPageLazyLoaded & {
+import type { PageContextConfig } from '../../shared/getPageFiles.js';
+type PageContextCurrent = PageContextConfig & {
     urlPathname: string;
 };
 declare function getPageContextCurrent(): null | PageContextCurrent;