vike 0.4.253 → 0.4.254

package/dist/server/runtime/renderPageServer/resolveRedirects.js

@@ -1,15 +1,13 @@
-import '../../assertEnvServer.js';
 export { resolveRedirects };
 export { getStaticRedirectsForPrerender };
 // For ./resolveRedirects.spec.ts
 export { resolveRouteStringRedirect };
-import { assertIsNotBrowser } from '../../../utils/assertIsNotBrowser.js';
 import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
 import { isUrlRedirectTarget, assertUsageUrlRedirectTarget } from '../../../utils/parseUrl.js';
 import { resolveUrlPathname } from '../../../shared-server-client/route/resolveUrlPathname.js';
 import { assertRouteString, isStaticRouteString, resolveRouteString, } from '../../../shared-server-client/route/resolveRouteString.js';
 import pc from '@brillout/picocolors';
-assertIsNotBrowser(); // Don't bloat the client
+import '../../assertEnvServer.js';
 const redirectsErrPrefix = '[+redirects]';
 function resolveRedirects(redirectsAll, urlPathname) {
     const redirects = merge(redirectsAll);

package/dist/server/runtime/renderPageServer.d.ts

@@ -1,4 +1,3 @@
-import '../assertEnvServer.js';
 export { renderPageServer };
 export { getRequestTag };
 export type { PageContextInit };
@@ -10,6 +9,7 @@ import { type HttpResponse } from './renderPageServer/createHttpResponse.js';
 import type { PageContextServer } from '../../types/index.js';
 import type { PageContextInit } from '../../types/PageContext.js';
 import { type AsyncStore } from './asyncHook.js';
+import '../assertEnvServer.js';
 type PageContextBegin = ReturnType<typeof getPageContextBegin>;
 declare function renderPageServer<PageContextUserAdded extends {}, PageContextInitUser extends PageContextInit>(pageContextInit: PageContextInitUser): Promise<PageContextInitUser & {
     httpResponse: HttpResponse;
@@ -116,7 +116,9 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     _pageFilesAll: import("../__internal/index.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _pageContextInit: PageContextInit;
+    _pageContextInit: PageContextInit & {
+        headers?: Record<string, unknown>;
+    };
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {

package/dist/server/runtime/renderPageServer.js

@@ -1,4 +1,3 @@
-import '../assertEnvServer.js';
 export { renderPageServer };
 export { getRequestTag };
 import { renderPageServerAfterRoute } from './renderPageServer/renderPageServerAfterRoute.js';
@@ -31,6 +30,7 @@ import { resolveRedirects } from './renderPageServer/resolveRedirects.js';
 import { getVikeConfigError } from '../../shared-server-node/getVikeConfigError.js';
 import { forkPageContext } from '../../shared-server-client/forkPageContext.js';
 import { getAsyncLocalStorage } from './asyncHook.js';
+import '../assertEnvServer.js';
 const globalObject = getGlobalObject('runtime/renderPageServer.ts', {
     httpRequestsCount: 0,
 });

package/dist/server/runtime/universal-middleware.d.ts

@@ -1,3 +1,3 @@
-import '../assertEnvServer.js';
 export default universalVikeHandler;
+import '../assertEnvServer.js';
 declare function universalVikeHandler(request: Request, context: Record<string, unknown>, runtime: Record<string, unknown>): Promise<Response>;

package/dist/server/runtime/universal-middleware.js

@@ -1,6 +1,6 @@
-import '../assertEnvServer.js';
 export default universalVikeHandler;
 import { renderPageServer } from './renderPageServer.js';
+import '../assertEnvServer.js';
 async function universalVikeHandler(request, context, runtime) {
     const pageContextInit = {
         ...context,

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

@@ -24,8 +24,13 @@ function getPageContextPublicShared(pageContext) {
             enumerable: false,
         });
     }
-    // For a more readable `console.log(pageContext)` output
-    sortPageContext(pageContext);
+    // More readable `console.log(pageContext)` output
+    if (
+    // https://github.com/vikejs/vike/issues/3099
+    globalThis.__VIKE__IS_DEV ||
+        globalThis.__VIKE__IS_DEBUG) {
+        sortPageContext(pageContext);
+    }
     const globalContextPublic = getGlobalContextPublicShared(pageContext._globalContext);
     const pageContextPublic = getPublicProxy(pageContext, 'pageContext', 
     // We must skip it in the client-side because of the reactivity mechanism of UI frameworks like Solid.

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

@@ -16,7 +16,18 @@ async function loadAndParseVirtualFilePageEntry(pageConfig, isDev) {
     // Catch @cloudflare/vite-plugin bug
     assertVirtualFileExports(moduleExports, () => 'configValuesSerialized' in moduleExports, moduleId);
     const virtualFileExportsPageEntry = moduleExports;
-    const configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry);
+    let configValues;
+    try {
+        configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry);
+    }
+    catch (e) {
+        if (!(e instanceof ReferenceError))
+            throw e;
+        // Safari WebKit bug: dynamic import() may resolve before the module body executes,
+        // https://github.com/vikejs/vike/issues/3121
+        await new Promise((resolve) => setTimeout(resolve));
+        configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry);
+    }
     Object.assign(pageConfig.configValues, configValues);
     objectAssign(pageConfig, { isPageEntryLoaded: true });
     return pageConfig;

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

@@ -52,7 +52,7 @@ function serializeConfigValues(pageConfig, importStatements, filesEnv, runtimeEn
 }
 function getValueSerializedFromSource(configValueSource, configName, importStatements, filesEnv) {
     let valueData;
-    if (configValueSource.valueIsLoaded && !configValueSource.valueIsLoadedWithImport) {
+    if (configValueSource.valueIsLoaded && !configValueSource.valueLoadedViaImport) {
         valueData = getValueSerializedWithJson(configValueSource.value, configName, configValueSource.definedAt, importStatements, filesEnv, configValueSource.configEnv);
     }
     else {

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

@@ -163,15 +163,12 @@ function assertStatusCode(statusCode, expected, caller) {
     }
     else {
         assert(!isBrowser());
-        if (import.meta.env) {
+        if (globalThis.__VIKE__NO_EXTERNAL) {
             assert(typeof globalThis.__VIKE__IS_DEV === 'boolean');
             assert(typeof globalThis.__VIKE__IS_CLIENT === 'boolean');
             assert(import.meta.env.SSR === true);
             assert(import.meta.env.DEV === globalThis.__VIKE__IS_DEV);
         }
-        else {
-            // import.meta.env isn't defined when 'vike' is ssr.external
-        }
     }
     const expectedEnglish = joinEnglish(expected.map((s) => pc.bold(String(s))), 'or');
     const statusCodeWithColor = pc.bold(String(statusCode));

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

@@ -1,8 +1,8 @@
+export { deduceRouteStringFromFilesystemPath };
 // Unit tests at ./deduceRouteStringFromFilesystemPath.spec.ts
 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) {
     // Handle Filesystem Routing Root

package/dist/types/PageConfig.d.ts

@@ -98,7 +98,7 @@ type ConfigValueSource = {
     plusFile: PlusFile | null;
     locationId: LocationId;
     /** Whether the config value is loaded at runtime, for example config.Page or config.onBeforeRender */
-    valueIsLoadedWithImport: boolean;
+    valueLoadedViaImport: boolean;
     /** Whether the config value is a file path, this is currently only true for +client */
     valueIsFilePath?: true;
     /** Whether the config value is defined by a +{configName}.js file */

package/dist/types/PageContext.d.ts

@@ -131,7 +131,6 @@ type PageContextInit = {
      */
     headersOriginal?: unknown;
     /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
-    /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
 };
 type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextInit & PageContextUrlServer & {
     /**
@@ -270,6 +269,8 @@ type PageContextClientCommon = {
      * https://vike.dev/pageContext#isPrerendering
      */
     isPrerendering: false;
+    cspNonce?: undefined;
+    headers?: undefined;
 };
 type PageContextInternalServer = Omit<PageContextBuiltInCommon<unknown> & PageContextUrlInternal, 'data' | 'globalContext'>;
 type OnlyUsers = 'data' | 'Page' | 'globalContext';

package/dist/types/index.d.ts

@@ -32,6 +32,7 @@ import type { ConfigEffect } from '../node/vite/shared/resolveVikeConfigInternal
  */
 type Effect = ConfigEffect;
 export type { Effect };
+export type { EarlyHint } from '../server/runtime/renderPageServer/getEarlyHints.js';
 import { PageContextBuiltInClientWithServerRouting } from './PageContext.js';
 /** @deprecated Replace:
  *   `import type { PageContextBuiltInClient } from 'vike/types'`

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.253";
+export declare const PROJECT_VERSION: "0.4.254";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.253';
+export const PROJECT_VERSION = '0.4.254';

package/dist/utils/assertSingleInstance.js

@@ -34,7 +34,7 @@ function assertSingleInstance() {
         assertWarning(versions.length <= 1, 
         // Do *NOT* patch Vike to remove this warning: you *will* eventually encounter the issues listed at https://vike.dev/warning/version-mismatch
         // - This happened before: https://github.com/vikejs/vike/issues/1108#issuecomment-1719061509
-        `vike@${pc.bold(versions[0])} and vike@${pc.bold(versions[1])} loaded which is highly discouraged, see ${pc.underline('https://vike.dev/warning/version-mismatch')}`, { onlyOnce: true, showStackTrace: false });
+        `vike@${pc.bold(versions[0])} and vike@${pc.bold(versions[1])} loaded which is highly discouraged ${pc.underline('https://vike.dev/warning/version-mismatch')}`, { onlyOnce: true, showStackTrace: false });
     }
     if (globalObject.checkSingleInstance && globalObject.instances.length > 1) {
         /*/ Not sure whether circular dependency can cause problems? In principle not since client-side code is ESM.

package/dist/utils/debug.d.ts

@@ -2,7 +2,7 @@ export { createDebug };
 export { isDebug };
 export { isDebugError };
 export { debug };
-declare const flags: ["vike", "vike:crawl", "vike:file-change", "vike:error", "vike:esbuild-resolve", "vike:pluginExtractAssets", "vike:pluginExtractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:requireResolve", "vike:routing", "vike:setup", "vike:staticReplace", "vike:stream", "vike:virtualFiles", "vike:vite-rpc"];
+declare const flags: ["vike", "vike:config", "vike:crawl", "vike:file-change", "vike:error", "vike:esbuild-resolve", "vike:pluginExtractAssets", "vike:pluginExtractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:requireResolve", "vike:routing", "vike:setup", "vike:staticReplace", "vike:stream", "vike:virtualFiles", "vike:vite-rpc"];
 type Flag = (typeof flags)[number];
 type Options = {
     serialization?: {

package/dist/utils/debug.js

@@ -11,6 +11,7 @@ import { isArray } from './isArray.js';
 import { isObject } from './isObject.js';
 const flags = [
     'vike',
+    'vike:config',
     'vike:crawl',
     'vike:file-change',
     'vike:error',

package/dist/utils/isObjectWithKeys.js

@@ -1,5 +1,5 @@
-import { isPlainObject } from './isPlainObject.js';
 export { isObjectWithKeys };
+import { isPlainObject } from './isPlainObject.js';
 function isObjectWithKeys(obj, keys) {
     if (!isPlainObject(obj)) {
         return false;

package/dist/utils/isSameErrorMessage.js

@@ -1,5 +1,5 @@
-import { isObject } from './isObject.js';
 export { isSameErrorMessage };
+import { isObject } from './isObject.js';
 function isSameErrorMessage(err1, err2) {
     if (!isObject(err1) || !isObject(err2))
         return false;

package/dist/utils/isScriptFile.js

@@ -52,7 +52,7 @@ const extTemplates = [
     'mdx'
 ];
 const scriptFileExtensionList = [...extJsOrTs, ...extJsxOrTsx, ...extTemplates];
-const scriptFileExtensionPattern = '(' + scriptFileExtensionList.join('|') + ')';
+const scriptFileExtensionPattern = '{' + scriptFileExtensionList.join(',') + '}';
 function isScriptFile(filePath) {
     return scriptFileExtensionList.some((ext) => filePath.endsWith('.' + ext));
 }

package/dist/utils/isStorybook.d.ts

@@ -0,0 +1,2 @@
+export { isStorybook };
+declare function isStorybook(): boolean;

package/dist/utils/isStorybook.js

@@ -0,0 +1,8 @@
+export { isStorybook };
+import { isToolCli } from './isToolCli.js';
+function isStorybook() {
+    const TEST_CLI = isToolCli('storybook');
+    // https://github.com/storybookjs/storybook/pull/33938
+    const TEST_ENV = 'STORYBOOK' in process.env;
+    return TEST_ENV || TEST_CLI;
+}

package/dist/utils/isToolCli.d.ts

@@ -0,0 +1,2 @@
+export { isToolCli };
+declare function isToolCli(tool: 'vite' | 'storybook'): boolean;

package/dist/utils/isToolCli.js

@@ -0,0 +1,7 @@
+export { isToolCli };
+import { toPosixPath } from './path.js';
+function isToolCli(tool) {
+    let execPath = process.argv[1];
+    execPath = toPosixPath(execPath);
+    return !!execPath.split('node_modules/').at(-1)?.startsWith(`${tool}/`);
+}

package/dist/utils/preventConstantFolding.d.ts

@@ -0,0 +1,2 @@
+/** Prevent compilers from constant folding `'a' + 'b'` into `'ab'`*/
+export declare function preventConstantFolding(): "";

package/dist/utils/preventConstantFolding.js

@@ -0,0 +1,7 @@
+/** Prevent compilers from constant folding `'a' + 'b'` into `'ab'`*/
+export function preventConstantFolding() {
+    const undefined_ = globalThis.__vike__this_property_is_never_defined;
+    if (undefined_)
+        return '__vike__this_string_is_never_used';
+    return '';
+}

package/dist/utils/slice.js

@@ -1,5 +1,5 @@
-import { assert } from './assert.js';
 export { slice };
+import { assert } from './assert.js';
 function slice(thing, from, to) {
     if (typeof thing === 'string') {
         return sliceArray(thing.split(''), from, to).join('');

package/dist/utils/sorter.js

@@ -1,9 +1,9 @@
-import { assert } from './assert.js';
 export { higherFirst };
 export { lowerFirst };
 export { makeFirst };
 export { makeLast };
 export { reverse };
+import { assert } from './assert.js';
 /**
  * ```js
  * let arr = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.253",
+  "version": "0.4.254",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -121,10 +121,9 @@
     "@babel/core": "^7.28.5",
     "@babel/types": "^7.28.5",
     "@brillout/import": "^0.2.6",
-    "@brillout/json-serializer": "^0.5.21",
+    "@brillout/json-serializer": "^0.5.22",
     "@brillout/picocolors": "^1.0.30",
-    "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.7.17",
+    "@brillout/vite-plugin-server-entry": "0.7.18",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",
     "esbuild": ">=0.19.0",