vike 0.4.229-commit-e27d672 → 0.4.229-commit-847f1b6

package/dist/cjs/shared/getProxyForPublicUsage.js

@@ -18,13 +18,14 @@ function getProxyForPublicUsage(obj, objName, skipOnInternalProp, fallback) {
 function getTrapGet(obj, objName, skipOnInternalProp, fallback) {
     return function (_, prop) {
         const propStr = String(prop);
+        if (prop === '_isProxyObject')
+            return true;
         if (!skipOnInternalProp)
             onInternalProp(propStr, objName);
-        if (fallback) {
+        if (fallback && !(prop in obj)) {
             // Rudimentary flat pageContext implementation https://github.com/vikejs/vike/issues/1268
             // Failed full-fledged implementation: https://github.com/vikejs/vike/pull/2458
-            if (!(prop in obj) && prop in fallback)
-                return fallback[prop];
+            return fallback(prop);
         }
         const val = obj[prop];
         onNotSerializable(propStr, val, objName);

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

@@ -115,7 +115,7 @@ function execHookAsync(hookFnCaller, hook, pageContextForPublicUsage) {
         }, timeoutErr);
     (async () => {
         try {
-            providePageContext(pageContextForPublicUsage);
+            providePageContextInternal(pageContextForPublicUsage);
             const ret = await hookFnCaller();
             resolve(ret);
         }
@@ -130,7 +130,7 @@ function execHookAsync(hookFnCaller, hook, pageContextForPublicUsage) {
 }
 function execHookSync(hook, pageContext, preparePageContextForPublicUsage) {
     const pageContextForPublicUsage = preparePageContextForPublicUsage(pageContext);
-    providePageContext(pageContextForPublicUsage);
+    providePageContextInternal(pageContextForPublicUsage);
     const hookReturn = hook.hookFn(pageContextForPublicUsage);
     return { hookReturn };
 }
@@ -145,8 +145,11 @@ function isNotDisabled(timeout) {
 function getPageContext() {
     const { pageContext } = globalObject;
     if (!pageContext)
-        return pageContext;
-    const pageContextForPublicUsage = (0, preparePageContextForPublicUsage_js_1.preparePageContextForPublicUsage)(pageContext);
+        return null;
+    const pageContextForPublicUsage = pageContext._isProxyObject
+        ? // providePageContext() is called on the user-land (e.g. it's called by `vike-{react,vue,solid}`) thus it's already a proxy
+            pageContext
+        : (0, preparePageContextForPublicUsage_js_1.preparePageContextForPublicUsage)(pageContext);
     return pageContextForPublicUsage;
 }
 /**
@@ -155,6 +158,9 @@ function getPageContext() {
  * https://vike.dev/getPageContext
  */
 function providePageContext(pageContext) {
+    providePageContextInternal(pageContext);
+}
+function providePageContextInternal(pageContext) {
     globalObject.pageContext = pageContext;
     // Promise.resolve() is quicker than process.nextTick() and setImmediate()
     // https://stackoverflow.com/questions/67949576/process-nexttick-before-promise-resolve-then

package/dist/cjs/shared/preparePageContextForPublicUsage.js

@@ -7,12 +7,9 @@ const addIs404ToPageProps_js_1 = require("./addIs404ToPageProps.js");
 const prepareGlobalContextForPublicUsage_js_1 = require("./prepareGlobalContextForPublicUsage.js");
 const getProxyForPublicUsage_js_1 = require("./getProxyForPublicUsage.js");
 function preparePageContextForPublicUsage(pageContext) {
+    (0, utils_js_1.assert)(!pageContext._isProxyObject);
     (0, utils_js_1.assert)(!pageContext.globalContext); // pageContext.globalContext should only be available to users — Vike itself should use pageContext._globalContext instead
     (0, utils_js_1.assert)(pageContext._isOriginalObject); // ensure we preserve the original object reference
-    const globalContextPublic = (0, prepareGlobalContextForPublicUsage_js_1.prepareGlobalContextForPublicUsage)(pageContext._globalContext);
-    (0, utils_js_1.objectAssign)(pageContext, {
-        globalContext: globalContextPublic
-    });
     (0, addIs404ToPageProps_js_1.addIs404ToPageProps)(pageContext);
     // TODO/next-major-release: remove
     if (!('_pageId' in pageContext)) {
@@ -29,10 +26,18 @@ function preparePageContextForPublicUsage(pageContext) {
     }
     // For a more readable `console.log(pageContext)` output
     sortPageContext(pageContext);
+    const globalContextPublic = (0, prepareGlobalContextForPublicUsage_js_1.prepareGlobalContextForPublicUsage)(pageContext._globalContext);
     const pageContextPublic = (0, getProxyForPublicUsage_js_1.getProxyForPublicUsage)(pageContext, 'pageContext', 
     // We must skip it in the client-side because of the reactivity mechanism of UI frameworks like Solid.
     // - TODO/now: double check whether that's true
-    true, pageContext.globalContext);
+    true, (prop) => {
+        if (prop === 'globalContext') {
+            return globalContextPublic;
+        }
+        if (prop in globalContextPublic) {
+            return globalContextPublic[prop];
+        }
+    });
     return pageContextPublic;
 }
 // Sort `pageContext` keys alphabetically, in order to make reading the `console.log(pageContext)` output easier

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.229-commit-e27d672';
+exports.PROJECT_VERSION = '0.4.229-commit-847f1b6';

package/dist/esm/client/shared/preparePageContextForPublicUsageClientShared.d.ts

@@ -8,6 +8,4 @@ type PageContextForPublicUsageClientShared = PageContextPrepareMinimum & PageCon
 declare function preparePageContextForPublicUsageClientShared<PageContext extends PageContextForPublicUsageClientShared>(pageContext: PageContext): PageContext & {
     Page: unknown;
 };
-declare function preparePageContextForPublicUsageClientMinimal<PageContext extends PageContextPrepareMinimum>(pageContext: PageContext): PageContext & {
-    globalContext: import("../../shared/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
-};
+declare function preparePageContextForPublicUsageClientMinimal<PageContext extends PageContextPrepareMinimum>(pageContext: PageContext): PageContext;

package/dist/esm/shared/getProxyForPublicUsage.d.ts

@@ -1,4 +1,4 @@
 export { getProxyForPublicUsage };
 type Target = Record<string, unknown>;
-type Fallback = Record<string | symbol, unknown>;
+type Fallback = (prop: string | symbol) => unknown;
 declare function getProxyForPublicUsage<Obj extends Target>(obj: Obj, objName: string, skipOnInternalProp?: true, fallback?: Fallback): Obj;

package/dist/esm/shared/getProxyForPublicUsage.js

@@ -16,13 +16,14 @@ function getProxyForPublicUsage(obj, objName, skipOnInternalProp, fallback) {
 function getTrapGet(obj, objName, skipOnInternalProp, fallback) {
     return function (_, prop) {
         const propStr = String(prop);
+        if (prop === '_isProxyObject')
+            return true;
         if (!skipOnInternalProp)
             onInternalProp(propStr, objName);
-        if (fallback) {
+        if (fallback && !(prop in obj)) {
             // Rudimentary flat pageContext implementation https://github.com/vikejs/vike/issues/1268
             // Failed full-fledged implementation: https://github.com/vikejs/vike/pull/2458
-            if (!(prop in obj) && prop in fallback)
-                return fallback[prop];
+            return fallback(prop);
         }
         const val = obj[prop];
         onNotSerializable(propStr, val, objName);

package/dist/esm/shared/hooks/execHook.d.ts

@@ -60,4 +60,4 @@ declare function getPageContext<PageContext = PageContextClient | PageContextSer
  *
  * https://vike.dev/getPageContext
  */
-declare function providePageContext(pageContext: null | PageContextPrepareMinimum): void;
+declare function providePageContext(pageContext: null | PageContextClient | PageContextServer): void;

package/dist/esm/shared/hooks/execHook.js

@@ -113,7 +113,7 @@ function execHookAsync(hookFnCaller, hook, pageContextForPublicUsage) {
         }, timeoutErr);
     (async () => {
         try {
-            providePageContext(pageContextForPublicUsage);
+            providePageContextInternal(pageContextForPublicUsage);
             const ret = await hookFnCaller();
             resolve(ret);
         }
@@ -128,7 +128,7 @@ function execHookAsync(hookFnCaller, hook, pageContextForPublicUsage) {
 }
 function execHookSync(hook, pageContext, preparePageContextForPublicUsage) {
     const pageContextForPublicUsage = preparePageContextForPublicUsage(pageContext);
-    providePageContext(pageContextForPublicUsage);
+    providePageContextInternal(pageContextForPublicUsage);
     const hookReturn = hook.hookFn(pageContextForPublicUsage);
     return { hookReturn };
 }
@@ -143,8 +143,11 @@ function isNotDisabled(timeout) {
 function getPageContext() {
     const { pageContext } = globalObject;
     if (!pageContext)
-        return pageContext;
-    const pageContextForPublicUsage = preparePageContextForPublicUsage(pageContext);
+        return null;
+    const pageContextForPublicUsage = pageContext._isProxyObject
+        ? // providePageContext() is called on the user-land (e.g. it's called by `vike-{react,vue,solid}`) thus it's already a proxy
+            pageContext
+        : preparePageContextForPublicUsage(pageContext);
     return pageContextForPublicUsage;
 }
 /**
@@ -153,6 +156,9 @@ function getPageContext() {
  * https://vike.dev/getPageContext
  */
 function providePageContext(pageContext) {
+    providePageContextInternal(pageContext);
+}
+function providePageContextInternal(pageContext) {
     globalObject.pageContext = pageContext;
     // Promise.resolve() is quicker than process.nextTick() and setImmediate()
     // https://stackoverflow.com/questions/67949576/process-nexttick-before-promise-resolve-then

package/dist/esm/shared/preparePageContextForPublicUsage.d.ts

@@ -7,7 +7,5 @@ type PageContextPrepareMinimum = {
     isPageContext: true;
     _globalContext: GlobalContextPrepareMinimum;
 };
-declare function preparePageContextForPublicUsage<PageContext extends PageContextPrepareMinimum>(pageContext: PageContext): PageContext & {
-    globalContext: GlobalContextPrepareMinimum;
-};
+declare function preparePageContextForPublicUsage<PageContext extends PageContextPrepareMinimum>(pageContext: PageContext): PageContext;
 declare function assertPropertyGetters(pageContext: Record<string, unknown>): void;

package/dist/esm/shared/preparePageContextForPublicUsage.js

@@ -1,16 +1,13 @@
 export { preparePageContextForPublicUsage };
 export { assertPropertyGetters };
-import { assert, assertWarning, compareString, isPropertyGetter, objectAssign } from './utils.js';
+import { assert, assertWarning, compareString, isPropertyGetter } from './utils.js';
 import { addIs404ToPageProps } from './addIs404ToPageProps.js';
 import { prepareGlobalContextForPublicUsage } from './prepareGlobalContextForPublicUsage.js';
 import { getProxyForPublicUsage } from './getProxyForPublicUsage.js';
 function preparePageContextForPublicUsage(pageContext) {
+    assert(!pageContext._isProxyObject);
     assert(!pageContext.globalContext); // pageContext.globalContext should only be available to users — Vike itself should use pageContext._globalContext instead
     assert(pageContext._isOriginalObject); // ensure we preserve the original object reference
-    const globalContextPublic = prepareGlobalContextForPublicUsage(pageContext._globalContext);
-    objectAssign(pageContext, {
-        globalContext: globalContextPublic
-    });
     addIs404ToPageProps(pageContext);
     // TODO/next-major-release: remove
     if (!('_pageId' in pageContext)) {
@@ -27,10 +24,18 @@ function preparePageContextForPublicUsage(pageContext) {
     }
     // For a more readable `console.log(pageContext)` output
     sortPageContext(pageContext);
+    const globalContextPublic = prepareGlobalContextForPublicUsage(pageContext._globalContext);
     const pageContextPublic = getProxyForPublicUsage(pageContext, 'pageContext', 
     // We must skip it in the client-side because of the reactivity mechanism of UI frameworks like Solid.
     // - TODO/now: double check whether that's true
-    true, pageContext.globalContext);
+    true, (prop) => {
+        if (prop === 'globalContext') {
+            return globalContextPublic;
+        }
+        if (prop in globalContextPublic) {
+            return globalContextPublic[prop];
+        }
+    });
     return pageContextPublic;
 }
 // Sort `pageContext` keys alphabetically, in order to make reading the `console.log(pageContext)` output easier

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.229-commit-e27d672";
+export declare const PROJECT_VERSION: "0.4.229-commit-847f1b6";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.229-commit-e27d672';
+export const PROJECT_VERSION = '0.4.229-commit-847f1b6';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.229-commit-e27d672",
+  "version": "0.4.229-commit-847f1b6",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {