vike 0.4.252-commit-4fa40ed → 0.4.253-commit-1658209

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

@@ -202,6 +202,8 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
+        cspNonce?: undefined;
+        headers?: undefined;
     } & {
         urlOriginal: string;
         isHydration: boolean;
@@ -263,6 +265,8 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
 }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
     isClientSide: true;
     isPrerendering: false;
+    cspNonce?: undefined;
+    headers?: undefined;
 } & {
     urlOriginal: string;
     isHydration: boolean;
@@ -484,6 +488,8 @@ declare function getPageContextFromHooksClient(pageContext: {
     }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
+        cspNonce?: undefined;
+        headers?: undefined;
     } & {
         urlOriginal: string;
         isHydration: boolean;
@@ -543,6 +549,8 @@ declare function getPageContextFromHooksClient(pageContext: {
 }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
     isClientSide: true;
     isPrerendering: false;
+    cspNonce?: undefined;
+    headers?: undefined;
 } & {
     urlOriginal: string;
     isHydration: boolean;

package/dist/node/prerender/runPrerender.d.ts

@@ -167,7 +167,9 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _pageFilesAll: PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _pageContextInit: import("../../types/PageContext.js").PageContextInit;
+    _pageContextInit: import("../../types/PageContext.js").PageContextInit & {
+        headers?: Record<string, unknown>;
+    };
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {

package/dist/node/vite/plugins/pluginReplaceConstantsEnvVars.js

@@ -5,12 +5,13 @@ import { escapeRegex } from '../../../utils/escapeRegex.js';
 import { isNotNullish } from '../../../utils/isNullish.js';
 import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
 import { isArray } from '../../../utils/isArray.js';
-import { lowerFirst } from '../../../utils/sorter.js';
+import { makeLast } from '../../../utils/sorter.js';
 import { assertPosixPath } from '../../../utils/path.js';
 import { getFilePathToShowToUserModule } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 import { getMagicString } from '../shared/getMagicString.js';
+import pc from '@brillout/picocolors';
 const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
 const PUBLIC_ENV_ALLOWLIST = [
     // https://github.com/vikejs/vike/issues/1724
@@ -23,7 +24,7 @@ const PUBLIC_ENV_ALLOWLIST = [
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
 //   - Or stop using Vite's `mode` implementation and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
 // === Rolldown filter
-const skipIrrelevant = 'import.meta.env.';
+const skipIrrelevant = 'import.meta.env';
 const filterRolldown = {
     /* We don't do that, because vike-react-sentry uses import.meta.env.PUBLIC_ENV__SENTRY_DSN
     id: {
@@ -47,6 +48,11 @@ function pluginReplaceConstantsEnvVars() {
     return [
         {
             name: 'vike:pluginReplaceConstantsEnvVars',
+            // Correct order:
+            // 1. @vitejs/plugin-vue
+            // 2. vike:pluginExtractAssets and vike:pluginExtractExportNames [needs to be applied after @vitejs/plugin-vue]
+            // 3. vike:pluginReplaceConstantsEnvVars [needs to be applied after vike:pluginExtractAssets and vike:pluginExtractExportNames]
+            // 4. vite:define (Vite built-in plugin) [needs to be applied after vike:pluginReplaceConstantsEnvVars]
             enforce: 'post',
             configResolved: {
                 handler(config_) {
@@ -55,7 +61,7 @@ function pluginReplaceConstantsEnvVars() {
                     // Add process.env values defined by .env files
                     Object.entries(envVarsAll).forEach(([key, val]) => { var _a; return ((_a = process.env)[key] ?? (_a[key] = val)); });
                     envPrefix = getEnvPrefix(config);
-                    config.plugins.sort(lowerFirst((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
+                    config.plugins.sort(makeLast((plugin) => plugin.name === 'vite:define'));
                 },
             },
             transform: {
@@ -97,6 +103,17 @@ function pluginReplaceConstantsEnvVars() {
                     replacements.forEach(({ regExpStr, replacement }) => {
                         magicString.replaceAll(new RegExp(regExpStr, 'g'), JSON.stringify(replacement));
                     });
+                    // Replace bare `import.meta.env` expression with `null` in the user-land.
+                    // - Otherwise Vite replaces it with an object missing PUBLIC_ENV__ variables which is confusing for users.
+                    // - We purposely don't support replacing `import.meta.env` with an object to incentivize users to write tree-shaking friendly code.
+                    // - `define: { 'import.meta.env': JSON.stringify(null) }` doesn't work because it also replaces `import.meta.env` inside `import.meta.env.SONE_ENV`
+                    const bareImportMetaEnvRegex = /\bimport\.meta\.env(?!\.)/g;
+                    const isUserLand = !id.includes('node_modules') && id.startsWith(config.root); // skip node_modules/ as well as linked dependencies
+                    if (isUserLand && bareImportMetaEnvRegex.test(code)) {
+                        assertWarning(false, `The bare ${pc.cyan('import.meta.env')} expression in ${getFilePathToShowToUserModule(id, config)} is replaced with ${pc.cyan('null')} — use ${pc.cyan('import.meta.env.SONE_ENV')} instead ${pc.underline('https://vike.dev/env')}`, { onlyOnce: true });
+                        bareImportMetaEnvRegex.lastIndex = 0; // Reset state after .test() since the /g flag makes the RegExp stateful
+                        magicString.replaceAll(bareImportMetaEnvRegex, JSON.stringify(null));
+                    }
                     return getMagicStringResult();
                 },
             },

package/dist/node/vite/plugins/pluginReplaceConstantsGlobalThis.d.ts

@@ -9,6 +9,8 @@ declare global {
     /** Like `import.meta.env.SSR` but works for `node_modules/` packages with `ssr.external` */
     var __VIKE__IS_CLIENT: boolean;
     var __VIKE__IS_DEBUG: boolean;
+    /** Whether the code is processed by Vite, e.g. `true` when server code is `ssr.noExternal` */
+    var __VIKE__NO_EXTERNAL: true | undefined;
 }
 declare const VIRTUAL_FILE_ID_constantsGlobalThis = "virtual:vike:server:constantsGlobalThis";
 declare function pluginReplaceConstantsGlobalThis(): Plugin[];

package/dist/node/vite/plugins/pluginReplaceConstantsGlobalThis.js

@@ -33,6 +33,7 @@ function pluginReplaceConstantsGlobalThis() {
                         define: {
                             'globalThis.__VIKE__IS_DEV': JSON.stringify(isDev),
                             'globalThis.__VIKE__IS_DEBUG': JSON.stringify(isDebugVal),
+                            'globalThis.__VIKE__NO_EXTERNAL': 'true',
                         },
                     };
                 },

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

@@ -91,7 +91,8 @@ function addErrorHint(error) {
     const hint = getErrorHint(error);
     if (!hint)
         return error;
-    const append = `\n${pc.bold(formatHintLog(hint))}`;
+    const color = hint === hintDefault ? pc.gray : pc.bold;
+    const append = `\n${color(formatHintLog(hint))}`;
     return getBetterError(error, { message: { append } });
 }
 function getErrorHint(error) {

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

@@ -6,7 +6,9 @@ export type { PageContextCreatedServerWithoutGlobalContext };
 import type { GlobalContextServerInternal } from '../globalContext.js';
 import type { PageContextInit } from '../renderPageServer.js';
 type PageContextCreatedServer = Awaited<ReturnType<typeof createPageContextServer>>;
-declare function createPageContextServer(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, args: {
+declare function createPageContextServer(pageContextInit: PageContextInit & {
+    headers?: Record<string, unknown>;
+}, globalContext: GlobalContextServerInternal, args: {
     requestId: number;
 } & ({
     isPrerendering: true;
@@ -116,7 +118,9 @@ declare function createPageContextServer(pageContextInit: PageContextInit, globa
     _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/loadPageConfigsLazyServerSide.d.ts

@@ -117,7 +117,9 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     _pageFilesAll: import("../../../shared-server-client/getPageFiles.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _pageContextInit: import("../renderPageServer.js").PageContextInit;
+    _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+        headers?: Record<string, unknown>;
+    };
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {

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

@@ -125,7 +125,9 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _pageFilesAll: import("../../__internal/index.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
-        _pageContextInit: import("../renderPageServer.js").PageContextInit;
+        _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+            headers?: Record<string, unknown>;
+        };
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
@@ -286,7 +288,9 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _pageFilesAll: import("../../__internal/index.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
-        _pageContextInit: import("../renderPageServer.js").PageContextInit;
+        _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+            headers?: Record<string, unknown>;
+        };
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
@@ -455,7 +459,9 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _pageFilesAll: import("../../__internal/index.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
-        _pageContextInit: import("../renderPageServer.js").PageContextInit;
+        _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+            headers?: Record<string, unknown>;
+        };
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
@@ -616,7 +622,9 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _pageFilesAll: import("../../__internal/index.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
-        _pageContextInit: import("../renderPageServer.js").PageContextInit;
+        _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+            headers?: Record<string, unknown>;
+        };
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {

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

@@ -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/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/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/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.252-commit-4fa40ed";
+export declare const PROJECT_VERSION: "0.4.253-commit-1658209";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.252-commit-4fa40ed';
+export const PROJECT_VERSION = '0.4.253-commit-1658209';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.252-commit-4fa40ed",
+  "version": "0.4.253-commit-1658209",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {