vike 0.4.229-commit-c3526d6 → 0.4.229-commit-e1ca16d

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-e1ca16d';

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

@@ -77,7 +77,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
         routeParams: Record<string, string>;
     } & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../shared/types.js").PageContextInternalClient & Omit<Partial<{
         isPageContext: true;
-        Page: import("../../shared/page-configs/Config.js").Config["Page"];
+        Page: import("../../types/index.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
         config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
@@ -101,7 +101,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
         isBaseMissing?: true;
     }> & Pick<{
         isPageContext: true;
-        Page: import("../../shared/page-configs/Config.js").Config["Page"];
+        Page: import("../../types/index.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
         config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
@@ -148,7 +148,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     _hasPageContextFromServer: true;
 } & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<{
     isPageContext: true;
-    Page: import("../../shared/page-configs/Config.js").Config["Page"];
+    Page: import("../../types/index.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
     config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
@@ -172,7 +172,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     isBaseMissing?: true;
 }> & Pick<{
     isPageContext: true;
-    Page: import("../../shared/page-configs/Config.js").Config["Page"];
+    Page: import("../../types/index.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
     config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
@@ -288,7 +288,7 @@ declare function getPageContextFromClientHooks(pageContext: {
         routeParams: Record<string, string>;
     } & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../shared/types.js").PageContextInternalClient & Omit<Partial<{
         isPageContext: true;
-        Page: import("../../shared/page-configs/Config.js").Config["Page"];
+        Page: import("../../types/index.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
         config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
@@ -312,7 +312,7 @@ declare function getPageContextFromClientHooks(pageContext: {
         isBaseMissing?: true;
     }> & Pick<{
         isPageContext: true;
-        Page: import("../../shared/page-configs/Config.js").Config["Page"];
+        Page: import("../../types/index.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
         config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
@@ -357,7 +357,7 @@ declare function getPageContextFromClientHooks(pageContext: {
     }) | null;
 } & PageConfigUserFriendlyOld & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<{
     isPageContext: true;
-    Page: import("../../shared/page-configs/Config.js").Config["Page"];
+    Page: import("../../types/index.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
     config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
@@ -381,7 +381,7 @@ declare function getPageContextFromClientHooks(pageContext: {
     isBaseMissing?: true;
 }> & Pick<{
     isPageContext: true;
-    Page: import("../../shared/page-configs/Config.js").Config["Page"];
+    Page: import("../../types/index.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
     config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;

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

@@ -65,7 +65,7 @@ async function getPageContextFromServerHooks(pageContext, isErrorPage) {
     return { pageContextFromServerHooks };
 }
 async function getPageContextFromClientHooks(pageContext, isErrorPage) {
-    let dataHookExists = false;
+    let dataHookExec = false;
     // At this point, we need to call the client-side guard(), data() and onBeforeRender() hooks, if they exist on client
     // env. However if we have fetched pageContext from the server, some of them might have run already on the
     // server-side, so we run only the client-only ones in this case.
@@ -82,16 +82,17 @@ async function getPageContextFromClientHooks(pageContext, isErrorPage) {
             }
         }
         else {
-            if (hookName === 'data')
-                dataHookExists = true;
             if (hookClientOnlyExists(hookName, pageContext) || !pageContext._hasPageContextFromServer) {
+                if (hookName === 'data')
+                    dataHookExec = true;
                 // This won't do anything if no hook has been defined or if the hook's env.client is false.
                 await executeDataLikeHook(hookName, pageContext);
             }
         }
     }
     // Execute +onData
-    if (dataHookExists) {
+    const dataHookEnv = getHookEnv('data', pageContext);
+    if ((dataHookExec && dataHookEnv.client) || (pageContext._hasPageContextFromServer && dataHookEnv.server)) {
         await execHookClient('onData', pageContext);
     }
     const pageContextFromClientHooks = pageContext;
@@ -188,23 +189,22 @@ async function hookServerOnlyExists(hookName, pageContext) {
         return hasOnBeforeRenderServerSideOnlyHook;
     }
 }
-/**
- * @param hookName
- * @param pageContext
- * @returns `true` if the given page has a `hookName` hook defined with a client-only env.
- */
 function hookClientOnlyExists(hookName, pageContext) {
+    const hookEnv = getHookEnv(hookName, pageContext);
+    return !!hookEnv.client && !hookEnv.server;
+}
+function getHookEnv(hookName, pageContext) {
     if (pageContext._pageConfigs.length > 0) {
         // V1
         const pageConfig = getPageConfig(pageContext.pageId, pageContext._pageConfigs);
-        const hookEnv = getConfigValueRuntime(pageConfig, `${hookName}Env`)?.value ?? {};
-        assert(isObject(hookEnv));
-        return !!hookEnv.client && !hookEnv.server;
+        // No runtime validation to save client-side KBs
+        const hookEnv = (getConfigValueRuntime(pageConfig, `${hookName}Env`)?.value ?? {});
+        return hookEnv;
     }
     else {
         // TODO/v1-release: remove
         // Client-only onBeforeRender() or data() hooks were never supported for the V0.4 design
-        return false;
+        return { client: false, server: true };
     }
 }
 async function fetchPageContextFromServer(pageContext) {

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

@@ -4,7 +4,7 @@ export { disableClientRouting };
 export { firstRenderStartPromise };
 export { getPageContextClient };
 import { assert, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, hasProp, augmentType, genPromise, isCallable, catchInfiniteLoop } from './utils.js';
-import { getPageContextFromClientHooks, getPageContextFromServerHooks, getPageContextFromHooks_isHydration, getPageContextFromHooks_serialized, setPageContextInitIsPassedToClient, execHookClient } from './getPageContextFromHooks.js';
+import { getPageContextFromClientHooks, getPageContextFromServerHooks, getPageContextFromHooks_isHydration, getPageContextFromHooks_serialized, setPageContextInitIsPassedToClient } from './getPageContextFromHooks.js';
 import { createPageContextClientSide } from './createPageContextClientSide.js';
 import { addLinkPrefetchHandlers, addLinkPrefetchHandlers_unwatch, addLinkPrefetchHandlers_watch, getPageContextPrefetched, populatePageContextPrefetchCache } from './prefetch.js';
 import { assertInfo, assertWarning, isReact } from './utils.js';
@@ -203,16 +203,6 @@ async function renderPageClientSide(renderArgs) {
             // TO-DO/eventually: create helper assertPageContextFromHook()
             assert(!('urlOriginal' in pageContextFromServerHooks));
             objectAssign(pageContext, pageContextFromServerHooks);
-            // Execute +onData
-            try {
-                await execHookClient('onData', pageContext);
-            }
-            catch (err) {
-                await onError(err);
-                return;
-            }
-            if (isRenderOutdated())
-                return;
             // Get pageContext from client-side hooks
             let pageContextFromClientHooks;
             try {

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-e1ca16d";

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-e1ca16d';

package/package.json

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