vike 0.4.229-commit-5da80bf → 0.4.229-commit-c3526d6

package/dist/cjs/client/shared/preparePageContextForPublicUsageClientShared.js

@@ -34,7 +34,6 @@ function supportVueReactiviy(pageContext) {
 // Remove propery descriptor getters because they break Vue's reactivity.
 // E.g. resolve the `pageContext.urlPathname` getter.
 function resolveGetters(pageContext) {
-    return;
     Object.entries(pageContext).forEach(([key, val]) => {
         delete pageContext[key];
         pageContext[key] = val;

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

@@ -24,7 +24,6 @@ const error_page_js_1 = require("../../shared/error-page.js");
 const handleErrorWithoutErrorPage_js_1 = require("./renderPage/handleErrorWithoutErrorPage.js");
 const loadPageConfigsLazyServerSide_js_1 = require("./renderPage/loadPageConfigsLazyServerSide.js");
 const resolveRedirects_js_1 = require("./renderPage/resolveRedirects.js");
-const getProxyForPublicUsage_js_1 = require("../../shared/getProxyForPublicUsage.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', {
     httpRequestsCount: 0
 });
@@ -489,6 +488,5 @@ function getPageContextInvalidVikeConfig(err, pageContextInit, httpRequestId) {
 function forkPageContext(pageContextBegin) {
     const pageContext = {};
     (0, utils_js_1.objectAssign)(pageContext, pageContextBegin, true);
-    const pageContextWithProxy = (0, getProxyForPublicUsage_js_1.getProxyForMutationTracking)(pageContext);
-    return pageContextWithProxy;
+    return pageContext;
 }

package/dist/cjs/shared/createPageContextShared.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPageContextShared = createPageContextShared;
 exports.createPageContextObject = createPageContextObject;
-const getProxyForPublicUsage_js_1 = require("./getProxyForPublicUsage.js");
 const execHook_js_1 = require("./hooks/execHook.js");
 const preparePageContextForPublicUsage_js_1 = require("./preparePageContextForPublicUsage.js");
 const utils_js_1 = require("./utils.js");
@@ -17,6 +16,5 @@ function createPageContextObject() {
         isPageContext: true
     };
     (0, utils_js_1.changeEnumerable)(pageContext, '_isOriginalObject', false);
-    const pageContextWithProxy = (0, getProxyForPublicUsage_js_1.getProxyForMutationTracking)(pageContext);
-    return pageContextWithProxy;
+    return pageContext;
 }

package/dist/cjs/shared/getProxyForPublicUsage.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProxyForPublicUsage = getProxyForPublicUsage;
-exports.getProxyForPublicUsageFlat = getProxyForPublicUsageFlat;
-exports.getProxyForMutationTracking = getProxyForMutationTracking;
 // We use a proxy instead of property getters.
 // - The issue with property getters is that they can't be `writable: true` but we do want the user to be able to modify the value of internal properties.
 //   ```console
@@ -12,76 +10,29 @@ exports.getProxyForMutationTracking = getProxyForMutationTracking;
 // Show warning when user is accessing internal `_` properties.
 const NOT_SERIALIZABLE_js_1 = require("./NOT_SERIALIZABLE.js");
 const utils_js_1 = require("./utils.js");
-function getProxyForPublicUsage(obj, objName, skipOnInternalProp) {
+function getProxyForPublicUsage(obj, objName, skipOnInternalProp, fallback) {
     return new Proxy(obj, {
-        get: getTrapGet(obj, objName, skipOnInternalProp)
+        get: getTrapGet(obj, objName, skipOnInternalProp, fallback)
     });
 }
-function getProxyForPublicUsageFlat(obj, objName, skipOnInternalProp) {
-    (0, utils_js_1.assert)(obj._isOriginalObject);
-    (0, utils_js_1.assert)(obj._proxyTarget);
-    obj._proxyTargetPublic ?? (obj._proxyTargetPublic = {});
-    const target = obj._proxyTargetPublic;
-    obj._userMods ?? (obj._userMods = {});
-    const objUserMods = obj._userMods;
-    const update = () => {
-        (0, utils_js_1.assert)(obj._proxyTarget);
-        (0, utils_js_1.objectReplace)(target, obj._proxyTarget);
-        (0, utils_js_1.objectAssign)(target, objUserMods);
-    };
-    obj._onChange = () => {
-        update();
-    };
-    update();
-    return new Proxy(target, {
-        // get: getTrapGet(target, objName, skipOnInternalProp),
-        set(_, prop, val) {
-            const ret = Reflect.set(objUserMods, prop, val);
-            update();
-            return ret;
-        },
-        defineProperty(_, ...args) {
-            const ret = Reflect.defineProperty(objUserMods, ...args);
-            update();
-            return ret;
-        },
-        deleteProperty(_, ...args) {
-            const ret = Reflect.deleteProperty(objUserMods, ...args);
-            update();
-            return ret;
-        }
-    });
-}
-function getTrapGet(obj, objName, skipOnInternalProp) {
+function getTrapGet(obj, objName, skipOnInternalProp, fallback) {
     return function (_, prop) {
         const propStr = String(prop);
+        if (prop === '_isProxyObject')
+            return { target: obj };
         if (!skipOnInternalProp)
             onInternalProp(propStr, objName);
+        if (fallback) {
+            // 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);
+        }
         const val = obj[prop];
         onNotSerializable(propStr, val, objName);
         return val;
     };
 }
-function getProxyForMutationTracking(obj) {
-    (0, utils_js_1.objectAssign)(obj, { _proxyTarget: obj });
-    return new Proxy(obj, {
-        set(...args) {
-            const ret = Reflect.set(...args);
-            obj._onChange?.();
-            return ret;
-        },
-        defineProperty(...args) {
-            const ret = Reflect.defineProperty(...args);
-            obj._onChange?.();
-            return ret;
-        },
-        deleteProperty(...args) {
-            const ret = Reflect.deleteProperty(...args);
-            obj._onChange?.();
-            return ret;
-        }
-    });
-}
 function onNotSerializable(propStr, val, objName) {
     if (val !== NOT_SERIALIZABLE_js_1.NOT_SERIALIZABLE)
         return;

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

@@ -155,6 +155,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;
     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,11 +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)) {
@@ -28,15 +26,22 @@ function preparePageContextForPublicUsage(pageContext) {
     }
     // For a more readable `console.log(pageContext)` output
     sortPageContext(pageContext);
-    const pageContextPublic = (0, getProxyForPublicUsage_js_1.getProxyForPublicUsageFlat)(pageContext, '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);
+    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
 function sortPageContext(pageContext) {
-    return;
     let descriptors = Object.getOwnPropertyDescriptors(pageContext);
     for (const key of Object.keys(pageContext))
         delete pageContext[key];

package/dist/cjs/shared/utils.js

@@ -44,4 +44,3 @@ __exportStar(require("../utils/objectDefineProperty.js"), exports);
 __exportStar(require("../utils/isScriptFile.js"), exports);
 __exportStar(require("../utils/objectFilter.js"), exports);
 __exportStar(require("../utils/getPropAccessNotation.js"), exports);
-__exportStar(require("../utils/objectReplace.js"), exports);

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-5da80bf';
+exports.PROJECT_VERSION = '0.4.229-commit-c3526d6';

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

@@ -8,4 +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): never;
+declare function preparePageContextForPublicUsageClientMinimal<PageContext extends PageContextPrepareMinimum>(pageContext: PageContext): PageContext;

package/dist/esm/client/shared/preparePageContextForPublicUsageClientShared.js

@@ -32,7 +32,6 @@ function supportVueReactiviy(pageContext) {
 // Remove propery descriptor getters because they break Vue's reactivity.
 // E.g. resolve the `pageContext.urlPathname` getter.
 function resolveGetters(pageContext) {
-    return;
     Object.entries(pageContext).forEach(([key, val]) => {
         delete pageContext[key];
         pageContext[key] = val;

package/dist/esm/node/runtime/renderPage.js

@@ -19,7 +19,6 @@ import { getErrorPageId } from '../../shared/error-page.js';
 import { handleErrorWithoutErrorPage } from './renderPage/handleErrorWithoutErrorPage.js';
 import { loadPageConfigsLazyServerSide } from './renderPage/loadPageConfigsLazyServerSide.js';
 import { resolveRedirects } from './renderPage/resolveRedirects.js';
-import { getProxyForMutationTracking } from '../../shared/getProxyForPublicUsage.js';
 const globalObject = getGlobalObject('runtime/renderPage.ts', {
     httpRequestsCount: 0
 });
@@ -484,6 +483,5 @@ function getPageContextInvalidVikeConfig(err, pageContextInit, httpRequestId) {
 function forkPageContext(pageContextBegin) {
     const pageContext = {};
     objectAssign(pageContext, pageContextBegin, true);
-    const pageContextWithProxy = getProxyForMutationTracking(pageContext);
-    return pageContextWithProxy;
+    return pageContext;
 }

package/dist/esm/shared/createPageContextShared.js

@@ -1,6 +1,5 @@
 export { createPageContextShared };
 export { createPageContextObject };
-import { getProxyForMutationTracking } from './getProxyForPublicUsage.js';
 import { execHookGlobal } from './hooks/execHook.js';
 import { preparePageContextForPublicUsage } from './preparePageContextForPublicUsage.js';
 import { changeEnumerable, objectAssign } from './utils.js';
@@ -15,6 +14,5 @@ function createPageContextObject() {
         isPageContext: true
     };
     changeEnumerable(pageContext, '_isOriginalObject', false);
-    const pageContextWithProxy = getProxyForMutationTracking(pageContext);
-    return pageContextWithProxy;
+    return pageContext;
 }

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

@@ -1,12 +1,4 @@
 export { getProxyForPublicUsage };
-export { getProxyForPublicUsageFlat };
-export { getProxyForMutationTracking };
-type Target = Record<string, unknown> & {
-    _onChange?: () => void;
-    _proxyTarget?: any;
-    _userMods?: any;
-    _proxyTargetPublic?: any;
-};
-declare function getProxyForPublicUsage<Obj extends Target>(obj: Obj, objName: string, skipOnInternalProp?: true): Obj;
-declare function getProxyForPublicUsageFlat<Obj extends Target>(obj: Obj, objName: string, skipOnInternalProp?: true): Obj;
-declare function getProxyForMutationTracking<Obj extends Target>(obj: Obj): Obj;
+type Target = Record<string, 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

@@ -1,6 +1,4 @@
 export { getProxyForPublicUsage };
-export { getProxyForPublicUsageFlat };
-export { getProxyForMutationTracking };
 // We use a proxy instead of property getters.
 // - The issue with property getters is that they can't be `writable: true` but we do want the user to be able to modify the value of internal properties.
 //   ```console
@@ -9,77 +7,30 @@ export { getProxyForMutationTracking };
 // - Previous implementation using property getters: https://github.com/vikejs/vike/blob/main/vike/utils/makePublicCopy.ts
 // Show warning when user is accessing internal `_` properties.
 import { NOT_SERIALIZABLE } from './NOT_SERIALIZABLE.js';
-import { assert, assertUsage, assertWarning, getPropAccessNotation, isBrowser, objectAssign, objectReplace } from './utils.js';
-function getProxyForPublicUsage(obj, objName, skipOnInternalProp) {
+import { assert, assertUsage, assertWarning, getPropAccessNotation, isBrowser } from './utils.js';
+function getProxyForPublicUsage(obj, objName, skipOnInternalProp, fallback) {
     return new Proxy(obj, {
-        get: getTrapGet(obj, objName, skipOnInternalProp)
+        get: getTrapGet(obj, objName, skipOnInternalProp, fallback)
     });
 }
-function getProxyForPublicUsageFlat(obj, objName, skipOnInternalProp) {
-    assert(obj._isOriginalObject);
-    assert(obj._proxyTarget);
-    obj._proxyTargetPublic ?? (obj._proxyTargetPublic = {});
-    const target = obj._proxyTargetPublic;
-    obj._userMods ?? (obj._userMods = {});
-    const objUserMods = obj._userMods;
-    const update = () => {
-        assert(obj._proxyTarget);
-        objectReplace(target, obj._proxyTarget);
-        objectAssign(target, objUserMods);
-    };
-    obj._onChange = () => {
-        update();
-    };
-    update();
-    return new Proxy(target, {
-        // get: getTrapGet(target, objName, skipOnInternalProp),
-        set(_, prop, val) {
-            const ret = Reflect.set(objUserMods, prop, val);
-            update();
-            return ret;
-        },
-        defineProperty(_, ...args) {
-            const ret = Reflect.defineProperty(objUserMods, ...args);
-            update();
-            return ret;
-        },
-        deleteProperty(_, ...args) {
-            const ret = Reflect.deleteProperty(objUserMods, ...args);
-            update();
-            return ret;
-        }
-    });
-}
-function getTrapGet(obj, objName, skipOnInternalProp) {
+function getTrapGet(obj, objName, skipOnInternalProp, fallback) {
     return function (_, prop) {
         const propStr = String(prop);
+        if (prop === '_isProxyObject')
+            return { target: obj };
         if (!skipOnInternalProp)
             onInternalProp(propStr, objName);
+        if (fallback) {
+            // 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);
+        }
         const val = obj[prop];
         onNotSerializable(propStr, val, objName);
         return val;
     };
 }
-function getProxyForMutationTracking(obj) {
-    objectAssign(obj, { _proxyTarget: obj });
-    return new Proxy(obj, {
-        set(...args) {
-            const ret = Reflect.set(...args);
-            obj._onChange?.();
-            return ret;
-        },
-        defineProperty(...args) {
-            const ret = Reflect.defineProperty(...args);
-            obj._onChange?.();
-            return ret;
-        },
-        deleteProperty(...args) {
-            const ret = Reflect.deleteProperty(...args);
-            obj._onChange?.();
-            return ret;
-        }
-    });
-}
 function onNotSerializable(propStr, val, objName) {
     if (val !== NOT_SERIALIZABLE)
         return;

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

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

package/dist/esm/shared/preparePageContextForPublicUsage.js

@@ -1,15 +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 { getProxyForPublicUsageFlat } from './getProxyForPublicUsage.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)) {
@@ -26,15 +24,22 @@ function preparePageContextForPublicUsage(pageContext) {
     }
     // For a more readable `console.log(pageContext)` output
     sortPageContext(pageContext);
-    const pageContextPublic = getProxyForPublicUsageFlat(pageContext, '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);
+    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
 function sortPageContext(pageContext) {
-    return;
     let descriptors = Object.getOwnPropertyDescriptors(pageContext);
     for (const key of Object.keys(pageContext))
         delete pageContext[key];

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

@@ -24,4 +24,3 @@ export * from '../utils/objectDefineProperty.js';
 export * from '../utils/isScriptFile.js';
 export * from '../utils/objectFilter.js';
 export * from '../utils/getPropAccessNotation.js';
-export * from '../utils/objectReplace.js';

package/dist/esm/shared/utils.js

@@ -28,4 +28,3 @@ export * from '../utils/objectDefineProperty.js';
 export * from '../utils/isScriptFile.js';
 export * from '../utils/objectFilter.js';
 export * from '../utils/getPropAccessNotation.js';
-export * from '../utils/objectReplace.js';

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.229-commit-5da80bf";
+export declare const PROJECT_VERSION: "0.4.229-commit-c3526d6";

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-5da80bf';
+export const PROJECT_VERSION = '0.4.229-commit-c3526d6';

package/package.json

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