vike 0.4.250-commit-2686732 → 0.4.250-commit-0d50da9

package/dist/shared-server-client/hooks/getHook.js

@@ -1,8 +1,8 @@
 export { getHookFromPageContext };
-export { getHookFromPageContextNew };
+export { getHooksFromPageContextNew };
 export { getHookFromPageConfig };
 export { getHookFromPageConfigGlobal };
-export { getHookFromPageConfigGlobalCumulative };
+export { getHooksFromPageConfigGlobalCumulative };
 export { getHook_setIsPrerenderering };
 // TO-DO/next-major-release: remove
 // We export for old V0.4 design which doesn't support config.hooksTimeout
@@ -10,7 +10,11 @@ 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 } from '../../utils/assert.js';
+import { checkType } from '../../utils/checkType.js';
+import { isArray } from '../../utils/isArray.js';
+import { isCallable } from '../../utils/isCallable.js';
+import { isObject } from '../../utils/isObject.js';
 import pc from '@brillout/picocolors';
 const globalObject = getGlobalObject('hooks/getHook.ts', {});
 function getHookFromPageContext(pageContext, hookName) {
@@ -29,8 +33,8 @@ function getHookFromPageContext(pageContext, hookName) {
     assert(hookFilePath);
     return getHook(hookFn, hookName, hookFilePath, hookTimeout);
 }
-// TO-DO/eventually: remove getHookFromPageContext() in favor of getHookFromPageContextNew()
-function getHookFromPageContextNew(hookName, pageContext) {
+// TO-DO/eventually: remove getHookFromPageContext() in favor of getHooksFromPageContextNew()
+function getHooksFromPageContextNew(hookName, pageContext) {
     const { hooksTimeout } = pageContext.config;
     const hookTimeout = getHookTimeout(hooksTimeout, hookName);
     const hooks = [];
@@ -67,7 +71,7 @@ function getHookFromPageConfigGlobal(pageConfigGlobal, hookName) {
     const hookTimeout = getHookTimeoutGlobal(hookName);
     return getHook(hookFn, hookName, hookFilePath, hookTimeout);
 }
-function getHookFromPageConfigGlobalCumulative(pageConfigGlobal, hookName) {
+function getHooksFromPageConfigGlobalCumulative(pageConfigGlobal, hookName) {
     const configValue = pageConfigGlobal.configValues[hookName];
     if (!configValue?.value)
         return [];

package/dist/shared-server-client/modifyUrl.js

@@ -1,6 +1,6 @@
 export { modifyUrl };
 import { modifyUrlSameOrigin } from './modifyUrlSameOrigin.js';
-import { createUrlFromComponents, parseUrl } from './utils.js';
+import { parseUrl, createUrlFromComponents } from '../utils/parseUrl.js';
 /**
  * Modify a URL.
  *

package/dist/shared-server-client/modifyUrlSameOrigin.js

@@ -1,7 +1,9 @@
 export { modifyUrlSameOrigin };
 // We don't move modifyUrlSameOrigin() to the modifyUrl.ts file because we plan to use modifyUrlSameOrigin() on the client-side:
 // https://github.com/vikejs/vike/blob/c5a2de5e85262771f97851767c00ac35da69c64b/packages/vike/client/runtime-client-routing/navigate.ts#L4
-import { createUrlFromComponents, isNotNullish_keyVal, parseUrl, objectFilter, assertUsageUrlPathAbsolute, } from './utils.js';
+import { createUrlFromComponents, assertUsageUrlPathAbsolute, parseUrl } from '../utils/parseUrl.js';
+import { isNotNullish_keyVal } from '../utils/isNullish.js';
+import { objectFilter } from '../utils/objectFilter.js';
 function modifyUrlSameOrigin(url, modify) {
     const urlParsed = parseUrl(url, '/');
     // Pathname

package/dist/shared-server-client/page-configs/assertPlusFileExport.js

@@ -1,5 +1,5 @@
 export { assertPlusFileExport };
-import { assert, assertUsage, assertWarning } from '../utils.js';
+import { assert, assertUsage, assertWarning } from '../../utils/assert.js';
 import pc from '@brillout/picocolors';
 const SIDE_EXPORTS_TOLERATE = [
     // vite-plugin-solid adds `export { $$registrations }`

package/dist/shared-server-client/page-configs/findPageConfig.js

@@ -1,5 +1,5 @@
 export { findPageConfig };
-import { assert } from '../utils.js';
+import { assert } from '../../utils/assert.js';
 function findPageConfig(pageConfigs, pageId) {
     const result = pageConfigs.filter((p) => p.pageId === pageId);
     assert(result.length <= 1);

package/dist/shared-server-client/page-configs/getConfigDefinedAt.js

@@ -2,7 +2,9 @@ export { getConfigDefinedAt };
 export { getConfigDefinedAtOptional };
 export { getDefinedAtString };
 export { getDefinedByString };
-import { assert, checkType, isArray } from '../utils.js';
+import { assert } from '../../utils/assert.js';
+import { checkType } from '../../utils/checkType.js';
+import { isArray } from '../../utils/isArray.js';
 import pc from '@brillout/picocolors';
 import { getExportPath } from './getExportPath.js';
 function getConfigDefinedAt(sentenceBegin, configName, definedAtData) {

package/dist/shared-server-client/page-configs/getConfigValueBuildTime.d.ts

@@ -1,5 +1,5 @@
 export { getConfigValueBuildTime };
-import { type ResolveTypeAsString } from '../utils.js';
+import type { ResolveTypeAsString } from '../../utils/hasProp.js';
 import type { PageConfigBuildTime, ConfigValue } from '../../types/PageConfig.js';
 import type { ConfigNameBuiltIn } from '../../types/Config.js';
 import { type TypeAsString } from './getConfigValueTyped.js';

package/dist/shared-server-client/page-configs/getConfigValueBuildTime.js

@@ -1,5 +1,5 @@
 export { getConfigValueBuildTime };
-import { assert } from '../utils.js';
+import { assert } from '../../utils/assert.js';
 import { assertIsNotProductionRuntime } from '../../utils/assertSetup.js';
 import { getConfigValueTyped } from './getConfigValueTyped.js';
 assertIsNotProductionRuntime();

package/dist/shared-server-client/page-configs/getConfigValueRuntime.d.ts

@@ -1,5 +1,5 @@
 export { getConfigValueRuntime };
-import { type ResolveTypeAsString } from '../utils.js';
+import type { ResolveTypeAsString } from '../../utils/hasProp.js';
 import type { PageConfigRuntime, ConfigValue } from '../../types/PageConfig.js';
 import type { ConfigNameBuiltIn } from '../../types/Config.js';
 import { type TypeAsString } from './getConfigValueTyped.js';

package/dist/shared-server-client/page-configs/getConfigValueTyped.d.ts

@@ -1,6 +1,6 @@
 export { getConfigValueTyped };
 export type { TypeAsString };
-import { type ResolveTypeAsString } from '../utils.js';
+import type { ResolveTypeAsString } from '../../utils/hasProp.js';
 import type { ConfigValue } from '../../types/PageConfig.js';
 import type { ConfigNameBuiltIn } from '../../types/Config.js';
 type TypeAsString = 'string' | 'boolean' | undefined;

package/dist/shared-server-client/page-configs/getConfigValueTyped.js

@@ -1,5 +1,6 @@
 export { getConfigValueTyped };
-import { assert, assertUsage, getValuePrintable } from '../utils.js';
+import { assert, assertUsage } from '../../utils/assert.js';
+import { getValuePrintable } from '../../utils/getValuePrintable.js';
 import pc from '@brillout/picocolors';
 import { getConfigDefinedAtOptional } from './getConfigDefinedAt.js';
 function getConfigValueTyped(configValue, configName, type) {

package/dist/shared-server-client/page-configs/getExportPath.js

@@ -1,5 +1,5 @@
 export { getExportPath };
-import { assert } from '../utils.js';
+import { assert } from '../../utils/assert.js';
 function getExportPath(fileExportPathToShowToUser, configName) {
     if (!fileExportPathToShowToUser)
         return null;

package/dist/shared-server-client/page-configs/helpers.js

@@ -1,7 +1,8 @@
 export { getPageConfig };
 export { getConfigValueFilePathToShowToUser };
 export { getHookFilePathToShowToUser };
-import { assert, isArray } from '../utils.js';
+import { assert } from '../../utils/assert.js';
+import { isArray } from '../../utils/isArray.js';
 function getPageConfig(pageId, pageConfigs) {
     const pageConfig = pageConfigs.find((p) => p.pageId === pageId);
     assert(pageConfigs.length > 0);

package/dist/shared-server-client/page-configs/loadAndParseVirtualFilePageEntry.js

@@ -1,5 +1,5 @@
 export { loadAndParseVirtualFilePageEntry };
-import { objectAssign } from '../utils.js';
+import { objectAssign } from '../../utils/objectAssign.js';
 import { parseConfigValuesSerialized } from './serialize/parsePageConfigsSerialized.js';
 import { assertVirtualFileExports } from '../assertVirtualFileExports.js';
 async function loadAndParseVirtualFilePageEntry(pageConfig, isDev) {

package/dist/shared-server-client/page-configs/resolveVikeConfigPublic.js

@@ -6,7 +6,12 @@ export { resolveGlobalContextConfig };
 import { assertDefaultExports, forbiddenDefaultExports } from '../getPageFiles/assert_exports_old_design.js';
 import { getConfigDefinedAtOptional, getDefinedAtString } from './getConfigDefinedAt.js';
 import { getConfigValueFilePathToShowToUser } from './helpers.js';
-import { assert, isObject, assertWarning, assertUsage, makeLast, isBrowser, isScriptFile, isTemplateFile, objectDefineProperty, } from '../utils.js';
+import { assert, assertWarning, assertUsage } from '../../utils/assert.js';
+import { makeLast } from '../../utils/sorter.js';
+import { isScriptFile, isTemplateFile } from '../../utils/isScriptFile.js';
+import { objectDefineProperty } from '../../utils/objectDefineProperty.js';
+import { isBrowser } from '../../utils/isBrowser.js';
+import { isObject } from '../../utils/isObject.js';
 import pc from '@brillout/picocolors';
 function resolveGlobalConfigPublicPage(pageConfigGlobalValues, pageConfig, pageConfigValues) {
     const pageConfigPublic_ = resolvePageConfigPublic({ pageConfigGlobalValues, pageConfigValues });

package/dist/shared-server-client/page-configs/serialize/parsePageConfigsSerialized.js

@@ -1,6 +1,7 @@
 export { parsePageConfigsSerialized };
 export { parseConfigValuesSerialized };
-import { assert, assertUsage, isCallable } from '../../utils.js';
+import { assert, assertUsage } from '../../../utils/assert.js';
+import { isCallable } from '../../../utils/isCallable.js';
 import { getConfigDefinedAt } from '../getConfigDefinedAt.js';
 import { parseTransform } from '@brillout/json-serializer/parse';
 import { assertPlusFileExport } from '../assertPlusFileExport.js';

package/dist/shared-server-client/page-configs/serialize/serializeConfigValues.js

@@ -2,7 +2,12 @@ export { serializeConfigValues };
 export { getConfigValuesBase };
 export { isJsonValue };
 import { assertIsNotProductionRuntime } from '../../../utils/assertSetup.js';
-import { assert, assertIsNotBrowser, assertPosixPath, assertUsage, deepEqual, getPropAccessNotation, isImportPathRelative, } from '../../../node/vite/utils.js';
+import { assert, assertUsage } from '../../../utils/assert.js';
+import { assertIsNotBrowser } from '../../../utils/assertIsNotBrowser.js';
+import { assertPosixPath } from '../../../utils/path.js';
+import { deepEqual } from '../../../utils/deepEqual.js';
+import { getPropAccessNotation } from '../../../utils/getPropAccessNotation.js';
+import { isImportPathRelative } from '../../../utils/isImportPath.js';
 import { parsePointerImportData } from '../../../node/vite/shared/resolveVikeConfigInternal/pointerImports.js';
 import { getConfigValueFilePathToShowToUser } from '../helpers.js';
 import { stringify } from '@brillout/json-serializer/stringify';

package/dist/shared-server-client/route/abort.js

@@ -8,7 +8,15 @@ export { getPageContextAddendumAbort };
 export { addNewPageContextAborted };
 export { AbortRender };
 import { isUserHookError } from '../hooks/execHook.js';
-import { assert, assertInfo, assertUsage, assertUsageUrlPathAbsolute, assertUsageUrlRedirectTarget, assertWarning, checkType, hasProp, isBrowser, joinEnglish, objectAssign, truncateString, unique, } from './utils.js';
+import { assert, assertInfo, assertUsage, assertWarning } from '../../utils/assert.js';
+import { assertUsageUrlPathAbsolute, assertUsageUrlRedirectTarget } from '../../utils/parseUrl.js';
+import { checkType } from '../../utils/checkType.js';
+import { hasProp } from '../../utils/hasProp.js';
+import { isBrowser } from '../../utils/isBrowser.js';
+import { joinEnglish } from '../../utils/joinEnglish.js';
+import { objectAssign } from '../../utils/objectAssign.js';
+import { truncateString } from '../../utils/truncateString.js';
+import { unique } from '../../utils/unique.js';
 import pc from '@brillout/picocolors';
 /**
  * Abort the rendering of the current page, and redirect the user to another URL instead.

package/dist/shared-server-client/route/deduceRouteStringFromFilesystemPath.js

@@ -1,5 +1,7 @@
 // Unit tests at ./deduceRouteStringFromFilesystemPath.spec.ts
-import { assert, higherFirst, slice } from './utils.js';
+import { assert } from '../../utils/assert.js';
+import { slice } from '../../utils/slice.js';
+import { higherFirst } from '../../utils/sorter.js';
 export { deduceRouteStringFromFilesystemPath };
 // TO-DO/next-major-release: remove this and whole filesystemRoot mechanism
 function deduceRouteStringFromFilesystemPath(pageId, filesystemRoots) {

package/dist/shared-server-client/route/execHookGuard.d.ts

@@ -1,8 +1,9 @@
 export { execHookGuard };
+import type { PageContextConfig } from '../getPageFiles.js';
 import { type PageContextExecHook } from '../hooks/execHook.js';
 import type { GlobalContextInternal } from '../createGlobalContextShared.js';
 declare function execHookGuard<PageContext extends {
     pageId: string;
 } & {
     _globalContext: GlobalContextInternal;
-} & PageContextExecHook>(pageContext: PageContext, prepareForPublicUsage: (pageConfig: PageContext) => PageContext): Promise<void>;
+} & PageContextExecHook & PageContextConfig>(pageContext: PageContext, getPageContextPublic: (pageConfig: PageContext) => PageContext): Promise<void>;

package/dist/shared-server-client/route/execHookGuard.js

@@ -1,9 +1,10 @@
 export { execHookGuard };
 import { getHookFromPageContext, getHookTimeoutDefault } from '../hooks/getHook.js';
-import { assert, assertUsage, isCallable } from './utils.js';
-import { execHookDirectSingle } from '../hooks/execHook.js';
+import { assert, assertUsage } from '../../utils/assert.js';
+import { isCallable } from '../../utils/isCallable.js';
+import { execHookSingle } from '../hooks/execHook.js';
 const errIntro = 'The guard() hook defined by';
-async function execHookGuard(pageContext, prepareForPublicUsage) {
+async function execHookGuard(pageContext, getPageContextPublic) {
     let hook;
     if (pageContext._globalContext._pageFilesAll.length > 0) {
         // TO-DO/next-major-release: remove
@@ -17,7 +18,7 @@ async function execHookGuard(pageContext, prepareForPublicUsage) {
     }
     if (!hook)
         return;
-    await execHookDirectSingle(hook, pageContext, prepareForPublicUsage);
+    await execHookSingle(hook, pageContext, getPageContextPublic);
 }
 function findPageGuard(pageId, pageFilesAll) {
     const pageRouteFile = pageFilesAll.find((p) => p.pageId === pageId && p.fileType === '.page.route');

package/dist/shared-server-client/route/execHookOnBeforeRoute.js

@@ -1,10 +1,15 @@
 export { execHookOnBeforeRoute };
 import { assertPageContextProvidedByUser } from '../assertPageContextProvidedByUser.js';
-import { assertUsage, hasProp, isObjectWithKeys, objectAssign, assertWarning, assertUsageUrlAbsolute, joinEnglish, assert, } from './utils.js';
+import { assertUsage, assertWarning, assert } from '../../utils/assert.js';
+import { assertUsageUrlAbsolute } from '../../utils/parseUrl.js';
+import { hasProp } from '../../utils/hasProp.js';
+import { isObjectWithKeys } from '../../utils/isObjectWithKeys.js';
+import { joinEnglish } from '../../utils/joinEnglish.js';
+import { objectAssign } from '../../utils/objectAssign.js';
 import { assertRouteParams, assertSyncRouting } from './resolveRouteFunction.js';
 import pc from '@brillout/picocolors';
-import { execHookDirectSync } from '../hooks/execHook.js';
-import { preparePageContextForPublicUsage, } from '../preparePageContextForPublicUsage.js';
+import { execHookSingleSync } from '../hooks/execHook.js';
+import { getPageContextPublicShared } from '../getPageContextPublicShared.js';
 async function execHookOnBeforeRoute(pageContext) {
     const pageContextFromOnBeforeRouteHook = {};
     if (!pageContext._globalContext._onBeforeRouteHook)
@@ -33,7 +38,7 @@ async function execHookOnBeforeRoute(pageContext) {
     return pageContextFromOnBeforeRouteHook;
 }
 async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
-    let { hookReturn } = execHookDirectSync(onBeforeRouteHook, pageContext, preparePageContextForPublicUsage);
+    let { hookReturn } = execHookSingleSync(onBeforeRouteHook, pageContext._globalContext, pageContext, getPageContextPublicShared);
     assertSyncRouting(hookReturn, `The onBeforeRoute() hook ${onBeforeRouteHook.hookFilePath}`);
     // TO-DO/next-major-release: make execHookOnBeforeRoute() and route() sync
     hookReturn = await hookReturn;

package/dist/shared-server-client/route/index.d.ts

@@ -3,7 +3,7 @@ export type { PageContextBeforeRoute };
 export type { PageContextAfterRoute };
 export type { PageRoutes };
 export type { RouteMatches };
-import { type PageContextUrlInternal, type PageContextUrlSource } from '../getPageContextUrlComputed.js';
+import type { PageContextUrlInternal, PageContextUrlSource } from '../getPageContextUrlComputed.js';
 import type { PageRoutes, RouteType } from './loadPageRoutes.js';
 import type { GlobalContextInternal } from '../createGlobalContextShared.js';
 type PageContextBeforeRoute = PageContextUrlInternal & {

package/dist/shared-server-client/route/index.js

@@ -5,7 +5,10 @@ import { isBrowser } from '../../utils/isBrowser.js';
 if (isBrowser()) {
     assertClientRouting();
 }
-import { assert, assertUsage, isPlainObject, objectAssign, debug } from './utils.js';
+import { assert, assertUsage } from '../../utils/assert.js';
+import { debug } from '../../utils/debug.js';
+import { isPlainObject } from '../../utils/isPlainObject.js';
+import { objectAssign } from '../../utils/objectAssign.js';
 import { resolvePrecedence } from './resolvePrecedence.js';
 import { resolveRouteString } from './resolveRouteString.js';
 import { resolveRouteFunction } from './resolveRouteFunction.js';

package/dist/shared-server-client/route/loadPageRoutes.js

@@ -1,9 +1,12 @@
 export { loadPageRoutes };
 export { loadPageRoutesSync };
 import { isErrorPageId } from '../error-page.js';
-import { assert, assertUsage, hasProp, slice } from './utils.js';
+import { assert, assertUsage } from '../../utils/assert.js';
+import { hasProp } from '../../utils/hasProp.js';
+import { isArray } from '../../utils/isArray.js';
+import { isCallable } from '../../utils/isCallable.js';
+import { slice } from '../../utils/slice.js';
 import { deduceRouteStringFromFilesystemPath } from './deduceRouteStringFromFilesystemPath.js';
-import { isArray, isCallable } from '../utils.js';
 import { getConfigValueRuntime } from '../page-configs/getConfigValueRuntime.js';
 import { getDefinedAtString } from '../page-configs/getConfigDefinedAt.js';
 import { warnDeprecatedAllowKey } from './resolveRouteFunction.js';

package/dist/shared-server-client/route/resolvePrecedence.js

@@ -1,8 +1,7 @@
 export { resolvePrecedence };
 // export type { RouteMatch }
 import { analyzeRouteString } from './resolveRouteString.js';
-import { higherFirst, lowerFirst } from './utils.js';
-import { makeFirst } from './utils.js';
+import { higherFirst, lowerFirst, makeFirst } from '../../utils/sorter.js';
 import { isStaticRouteString } from './resolveRouteString.js';
 // See https://vike.dev/route-function#precedence
 function resolvePrecedence(routeMatches) {

package/dist/shared-server-client/route/resolveRoute.js

@@ -1,5 +1,5 @@
 export { resolveRoute };
-import { assertUsage } from './utils.js';
+import { assertUsage } from '../../utils/assert.js';
 import { resolveRouteString } from './resolveRouteString.js';
 import pc from '@brillout/picocolors';
 function resolveRoute(routeString, urlPathname) {

package/dist/shared-server-client/route/resolveRouteFunction.js

@@ -2,16 +2,19 @@ export { resolveRouteFunction };
 export { assertRouteParams };
 export { assertSyncRouting };
 export { warnDeprecatedAllowKey };
-import { execHookDirectSync } from '../hooks/execHook.js';
-import { preparePageContextForPublicUsage } from '../preparePageContextForPublicUsage.js';
-import { assert, assertUsage, assertWarning, hasProp, isPlainObject, isPromise } from './utils.js';
+import { execHookSingleSync } from '../hooks/execHook.js';
+import { getPageContextPublicShared } from '../getPageContextPublicShared.js';
+import { assert, assertUsage, assertWarning } from '../../utils/assert.js';
+import { hasProp } from '../../utils/hasProp.js';
+import { isPlainObject } from '../../utils/isPlainObject.js';
+import { isPromise } from '../../utils/isPromise.js';
 import pc from '@brillout/picocolors';
 async function resolveRouteFunction(routeFunction, pageContext, routeFunctionFilePath) {
-    let { hookReturn: result } = execHookDirectSync({
+    let { hookReturn: result } = execHookSingleSync({
         hookFn: routeFunction,
         hookFilePath: routeFunctionFilePath,
         hookName: 'route',
-    }, pageContext, preparePageContextForPublicUsage);
+    }, pageContext._globalContext, pageContext, getPageContextPublicShared);
     assertSyncRouting(result, `The Route Function ${routeFunctionFilePath}`);
     // TO-DO/next-major-release: make resolveRouteFunction() and route() sync
     //* We disallow asynchronous routing, because we need to check whether a link is a Vike link in a synchronous fashion before calling ev.preventDefault() in the 'click' event listener

package/dist/shared-server-client/route/resolveRouteString.js

@@ -4,8 +4,9 @@ export { isStaticRouteString };
 export { analyzeRouteString };
 export { assertRouteString };
 export { getRouteStringParameterList };
-import { assertWarning, isBrowser, escapeRegex } from '../utils.js';
-import { assert, assertUsage } from './utils.js';
+import { assertWarning, assert, assertUsage } from '../../utils/assert.js';
+import { escapeRegex } from '../../utils/escapeRegex.js';
+import { isBrowser } from '../../utils/isBrowser.js';
 import pc from '@brillout/picocolors';
 const PARAM_TOKEN_NEW = '@';
 // TO-DO/next-major-release: remove

package/dist/shared-server-client/route/resolveUrlPathname.js

@@ -1,6 +1,6 @@
 export { resolveUrlPathname };
 import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
-import { assert, assertUsage } from '../utils.js';
+import { assert, assertUsage } from '../../utils/assert.js';
 assertIsNotBrowser(); // Don't bloat the client
 /** Given a `routeString` and `routeParams`, resolve `urlPathname`.
  *

package/dist/shared-server-node/api-context.js

@@ -3,7 +3,8 @@ export { setContextVikeApiOperation };
 export { clearContextVikeApiOperation };
 export { getVikeApiOperation };
 // We don't import ./utils.js because this file is imported by server/
-import { assert, getGlobalObject } from '../server/utils.js';
+import { assert } from '../utils/assert.js';
+import { getGlobalObject } from '../utils/getGlobalObject.js';
 const globalObject = getGlobalObject('api/context.ts', {});
 function getVikeApiOperation() {
     return globalObject.vikeApiOperation ?? null;

package/dist/shared-server-node/assertV1Design.js

@@ -1,5 +1,7 @@
 export { assertV1Design };
-import { assert, assertUsage, assertWarning, isNotNullish, unique } from './utils.js';
+import { assert, assertUsage, assertWarning } from '../utils/assert.js';
+import { isNotNullish } from '../utils/isNullish.js';
+import { unique } from '../utils/unique.js';
 function assertV1Design(pageConfigs, pageFilesAll) {
     const isOldDesign = pageFilesAll === true || (pageFilesAll !== false && pageFilesAll.length > 0);
     const isV1Design = pageConfigs === true || (pageConfigs !== false && pageConfigs.length > 0);

package/dist/shared-server-node/extractAssetsQuery.js

@@ -1,7 +1,8 @@
 export { extractAssetsAddQuery };
 export { extractAssetsRemoveQuery };
 // We import from node/utils.ts instead of node/vite/utils.ts because this file is loaded by the server runtime
-import { assert, getFileExtension } from './utils.js';
+import { assert } from '../utils/assert.js';
+import { getFileExtension } from '../utils/getFileExtension.js';
 const query = 'extractAssets';
 function extractAssetsAddQuery(id) {
     const fileExtension = getFileExtension(id);

package/dist/shared-server-node/getVikeConfigError.js

@@ -2,7 +2,8 @@ export { getVikeConfigError };
 export { getVikeConfigErrorBuild };
 export { setVikeConfigError };
 export { debugFileChange };
-import { getGlobalObject, createDebug } from './utils.js';
+import { createDebug } from '../utils/debug.js';
+import { getGlobalObject } from '../utils/getGlobalObject.js';
 const globalObject = getGlobalObject('server/shared/getVikeConfigError.ts', {
     errorRuntime: false,
     errorBuild: false,

package/dist/shared-server-node/prependEntriesDir.js

@@ -1,5 +1,5 @@
 export { prependEntriesDir };
-import { assert } from './utils.js';
+import { assert } from '../utils/assert.js';
 function prependEntriesDir(entryName) {
     if (entryName.startsWith('/')) {
         entryName = entryName.slice(1);

package/dist/shared-server-node/resolveBase.js

@@ -1,5 +1,7 @@
 export { resolveBase };
-import { assert, assertUsage, isBaseServer, isBaseAssets } from './utils.js';
+import { assert, assertUsage } from '../utils/assert.js';
+import { isBaseServer } from '../utils/parseUrl.js';
+import { isBaseAssets } from '../utils/parseUrl-extras.js';
 import pc from '@brillout/picocolors';
 function resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved) {
     if (baseViteOriginal === '/__UNSET__')

package/dist/shared-server-node/virtualFileId.js

@@ -4,7 +4,9 @@ export { virtualFileIdGlobalEntryServer };
 export { virtualFileIdGlobalEntryClientSR };
 export { virtualFileIdGlobalEntryClientCR };
 import { extractAssetsRemoveQuery } from './extractAssetsQuery.js';
-import { assert, assertIsNotBrowser, removeVirtualFileIdPrefix } from './utils.js';
+import { assert } from '../utils/assert.js';
+import { assertIsNotBrowser } from '../utils/assertIsNotBrowser.js';
+import { removeVirtualFileIdPrefix } from '../utils/virtualFileId.js';
 assertIsNotBrowser();
 // Global entries
 const virtualFileIdGlobalEntryServer = 

package/dist/types/Config.d.ts

@@ -292,7 +292,7 @@ type ConfigBuiltIn = {
      *  https://vike.dev/onCreateGlobalContext
      */
     onCreateGlobalContext?: ((globalContext: GlobalContext) => void) | ImportStringList | null;
-    /** Called whenever a hook is called.
+    /** Hook called whenever a hook is called.
      *
      *  https://vike.dev/onHookCall
      */
@@ -336,12 +336,12 @@ type ConfigBuiltIn = {
      * https://vike.dev/filesystemRoutingRoot
      */
     filesystemRoutingRoot?: string | ImportStringList;
-    /** Page Hook called when pre-rendering starts.
+    /** Hook called when pre-rendering starts.
      *
      * https://vike.dev/onPrerenderStart
      */
     onPrerenderStart?: OnPrerenderStartAsync | OnPrerenderStartSync | ImportStringList;
-    /** Global Hook called before the whole pre-rendering process starts.
+    /** Hook called for initializing pre-rendering.
      *
      * https://vike.dev/onBeforePrerenderStart
      */
@@ -524,8 +524,17 @@ type ConfigBuiltIn = {
     keepScrollPosition?: KeepScrollPosition;
     /** @experimental */
     middleware?: Function;
-    /** @experimental */
     cli?: {
+        /** @experimental
+         *
+         * Preview configuration.
+         *
+         * Set it to `false` if previewing isn't supported.
+         *
+         * Set it to `true` if previewing should load the `dist/server/index.js` entry.
+         *
+         * Set it to `vite` if previewing should use Vite's preview server.
+         */
         preview?: CliPreviewConfig;
     };
     /**
@@ -537,7 +546,7 @@ type ConfigBuiltIn = {
 };
 type PrerenderSetting = boolean | {
     /**
-     * Allow only some of your pages to be pre-rendered.
+     * Allow only some pages to be pre-rendered.
      *
      * This setting doesn't affect the pre-rendering process: it merely suppresses the warnings when some of your pages cannot be pre-rendered.
      *
@@ -547,7 +556,7 @@ type PrerenderSetting = boolean | {
      */
     partial?: boolean;
     /**
-     * Whether +redirects should be pre-rendered to HTML documents that redirect the user.
+     * Whether +redirects should be pre-rendered to redirecting HTML documents.
      *
      * https://vike.dev/prerender#redirects
      */
@@ -573,7 +582,7 @@ type PrerenderSetting = boolean | {
      */
     parallel?: boolean | number;
     /**
-     * Disable the automatic initiation of the pre-rendering process when running `$ vike build`.
+     * Don't automatically run the pre-rendering process upon `$ vike build`.
      *
      * Use this if you want to programmatically initiate the pre-rendering process instead.
      *
@@ -583,11 +592,11 @@ type PrerenderSetting = boolean | {
      */
     disableAutoRun?: boolean;
     /**
-     * Whether to enable pre-rendering.
+     * Change settings without enabling pre-rendering.
      *
-     * Setting `enable: null` enables you to set prerender settings without enabling pre-rendering by default.
+     * By setting `enable: null` you can define pre-render settings without enabling pre-rendering.
      *
-     * This is useful, for example, if you want pre-rendering to stay opt-in instead of opt-out while setting pre-render settings globally.
+     * Used by Vike extensions to set pre-render settings without enabling pre-rerendering on behalf of the user.
      *
      * https://vike.dev/prerender#enable
      *
@@ -595,9 +604,11 @@ type PrerenderSetting = boolean | {
      */
     enable?: boolean | null;
     /**
+     * Don't remove the `dist/server/` directory.
+     *
      * If you pre-render all your pages then Vike removes the `dist/server/` directory after pre-rendering has finished.
      *
-     * If you set this setting to `true` then Vike won't remove the `dist/server/` directory.
+     * If `keepDistServer: true` then Vike won't remove the `dist/server/` directory.
      *
      * https://vike.dev/prerender#keepDistServer
      *

package/dist/types/Config.js

@@ -1,2 +1 @@
-// TODO: rename 'Hook called' Called
 export {};

package/dist/types/PageContext.d.ts

@@ -16,14 +16,14 @@ import type { From, PageContextConfig, Source, Sources } from '../shared-server-
 import type { Config } from './Config.js';
 import type { AbortStatusCode } from '../shared-server-client/route/abort.js';
 import type { GlobalContextClient, GlobalContextServer, GlobalContextClientWithServerRouting } from './GlobalContext.js';
-import type { DangerouslyUseInternals } from '../shared-server-client/getProxyForPublicUsage.js';
+import type { DangerouslyUseInternals } from '../shared-server-client/getPublicProxy.js';
 import type { PageContextInternalClientAfterRender } from '../client/runtime-client-routing/renderPageClient.js';
 import type { PageContextAfterRender } from '../server/runtime/renderPageServer/renderPageServerAfterRoute.js';
-import type { PageContextPublicProxyServer } from '../server/runtime/renderPageServer/preparePageContextForPublicUsageServer.js';
-import type { PageContextPublicProxyClient } from '../client/runtime-client-routing/preparePageContextForPublicUsageClient.js';
+import type { PageContextPublicServer } from '../server/runtime/renderPageServer/getPageContextPublicServer.js';
+import type { PageContextPublicProxyClient } from '../client/runtime-client-routing/getPageContextPublicClient.js';
 type PageContextServer<Data = unknown> = PageContextBuiltInServer<Data> & {
     /** https://vike.dev/warning/internals */
-    dangerouslyUseInternals: DangerouslyUseInternals<PageContextInternalServer & PageContextAfterRender & PageContextPublicProxyServer>;
+    dangerouslyUseInternals: DangerouslyUseInternals<PageContextInternalServer & PageContextAfterRender & PageContextPublicServer>;
 } & Vike.PageContext & Vike.PageContextServer;
 type PageContext<Data = unknown> = PageContextClient<Data> | PageContextServer<Data>;
 type PageContextClient<Data = unknown> = PageContextBuiltInClientWithClientRouting<Data> & {

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.250-commit-2686732";
+export declare const PROJECT_VERSION: "0.4.250-commit-0d50da9";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.250-commit-2686732';
+export const PROJECT_VERSION = '0.4.250-commit-0d50da9';