vike 0.4.228 → 0.4.229-commit-a19745d

package/dist/cjs/__internal/index.js

@@ -17,10 +17,10 @@ const assertSetup_js_1 = require("../utils/assertSetup.js");
 async function getPagesAndRoutes() {
     (0, assertSetup_js_1.setNodeEnvProduction)();
     await (0, globalContext_js_2.initGlobalContext_getPagesAndRoutes)();
-    const globalContext = await (0, globalContext_js_2.getGlobalContextInternal)();
+    const { globalContext } = await (0, globalContext_js_2.getGlobalContextServerInternal)();
     const { 
     //
-    pageRoutes, pageFilesAll, pageConfigs, allPageIds } = globalContext;
+    _pageRoutes: pageRoutes, _pageFilesAll: pageFilesAll, _pageConfigs: pageConfigs, _allPageIds: allPageIds } = globalContext;
     return {
         pageRoutes,
         pageFilesAll,

package/dist/cjs/client/client-routing-runtime/globalContext.js

@@ -0,0 +1,49 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGlobalContextClientInternal = void 0;
+const createGetGlobalContextClient_js_1 = require("../shared/createGetGlobalContextClient.js");
+const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
+// @ts-ignore
+const virtualFileExports = __importStar(require("virtual:vike:importUserCode:client:client-routing"));
+const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(virtualFileExports, true, addGlobalContext);
+exports.getGlobalContextClientInternal = getGlobalContextClientInternal;
+async function addGlobalContext(globalContext) {
+    const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
+    return {
+        _pageRoutes: pageRoutes,
+        _onBeforeRouteHook: onBeforeRouteHook
+    };
+}

package/dist/cjs/client/server-routing-runtime/globalContext.js

@@ -0,0 +1,41 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGlobalContextClientInternal = void 0;
+const createGetGlobalContextClient_js_1 = require("../shared/createGetGlobalContextClient.js");
+// @ts-ignore
+const virtualFileExports = __importStar(require("virtual:vike:importUserCode:client:server-routing"));
+const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(virtualFileExports, false);
+exports.getGlobalContextClientInternal = getGlobalContextClientInternal;

package/dist/cjs/client/server-routing-runtime/utils.js

@@ -20,7 +20,6 @@ const onLoad_js_1 = require("./onLoad.js");
 (0, onLoad_js_1.onLoad)();
 __exportStar(require("../../utils/assert.js"), exports);
 __exportStar(require("../../utils/assertSingleInstance.js"), exports);
-__exportStar(require("../../shared/hooks/executeHook.js"), exports);
 __exportStar(require("../../utils/checkType.js"), exports); // Only used by Server Routing (not needed for Client Routing)
 __exportStar(require("../../utils/getGlobalObject.js"), exports);
 __exportStar(require("../../utils/hasProp.js"), exports);
@@ -31,3 +30,4 @@ __exportStar(require("../../utils/parseUrl.js"), exports);
 __exportStar(require("../../utils/slice.js"), exports);
 __exportStar(require("../../utils/unique.js"), exports); // Only used by Server Routing (not needed for Client Routing)
 __exportStar(require("../../utils/getPropAccessNotation.js"), exports);
+__exportStar(require("../../utils/augmentType.js"), exports);

package/dist/cjs/client/shared/createGetGlobalContextClient.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGlobalContext = getGlobalContext;
+exports.getGlobalContextSync = getGlobalContextSync;
+exports.createGetGlobalContextClient = createGetGlobalContextClient;
+const createGlobalContextShared_js_1 = require("../../shared/createGlobalContextShared.js");
+const getJsonSerializedInHtml_js_1 = require("./getJsonSerializedInHtml.js");
+const utils_js_1 = require("./utils.js");
+const globalObject = (0, utils_js_1.getGlobalObject)('createGetGlobalContextClient.ts', (() => {
+    const { promise: globalContextPromise, resolve: globalContextPromiseResolve } = (0, utils_js_1.genPromise)();
+    return {
+        globalContextPromise,
+        globalContextPromiseResolve
+    };
+})());
+function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGlobalContext) {
+    (0, utils_js_1.assert)(globalObject.isClientRouting === undefined || globalObject.isClientRouting === isClientRouting);
+    globalObject.isClientRouting = isClientRouting;
+    // Eagerly call onCreateGlobalContext() hook
+    getGlobalContext();
+    return getGlobalContext;
+    async function getGlobalContext() {
+        // Cache
+        if (globalObject.globalContext &&
+            // Don't break HMR
+            globalObject.globalContext._virtualFileExports !== virtualFileExports) {
+            return globalObject.globalContext;
+        }
+        // Create
+        const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, async (globalContext) => {
+            const globalContextAddendum = {
+                /**
+                 * Whether the environment is client-side or server-side / pre-rendering.
+                 *
+                 * We recommend using `import.meta.env.SSR` instead, see https://vike.dev/globalContext
+                 */
+                isClientSide: true
+            };
+            (0, utils_js_1.objectAssign)(globalContextAddendum, (0, getJsonSerializedInHtml_js_1.getGlobalContextSerializedInHtml)());
+            (0, utils_js_1.objectAssign)(globalContextAddendum, await addGlobalContext?.(globalContext));
+            return globalContextAddendum;
+        });
+        (0, utils_js_1.assert)(globalObject.globalContext);
+        globalObject.globalContextPromiseResolve(globalObject.globalContext);
+        // Return
+        return globalContext;
+    }
+}
+// The type is never used: it's the type of the server-side getGlobalContext() that is used.
+async function getGlobalContext() {
+    const globalContext = await globalObject.globalContextPromise;
+    return globalContext;
+}
+function getGlobalContextSync() {
+    const { globalContext } = globalObject;
+    (0, utils_js_1.assertUsage)(globalContext, createGlobalContextShared_js_1.getGlobalContextSyncErrMsg);
+    return globalContext;
+}

