vike 0.4.229-commit-845a4e0 → 0.4.229-commit-58f7ed0

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js

@@ -58,12 +58,6 @@ const configDefinitionsBuiltIn = {
     data: {
         env: { server: true }
     },
-    onData: {
-        env: { server: true, client: true }
-        /* TODO/now
-        cumulative: true
-        */
-    },
     iKnowThePerformanceRisksOfAsyncRouteFunctions: {
         env: { server: true, client: 'if-client-routing' },
         eager: true

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

@@ -22,13 +22,6 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
             data: hookResult
         };
         Object.assign(pageContext, pageContextFromHook);
-        // Execute +onData
-        if (!pageContext.isClientSideNavigation) {
-            const onDataHook = (0, getHook_js_1.getHookFromPageContext)(pageContext, 'onData');
-            if (onDataHook) {
-                await (0, executeHook_js_1.executeHook)(() => onDataHook.hookFn(pageContext), dataHook, pageContext);
-            }
-        }
     }
     if (onBeforeRenderHook) {
         const hookResult = await (0, executeHook_js_1.executeHook)(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook, pageContext);

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-845a4e0';
+exports.PROJECT_VERSION = '0.4.229-commit-58f7ed0';

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

@@ -73,7 +73,6 @@ async function getPageContextFromClientHooks(pageContext, isErrorPage) {
     objectAssign(pageContext, {
         _hasPageContextFromClient: false
     });
-    let dataHookExists = 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.
@@ -90,8 +89,7 @@ async function getPageContextFromClientHooks(pageContext, isErrorPage) {
             }
         }
         else {
-            if (hookName === 'data')
-                dataHookExists = true;
+            assert(hookName === 'data' || hookName === 'onBeforeRender');
             if (hookClientOnlyExists(hookName, pageContext) || !pageContext._hasPageContextFromServer) {
                 // This won't do anything if no hook has been defined or if the hook's env.client is false.
                 const pageContextFromHook = await executeHookClientSide(hookName, pageContext);
@@ -100,14 +98,6 @@ async function getPageContextFromClientHooks(pageContext, isErrorPage) {
             }
         }
     }
-    // Execute +onData
-    if (dataHookExists) {
-        const hook = getHookFromPageContext(pageContext, 'onData');
-        if (hook) {
-            const pageContextForUserConsumption = preparePageContextForUserConsumptionClientSide(pageContext, true);
-            await executeHook(() => hook.hookFn(pageContextForUserConsumption), hook, pageContext);
-        }
-    }
     const pageContextFromClientHooks = pageContext;
     return pageContextFromClientHooks;
 }

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

