vike 0.4.228-commit-ae4784f → 0.4.228-commit-f3eb7f0

package/dist/cjs/node/plugin/plugins/build/pluginModuleBanner.js

@@ -31,6 +31,7 @@ function pluginModuleBanner() {
                 id = (0, virtual_files_js_1.removeVirtualIdTag)(id);
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
+                id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377
                 const s = new magic_string_1.default(code);
                 // Use legal comment so that esbuild doesn't remove it.
                 // - Terser still removes the comment, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.

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

@@ -19,11 +19,6 @@ const configDefinitionsBuiltIn = {
     onPageTransitionEnd: {
         env: { client: true }
     },
-    onCreatePageContext: {
-        env: { server: true },
-        global: true,
-        cumulative: true
-    },
     onBeforeRender: {
         env: { server: true }
     },

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

@@ -4,7 +4,6 @@ exports.createPageContextServerSide = createPageContextServerSide;
 exports.createPageContextServerSideWithoutGlobalContext = createPageContextServerSideWithoutGlobalContext;
 const utils_js_1 = require("../utils.js");
 const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUrlComputed.js");
-const executeHookGeneric_js_1 = require("./executeHookGeneric.js");
 async function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
     urlHandler: null,
     isClientSideNavigation: false
@@ -55,7 +54,6 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
         }
         (0, utils_js_1.objectAssign)(pageContextCreated, { headers });
     }
