vike 0.4.239-commit-050a4a3 → 0.4.239-commit-33e55d4

package/dist/esm/node/runtime/globalContext.d.ts

@@ -10,6 +10,7 @@ export { initGlobalContext_getPagesAndRoutes };
 export { setGlobalContext_viteDevServer };
 export { setGlobalContext_viteConfig };
 export { setGlobalContext_isPrerendering };
+export { setGlobalContext_prerenderContext };
 export { setGlobalContext_isProductionAccordingToVite };
 export { setGlobalContext_prodBuildEntry };
 export { clearGlobalContext };
@@ -26,6 +27,7 @@ import { type PageRoutes } from '../../shared/route/loadPageRoutes.js';
 import type { ViteConfigRuntime } from '../vite/shared/getViteConfigRuntime.js';
 import type { GlobalContext } from '../../types/PageContext.js';
 import type { Hook } from '../../shared/hooks/getHook.js';
+import type { PrerenderContext } from '../../types/index.js';
 declare const vikeConfigErrorRecoverMsg: "Vike config loaded";
 type GlobalContextServer = Pick<GlobalContextServerInternal, 'assetsManifest' | 'config' | 'viteConfig' | 'viteConfigRuntime' | 'pages' | 'baseServer' | 'baseAssets' | 'isClientSide'> & Vike.GlobalContext & Vike.GlobalContextServer;
 type GlobalContextServerInternal = Awaited<ReturnType<typeof createGlobalContext>>;
@@ -98,6 +100,8 @@ declare function getGlobalContextServerInternal(): Promise<{
                 inject: boolean | undefined;
             };
         };