package/dist/cjs/client/shared/getJsonSerializedInHtml.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPageContextSerializedInHtml = getPageContextSerializedInHtml;
+exports.getGlobalContextSerializedInHtml = getGlobalContextSerializedInHtml;
+const parse_1 = require("@brillout/json-serializer/parse");
+const utils_js_1 = require("./utils.js");
+const htmlElementIds_js_1 = require("../../shared/htmlElementIds.js");
+// elements should exist because:
+// 1. <script id="vike_pageContext" type="application/json"> appears before the <script> that loads Vike's client runtime (which includes this file)
+// 2. <script id="vike_pageContext" type="application/json"> is neither async nor defer
+// See https://github.com/vikejs/vike/pull/1271
+function getPageContextSerializedInHtml() {
+    const pageContextSerializedInHtml = findAndParseJson(htmlElementIds_js_1.htmlElementId_pageContext);
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextSerializedInHtml, 'pageId', 'string'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextSerializedInHtml, 'routeParams', 'string{}'));
+    return pageContextSerializedInHtml;
+}
+function getGlobalContextSerializedInHtml() {
+    const globalContextSerializedInHtml = findAndParseJson(htmlElementIds_js_1.htmlElementId_globalContext);
+    return globalContextSerializedInHtml;
+}
+function findAndParseJson(id) {
+    const elem = document.getElementById(id);
+    (0, utils_js_1.assertUsage)(elem, 
+    // It seems like it can be missing when HTML is malformed: https://github.com/vikejs/vike/issues/913
+    `Couldn't find #${id} (which Vike automatically injects in the HTML): make sure it exists (i.e. don't remove it and make sure your HTML isn't malformed)`);
+    const jsonStr = elem.textContent;
+    (0, utils_js_1.assert)(jsonStr);
+    const json = (0, parse_1.parse)(jsonStr);
+    return json;
+}

package/dist/cjs/client/shared/utils.js

