vike 0.4.229-commit-c3526d6 → 0.4.229-commit-847f1b6

package/dist/cjs/shared/getProxyForPublicUsage.js

@@ -19,14 +19,13 @@ function getTrapGet(obj, objName, skipOnInternalProp, fallback) {
     return function (_, prop) {
         const propStr = String(prop);
         if (prop === '_isProxyObject')
-            return { target: obj };
+            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))
-                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,9 +158,9 @@ function getPageContext() {
  * https://vike.dev/getPageContext
  */
 function providePageContext(pageContext) {
-    // providePageContext() can be called in the user-land (e.g. it's called by `vike-{react,vue,solid}`) thus we need to unwrap the proxy.
-    if (pageContext?._isProxyObject)
-        pageContext = pageContext._isProxyObject.target;
+    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/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-c3526d6';
+exports.PROJECT_VERSION = '0.4.229-commit-847f1b6';

package/dist/esm/shared/getProxyForPublicUsage.js

@@ -17,14 +17,13 @@ function getTrapGet(obj, objName, skipOnInternalProp, fallback) {
     return function (_, prop) {
         const propStr = String(prop);
         if (prop === '_isProxyObject')
-            return { target: obj };
+            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))
-                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,9 +156,9 @@ function getPageContext() {
  * https://vike.dev/getPageContext
  */
 function providePageContext(pageContext) {
-    // providePageContext() can be called in the user-land (e.g. it's called by `vike-{react,vue,solid}`) thus we need to unwrap the proxy.
-    if (pageContext?._isProxyObject)
-        pageContext = pageContext._isProxyObject.target;
+    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

@@ -6,9 +6,6 @@ type PageContextPrepareMinimum = {
     _isOriginalObject: true;
     isPageContext: true;
     _globalContext: GlobalContextPrepareMinimum;
-    _isProxyObject?: {
-        target: PageContextPrepareMinimum;
-    };
 };
 declare function preparePageContextForPublicUsage<PageContext extends PageContextPrepareMinimum>(pageContext: PageContext): PageContext;
 declare function assertPropertyGetters(pageContext: Record<string, unknown>): void;

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.229-commit-c3526d6";
+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-c3526d6';
+export const PROJECT_VERSION = '0.4.229-commit-847f1b6';

package/package.json

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