+    } & {
+        prerenderContext: PrerenderContext | undefined;
     }) | (Record<string, unknown> & {
         _globalConfigPublic: {
             pages: {
@@ -167,6 +171,8 @@ declare function getGlobalContextServerInternal(): Promise<{
                 inject: boolean | undefined;
             };
         };
+    } & {
+        prerenderContext: PrerenderContext | undefined;
     }) | (Record<string, unknown> & {
         _globalConfigPublic: {
             pages: {
@@ -236,6 +242,8 @@ declare function getGlobalContextServerInternal(): Promise<{
                 inject: boolean | undefined;
             };
         };
+    } & {
+        prerenderContext: PrerenderContext | undefined;
     });
 }>;
 /**
@@ -259,6 +267,7 @@ declare function getGlobalContextSync(): GlobalContext;
 declare function setGlobalContext_viteDevServer(viteDevServer: ViteDevServer): Promise<void>;
 declare function setGlobalContext_viteConfig(viteConfig: ResolvedConfig, viteConfigRuntime: ViteConfigRuntime): void;
 declare function setGlobalContext_isPrerendering(): void;
+declare function setGlobalContext_prerenderContext(prerenderContextPublic: PrerenderContext): void;
 declare function setGlobalContext_isProductionAccordingToVite(isProductionAccordingToVite: boolean): void;
 declare function getViteDevServer(): ViteDevServer | null;
 declare function getViteConfig(): ResolvedConfig | null;
@@ -275,7 +284,7 @@ declare function assertBuildInfo(buildInfo: unknown): asserts buildInfo is Build
 declare function updateUserFiles(): Promise<{
     success: boolean;
 }>;
-declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Promise<{
+declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Promise<({
     _globalConfigPublic: {
         pages: {
             [k: string]: {
@@ -363,6 +372,8 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
             inject: boolean | undefined;
         };
     };
-})>;
+})) & {
+    prerenderContext: PrerenderContext | undefined;
+}>;
 declare function clearGlobalContext(): void;
 declare function isRunnable(viteDevServer: ViteDevServer): boolean;

package/dist/esm/node/runtime/globalContext.js

@@ -12,6 +12,7 @@ export { initGlobalContext_getPagesAndRoutes };
 export { setGlobalContext_viteDevServer };
 export { setGlobalContext_viteConfig };
 export { setGlobalContext_isPrerendering };
+export { setGlobalContext_prerenderContext };
 export { setGlobalContext_isProductionAccordingToVite };
 export { setGlobalContext_prodBuildEntry }; // production entry
 export { clearGlobalContext };
@@ -27,7 +28,7 @@ export { vikeConfigErrorRecoverMsg };
 //   - Without vike-server it's manually loaded here using importServerProductionEntry() which uses @brillout/vite-plugin-server-entry's autoImporter or crawler
 // - In development: globalObject.viteDevServer which is Vite's development server
 //   - globalObject.viteDevServer is used by updateUserFiles() which then sets virtualFileExportsGlobalEntry
-import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, getGlobalObject, genPromise, createDebugger, checkType, PROJECT_VERSION, getViteRPC, isRunnableDevEnvironment, assertIsNotBrowser, isNonRunnableDev, } from './utils.js';
+import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, getGlobalObject, genPromise, createDebugger, checkType, PROJECT_VERSION, getViteRPC, isRunnableDevEnvironment, assertIsNotBrowser, isNonRunnableDev, objectAssign, } from './utils.js';
 import { importServerProductionEntry } from '@brillout/vite-plugin-server-entry/runtime';
 import { virtualFileIdGlobalEntryServer } from '../shared/virtualFileId.js';
 import pc from '@brillout/picocolors';
@@ -150,6 +151,13 @@ function assertIsNotInitializedYet() {
 function setGlobalContext_isPrerendering() {
     globalObject.isPrerendering = true;
 }
+function setGlobalContext_prerenderContext(prerenderContextPublic) {
+    globalObject.prerenderContextPublic = prerenderContextPublic;
+    // Ugly redundancy, which we can remove after globalContext is a proxy
+    const { globalContext } = globalObjectTyped;
+    if (globalContext)
+        globalContext.prerenderContext = prerenderContextPublic;
+}
 function setGlobalContext_isProductionAccordingToVite(isProductionAccordingToVite) {
     globalObject.isProductionAccordingToVite = isProductionAccordingToVite;
 }
@@ -401,6 +409,7 @@ async function createGlobalContext(virtualFileExportsGlobalEntry) {
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
     assertGlobalContextIsDefined();
     onSetupRuntime();
+    objectAssign(globalContext, { prerenderContext: globalObject.prerenderContextPublic });
     // Never actually used, only used for TypeScript `ReturnType<typeof createGlobalContext>`
     return globalContext;
 }

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

@@ -23,7 +23,7 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
     url?: string;
     headers?: Record<string, string>;
 } & {
-    _globalContext: {
+    _globalContext: ({
         _globalConfigPublic: {
             pages: {
                 [k: string]: {
@@ -111,7 +111,9 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
                 inject: boolean | undefined;
             };
         };
-    });
+    })) & {
+        prerenderContext: import("../../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+    };
     _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;

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

@@ -24,7 +24,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     url?: string;
     headers?: Record<string, string>;
 } & {
-    _globalContext: {
+    _globalContext: ({
         _globalConfigPublic: {
             pages: {
                 [k: string]: {
@@ -112,7 +112,9 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
                 inject: boolean | undefined;
             };
         };
-    });
+    })) & {
+        prerenderContext: import("../../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+    };
     _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;

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

@@ -39,7 +39,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         url?: string;
         headers?: Record<string, string>;
     } & {
-        _globalContext: {
+        _globalContext: ({
             _globalConfigPublic: {
                 pages: {
                     [k: string]: {
@@ -127,7 +127,9 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
                     inject: boolean | undefined;
                 };
             };
-        });
+        })) & {
+            prerenderContext: import("../../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+        };
         _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
@@ -201,7 +203,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         url?: string;
         headers?: Record<string, string>;
     } & {
-        _globalContext: {
+        _globalContext: ({
             _globalConfigPublic: {
                 pages: {
                     [k: string]: {
@@ -289,7 +291,9 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
                     inject: boolean | undefined;
                 };
             };
-        });
+        })) & {
+            prerenderContext: import("../../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+        };
         _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;

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

@@ -31,7 +31,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
     /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
 } & {
-    _globalContext: {
+    _globalContext: ({
         _globalConfigPublic: {
             pages: {
                 [k: string]: {
@@ -119,7 +119,9 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
                 inject: boolean | undefined;
             };
         };
-    });
+    })) & {
+        prerenderContext: import("../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+    };
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;

package/dist/esm/node/vite/onLoad.js

@@ -13,7 +13,7 @@ function onLoad() {
     // TO-DO/eventually: let's also use this.meta.viteVersion
     // - https://github.com/vitejs/vite/pull/20088
     // - https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md#700-2025-06-24
-    assertVersion('Vite', version, ['6.0.0']);
+    assertVersion('Vite', version, ['6.3.0']);
     // Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
     assertIsNotProductionRuntime();
 }

package/dist/esm/node/vite/plugins/pluginBuild/pluginModuleBanner.js

@@ -1,7 +1,6 @@
 export { pluginModuleBanner };
-import { removeVirtualFileIdPrefix } from '../../utils.js';
+import { assert, removeVirtualFileIdPrefix } from '../../utils.js';
 import { getMagicString } from '../../shared/getMagicString.js';
-import { isViteServerSide_extraSafe } from '../../shared/isViteServerSide.js';
 // Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
 function pluginModuleBanner() {
@@ -10,6 +9,13 @@ function pluginModuleBanner() {
         name: 'vike:build:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
+        applyToEnvironment(environment) {
+            const { config } = environment;
+            const { consumer } = config;
+            const { minify } = config.build;
+            assert(minify === false || minify, { minify, consumer });
+            return !minify;
+        },
         configResolved: {
             handler(config_) {
                 config = config_;
@@ -17,12 +23,12 @@ function pluginModuleBanner() {
         },
         transform: {
             order: 'post',
-            handler(code, id, options) {
-                if (!isViteServerSide_extraSafe(config, this.environment, options) &&
-                    // Inject module banners if user sets `build.minify` to `false` for inspecting dist/client/
-                    config.build.minify) {
-                    return;
-                }
+            /* Using a Rolldown hook filter doesn't make sense here — we use applyToEnvironment() to conditionally apply this plugin.
+            filter: {},
+            */
+            handler(code, id) {
+                const { minify } = this.environment.config.build;
+                assert(minify === false, { minify });
                 if (id.startsWith('\0'))
                     id = id;
                 id = removeVirtualFileIdPrefix(id);

package/dist/esm/node/vite/plugins/pluginEnvVars.js

@@ -5,6 +5,7 @@ import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 import { getMagicString } from '../shared/getMagicString.js';
+import { filterRolldown, filterFunction } from './pluginReplaceConstants.js';
 // TO-DO/eventually:
 // - 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
@@ -28,16 +29,14 @@ function pluginEnvVars() {
             },
         },
         transform: {
+            filter: filterRolldown,
             handler(code, id, options) {
                 id = normalizeId(id);
                 assertPosixPath(id);
-                if (id.includes('/node_modules/'))
-                    return;
                 assertPosixPath(config.root);
                 if (!id.startsWith(config.root))
-                    return;
-                if (!code.includes('import.meta.env.'))
-                    return;
+                    return; // skip linked dependencies
+                assert(filterFunction(id, code));
                 const isBuild = config.command === 'build';
                 const isClientSide = !isViteServerSide_extraSafe(config, this.environment, options);
                 const { magicString, getMagicStringResult } = getMagicString(code, id);

package/dist/esm/node/vite/plugins/pluginExtractAssets.js

@@ -1,3 +1,4 @@
+// TO-DO/next-major-release: remove
 // Remove this workaround if the other workaround config.build.ssrEmitAssets turns out to be reliable.
 //  - Remove this file then revert this commit: https://github.com/vikejs/vike/commit/805a18974f13420a78fcc30fdd676696e405c3ca
 // Workaround to make client-side bundles include the CSS imports living in server-side-only code.
@@ -22,6 +23,12 @@ const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
 const EMPTY_MODULE_ID = 'virtual:vike:empty-module';
 const debug = createDebugger('vike:pluginExtractAssets');
+const filterRolldown = {
+    id: {
+        include: extractAssetsRE,
+    },
+};
+const filterFunction = (id) => extractAssetsRE.test(id);
 function pluginExtractAssets() {
     let config;
     let vikeConfig;
@@ -34,11 +41,10 @@ function pluginExtractAssets() {
             apply: 'build',
             enforce: 'post',
             transform: {
+                filter: filterRolldown,
                 async handler(src, id, options) {
                     id = normalizeId(id);
-                    if (!extractAssetsRE.test(id)) {
-                        return;
-                    }
+                    assert(filterFunction(id));
                     if (isFixEnabled) {
                         // I'm guessing isFixEnabled can only be true when mixing both designs: https://github.com/vikejs/vike/issues/1480
                         assertV1Design(vikeConfig._pageConfigs, true);

package/dist/esm/node/vite/plugins/pluginExtractExportNames.js

@@ -8,6 +8,12 @@ import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 const debug = createDebugger('vike:pluginExtractExportNames');
 const globalObject = getGlobalObject('plugins/pluginExtractExportNames.ts', {});
+const filterRolldown = {
+    id: {
+        include: extractExportNamesRE,
+    },
+};
+const filterFunction = (id) => extractExportNamesRE.test(id);
 function pluginExtractExportNames() {
     let isDev = false;
     let config;
@@ -15,14 +21,14 @@ function pluginExtractExportNames() {
         name: 'vike:pluginExtractExportNames',
         enforce: 'post',
         transform: {
+            filter: filterRolldown,
             async handler(src, id, options) {
                 id = normalizeId(id);
                 const isClientSide = !isViteServerSide_extraSafe(config, this.environment, options);
-                if (extractExportNamesRE.test(id)) {
-                    const code = await getExtractExportNamesCode(src, isClientSide, !isDev, id);
-                    debug('id ' + id, ['result:\n' + code.code.trim(), 'src:\n' + src.trim()]);
-                    return code;
-                }
+                assert(filterFunction(id));
+                const code = await getExtractExportNamesCode(src, isClientSide, !isDev, id);
+                debug('id ' + id, ['result:\n' + code.code.trim(), 'src:\n' + src.trim()]);
+                return code;
             },
         },
         configureServer: {

package/dist/esm/node/vite/plugins/pluginFileEnv.js

@@ -8,19 +8,34 @@ import { getExportNames } from '../shared/parseEsModule.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isV1Design } from '../shared/resolveVikeConfigInternal.js';
 import { isViteServerSide, isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
+const skipNodeModules = '/node_modules/'; // Only apply `.server.js` and `.client.js` to user files
+const filterRolldown = {
+    id: {
+        include: ['client', 'server'].map((env) => `**/*${getSuffix(env)}*`),
+        exclude: [`**${skipNodeModules}**`],
+    },
+};
+const filterFunction = (id) => {
+    if (id.includes(skipNodeModules))
+        return false;
+    if (!id.includes(getSuffix('client')) && !id.includes(getSuffix('server')))
+        return false;
+    return true;
+};
 function pluginFileEnv() {
     let config;
     let viteDevServer;
     return {
         name: 'vike:pluginFileEnv',
         load: {
+            filter: filterRolldown,
             handler(id, options) {
                 // In build, we use generateBundle() instead of the load() hook. Using load() works for dynamic imports in dev thanks to Vite's lazy transpiling, but it doesn't work in build because Rollup transpiles any dynamically imported module even if it's never actually imported.
                 if (!viteDevServer)
                     return;
                 if (!isV1Design())
                     return;
-                if (skip(id))
+                if (skip(id, config.root))
                     return;
                 // For `.vue` files: https://github.com/vikejs/vike/issues/1912#issuecomment-2394981475
                 if (id.endsWith('?direct'))
@@ -37,12 +52,13 @@ function pluginFileEnv() {
         },
         // In production, we have to use transform() to replace modules with a runtime error because generateBundle() doesn't work for dynamic imports. In production, dynamic imports can only be verified at runtime.
         transform: {
+            filter: filterRolldown,
             async handler(code, id, options) {
                 id = normalizeId(id);
                 // In dev, only using load() is enough as it also works for dynamic imports (see sibling comment).
                 if (viteDevServer)
                     return;
-                if (skip(id))
+                if (skip(id, config.root))
                     return;
                 const isServerSide = isViteServerSide_extraSafe(config, this.environment, options);
                 if (!isWrongEnv(id, isServerSide))
@@ -61,7 +77,8 @@ function pluginFileEnv() {
         generateBundle: {
             handler() {
                 Array.from(this.getModuleIds())
-                    .filter((id) => !skip(id))
+                    .filter(filterFunction)
+                    .filter((id) => !skip(id, config.root))
                     .forEach((moduleId) => {
                     const mod = this.getModuleInfo(moduleId);
                     const { importers } = mod;
@@ -124,31 +141,27 @@ function pluginFileEnv() {
         }
         return errMsg;
     }
-    function isWrongEnv(moduleId, isServerSide) {
-        const modulePath = getModulePath(moduleId);
-        const suffixWrong = getSuffix(isServerSide ? 'client' : 'server');
-        return modulePath.includes(suffixWrong);
-    }
-    function skip(id) {
-        // TO-DO/next-major-release: remove
-        if (extractAssetsRE.test(id) || extractExportNamesRE.test(id))
-            return true;
-        if (!id.includes(getSuffix('client')) && !id.includes(getSuffix('server')))
-            return true;
-        if (getModulePath(id).endsWith('.css'))
-            return true;
-        // Apply `.server.js` and `.client.js` only to user files
-        if (id.includes('/node_modules/'))
-            return true;
-        // Only user files
-        if (!id.startsWith(config.root))
-            return true;
-        return false;
-    }
-    function getSuffix(env) {
-        return `.${env}.`;
-    }
-    function getModulePath(moduleId) {
-        return moduleId.split('?')[0];
-    }
+}
+function isWrongEnv(moduleId, isServerSide) {
+    const modulePath = getModulePath(moduleId);
+    const suffixWrong = getSuffix(isServerSide ? 'client' : 'server');
+    return modulePath.includes(suffixWrong);
+}
+function skip(id, userRootDir) {
+    assert(filterFunction(id));
+    // TO-DO/next-major-release: remove
+    if (extractAssetsRE.test(id) || extractExportNamesRE.test(id))
+        return true;
+    if (getModulePath(id).endsWith('.css'))
+        return true;
+    // Skip linked dependencies
+    if (!id.startsWith(userRootDir))
+        return true;
+    return false;
+}
+function getSuffix(env) {
+    return `.${env}.`;
+}
+function getModulePath(moduleId) {
+    return moduleId.split('?')[0];
 }

package/dist/esm/node/vite/plugins/pluginNonRunnableDev.js

@@ -1,9 +1,20 @@
 export { pluginNonRunnableDev };
-import { createViteRPC, assertIsNotProductionRuntime, requireResolveDistFile, isRunnableDevEnvironment, } from '../utils.js';
+import { createViteRPC, assertIsNotProductionRuntime, requireResolveDistFile, isRunnableDevEnvironment, assert, escapeRegex, isDevCheck, } from '../utils.js';
 import { retrievePageAssetsDev } from '../../runtime/renderPage/getPageAssets/retrievePageAssetsDev.js';
 import { getViteConfigRuntime } from '../shared/getViteConfigRuntime.js';
 import { getMagicString } from '../shared/getMagicString.js';
 assertIsNotProductionRuntime();
+const distFileIsNonRunnableDev = requireResolveDistFile('dist/esm/utils/isNonRunnableDev.js');
+const distFileGlobalContext = requireResolveDistFile('dist/esm/node/runtime/globalContext.js');
+const filterRolldown = {
+    id: {
+        include: [distFileIsNonRunnableDev, distFileGlobalContext].map((filePath) => new RegExp(`^${escapeRegex(filePath)}($|${escapeRegex('?')}.*)`)),
+    },
+};
+const filterFunction = (id) => {
+    const idWithoutQuery = getIdWithoutQuery(id);
+    return idWithoutQuery === distFileIsNonRunnableDev || idWithoutQuery === distFileGlobalContext;
+};
 function getViteRpcFunctions(viteDevServer) {
     return {
         async transformIndexHtmlRPC(html) {
@@ -18,11 +29,10 @@ function getViteRpcFunctions(viteDevServer) {
     };
 }
 function pluginNonRunnableDev() {
-    const distFileIsNonRunnableDev = requireResolveDistFile('dist/esm/utils/isNonRunnableDev.js');
-    const distFileGlobalContext = requireResolveDistFile('dist/esm/node/runtime/globalContext.js');
     let config;
     return {
         name: 'vike:pluginNonRunnableDev',
+        apply: (_, configEnv) => isDevCheck(configEnv),
         configureServer: {
             handler(viteDevServer) {
                 createViteRPC(viteDevServer, getViteRpcFunctions);
@@ -34,12 +44,11 @@ function pluginNonRunnableDev() {
             },
         },
         transform: {
+            filter: filterRolldown,
             handler(code, id) {
-                if (!config._isDev)
-                    return;
-                const idWithoutQuery = id.split('?')[0];
-                if (idWithoutQuery !== distFileIsNonRunnableDev && idWithoutQuery !== distFileGlobalContext)
-                    return;
+                assert(config._isDev);
+                assert(filterFunction(id));
+                const idWithoutQuery = getIdWithoutQuery(id);
                 if (isRunnableDevEnvironment(this.environment))
                     return;
                 const { magicString, getMagicStringResult } = getMagicString(code, id);
@@ -54,3 +63,6 @@ function pluginNonRunnableDev() {
         },
     };
 }
+function getIdWithoutQuery(id) {
+    return id.split('?')[0];
+}

package/dist/esm/node/vite/plugins/pluginReplaceConstants.d.ts

@@ -1,3 +1,14 @@
 export { pluginReplaceConstants };
+export { filterFunction };
+export { filterRolldown };
 import type { Plugin } from 'vite';
+declare const filterRolldown: {
+    id: {
+        exclude: string;
+    };
+    code: {
+        include: string;
+    };
+};
+declare const filterFunction: (id: string, code: string) => boolean;
 declare function pluginReplaceConstants(): Plugin;

package/dist/esm/node/vite/plugins/pluginReplaceConstants.js

@@ -1,8 +1,27 @@
 export { pluginReplaceConstants };
+export { filterFunction };
+export { filterRolldown };
 import { assert, assertPosixPath } from '../utils.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 import { getMagicString } from '../shared/getMagicString.js';
+const skipNodeModules = '/node_modules/';
+const skipIrrelevant = 'import.meta.env.';
+const filterRolldown = {
+    id: {
+        exclude: `**${skipNodeModules}**`,
+    },
+    code: {
+        include: skipIrrelevant,
+    },
+};
+const filterFunction = (id, code) => {
+    if (id.includes(skipNodeModules))
+        return false;
+    if (!code.includes(skipIrrelevant))
+        return false;
+    return true;
+};
 function pluginReplaceConstants() {
     let config;
     return {
@@ -15,16 +34,14 @@ function pluginReplaceConstants() {
             },
         },
         transform: {
+            filter: filterRolldown,
             handler(code, id, options) {
                 id = normalizeId(id);
                 assertPosixPath(id);
-                if (id.includes('/node_modules/'))
-                    return;
                 assertPosixPath(config.root);
                 if (!id.startsWith(config.root))
-                    return;
-                if (!code.includes('import.meta.env.'))
-                    return;
+                    return; // skip linked dependencies
+                assert(filterFunction(id, code));
                 const isBuild = config.command === 'build';
                 assert(isBuild);
                 // Used by vike.dev

package/dist/esm/node/vite/plugins/pluginVirtualFiles.js

@@ -2,7 +2,7 @@ export { pluginVirtualFiles };
 import { normalizePath } from 'vite';
 import { generateVirtualFilePageEntry } from './pluginVirtualFiles/generateVirtualFilePageEntry.js';
 import { generateVirtualFileGlobalEntryWithOldDesign } from './pluginVirtualFiles/generateVirtualFileGlobalEntryWithOldDesign.js';
-import { assert, assertPosixPath, isScriptFile, addVirtualFileIdPrefix, isVirtualFileId, removeVirtualFileIdPrefix, } from '../utils.js';
+import { assert, assertPosixPath, isScriptFile, addVirtualFileIdPrefix, isVirtualFileId, removeVirtualFileIdPrefix, escapeRegex, virtualFileIdPrefix1, virtualFileIdPrefix2, } from '../utils.js';
 import { parseVirtualFileId } from '../../shared/virtualFileId.js';
 import { reloadVikeConfig, isV1Design, getVikeConfigInternalOptional } from '../shared/resolveVikeConfigInternal.js';
 import pc from '@brillout/picocolors';
@@ -12,6 +12,12 @@ import { isRunnable, updateUserFiles } from '../../runtime/globalContext.js';
 import { isPlusFile } from '../shared/resolveVikeConfigInternal/crawlPlusFiles.js';
 import { isTemporaryBuildFile } from '../shared/resolveVikeConfigInternal/transpileAndExecuteFile.js';
 import { getVikeConfigError } from '../../shared/getVikeConfigError.js';
+const filterRolldown = {
+    id: {
+        include: new RegExp(`^(${escapeRegex(virtualFileIdPrefix1)}|${escapeRegex(virtualFileIdPrefix2)})`),
+    },
+};
+const filterFunction = (id) => isVirtualFileId(id);
 function pluginVirtualFiles() {
     let config;
     return {
@@ -25,10 +31,10 @@ function pluginVirtualFiles() {
             },
         },
         resolveId: {
+            filter: filterRolldown,
             handler(id) {
-                if (isVirtualFileId(id)) {
-                    return addVirtualFileIdPrefix(id);
-                }
+                assert(filterFunction(id));
+                return addVirtualFileIdPrefix(id);
             },
         },
         handleHotUpdate: {
@@ -44,9 +50,9 @@ function pluginVirtualFiles() {
             },
         },
         load: {
+            filter: filterRolldown,
             async handler(id, options) {
-                if (!isVirtualFileId(id))
-                    return undefined;
+                assert(filterFunction(id));
                 id = removeVirtualFileIdPrefix(id);
                 const isDev = config._isDev;
                 assert(typeof isDev === 'boolean');
@@ -136,8 +142,7 @@ async function handleHotUpdate(ctx, config) {
             // Vite already invalidates it, but *after* handleHotUpdate() and thus after server.ssrLoadModule()
             ctx.modules.forEach((mod) => server.moduleGraph.invalidateModule(mod));
             if (isRunnable(server)) {
-                // TODO/now: await
-                updateUserFiles();
+                await updateUserFiles();
             }
         }
     }