-    await (0, executeHookGeneric_js_1.executeHookGenericGlobalCumulative)('onCreatePageContext', globalContext, pageContextCreated);
     return pageContextCreated;
 }
 function createPageContextServerSideWithoutGlobalContext(pageContextInit) {

package/dist/cjs/node/runtime/universal-middleware.js

@@ -3,7 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = universalVikeHandler;
 const index_js_1 = require("./index.js");
 async function universalVikeHandler(request, context, runtime) {
-    const pageContextInit = { ...context, ...runtime, urlOriginal: request.url, headersOriginal: request.headers };
+    const pageContextInit = {
+        ...context,
+        ...runtime,
+        runtime,
+        urlOriginal: request.url,
+        headersOriginal: request.headers
+    };
     const pageContext = await (0, index_js_1.renderPage)(pageContextInit);
     const response = pageContext.httpResponse;
     const readable = response.getReadableWebStream();

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHookFromPageContext = getHookFromPageContext;
 exports.getHookFromPageConfig = getHookFromPageConfig;
 exports.getHookFromPageConfigGlobal = getHookFromPageConfigGlobal;
-exports.getHookFromPageConfigGlobalCumulative = getHookFromPageConfigGlobalCumulative;
 exports.assertHook = assertHook;
 exports.getHook_setIsPrerenderering = getHook_setIsPrerenderering;
 exports.getHookTimeoutDefault = getHookTimeoutDefault;
@@ -48,20 +47,6 @@ function getHookFromPageConfigGlobal(pageConfigGlobal, hookName) {
     const hookTimeout = getHookTimeoutGlobal(hookName);
     return getHook(hookFn, hookName, hookFilePath, hookTimeout);
 }
-function getHookFromPageConfigGlobalCumulative(pageConfigGlobal, hookName) {
-    const configValue = pageConfigGlobal.configValues[hookName];
-    if (!configValue?.value)
-        return [];
-    const val = configValue.value;
-    (0, utils_js_1.assert)((0, utils_js_1.isArray)(val));
-    return val.map((v, i) => {
-        const hookFn = v;
-        const hookTimeout = getHookTimeoutGlobal(hookName);
-        (0, utils_js_1.assert)((0, utils_js_1.isArray)(configValue.definedAtData));
-        const hookFilePath = (0, helpers_js_1.getHookFilePathToShowToUser)(configValue.definedAtData[i]);
-        return getHook(hookFn, hookName, hookFilePath, hookTimeout);
-    });
-}
 function getHookTimeoutGlobal(hookName) {
     // TO-DO/perfection: we could use the global value of configooksTimeout but it requires some non-trivial refactoring
     const hookTimeout = getHookTimeoutDefault(hookName);

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.228-commit-ae4784f';
+exports.PROJECT_VERSION = '0.4.228-commit-f3eb7f0';

package/dist/esm/node/plugin/plugins/build/pluginModuleBanner.js

@@ -26,6 +26,7 @@ function pluginModuleBanner() {
                 id = removeVirtualIdTag(id);
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
+                id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377
                 const s = new MagicString(code);
                 // Use legal comment so that esbuild doesn't remove it.
                 // - Terser still removes the comment, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.

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

@@ -17,11 +17,6 @@ const configDefinitionsBuiltIn = {
     onPageTransitionEnd: {
         env: { client: true }
     },
-    onCreatePageContext: {
-        env: { server: true },
-        global: true,
-        cumulative: true
-    },
     onBeforeRender: {
         env: { server: true }
     },

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

@@ -2,7 +2,6 @@ export { createPageContextServerSide };
 export { createPageContextServerSideWithoutGlobalContext };
 import { assert, assertUsage, assertWarning, normalizeHeaders, objectAssign } from '../utils.js';
 import { getPageContextUrlComputed } from '../../../shared/getPageContextUrlComputed.js';
-import { executeHookGenericGlobalCumulative } from './executeHookGeneric.js';
 async function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
     urlHandler: null,
     isClientSideNavigation: false
@@ -53,7 +52,6 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
         }
         objectAssign(pageContextCreated, { headers });
     }
-    await executeHookGenericGlobalCumulative('onCreatePageContext', globalContext, pageContextCreated);
     return pageContextCreated;
 }
 function createPageContextServerSideWithoutGlobalContext(pageContextInit) {

package/dist/esm/node/runtime/universal-middleware.js

@@ -1,6 +1,12 @@
 import { renderPage } from './index.js';
 export default async function universalVikeHandler(request, context, runtime) {
-    const pageContextInit = { ...context, ...runtime, urlOriginal: request.url, headersOriginal: request.headers };
+    const pageContextInit = {
+        ...context,
+        ...runtime,
+        runtime,
+        urlOriginal: request.url,
+        headersOriginal: request.headers
+    };
     const pageContext = await renderPage(pageContextInit);
     const response = pageContext.httpResponse;
     const readable = response.getReadableWebStream();

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

@@ -1,7 +1,6 @@
 export { getHookFromPageContext };
 export { getHookFromPageConfig };
 export { getHookFromPageConfigGlobal };
-export { getHookFromPageConfigGlobalCumulative };
 export { assertHook };
 export { getHook_setIsPrerenderering };
 export type { Hook };
@@ -30,7 +29,6 @@ type HooksTimeoutProvidedByUser = false | Partial<Record<HookName, false | Parti
 declare function getHookFromPageContext(pageContext: PageConfigUserFriendlyOld, hookName: HookName): null | Hook;
 declare function getHookFromPageConfig(pageConfig: PageConfigRuntime, hookName: HookNamePage): null | Hook;
 declare function getHookFromPageConfigGlobal(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): null | Hook;
-declare function getHookFromPageConfigGlobalCumulative(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): Hook[];
 declare function assertHook<TPageContext extends PageConfigUserFriendlyOld, THookName extends PropertyKey & HookName>(pageContext: TPageContext, hookName: THookName): asserts pageContext is TPageContext & {
     exports: Record<THookName, Function | undefined>;
 };

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

@@ -1,7 +1,6 @@
 export { getHookFromPageContext };
 export { getHookFromPageConfig };
 export { getHookFromPageConfigGlobal };
-export { getHookFromPageConfigGlobalCumulative };
 export { assertHook };
 export { getHook_setIsPrerenderering };
 // TODO/v1-release: remove
@@ -10,7 +9,7 @@ export { getHookTimeoutDefault };
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { getHookFilePathToShowToUser } from '../page-configs/helpers.js';
 import { getConfigValueRuntime } from '../page-configs/getConfigValueRuntime.js';
-import { assert, assertUsage, checkType, isArray, isCallable, isObject } from '../utils.js';
+import { assert, assertUsage, checkType, isCallable, isObject } from '../utils.js';
 import pc from '@brillout/picocolors';
 const globalObject = getGlobalObject('hooks/getHook.ts', {});
 function getHookFromPageContext(pageContext, hookName) {
@@ -45,20 +44,6 @@ function getHookFromPageConfigGlobal(pageConfigGlobal, hookName) {
     const hookTimeout = getHookTimeoutGlobal(hookName);
     return getHook(hookFn, hookName, hookFilePath, hookTimeout);
 }
-function getHookFromPageConfigGlobalCumulative(pageConfigGlobal, hookName) {
-    const configValue = pageConfigGlobal.configValues[hookName];
-    if (!configValue?.value)
-        return [];
-    const val = configValue.value;
-    assert(isArray(val));
-    return val.map((v, i) => {
-        const hookFn = v;
-        const hookTimeout = getHookTimeoutGlobal(hookName);
-        assert(isArray(configValue.definedAtData));
-        const hookFilePath = getHookFilePathToShowToUser(configValue.definedAtData[i]);
-        return getHook(hookFn, hookName, hookFilePath, hookTimeout);
-    });
-}
 function getHookTimeoutGlobal(hookName) {
     // TO-DO/perfection: we could use the global value of configooksTimeout but it requires some non-trivial refactoring
     const hookTimeout = getHookTimeoutDefault(hookName);

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

@@ -45,7 +45,7 @@ import type { 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';
-type HookNameGlobal = 'onCreatePageContext' | 'onBeforePrerender' | 'onBeforeRoute' | 'onPrerenderStart';
+type HookNameGlobal = 'onBeforePrerender' | 'onBeforeRoute' | 'onPrerenderStart';
 type HookNameOldDesign = 'render' | 'prerender';
 type ConfigNameBuiltIn = Exclude<keyof Config, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware';
 type ConfigNameGlobal = 'onPrerenderStart' | 'onBeforeRoute' | 'prerender' | 'disableAutoFullBuild' | 'includeAssetsImportedByServer' | 'baseAssets' | 'baseServer' | 'redirects' | 'trailingSlash' | 'disableUrlNormalization' | 'vite';
@@ -330,11 +330,6 @@ type ConfigBuiltIn = {
      *  https://vike.dev/onBeforeRender
      */
     onBeforeRender?: OnBeforeRenderAsync | OnBeforeRenderSync | ImportString | null;
-    /** Hook called when a page starts rendering.
-     *
-     *  https://vike.dev/onCreatePageContext TODO/now
-     */
-    onCreatePageContext?: (pageContext: PageContextServer) => void | ImportString | null;
     /** Hook for fetching data.
      *
      *  https://vike.dev/data

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.228-commit-ae4784f";
+export declare const PROJECT_VERSION: "0.4.228-commit-f3eb7f0";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.228-commit-ae4784f';
+export const PROJECT_VERSION = '0.4.228-commit-f3eb7f0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.228-commit-ae4784f",
+  "version": "0.4.228-commit-f3eb7f0",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {

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

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeHookGeneric = executeHookGeneric;
-exports.executeHookGenericGlobalCumulative = executeHookGenericGlobalCumulative;
-const executeHook_js_1 = require("../../../shared/hooks/executeHook.js");
-const getHook_js_1 = require("../../../shared/hooks/getHook.js");
-async function executeHookGeneric(hookName, pageContext) {
-    const hook = (0, getHook_js_1.getHookFromPageContext)(pageContext, hookName);
-    if (!hook)
-        return;
-    await (0, executeHook_js_1.executeHook)(() => hook.hookFn(pageContext), hook, pageContext);
-}
-async function executeHookGenericGlobalCumulative(hookName, globalContext, pageContext) {
-    const hooks = (0, getHook_js_1.getHookFromPageConfigGlobalCumulative)(globalContext.pageConfigGlobal, hookName);
-    await Promise.all(hooks.map(async (hook) => {
-        await (0, executeHook_js_1.executeHook)(() => hook.hookFn(pageContext), hook, null);
-    }));
-}

package/dist/esm/node/runtime/renderPage/executeHookGeneric.d.ts

@@ -1,9 +0,0 @@
-export { executeHookGeneric };
-export { executeHookGenericGlobalCumulative };
-import type { PageConfigUserFriendlyOld } from '../../../shared/getPageFiles.js';
-import { type HookName } from '../../../shared/hooks/getHook.js';
-import type { HookNameGlobal } from '../../../shared/page-configs/Config.js';
-import type { GlobalContextInternal } from '../globalContext.js';
-import type { PageContextServerSideCreated } from './createPageContextServerSide.js';
-declare function executeHookGeneric(hookName: HookName, pageContext: PageConfigUserFriendlyOld): Promise<void>;
-declare function executeHookGenericGlobalCumulative(hookName: HookNameGlobal, globalContext: GlobalContextInternal, pageContext: PageContextServerSideCreated): Promise<void>;

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

@@ -1,16 +0,0 @@
-export { executeHookGeneric }; // TO-DO/refactor: start using executeHookGeneric() and, eventually, prominently use it
-export { executeHookGenericGlobalCumulative };
-import { executeHook } from '../../../shared/hooks/executeHook.js';
-import { getHookFromPageContext, getHookFromPageConfigGlobalCumulative } from '../../../shared/hooks/getHook.js';
-async function executeHookGeneric(hookName, pageContext) {
-    const hook = getHookFromPageContext(pageContext, hookName);
-    if (!hook)
-        return;
-    await executeHook(() => hook.hookFn(pageContext), hook, pageContext);
-}
-async function executeHookGenericGlobalCumulative(hookName, globalContext, pageContext) {
-    const hooks = getHookFromPageConfigGlobalCumulative(globalContext.pageConfigGlobal, hookName);
-    await Promise.all(hooks.map(async (hook) => {
-        await executeHook(() => hook.hookFn(pageContext), hook, null);
-    }));
-}