@@ -0,0 +1,22 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("../../utils/assert.js"), exports);
+__exportStar(require("../../utils/parseUrl.js"), exports);
+__exportStar(require("../../utils/getGlobalObject.js"), exports);
+__exportStar(require("../../utils/objectAssign.js"), exports);
+__exportStar(require("../../utils/hasProp.js"), exports);
+__exportStar(require("../../utils/genPromise.js"), exports);

package/dist/cjs/node/plugin/index.js

@@ -28,6 +28,7 @@ const getPageAssets_js_1 = require("../runtime/renderPage/getPageAssets.js");
 const resolveClientEntriesDev_js_1 = require("./shared/resolveClientEntriesDev.js");
 const workaroundCssModuleHmr_js_1 = require("./plugins/workaroundCssModuleHmr.js");
 const workaroundVite6HmrRegression_js_1 = require("./plugins/workaroundVite6HmrRegression.js");
+const replaceConstants_js_1 = require("./plugins/replaceConstants.js");
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 (0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
@@ -45,7 +46,8 @@ function plugin(vikeVitePluginOptions = {}) {
         (0, envVars_js_1.envVarsPlugin)(),
         (0, fileEnv_js_1.fileEnv)(),
         (0, workaroundCssModuleHmr_js_1.workaroundCssModuleHmr)(),
-        (0, workaroundVite6HmrRegression_js_1.workaroundVite6HmrRegression)()
+        (0, workaroundVite6HmrRegression_js_1.workaroundVite6HmrRegression)(),
+        (0, replaceConstants_js_1.replaceConstants)()
     ];
     Object.assign(plugins, { __vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;

package/dist/cjs/node/plugin/plugins/baseUrls.js

@@ -14,7 +14,7 @@ function baseUrls() {
             const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
             const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
+            const vike = (0, commonConfig_js_1.getVikeConfigInternal)(config);
             basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, vike.config.baseServer ?? null, vike.config.baseAssets ?? null);
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
             process.env.BASE_SERVER = basesResolved.baseServer;

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

@@ -286,7 +286,7 @@ async function writeManifestFile(manifest, manifestFilePath) {
     await promises_1.default.writeFile(manifestFilePath, manifestFileContent, 'utf-8');
 }
 function handleAssetsManifest_getBuildConfig(config) {
-    const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
+    const vike = (0, commonConfig_js_1.getVikeConfigInternal)(config);
     const isFixEnabled = handleAssetsManifest_isFixEnabled(config);
     return {
         // https://github.com/vikejs/vike/issues/1339
@@ -301,16 +301,21 @@ function handleAssetsManifest_getBuildConfig(config) {
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
-    if ((0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv)) {
+    const isSsREnv = (0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv);
+    if (isSsREnv) {
         (0, utils_js_1.assert)(!assetsJsonFilePath);
         const outDirs = (0, getOutDirs_js_1.getOutDirs)(config, viteEnv);
         assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
         await writeAssetsManifestFile(outDirs, assetsJsonFilePath, config);
     }
     if ((0, isViteServerBuild_js_1.isViteServerBuild)(config, viteEnv)) {
-        (0, utils_js_1.assert)(assetsJsonFilePath);
-        // Replace __VITE_ASSETS_MANIFEST__ in all server-side bundles
-        await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(options, bundle, assetsJsonFilePath);
+        // Replace __VITE_ASSETS_MANIFEST__ in server builds
+        // - Always replace it in dist/server/
+        // - Also in some other server builds such as dist/vercel/ from vike-vercel
+        // - Don't replace it in dist/rsc/ from vike-react-rsc since __VITE_ASSETS_MANIFEST__ doesn't exist there
+        const noop = await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(options, bundle, assetsJsonFilePath);
+        if (isSsREnv)
+            (0, utils_js_1.assert)(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
     }
 }
 async function writeAssetsManifestFile(outDirs, assetsJsonFilePath, config) {

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

@@ -12,7 +12,7 @@ function pluginBuildApp() {
             name: 'vike:build:pluginBuildApp',
             apply: 'build',
             config(config) {
-                const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
+                const vike = (0, commonConfig_js_1.getVikeConfigInternal)(config);
                 if (!vike.config.vite6BuilderApp)
                     return;
                 return {

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

@@ -15,8 +15,6 @@ const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/ge
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
-// @ts-ignore `file:///${__filename.split('\\').join('/')}` is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = `file:///${__filename.split('\\').join('/')}`;
 const manifestTempFile = '_temp_manifest.json';
 exports.manifestTempFile = manifestTempFile;
 function pluginBuildConfig() {
@@ -84,8 +82,8 @@ async function getEntries(config) {
             ...clientEntries,
             ...pageFileEntries
         };
-        const clientRoutingEntry = resolve(`dist/esm/client/client-routing-runtime/entry.js`);
-        const serverRoutingEntry = resolve(`dist/esm/client/server-routing-runtime/entry.js`);
+        const clientRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/client-routing-runtime/entry.js');
+        const serverRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/server-routing-runtime/entry.js');
         if (hasClientRouting) {
             entries['entries/entry-client-routing'] = clientRoutingEntry;
         }
@@ -159,7 +157,7 @@ async function getPageFileEntries(config, includeAssetsImportedByServer) {
 }
 function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
     if (!clientEntry.startsWith('/')) {
-        (0, utils_js_1.assertIsNpmPackageImport)(clientEntry);
+        (0, utils_js_1.assertIsImportPathNpmPackage)(clientEntry);
         const entryTarget = clientEntry;
         const entryName = (0, prependEntriesDir_js_1.prependEntriesDir)(clientEntry);
         return { entryName, entryTarget };
@@ -195,11 +193,6 @@ function getEntryFromPageConfig(pageConfig, isForClientSide) {
     (0, utils_js_1.assert)(!entryName.endsWith('/'));
     return { entryName, entryTarget };
 }
-function resolve(filePath) {
-    (0, utils_js_1.assert)(filePath.startsWith('dist/'));
-    // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/build/
-    return (0, utils_js_1.requireResolveNonUserFile)(`../../../../../../${filePath}`, importMetaUrl);
-}
 function addLogHook() {
     const tty = process.stdout.isTTY && !process.env.CI; // Equals https://github.com/vitejs/vite/blob/193d55c7b9cbfec5b79ebfca276d4a721e7de14d/packages/vite/src/node/plugins/reporter.ts#L27
     if (!tty)

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

@@ -10,8 +10,6 @@ const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/vi
 const utils_js_1 = require("../../utils.js");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
-// @ts-ignore `file:///${__filename.split('\\').join('/')}` is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = `file:///${__filename.split('\\').join('/')}`;
 const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
@@ -68,6 +66,12 @@ async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
     const { dir } = options;
     (0, utils_js_1.assert)(dir);
     const chunkPath = find_ASSETS_MANIFEST(bundle);
+    // Some server builds don't contain __VITE_ASSETS_MANIFEST__ such as dist/rsc/ from vike-react-rsc
+    if (!chunkPath) {
+        const noop = true; // no operation
+        return noop;
+    }
+    (0, utils_js_1.assert)(assetsJsonFilePath);
     const chunkFilePath = path_1.default.join(dir, chunkPath);
     const [assetsJsonString, chunkFileContent] = await Promise.all([
         await promises_1.default.readFile(assetsJsonFilePath, 'utf8'),
@@ -76,6 +80,8 @@ async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
     const serverEntryFileContentPatched = chunkFileContent.replace(ASSETS_MANIFEST, assetsJsonString);
     (0, utils_js_1.assert)(serverEntryFileContentPatched !== chunkFileContent);
     await promises_1.default.writeFile(chunkFilePath, serverEntryFileContentPatched);
+    const noop = false;
+    return noop;
 }
 function find_ASSETS_MANIFEST(bundle) {
     let chunkPath;
@@ -86,13 +92,11 @@ function find_ASSETS_MANIFEST(bundle) {
             chunkPath = filePath;
         }
     }
-    (0, utils_js_1.assert)(chunkPath);
     return chunkPath;
 }
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct
-    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/pluginBuildEntry/index.js
-    const filePathAbsolute = (0, utils_js_1.requireResolveNonUserFile)(`../../../../../../dist/esm/__internal/index.js`, importMetaUrl);
+    const filePathAbsolute = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/__internal/index.js');
     if (
     // Let's implement a new config if a user needs the import to be a relative path instead of 'vike/__internal' (AFAIK a relative path is needed only if a framework has npm package 'vike' as direct dependency instead of a peer dependency and if the user of that framework uses pnpm)
     true) {

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

@@ -21,21 +21,25 @@ function pluginModuleBanner() {
         transform: {
             order: 'post',
             handler(code, id, options) {
-                if (!(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options))
+                if (!(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options) &&
+                    // Inject module banners if user sets `build.minify` to `false` for inspecting dist/client/
+                    config.build.minify) {
                     return;
+                }
                 if (id.startsWith('\0'))
                     id = id;
                 id = (0, virtual_files_js_1.removeVirtualIdTag)(id);
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
-                const s = new magic_string_1.default(code);
+                id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377
+                const magicString = 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.
                 // - https://esbuild.github.io/api/#legal-comments
-                s.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
+                magicString.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
                 return {
-                    code: s.toString(),
-                    map: s.generateMap({ hires: true, source: id })
+                    code: magicString.toString(),
+                    map: magicString.generateMap({ hires: true, source: id })
                 };
             }
         }

package/dist/cjs/node/plugin/plugins/commonConfig/assertResolveAlias.js

@@ -64,7 +64,7 @@ function assertResolveAlias(config) {
             //  - determineOptimizeDeps()
             //  - extractAssets
             //  - in general: using un-distinguishable path aliases is asking for trouble
-            if (!(0, utils_js_1.isValidPathAlias)(find)) {
+            if (!(0, utils_js_1.isPathAliasRecommended)(find)) {
                 if (find.startsWith('@')) {
                     const msg = `${errPrefix} defines an invalid resolve.alias ${deprecation}: a path alias cannot start with ${picocolors_1.default.cyan('@')}, ${errSuffix1}`;
                     (0, utils_js_1.assertWarning)(false, msg, { onlyOnce: true });

package/dist/cjs/node/plugin/plugins/commonConfig.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commonConfig = commonConfig;
 exports.getVikeConfigPublic = getVikeConfigPublic;
+exports.getVikeConfigInternal = getVikeConfigInternal;
 const utils_js_1 = require("../utils.js");
 const pluginBuildConfig_js_1 = require("./build/pluginBuildConfig.js");
 const require_shim_1 = require("@brillout/require-shim");
@@ -90,7 +91,7 @@ function commonConfig(vikeVitePluginOptions) {
                 order: 'post',
                 handler(configFromUser) {
                     let configFromVike = { server: {}, preview: {} };
-                    const vike = getVikeConfigPublic(configFromUser);
+                    const vike = getVikeConfigInternal(configFromUser);
                     if (vike.config.port !== undefined) {
                         // https://vike.dev/port
                         setDefault('port', vike.config.port, configFromUser, configFromVike);
@@ -158,11 +159,16 @@ function assertVikeCliOrApi(config) {
     if ((0, context_js_1.isVikeCliOrApi)())
         return;
     if ((0, isViteCliCall_js_1.isViteCliCall)()) {
+        (0, utils_js_1.assert)(!(0, utils_js_1.isVitest)());
         (0, utils_js_1.assertWarning)(false, `Vite's CLI is deprecated ${picocolors_1.default.underline('https://vike.dev/migration/cli')}`, {
             onlyOnce: true
         });
         return;
     }
+    if ((0, utils_js_1.isVitest)()) {
+        (0, utils_js_1.assertWarning)(false, `Unexpected Vitest setup: you seem to be using Vitest together with Vike's Vite plugin but without using Vike's JavaScript API which is unexpected, see ${picocolors_1.default.underline('https://vike.dev/vitest')}`, { onlyOnce: true });
+        return;
+    }
     if (config.server.middlewareMode) {
         (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('vite.createServer()')} is deprecated ${picocolors_1.default.underline('https://vike.dev/migration/cli#api')}`, {
             onlyOnce: true
@@ -196,7 +202,7 @@ function temp_supportOldInterface(config) {
 }
 // TODO/soon rename:
 // - `getVikeConfig()` => `resolveVikeConfig()` ?
-// - `getVikeConfigPublic()` => `getVikeConfig()`
+// - `getVikeConfigInternal()` => `getVikeConfig()`
 // - `VikeConfigPublic` => `VikeConfig` ?
 // - `VikeConfigObject` => `VikeConfigInternal` ?
 /**
@@ -204,11 +210,16 @@ function temp_supportOldInterface(config) {
  *
  * https://vike.dev/getVikeConfig
  */
-function getVikeConfigPublic(config) {
+function getVikeConfigInternal(config) {
     const vikeConfig = config._vike;
     (0, utils_js_1.assert)(vikeConfig);
     return vikeConfig;
 }
+function getVikeConfigPublic(config) {
+    const vikeConfig = config._vike;
+    (0, utils_js_1.assertUsage)(vikeConfig, "getVikeConfig() can only be used when Vite is running with Vike's Vite plugin");
+    return vikeConfig;
+}
 // Only emit dist/server/entry.mjs if necessary
 function emitServerEntryOnlyIfNeeded(config) {
     if (config.vitePluginServerEntry?.inject &&

package/dist/cjs/node/plugin/plugins/devConfig/determineFsAllowList.js

@@ -23,11 +23,6 @@ async function determineFsAllowList(config) {
     // We add it again just to be sure.
     fsAllow.push((0, vite_1.searchForWorkspaceRoot)(process.cwd()));
     // Add node_modules/vike/
-    {
-        // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/config/
-        const vikeRoot = node_path_1.default.posix.join(__dirname_, '../../../../../../');
-        // Assert that `vikeRoot` is indeed pointing to `node_modules/vike/`
-        (0, utils_js_1.requireResolveNonUserFile)(`${vikeRoot}/dist/esm/node/plugin/plugins/devConfig/index.js`, importMetaUrl);
-        fsAllow.push(vikeRoot);
-    }
+    const vikeNodeModulesRoot = (0, utils_js_1.getVikeNodeModulesRoot)();
+    fsAllow.push(vikeNodeModulesRoot);
 }

package/dist/cjs/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -40,7 +40,7 @@ async function getPageDeps(config, pageConfigs) {
     const addInclude = (e) => {
         (0, utils_js_1.assert)(e);
         // Shouldn't be a path alias, as path aliases would need to be added to config.optimizeDeps.entries instead of config.optimizeDeps.include
-        (0, utils_js_1.assertIsNpmPackageImport)(e);
+        (0, utils_js_1.assertIsImportPathNpmPackage)(e);
         include.push(e);
     };
     // V1 design
@@ -57,6 +57,11 @@ async function getPageDeps(config, pageConfigs) {
                         return;
                     if (definedAt.definedBy)
                         return;
+                    if (definedAt.importPathAbsolute) {
+                        const npmPackageName = (0, utils_js_1.getNpmPackageName)(definedAt.importPathAbsolute);
+                        if (npmPackageName && config.optimizeDeps.exclude?.includes(npmPackageName))
+                            return;
+                    }
                     if (definedAt.filePathAbsoluteUserRootDir !== null) {
                         // Vite expects entries to be filesystem absolute paths (surprisingly so).
                         addEntry(definedAt.filePathAbsoluteFilesystem);

package/dist/cjs/node/plugin/plugins/envVars.js

@@ -10,7 +10,8 @@ const utils_js_1 = require("../utils.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
-// TODO/enventually: (after we implemented vike.config.js)
+const applyRegExWithMagicString_js_1 = require("../shared/applyRegExWithMagicString.js");
+// TODO/enventually:
 // - Make import.meta.env work inside +config.js
 //   - 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` implemention and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
@@ -27,7 +28,6 @@ function envVarsPlugin() {
         enforce: 'post',
         configResolved(config_) {
             config = config_;
-            config.command;
             envsAll = (0, vite_1.loadEnv)(config.mode, config.envDir || config.root, '');
             config.plugins.sort((0, utils_js_1.lowerFirst)((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
         },
@@ -43,21 +43,22 @@ function envVarsPlugin() {
                 return;
             const isBuild = config.command === 'build';
             const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options);
-            const s = new magic_string_1.default(code);
-            Object.entries(envsAll)
+            const magicString = new magic_string_1.default(code);
+            // Find & check
+            const replacements = Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite
                 const envPrefix = !config.envPrefix ? [] : (0, utils_js_1.isArray)(config.envPrefix) ? config.envPrefix : [config.envPrefix];
                 return !envPrefix.some((prefix) => key.startsWith(prefix));
             })
-                .forEach(([envName, envVal]) => {
+                .map(([envName, envVal]) => {
                 const envStatement = `import.meta.env.${envName}`;
-                const envStatementRegExStr = (0, utils_js_1.escapeRegex)(envStatement) + '\\b';
+                const envStatementRegExpStr = (0, utils_js_1.escapeRegex)(envStatement) + '\\b';
                 // Security check
                 {
                     const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_ALLOWLIST.includes(envName);
                     if (isPrivate && isClientSide) {
-                        if (!new RegExp(envStatementRegExStr).test(code))
+                        if (!new RegExp(envStatementRegExpStr).test(code))
                             return;
                         const modulePath = (0, getFilePath_js_1.getModuleFilePathAbsolute)(id, config);
                         const errMsgAddendum = isBuild ? '' : ' (Vike will prevent your app from building for production)';
@@ -75,22 +76,19 @@ function envVarsPlugin() {
                     // Double check
                     (0, utils_js_1.assert)(!(isPrivate && isClientSide) || !isBuild);
                 }
-                // Apply
-                applyEnvVar(s, envStatementRegExStr, envVal);
+                return { regExpStr: envStatementRegExpStr, replacement: envVal };
+            })
+                .filter(utils_js_1.isNotNullish);
+            // Apply
+            replacements.forEach(({ regExpStr, replacement }) => {
+                (0, applyRegExWithMagicString_js_1.applyRegExpWithMagicString)(magicString, regExpStr, replacement);
             });
-            if (!s.hasChanged())
+            if (!magicString.hasChanged())
                 return null;
             return {
-                code: s.toString(),
-                map: s.generateMap({ hires: true, source: id })
+                code: magicString.toString(),
+                map: magicString.generateMap({ hires: true, source: id })
             };
         }
     };
 }
-function applyEnvVar(s, envStatementRegExStr, envVal) {
-    const envStatementRegEx = new RegExp(envStatementRegExStr, 'g');
-    let match;
-    while ((match = envStatementRegEx.exec(s.original))) {
-        s.overwrite(match.index, match.index + match[0].length, JSON.stringify(envVal));
-    }
-}

package/dist/cjs/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -179,7 +179,9 @@ function getGlobRoots(config) {
 }
 function getGlobPath(globRootDir, fileType) {
     (0, utils_js_1.assertPosixPath)(globRootDir);
-    let globPath = [...globRootDir.split('/'), '**', `*${fileType}.${utils_js_1.scriptFileExtensions}`].filter(Boolean).join('/');
+    let globPath = [...globRootDir.split('/'), '**', `*${fileType}.${utils_js_1.scriptFileExtensionPattern}`]
+        .filter(Boolean)
+        .join('/');
     if (!globPath.startsWith('/')) {
         globPath = '/' + globPath;
     }