@@ -200,21 +200,6 @@ async function renderPageClientSide(renderArgs) {
             // TO-DO/eventually: create helper assertPageContextFromHook()
             assert(!('urlOriginal' in pageContextFromServerHooks));
             objectAssign(pageContext, pageContextFromServerHooks);
-            // Execute +onData
-            assertHook(pageContext, 'onData');
-            const hook = getHookFromPageContext(pageContext, 'onData');
-            if (hook) {
-                const { hookFn } = hook;
-                try {
-                    await executeHook(() => hookFn(pageContext), hook, pageContext);
-                }
-                catch (err) {
-                    await onError(err);
-                    return;
-                }
-                if (isRenderOutdated())
-                    return;
-            }
             // Get pageContext from client-side hooks
             let pageContextFromClientHooks;
             try {

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

@@ -25,12 +25,12 @@ declare function createPageContextClientSide(): Promise<{
 } & {
     pageId: string;
     routeParams: Record<string, string>;
-} & import("../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
-    _pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
 } & {
     config: import("../../types/index.js").ConfigResolved;
     _source: import("../../shared/page-configs/getPageConfigUserFriendly.js").Source;
     _sources: import("../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
     _from: import("../../shared/page-configs/getPageConfigUserFriendly.js").From;
     isPageContext: true;
+} & import("../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
+    _pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
 }>;

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

@@ -1,5 +1,5 @@
 export { createPageContextClientSide };
-import { assertUsage, assertWarning, augmentType, objectAssign } from './utils.js';
+import { assertUsage, augmentType, objectAssign } from './utils.js';
 import { getPageContextSerializedInHtml } from '../shared/getJsonSerializedInHtml.js';
 import { loadUserFilesClientSide } from '../shared/loadUserFilesClientSide.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
@@ -25,9 +25,11 @@ async function createPageContextClientSide() {
         _hasPageContextFromClient: false
     };
     objectAssign(pageContextCreated, getPageContextSerializedInHtml());
-    objectAssign(pageContextCreated, await loadPageUserFiles(pageContextCreated.pageId, pageContextCreated));
+    // Sets pageContext.config to global configs
     const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext._pageConfigGlobal);
     augmentType(pageContextCreated, pageContextAugmented);
+    // Sets pageContext.config to local configs (overrides the pageContext.config set above)
+    objectAssign(pageContextCreated, await loadUserFilesClientSide(pageContextCreated.pageId, pageContextCreated._pageFilesAll, pageContextCreated._pageConfigs, pageContextCreated._pageConfigGlobal));
     assertPristineUrl();
     return pageContextCreated;
 }
@@ -35,13 +37,3 @@ function assertPristineUrl() {
     const urlCurrent = getCurrentUrl({ withoutHash: true });
     assertUsage(urlFirst === urlCurrent, `The URL was manipulated before the hydration finished ('${urlFirst}' to '${urlCurrent}'). Ensure the hydration has finished before manipulating the URL. Consider using the onHydrationEnd() hook.`);
 }
-async function loadPageUserFiles(pageId, pageContext) {
-    const pageContextAddendum = {};
-    objectAssign(pageContextAddendum, await loadUserFilesClientSide(pageId, pageContext._pageFilesAll, pageContext._pageConfigs, pageContext._pageConfigGlobal));
-    pageContext._pageFilesAll
-        .filter((p) => p.fileType !== '.page.server')
-        .forEach((p) => {
-        assertWarning(!p.fileExports?.onBeforeRender, `export { onBeforeRender } of ${p.filePath} is loaded in the browser but never executed (because you are using Server-side Routing). In order to reduce the size of you browser-side JavaScript, define onBeforeRender() in a .page.server.js file instead, see https://vike.dev/onBeforeRender-isomorphic#server-routing`, { onlyOnce: true });
-    });
-    return pageContextAddendum;
-}

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js

@@ -56,12 +56,6 @@ const configDefinitionsBuiltIn = {
     data: {
         env: { server: true }
     },
-    onData: {
-        env: { server: true, client: true }
-        /* TODO/now
-        cumulative: true
-        */
-    },
     iKnowThePerformanceRisksOfAsyncRouteFunctions: {
         env: { server: true, client: 'if-client-routing' },
         eager: true

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

@@ -20,13 +20,6 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
             data: hookResult
         };
         Object.assign(pageContext, pageContextFromHook);
-        // Execute +onData
-        if (!pageContext.isClientSideNavigation) {
-            const onDataHook = getHookFromPageContext(pageContext, 'onData');
-            if (onDataHook) {
-                await executeHook(() => onDataHook.hookFn(pageContext), dataHook, pageContext);
-            }
-        }
     }
     if (onBeforeRenderHook) {
         const hookResult = await executeHook(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook, pageContext);

package/dist/esm/shared/page-configs/Config.d.ts

@@ -44,7 +44,7 @@ import type { HooksTimeoutProvidedByUser } from '../hooks/getHook.js';
 import type { GlobalContext, PageContextClient, PageContextServer } from '../types.js';
 import type { InlineConfig } from 'vite';
 type HookName = HookNamePage | HookNameGlobal | HookNameOldDesign;
-type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data' | 'onData';
+type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data';
 type HookNameGlobal = 'onBeforePrerender' | 'onBeforeRoute' | 'onPrerenderStart' | 'onCreatePageContext' | 'onCreateGlobalContext';
 type HookNameOldDesign = 'render' | 'prerender';
 type ConfigNameBuiltIn = Exclude<keyof Config, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware';
@@ -345,11 +345,6 @@ type ConfigBuiltIn = {
      *  https://vike.dev/data
      */
     data?: DataAsync<unknown> | DataSync<unknown> | ImportString | null;
-    /** TODO/now
-     *
-     *  https://vike.dev/onData
-     */
-    onData?: Function;
     /** Determines what pageContext properties are sent to the client-side.
      *
      * https://vike.dev/passToClient

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.229-commit-845a4e0";
+export declare const PROJECT_VERSION: "0.4.229-commit-58f7ed0";

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-845a4e0';
+export const PROJECT_VERSION = '0.4.229-commit-58f7ed0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.229-commit-845a4e0",
+  "version": "0.4.229-commit-58f7ed0",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {