vike 0.4.239-commit-050a4a3 → 0.4.239-commit-59f1017

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();
             }
         }
     }

package/dist/esm/shared/createGlobalContextShared.d.ts

@@ -9,8 +9,8 @@ import type { GlobalContextServerInternal } from '../node/runtime/globalContext.
 import type { GlobalContextClientInternal } from '../client/runtime-client-routing/globalContext.js';
 import { type Hook } from './hooks/getHook.js';
 declare const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
-declare function createGlobalContextShared<GlobalContextAdded extends Record<string, any>, GlobalContextAddedAsync extends Record<string, any>>(virtualFileExportsGlobalEntry: unknown, globalObject: {
-    globalContext?: Record<string, unknown>;
+declare function createGlobalContextShared<GlobalContextAdded extends {}, GlobalContextAddedAsync extends {}>(virtualFileExportsGlobalEntry: unknown, globalObject: {
+    globalContext?: {};
     onCreateGlobalContextHooks?: Hook[];
     previousCreateGlobalContextPromise?: Promise<void>;
 }, addGlobalContext?: (globalContext: GlobalContextBase) => GlobalContextAdded, addGlobalContextTmp?: (globalContext: GlobalContextBase) => Promise<GlobalContextAdded>, addGlobalContextAsync?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddedAsync>): Promise<{
@@ -64,7 +64,7 @@ declare function createGlobalContextShared<GlobalContextAdded extends Record<str
     _pageConfigs: PageConfigRuntime[];
     _pageConfigGlobal: import("../types/PageConfig.js").PageConfigGlobalRuntime;
     _allPageIds: string[];
-} & GlobalContextAdded & GlobalContextAddedAsync>;
+} & GlobalContextAdded & Awaited<GlobalContextAddedAsync>>;
 type GlobalContextBasePublic = Pick<GlobalContextBase, 'config' | 'pages' | 'isGlobalContext'>;
 type GlobalContextBase = ReturnType<typeof createGlobalContextBase>;
 declare function createGlobalContextBase(virtualFileExportsGlobalEntry: unknown): {

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.239-commit-050a4a3";
+export declare const PROJECT_VERSION: "0.4.239-commit-59f1017";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.239-commit-050a4a3';
+export const PROJECT_VERSION = '0.4.239-commit-59f1017';

package/dist/esm/utils/virtualFileId.d.ts

@@ -1,6 +1,10 @@
 export { isVirtualFileId };
 export { addVirtualFileIdPrefix };
 export { removeVirtualFileIdPrefix };
+export { virtualFileIdPrefix1 };
+export { virtualFileIdPrefix2 };
+declare const virtualFileIdPrefix1 = "virtual:vike:";
+declare const virtualFileIdPrefix2: "\0virtual:vike:";
 declare function isVirtualFileId(id: string): boolean;
 declare function addVirtualFileIdPrefix(id: string): string;
 declare function removeVirtualFileIdPrefix(id: string): string;

package/dist/esm/utils/virtualFileId.js

@@ -1,34 +1,37 @@
 export { isVirtualFileId };
 export { addVirtualFileIdPrefix };
 export { removeVirtualFileIdPrefix };
+export { virtualFileIdPrefix1 };
+export { virtualFileIdPrefix2 };
 import pc from '@brillout/picocolors';
 import { assert, assertUsage } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 assertIsNotBrowser();
-const idBase = 'virtual:vike:';
+const virtualFileIdPrefix1 = 'virtual:vike:';
 // https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
-const prefix = '\0';
+const convention = '\0';
+const virtualFileIdPrefix2 = `${convention}${virtualFileIdPrefix1}`;
 function isVirtualFileId(id) {
-    if (id.startsWith(idBase))
+    if (id.startsWith(virtualFileIdPrefix1))
         return true;
-    if (id.startsWith(prefix + idBase))
+    if (id.startsWith(virtualFileIdPrefix2))
         return true;
     // https://github.com/vikejs/vike/issues/1985
-    assertUsage(!id.includes(idBase), `Encountered a module ID ${pc.cyan(id)} that is unexpected. Are you using a tool that modifies the ID of modules? For example, the baseUrl setting in tsconfig.json cannot be used.`);
+    assertUsage(!id.includes(virtualFileIdPrefix1), `Encountered a module ID ${pc.cyan(id)} that is unexpected. Are you using a tool that modifies the ID of modules? For example, the baseUrl setting in tsconfig.json cannot be used.`);
     return false;
 }
 function addVirtualFileIdPrefix(id) {
     assert(isVirtualFileId(id));
-    if (!id.startsWith(prefix)) {
-        id = prefix + id;
+    if (!id.startsWith(convention)) {
+        id = convention + id;
     }
-    assert(id.startsWith(prefix));
+    assert(id.startsWith(convention));
     return id;
 }
 function removeVirtualFileIdPrefix(id) {
-    if (id.startsWith(prefix)) {
-        id = id.slice(prefix.length);
+    if (id.startsWith(convention)) {
+        id = id.slice(convention.length);
     }
-    assert(!id.startsWith(prefix));
+    assert(!id.startsWith(convention));
     return id;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.239-commit-050a4a3",
+  "version": "0.4.239-commit-59f1017",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -132,7 +132,7 @@
     "@brillout/json-serializer": "^0.5.20",
     "@brillout/picocolors": "^1.0.26",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.7.13",
+    "@brillout/vite-plugin-server-entry": "^0.7.14",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",
@@ -144,11 +144,11 @@
     "sirv": "^3.0.1",
     "source-map-support": "^0.5.0",
     "tinyglobby": "^0.2.10",
-    "vite": ">=6.0.0"
+    "vite": ">=6.3.0"
   },
   "peerDependencies": {
     "react-streaming": ">=0.3.42",
-    "vite": ">=6.0.0"
+    "vite": ">=6.3.0"
   },
   "peerDependenciesMeta": {
     "react-streaming": {
@@ -263,7 +263,7 @@
     "react-streaming": "^0.4.3",
     "rimraf": "^5.0.5",
     "typescript": "^5.8.3",
-    "vite": "^7.1.3"
+    "vite": "^7.1.5"
   },
   "scripts": {
     "dev": "tsc --watch",