vike 0.4.236-commit-e752d12 → 0.4.236-commit-08fbc10

package/dist/esm/node/vite/plugins/pluginDev/determineOptimizeDeps.js

@@ -1,6 +1,6 @@
 export { determineOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
-import { assert, assertIsImportPathNpmPackage, createDebugger, getNpmPackageName, isArray, unique, } from '../../utils.js';
+import { assert, assertIsImportPathNpmPackage, createDebugger, getNpmPackageName, isArray, isFilePathAbsoluteFilesystem, isVirtualFileId, } from '../../utils.js';
 import { getVikeConfigInternal, isOverridden } from '../../shared/resolveVikeConfigInternal.js';
 import { analyzeClientEntries } from '../pluginBuild/pluginBuildConfig.js';
 import { virtualFileIdEntryClientCR, virtualFileIdEntryClientSR, } from '../../../shared/virtualFiles/virtualFileEntry.js';
@@ -9,38 +9,78 @@ const debug = createDebugger('vike:optimizeDeps');
 async function determineOptimizeDeps(config) {
     const vikeConfig = await getVikeConfigInternal();
     const { _pageConfigs: pageConfigs } = vikeConfig;
-    const { entries, include } = await getPageDeps(config, pageConfigs);
-    {
-        // This actually doesn't work: Vite's dep optimizer doesn't seem to be able to crawl virtual files.
-        //  - Should we make it work? E.g. by creating a temporary file at node_modules/.vike/virtualFiles.js
-        //  - Or should we remove it? And make sure getPageDeps() also works for aliased import paths
-        //    - If we do, then we need to adjust include/entries (maybe by making include === entries -> will Vite complain?)
-        const entriesVirtualFiles = getVirtualFiles(config, pageConfigs);
-        entries.push(...entriesVirtualFiles);
+    const { entriesClient, entriesServer, includeClient, includeServer } = await getPageDeps(config, pageConfigs);
+    config.optimizeDeps.include = add(config.optimizeDeps.include, includeClient);
+    config.optimizeDeps.entries = add(config.optimizeDeps.entries, entriesClient);
+    // TO-DO/eventually: use a check that is agnostic to @cloudflare/vite-plugin
+    const isNotRunnable = config.environments?.ssr?.resolve.conditions.includes('workerd');
+    if (isNotRunnable) {
+        config.ssr.optimizeDeps.include = add(config.ssr.optimizeDeps.include, includeServer);
+        // @ts-ignore — Vite doesn't seem to support ssr.optimizeDeps.entries (vite@7.0.6, July 2025)
+        config.ssr.optimizeDeps.entries = add(config.ssr.optimizeDeps.entries, entriesServer);
     }
-    /* Other Vite plugins may populate optimizeDeps, e.g. Cypress: https://github.com/vikejs/vike/issues/386
-    assert(config.optimizeDeps.entries === undefined)
-    */
-    config.optimizeDeps.include = [...include, ...normalizeInclude(config.optimizeDeps.include)];
-    config.optimizeDeps.entries = [...entries, ...normalizeEntries(config.optimizeDeps.entries)];
     if (debug.isActivated)
-        debug('config.optimizeDeps', {
+        debug('optimizeDeps', {
             'config.optimizeDeps.entries': config.optimizeDeps.entries,
             'config.optimizeDeps.include': config.optimizeDeps.include,
+            'config.optimizeDeps.exclude': config.optimizeDeps.exclude,
+            /* Vite doesn't seem to support ssr.optimizeDeps.entries (vite@7.0.6, July 2025)
+            'config.ssr.optimizeDeps.entries': config.ssr.optimizeDeps.entries,
+            //*/
+            'config.ssr.optimizeDeps.include': config.ssr.optimizeDeps.include,
+            'config.ssr.optimizeDeps.exclude': config.ssr.optimizeDeps.exclude,
         });
 }
 async function getPageDeps(config, pageConfigs) {
-    let entries = [];
-    let include = [];
-    const addEntry = (e) => {
+    let entriesClient = [];
+    let entriesServer = [];
+    let includeClient = [];
+    let includeServer = [];
+    const addEntry = (e, configEnv, definedAt) => {
         assert(e);
-        entries.push(e);
+        // optimizeDeps.entries expects filesystem absolute paths
+        assert(isVirtualFileId(e) || isFilePathAbsoluteFilesystem(e));
+        if (isRelevant(e, false, configEnv, definedAt)) {
+            entriesClient.push(e);
+        }
+        if (isRelevant(e, true, configEnv, definedAt)) {
+            entriesServer.push(e);
+        }
     };
-    const addInclude = (e) => {
+    const addInclude = (e, configEnv, definedAt) => {
         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
+        // optimizeDeps.include expects npm packages
+        assert(!e.startsWith('/'));
+        // Shouldn't be a path alias, as path aliases would need to be added to optimizeDeps.entries instead of optimizeDeps.include
         assertIsImportPathNpmPackage(e);
-        include.push(e);
+        if (isRelevant(e, false, configEnv, definedAt)) {
+            includeClient.push(e);
+        }
+        if (isRelevant(e, true, configEnv, definedAt)) {
+            includeServer.push(e);
+        }
+    };
+    const isRelevant = (e, server, configEnv, definedAt) => {
+        if (server) {
+            if (!configEnv || !configEnv.server)
+                return false;
+        }
+        else {
+            if (configEnv && !configEnv.client)
+                return false;
+        }
+        return !isExcluded(e, server, definedAt);
+    };
+    const isExcluded = (e, server, definedAt) => {
+        const exclude = server ? config.ssr.optimizeDeps.exclude : config.optimizeDeps.exclude;
+        if (!exclude)
+            return false;
+        if (definedAt?.importPathAbsolute) {
+            const npmPackageName = getNpmPackageName(definedAt.importPathAbsolute);
+            if (npmPackageName && exclude.includes(npmPackageName))
+                return true;
+        }
+        return exclude.includes(e);
     };
     // V1 design
     {
@@ -52,22 +92,17 @@ async function getPageDeps(config, pageConfigs) {
                     if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
                         return;
                     const { definedAt, configEnv } = configValueSource;
-                    if (!configEnv.client)
-                        return;
                     if (definedAt.definedBy)
                         return;
-                    if (definedAt.importPathAbsolute) {
-                        const npmPackageName = 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);
+                        addEntry(
+                        // optimizeDeps.entries expects filesystem absolute paths
+                        definedAt.filePathAbsoluteFilesystem, configEnv, definedAt);
                     }
                     else {
-                        // Adding definedAtFilePath.filePathAbsoluteFilesystem doesn't work for npm packages, I guess because of Vite's config.server.fs.allow
-                        addInclude(definedAt.importPathAbsolute);
+                        addInclude(
+                        // optimizeDeps.include expects npm packages
+                        definedAt.importPathAbsolute, configEnv, definedAt);
                     }
                 });
             });
@@ -83,32 +118,39 @@ async function getPageDeps(config, pageConfigs) {
             addEntry(filePathAbsoluteFilesystem);
         });
     }
-    entries = unique(entries);
-    include = unique(include);
-    return { entries, include };
-}
-function getVirtualFiles(config, pageConfigs) {
-    const { hasClientRouting, hasServerRouting, clientEntries } = analyzeClientEntries(pageConfigs, config);
-    const entriesVirtualFiles = Object.values(clientEntries);
-    if (hasClientRouting)
-        entriesVirtualFiles.push(virtualFileIdEntryClientCR);
-    if (hasServerRouting)
-        entriesVirtualFiles.push(virtualFileIdEntryClientSR);
-    return entriesVirtualFiles;
+    // Add virtual files.
+    // - This doesn't work: Vite's dep optimizer doesn't seem to be able to crawl virtual files.
+    //   - Should we make it work? E.g. by creating a temporary file at node_modules/.vike/virtualFiles.js
+    //   - Or should we remove it? And make sure getPageDeps() also works for aliased import paths
+    //     - If we do, then we need to adjust include/entries (maybe by making include === entries -> will Vite complain?)
+    {
+        const { hasClientRouting, hasServerRouting, clientEntries } = analyzeClientEntries(pageConfigs, config);
+        Object.values(clientEntries).forEach((e) => addEntry(e));
+        if (hasClientRouting)
+            addEntry(virtualFileIdEntryClientCR);
+        if (hasServerRouting)
+            addEntry(virtualFileIdEntryClientSR);
+    }
+    entriesClient = entriesClient;
+    entriesServer = entriesServer;
+    includeClient = includeClient;
+    includeServer = includeServer;
+    return {
+        entriesClient,
+        entriesServer,
+        includeClient,
+        includeServer,
+    };
 }
-function normalizeEntries(entries) {
-    if (isArray(entries))
-        return entries;
-    if (typeof entries === 'string')
-        return [entries];
-    if (entries === undefined)
-        return [];
-    assert(false);
+function add(input, listAddendum) {
+    const list = !input ? [] : isArray(input) ? unique(input) : [input];
+    listAddendum.forEach((e) => {
+        if (!list.includes(e))
+            list.push(e);
+    });
+    return list;
 }
-function normalizeInclude(include) {
-    if (isArray(include))
-        return include;
-    if (include === undefined)
-        return [];
-    assert(false);
+function unique(arr) {
+    const arrUnique = Array.from(new Set(arr));
+    return arr.length !== arrUnique.length ? arrUnique : arr;
 }

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

@@ -6,8 +6,7 @@
 //  - This approach supports import path aliases `vite.config.js#resolve.alias` https://vitejs.dev/config/#resolve-alias
 export { pluginExtractAssets };
 export { extractAssetsRE };
-import { assert, assertPosixPath, styleFileRE, createDebugger, isScriptFile, assertUsage, rollupSourceMapRemove, } from '../utils.js';
-import { resolveVirtualFileId, isVirtualFileId, getVirtualFileId } from '../../shared/virtualFiles.js';
+import { assert, assertPosixPath, styleFileRE, createDebugger, isScriptFile, assertUsage, rollupSourceMapRemove, addVirtualFileIdPrefix, isVirtualFileId, removeVirtualFileIdPrefix, } from '../utils.js';
 import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { isAsset } from '../shared/isAsset.js';
 import { getImportStatements } from '../shared/parseEsModule.js';
@@ -124,7 +123,7 @@ function pluginExtractAssets() {
             load(id) {
                 if (!isVirtualFileId(id))
                     return undefined;
-                id = getVirtualFileId(id);
+                id = removeVirtualFileIdPrefix(id);
                 if (id === EMPTY_MODULE_ID) {
                     return '// Erased by vike:pluginExtractAssets';
                 }
@@ -151,7 +150,7 @@ function pluginExtractAssets() {
 }
 function emptyModule(file, importer) {
     debugOperation('NUKED', file, importer);
-    return resolveVirtualFileId(EMPTY_MODULE_ID);
+    return addVirtualFileIdPrefix(EMPTY_MODULE_ID);
 }
 function appendExtractAssetsQuery(file, importer) {
     debugOperation('TRANSFORMED', file, importer);

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

@@ -1,4 +1,5 @@
 export { getVirtualFilePageConfigLazy };
+// TODO/now: rename file to generateVirtualFileEntryPage.ts
 import { assert, getProjectError } from '../../utils.js';
 import { getVirtualFileIdPageConfigLazy, isVirtualFileIdPageConfigLazy, } from '../../../shared/virtualFiles/virtualFilePageConfigLazy.js';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';

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

@@ -2,8 +2,7 @@ export { pluginVirtualFiles };
 import { normalizePath } from 'vite';
 import { getVirtualFilePageConfigLazy } from './pluginVirtualFiles/getVirtualFilePageConfigLazy.js';
 import { getVirtualFileEntry } from './pluginVirtualFiles/getVirtualFileEntry.js';
-import { assert, assertPosixPath, isScriptFile } from '../utils.js';
-import { resolveVirtualFileId, isVirtualFileId, getVirtualFileId } from '../../shared/virtualFiles.js';
+import { assert, assertPosixPath, isScriptFile, addVirtualFileIdPrefix, isVirtualFileId, removeVirtualFileIdPrefix, } from '../utils.js';
 import { isVirtualFileIdPageConfigLazy } from '../../shared/virtualFiles/virtualFilePageConfigLazy.js';
 import { isVirtualFileIdEntry } from '../../shared/virtualFiles/virtualFileEntry.js';
 import { reloadVikeConfig, isV1Design, getVikeConfigInternalOptional } from '../shared/resolveVikeConfigInternal.js';
@@ -26,7 +25,7 @@ function pluginVirtualFiles() {
         },
         resolveId(id) {
             if (isVirtualFileId(id)) {
-                return resolveVirtualFileId(id);
+                return addVirtualFileIdPrefix(id);
             }
         },
         async handleHotUpdate(ctx) {
@@ -42,7 +41,7 @@ function pluginVirtualFiles() {
         async load(id, options) {
             if (!isVirtualFileId(id))
                 return undefined;
-            id = getVirtualFileId(id);
+            id = removeVirtualFileIdPrefix(id);
             const isDev = config._isDev;
             assert(typeof isDev === 'boolean');
             if (isVirtualFileIdPageConfigLazy(id)) {

package/dist/esm/node/vite/utils.d.ts

@@ -19,3 +19,4 @@ export * from '../../utils/isDocker.js';
 export * from '../../utils/isVitest.js';
 export * from '../../utils/rollupSourceMap.js';
 export * from '../../utils/isImportPath.js';
+export * from '../../utils/virtualFileId.js';

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

@@ -26,3 +26,4 @@ export * from '../../utils/isDocker.js';
 export * from '../../utils/isVitest.js';
 export * from '../../utils/rollupSourceMap.js';
 export * from '../../utils/isImportPath.js';
+export * from '../../utils/virtualFileId.js';

package/dist/esm/shared/getPageFiles/parseVirtualFileExports.js

@@ -1,4 +1,10 @@
 export { parseVirtualFileExports };
+// TODO/now: rename parseVirtualFileExportsEntryGlobal
+// TODO/now: merge or collocate following both files?
+// ```filesystem
+// vike/packages/vike/shared/getPageFiles/parseVirtualFileExports.ts
+// vike/shared/page-configs/serialize/parsePageConfigs.ts
+// ```
 // TO-DO/next-major-release: remove old design code, and remove all assertions.
 import { assert, hasProp, isCallable, isObject, cast, isArray } from '../utils.js';
 import { assertExportValues } from './assert_exports_old_design.js';

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.236-commit-e752d12";
+export declare const PROJECT_VERSION: "0.4.236-commit-08fbc10";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.236-commit-e752d12';
+export const PROJECT_VERSION = '0.4.236-commit-08fbc10';

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

@@ -1,4 +1,5 @@
 export { assertFilePathAbsoluteFilesystem };
+export { isFilePathAbsoluteFilesystem };
 export { isFilePathAbsolute };
 /**
  * Asserts that `filePath` is an absolute file path starting from the filesystem root.
@@ -6,6 +7,12 @@ export { isFilePathAbsolute };
  * It isn't reliable for Linux users, but that's okay because the assertion will eventually fail on windows.
  */
 declare function assertFilePathAbsoluteFilesystem(filePath: string): void;
+/**
+ * Whether `filePath` is an absolute file path starting from the filesystem root.
+ *
+ * Isn't reliable for Linux users: it returns `true` for an absolute path starting from the user root dir.
+ */
+declare function isFilePathAbsoluteFilesystem(filePath: string): boolean;
 /**
  * Whether `filePath` is an absolute file path.
  *

package/dist/esm/utils/isFilePathAbsoluteFilesystem.js

@@ -1,4 +1,5 @@
 export { assertFilePathAbsoluteFilesystem };
+export { isFilePathAbsoluteFilesystem };
 export { isFilePathAbsolute };
 import path from 'node:path';
 import { assert } from './assert.js';

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

@@ -0,0 +1,6 @@
+export { isVirtualFileId };
+export { addVirtualFileIdPrefix };
+export { removeVirtualFileIdPrefix };
+declare function isVirtualFileId(id: string): boolean;
+declare function addVirtualFileIdPrefix(id: string): string;
+declare function removeVirtualFileIdPrefix(id: string): string;

package/dist/esm/{node/shared/virtualFiles.js → utils/virtualFileId.js}

@@ -1,36 +1,34 @@
 export { isVirtualFileId };
-export { getVirtualFileId };
-export { resolveVirtualFileId };
-export { removeVirtualIdTag };
+export { addVirtualFileIdPrefix };
+export { removeVirtualFileIdPrefix };
 import pc from '@brillout/picocolors';
-import { assert, assertUsage } from './utils.js';
+import { assert, assertUsage } from './assert.js';
+import { assertIsNotBrowser } from './assertIsNotBrowser.js';
+assertIsNotBrowser();
 const idBase = 'virtual:vike:';
 // https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
-const virtualIdTag = '\0';
+const prefix = '\0';
 function isVirtualFileId(id) {
     if (id.startsWith(idBase))
         return true;
-    if (id.startsWith(virtualIdTag + idBase))
+    if (id.startsWith(prefix + idBase))
         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.`);
     return false;
 }
-function getVirtualFileId(id) {
-    return removeVirtualIdTag(id);
-}
-function resolveVirtualFileId(id) {
+function addVirtualFileIdPrefix(id) {
     assert(isVirtualFileId(id));
-    if (!id.startsWith(virtualIdTag)) {
-        id = virtualIdTag + id;
+    if (!id.startsWith(prefix)) {
+        id = prefix + id;
     }
-    assert(id.startsWith(virtualIdTag));
+    assert(id.startsWith(prefix));
     return id;
 }
-function removeVirtualIdTag(id) {
-    if (id.startsWith(virtualIdTag)) {
-        id = id.slice(virtualIdTag.length);
+function removeVirtualFileIdPrefix(id) {
+    if (id.startsWith(prefix)) {
+        id = id.slice(prefix.length);
     }
-    assert(!id.startsWith(virtualIdTag));
+    assert(!id.startsWith(prefix));
     return id;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.236-commit-e752d12",
+  "version": "0.4.236-commit-08fbc10",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -123,7 +123,7 @@
     "@brillout/json-serializer": "^0.5.16",
     "@brillout/picocolors": "^1.0.26",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.7.8",
+    "@brillout/vite-plugin-server-entry": "^0.7.10",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",
@@ -254,7 +254,7 @@
     "react-streaming": "^0.4.3",
     "rimraf": "^5.0.5",
     "typescript": "^5.8.3",
-    "vite": "^6.3.2"
+    "vite": "^7.0.6"
   },
   "scripts": {
     "dev": "tsc --watch",

package/dist/cjs/node/shared/virtualFiles.js

@@ -1,41 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVirtualFileId = isVirtualFileId;
-exports.getVirtualFileId = getVirtualFileId;
-exports.resolveVirtualFileId = resolveVirtualFileId;
-exports.removeVirtualIdTag = removeVirtualIdTag;
-const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const utils_js_1 = require("./utils.js");
-const idBase = 'virtual:vike:';
-// https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
-const virtualIdTag = '\0';
-function isVirtualFileId(id) {
-    if (id.startsWith(idBase))
-        return true;
-    if (id.startsWith(virtualIdTag + idBase))
-        return true;
-    // https://github.com/vikejs/vike/issues/1985
-    (0, utils_js_1.assertUsage)(!id.includes(idBase), `Encountered a module ID ${picocolors_1.default.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 getVirtualFileId(id) {
-    return removeVirtualIdTag(id);
-}
-function resolveVirtualFileId(id) {
-    (0, utils_js_1.assert)(isVirtualFileId(id));
-    if (!id.startsWith(virtualIdTag)) {
-        id = virtualIdTag + id;
-    }
-    (0, utils_js_1.assert)(id.startsWith(virtualIdTag));
-    return id;
-}
-function removeVirtualIdTag(id) {
-    if (id.startsWith(virtualIdTag)) {
-        id = id.slice(virtualIdTag.length);
-    }
-    (0, utils_js_1.assert)(!id.startsWith(virtualIdTag));
-    return id;
-}

package/dist/esm/node/shared/virtualFiles.d.ts

@@ -1,8 +0,0 @@
-export { isVirtualFileId };
-export { getVirtualFileId };
-export { resolveVirtualFileId };
-export { removeVirtualIdTag };
-declare function isVirtualFileId(id: string): boolean;
-declare function getVirtualFileId(id: string): string;
-declare function resolveVirtualFileId(id: string): string;
-declare function removeVirtualIdTag(id: string): string;