vike 0.4.236 → 0.4.237

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

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginModuleBanner = pluginModuleBanner;
 const magic_string_1 = __importDefault(require("magic-string"));
-const virtualFiles_js_1 = require("../../../shared/virtualFiles.js");
+const utils_js_1 = require("../../utils.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.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).
@@ -28,7 +28,7 @@ function pluginModuleBanner() {
                 }
                 if (id.startsWith('\0'))
                     id = id;
-                id = (0, virtualFiles_js_1.removeVirtualIdTag)(id);
+                id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
                 id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377

package/dist/cjs/node/vite/plugins/pluginCommon.js

@@ -16,6 +16,7 @@ const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInter
 const prepareViteApiCall_js_1 = require("../../api/prepareViteApiCall.js");
 const context_js_2 = require("../../prerender/context.js");
 const pluginName = 'vike:pluginCommon';
+globalThis.__VIKE__IS_PROCESS_SHARED_WITH_VITE = true;
 function pluginCommon(vikeVitePluginOptions) {
     return [
         {

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

@@ -7,70 +7,109 @@ const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigIn
 const pluginBuildConfig_js_1 = require("../pluginBuild/pluginBuildConfig.js");
 const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
+const getConfigValueSourcesRelevant_js_1 = require("../pluginVirtualFiles/getConfigValueSourcesRelevant.js");
 const debug = (0, utils_js_1.createDebugger)('vike:optimizeDeps');
 async function determineOptimizeDeps(config) {
     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.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);
+    // Workaround until https://github.com/vitejs/vite-plugin-react/issues/650
+    // - TODO/soon: remove workaround once https://github.com/vitejs/vite/pull/20495 is released
+    includeServer.push('react/jsx-dev-runtime');
+    for (const envName in config.environments) {
+        const env = config.environments[envName];
+        if (env.consumer === 'server' && env.optimizeDeps.noDiscovery === false) {
+            env.optimizeDeps.include = add(env.optimizeDeps.include, includeServer);
+            env.optimizeDeps.entries = add(env.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,
+            // @ts-ignore 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, isForClientSide, definedAt) => {
         (0, utils_js_1.assert)(e);
-        entries.push(e);
+        // optimizeDeps.entries expects filesystem absolute paths
+        (0, utils_js_1.assert)((0, utils_js_1.isVirtualFileId)(e) || (0, utils_js_1.isFilePathAbsoluteFilesystem)(e));
+        if (isExcluded(e, isForClientSide, definedAt))
+            return;
+        if (isForClientSide) {
+            entriesClient.push(e);
+        }
+        else {
+            entriesServer.push(e);
+        }
     };
-    const addInclude = (e) => {
+    const addInclude = (e, isForClientSide, definedAt) => {
         (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
+        // optimizeDeps.include expects npm packages
+        (0, utils_js_1.assert)(!e.startsWith('/'));
+        // Shouldn't be a path alias, as path aliases would need to be added to optimizeDeps.entries instead of optimizeDeps.include
         (0, utils_js_1.assertIsImportPathNpmPackage)(e);
-        include.push(e);
+        if (isExcluded(e, isForClientSide, definedAt))
+            return;
+        if (isForClientSide) {
+            includeClient.push(e);
+        }
+        else {
+            includeServer.push(e);
+        }
+    };
+    const isExcluded = (e, isForClientSide, definedAt) => {
+        const exclude = isForClientSide ? config.optimizeDeps.exclude : config.ssr.optimizeDeps.exclude;
+        if (!exclude)
+            return false;
+        if (definedAt?.importPathAbsolute) {
+            const npmPackageName = (0, utils_js_1.getNpmPackageName)(definedAt.importPathAbsolute);
+            if (npmPackageName && exclude.includes(npmPackageName))
+                return true;
+        }
+        return exclude.includes(e);
     };
     // V1 design
     {
-        pageConfigs.forEach((pageConfig) => {
-            Object.entries(pageConfig.configValueSources).forEach(([configName, sources]) => {
-                sources
-                    .filter((source) => !(0, resolveVikeConfigInternal_js_1.isOverridden)(source, configName, pageConfig))
-                    .forEach((configValueSource) => {
-                    if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
-                        return;
-                    const { definedAt, configEnv } = configValueSource;
-                    if (!configEnv.client)
-                        return;
-                    if (definedAt.definedBy)
-                        return;
-                    if (definedAt.importPathAbsolute) {
-                        const npmPackageName = (0, utils_js_1.getNpmPackageName)(definedAt.importPathAbsolute);
-                        if (npmPackageName && config.optimizeDeps.exclude?.includes(npmPackageName))
+        ;
+        [true, false].forEach((isForClientSide) => {
+            pageConfigs.forEach((pageConfig) => {
+                Object.entries(pageConfig.configValueSources).forEach(([configName]) => {
+                    const runtimeEnv = {
+                        isForClientSide,
+                        isDev: true,
+                        // TO-DO/eventually/remove-server-router: let's eventually remove support for Server Routing
+                        isClientRouting: true,
+                    };
+                    const sourcesRelevant = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourcesRelevant)(configName, runtimeEnv, pageConfig);
+                    sourcesRelevant.forEach((configValueSource) => {
+                        if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
                             return;
-                    }
-                    if (definedAt.filePathAbsoluteUserRootDir !== null) {
-                        // Vite expects entries to be filesystem absolute paths (surprisingly so).
-                        addEntry(definedAt.filePathAbsoluteFilesystem);
-                    }
-                    else {
-                        // Adding definedAtFilePath.filePathAbsoluteFilesystem doesn't work for npm packages, I guess because of Vite's config.server.fs.allow
-                        addInclude(definedAt.importPathAbsolute);
-                    }
+                        const { definedAt } = configValueSource;
+                        if (definedAt.definedBy)
+                            return;
+                        if (definedAt.filePathAbsoluteUserRootDir !== null) {
+                            addEntry(
+                            // optimizeDeps.entries expects filesystem absolute paths
+                            definedAt.filePathAbsoluteFilesystem, isForClientSide, definedAt);
+                        }
+                        else {
+                            addInclude(
+                            // optimizeDeps.include expects npm packages
+                            definedAt.importPathAbsolute, isForClientSide, definedAt);
+                        }
+                    });
                 });
             });
         });
@@ -82,35 +121,42 @@ async function getPageDeps(config, pageConfigs) {
         pageFiles.forEach((filePathAbsoluteUserRootDir) => {
             const entry = (0, getFilePath_js_1.getFilePathResolved)({ filePathAbsoluteUserRootDir, userRootDir });
             const { filePathAbsoluteFilesystem } = entry;
-            addEntry(filePathAbsoluteFilesystem);
+            addEntry(filePathAbsoluteFilesystem, true);
         });
     }
-    entries = (0, utils_js_1.unique)(entries);
-    include = (0, utils_js_1.unique)(include);
-    return { entries, include };
-}
-function getVirtualFiles(config, pageConfigs) {
-    const { hasClientRouting, hasServerRouting, clientEntries } = (0, pluginBuildConfig_js_1.analyzeClientEntries)(pageConfigs, config);
-    const entriesVirtualFiles = Object.values(clientEntries);
-    if (hasClientRouting)
-        entriesVirtualFiles.push(virtualFileEntry_js_1.virtualFileIdEntryClientCR);
-    if (hasServerRouting)
-        entriesVirtualFiles.push(virtualFileEntry_js_1.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 } = (0, pluginBuildConfig_js_1.analyzeClientEntries)(pageConfigs, config);
+        Object.values(clientEntries).forEach((e) => addEntry(e, true));
+        if (hasClientRouting)
+            addEntry(virtualFileEntry_js_1.virtualFileIdEntryClientCR, true);
+        if (hasServerRouting)
+            addEntry(virtualFileEntry_js_1.virtualFileIdEntryClientSR, true);
+    }
+    entriesClient = entriesClient;
+    entriesServer = entriesServer;
+    includeClient = includeClient;
+    includeServer = includeServer;
+    return {
+        entriesClient,
+        entriesServer,
+        includeClient,
+        includeServer,
+    };
 }
-function normalizeEntries(entries) {
-    if ((0, utils_js_1.isArray)(entries))
-        return entries;
-    if (typeof entries === 'string')
-        return [entries];
-    if (entries === undefined)
-        return [];
-    (0, utils_js_1.assert)(false);
+function add(input, listAddendum) {
+    const list = !input ? [] : (0, utils_js_1.isArray)(input) ? unique(input) : [input];
+    listAddendum.forEach((e) => {
+        if (!list.includes(e))
+            list.push(e);
+    });
+    return list;
 }
-function normalizeInclude(include) {
-    if ((0, utils_js_1.isArray)(include))
-        return include;
-    if (include === undefined)
-        return [];
-    (0, utils_js_1.assert)(false);
+function unique(arr) {
+    const arrUnique = Array.from(new Set(arr));
+    return arr.length !== arrUnique.length ? arrUnique : arr;
 }

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

@@ -12,7 +12,7 @@ const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 const applyRegExWithMagicString_js_1 = require("../shared/applyRegExWithMagicString.js");
 // TO-DO/eventually:
-// - Make import.meta.env work inside +config.js
+// - Make ({}) 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` implementation and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
 const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
@@ -39,7 +39,7 @@ function pluginEnvVars() {
             (0, utils_js_1.assertPosixPath)(config.root);
             if (!id.startsWith(config.root))
                 return;
-            if (!code.includes('import.meta.env.'))
+            if (!code.includes('({}).'))
                 return;
             const isBuild = config.command === 'build';
             const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options);
@@ -52,7 +52,7 @@ function pluginEnvVars() {
                 return !envPrefix.some((prefix) => key.startsWith(prefix));
             })
                 .map(([envName, envVal]) => {
-                const envStatement = `import.meta.env.${envName}`;
+                const envStatement = `({}).${envName}`;
                 const envStatementRegExpStr = (0, utils_js_1.escapeRegex)(envStatement) + '\\b';
                 // Security check
                 {

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

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractAssetsRE = void 0;
 exports.pluginExtractAssets = pluginExtractAssets;
 const utils_js_1 = require("../utils.js");
-const virtualFiles_js_1 = require("../../shared/virtualFiles.js");
 const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
 const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
@@ -124,9 +123,9 @@ function pluginExtractAssets() {
             name: 'vike:pluginExtractAssets-3',
             apply: 'build',
             load(id) {
-                if (!(0, virtualFiles_js_1.isVirtualFileId)(id))
+                if (!(0, utils_js_1.isVirtualFileId)(id))
                     return undefined;
-                id = (0, virtualFiles_js_1.getVirtualFileId)(id);
+                id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
                 if (id === EMPTY_MODULE_ID) {
                     return '// Erased by vike:pluginExtractAssets';
                 }
@@ -153,7 +152,7 @@ function pluginExtractAssets() {
 }
 function emptyModule(file, importer) {
     debugOperation('NUKED', file, importer);
-    return (0, virtualFiles_js_1.resolveVirtualFileId)(EMPTY_MODULE_ID);
+    return (0, utils_js_1.addVirtualFileIdPrefix)(EMPTY_MODULE_ID);
 }
 function appendExtractAssetsQuery(file, importer) {
     debugOperation('TRANSFORMED', file, importer);

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

@@ -81,12 +81,12 @@ function injectHmr(code, isClientSide, isProduction) {
     }
     if (isClientSide) {
         code += '\n';
-        code += `if (import.meta.hot) import.meta.hot.accept((mod) => { exportNames.length=0; exportNames.push(...mod.exportNames); });`;
+        code += `if ((undefined)) (undefined).accept((mod) => { exportNames.length=0; exportNames.push(...mod.exportNames); });`;
     }
     else {
         // Ensure Vite considers the module as `isSelfAccepting`. (Needed because Vite's module graph erroneously conflates the Vite server-side modules with their client-side counterparts.)
         code += '\n';
-        code += 'if(false){import.meta.hot.accept(()=>{})};';
+        code += 'if(false){(undefined).accept(()=>{})};';
     }
     return code;
 }

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

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pluginNonRunnableDev = pluginNonRunnableDev;
+const utils_js_1 = require("../utils.js");
+const resolveClientEntriesDev_js_1 = require("../shared/resolveClientEntriesDev.js");
+const retrieveAssetsDev_js_1 = require("../../runtime/renderPage/getPageAssets/retrieveAssetsDev.js");
+const getViteConfigRuntime_js_1 = require("../shared/getViteConfigRuntime.js");
+const getMagicString_js_1 = require("../shared/getMagicString.js");
+(0, utils_js_1.assertIsNotProductionRuntime)();
+function getViteRpcFunctions(viteDevServer) {
+    return {
+        async transformIndexHtmlRPC(html) {
+            return await viteDevServer.transformIndexHtml('/', html);
+        },
+        // TODO/now: dedupe retrievePageAssetsDevRPC and retrievePageAssetsDev()
+        async retrievePageAssetsDevRPC(clientDependencies, clientEntries) {
+            const clientEntriesSrc = clientEntries.map((clientEntry) => (0, resolveClientEntriesDev_js_1.resolveClientEntriesDev)(clientEntry, viteDevServer));
+            const assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
+            return { clientEntriesSrc, assetUrls };
+        },
+        async getViteConfigRuntimeRPC() {
+            return (0, getViteConfigRuntime_js_1.getViteConfigRuntime)(viteDevServer.config);
+        },
+    };
+}
+function pluginNonRunnableDev() {
+    const runtimeGlobalContextFilePath = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/node/runtime/globalContext.js');
+    let config;
+    return {
+        name: 'vike:pluginNonRunnableDev',
+        configureServer(viteDevServer) {
+            (0, utils_js_1.createViteRPC)(viteDevServer, getViteRpcFunctions);
+        },
+        configResolved(config_) {
+            config = config_;
+        },
+        transform(code, id) {
+            if (!config._isDev)
+                return;
+            if (id !== runtimeGlobalContextFilePath)
+                return;
+            const isNonRunnableDev = !(0, utils_js_1.isRunnableDevEnvironment)(this.environment);
+            const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
+            if (isNonRunnableDev) {
+                magicString.replaceAll('__VIKE__DYNAMIC_IMPORT', 'import');
+            }
+            magicString.replaceAll('__VIKE__IS_NON_RUNNABLE_DEV', JSON.stringify(isNonRunnableDev));
+            return getMagicStringResult();
+        },
+    };
+}

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

@@ -26,7 +26,7 @@ function pluginReplaceConstants() {
             (0, utils_js_1.assertPosixPath)(config.root);
             if (!id.startsWith(config.root))
                 return;
-            if (!code.includes('import.meta.env.'))
+            if (!code.includes('({}).'))
                 return;
             const isBuild = config.command === 'build';
             (0, utils_js_1.assert)(isBuild);

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConfigValueSourcesRelevant = getConfigValueSourcesRelevant;
+exports.isRuntimeEnvMatch = isRuntimeEnvMatch;
+const utils_js_1 = require("../../utils.js");
+function getConfigValueSourcesRelevant(configName, runtimeEnv, pageConfig) {
+    const configDef = pageConfig.configDefinitions[configName];
+    (0, utils_js_1.assert)(configDef);
+    let sourcesRelevant = pageConfig.configValueSources[configName];
+    if (!sourcesRelevant)
+        return [];
+    if (!configDef.cumulative) {
+        const source = sourcesRelevant[0];
+        if (source) {
+            sourcesRelevant = [source];
+        }
+        else {
+            (0, utils_js_1.assert)(sourcesRelevant.length === 0);
+        }
+    }
+    else {
+        // isOverridden() must be called before isRuntimeEnvMatch() is called (otherwise isOverridden() will return a wrong value)
+        sourcesRelevant = sourcesRelevant.filter((source) => !isOverridden(source, configName, pageConfig));
+    }
+    sourcesRelevant = sourcesRelevant.filter((source) => isRuntimeEnvMatch(source.configEnv, runtimeEnv));
+    return sourcesRelevant;
+}
+function isRuntimeEnvMatch(configEnv, runtimeEnv) {
+    if ('isForConfig' in runtimeEnv)
+        return !!configEnv.config;
+    // Runtime
+    if (!runtimeEnv.isForClientSide) {
+        if (!configEnv.server)
+            return false;
+    }
+    else {
+        if (!configEnv.client)
+            return false;
+        if (configEnv.client === 'if-client-routing' && !runtimeEnv.isClientRouting)
+            return false;
+    }
+    // Production/development
+    if (configEnv.production !== undefined) {
+        (0, utils_js_1.assert)(typeof configEnv.production === 'boolean');
+        (0, utils_js_1.assert)(typeof runtimeEnv.isDev === 'boolean');
+        if (configEnv.production) {
+            if (runtimeEnv.isDev)
+                return false;
+        }
+        else {
+            if (!runtimeEnv.isDev)
+                return false;
+        }
+    }
+    return true;
+}
+function isOverridden(source, configName, pageConfig) {
+    const configDef = pageConfig.configDefinitions[configName];
+    (0, utils_js_1.assert)(configDef);
+    if (configDef.cumulative)
+        return false;
+    const sources = pageConfig.configValueSources[configName];
+    (0, utils_js_1.assert)(sources);
+    const idx = sources.indexOf(source);
+    (0, utils_js_1.assert)(idx >= 0);
+    return idx > 0;
+}

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

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVirtualFilePageConfigLazy = getVirtualFilePageConfigLazy;
+// TODO/now: rename file to generateVirtualFileEntryPage.ts
 const utils_js_1 = require("../../utils.js");
 const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js");
 const debug_js_1 = require("./debug.js");
-const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../shared/page-configs/serialize/serializeConfigValues.js");
 const handleAssetsManifest_js_1 = require("../pluginBuild/handleAssetsManifest.js");
 const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/getConfigValueBuildTime.js");
@@ -45,7 +45,7 @@ function getLoadConfigLazy(pageConfig, isForClientSide, pageId, includeAssetsImp
     const filesEnv = new Map();
     const isClientRouting = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
     lines.push('export const configValuesSerialized = {');
-    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '', false));
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, { isForClientSide, isClientRouting, isDev }, '', false));
     lines.push('};');
     if (!(0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(config) && includeAssetsImportedByServer && isForClientSide && !isDev) {
         importStatements.push(`import '${(0, extractAssetsQuery_js_1.extractAssetsAddQuery)((0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageId, false))}'`);

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/getVirtualFilePageConfigsEager.js

@@ -4,7 +4,6 @@ exports.getVirtualFilePageConfigsEager = getVirtualFilePageConfigsEager;
 const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
 const debug_js_1 = require("./debug.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
-const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../shared/page-configs/serialize/serializeConfigValues.js");
 async function getVirtualFilePageConfigsEager(isForClientSide, isDev, id, isClientRouting) {
     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)(true);
@@ -21,6 +20,10 @@ function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isCl
     lines.push('export const pageConfigGlobalSerialized = {');
     lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements, filesEnv));
     lines.push('};');
+    if (!isForClientSide && isDev) {
+        // https://vite.dev/guide/api-environment-frameworks.html
+        lines.push('if ((undefined)) (undefined).accept();');
+    }
     const code = [...importStatements, ...lines].join('\n');
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
@@ -37,7 +40,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
         const load = `() => ({ moduleId: ${virtualFileId}, moduleExports: import(${virtualFileId}) })`;
         lines.push(`    loadConfigLazy: ${load},`);
         lines.push(`    configValuesSerialized: {`);
-        lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', true));
+        lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, { isForClientSide, isClientRouting, isDev }, '    ', true));
         lines.push(`    },`);
         lines.push(`  },`);
     });
@@ -47,7 +50,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
 function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements, filesEnv) {
     const lines = [];
     lines.push(`  configValuesSerialized: {`);
-    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfigGlobal, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', null));
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfigGlobal, importStatements, filesEnv, { isForClientSide, isClientRouting, isDev }, '    ', null));
     lines.push(`  },`);
     const code = lines.join('\n');
     return code;

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

@@ -8,7 +8,6 @@ const vite_1 = require("vite");
 const getVirtualFilePageConfigLazy_js_1 = require("./pluginVirtualFiles/getVirtualFilePageConfigLazy.js");
 const getVirtualFileEntry_js_1 = require("./pluginVirtualFiles/getVirtualFileEntry.js");
 const utils_js_1 = require("../utils.js");
-const virtualFiles_js_1 = require("../../shared/virtualFiles.js");
 const virtualFilePageConfigLazy_js_1 = require("../../shared/virtualFiles/virtualFilePageConfigLazy.js");
 const virtualFileEntry_js_1 = require("../../shared/virtualFiles/virtualFileEntry.js");
 const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
@@ -30,8 +29,8 @@ function pluginVirtualFiles() {
                 config.experimental.importGlobRestoreExtension = true;
         },
         resolveId(id) {
-            if ((0, virtualFiles_js_1.isVirtualFileId)(id)) {
-                return (0, virtualFiles_js_1.resolveVirtualFileId)(id);
+            if ((0, utils_js_1.isVirtualFileId)(id)) {
+                return (0, utils_js_1.addVirtualFileIdPrefix)(id);
             }
         },
         async handleHotUpdate(ctx) {
@@ -45,9 +44,9 @@ function pluginVirtualFiles() {
             }
         },
         async load(id, options) {
-            if (!(0, virtualFiles_js_1.isVirtualFileId)(id))
+            if (!(0, utils_js_1.isVirtualFileId)(id))
                 return undefined;
-            id = (0, virtualFiles_js_1.getVirtualFileId)(id);
+            id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
             const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
             if ((0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(id)) {

package/dist/cjs/node/vite/shared/applyRegExWithMagicString.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyRegExpWithMagicString = applyRegExpWithMagicString;
+// TODO/now: replace with .replaceAll() ?
 function applyRegExpWithMagicString(magicString, regExp, replacement) {
     const envStatementRegEx = typeof regExp === 'string' ? new RegExp(regExp, 'g') : regExp;
     let match;

package/dist/cjs/node/vite/shared/getMagicString.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMagicString = getMagicString;
+const magic_string_1 = __importDefault(require("magic-string"));
+// TODO/now use everywhere
+function getMagicString(code, id) {
+    const magicString = new magic_string_1.default(code);
+    const getMagicStringResult = () => {
+        return {
+            code: magicString.toString(),
+            map: magicString.generateMap({ hires: true, source: id }),
+        };
+    };
+    return { magicString, getMagicStringResult };
+}

package/dist/cjs/node/vite/shared/getManifestFilePathRelative.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getManifestFilePathRelative = getManifestFilePathRelative;
+const utils_js_1 = require("../utils.js");
+function getManifestFilePathRelative(manifestConfig) {
+    (0, utils_js_1.assert)(['string', 'boolean'].includes(typeof manifestConfig));
+    (0, utils_js_1.assert)(manifestConfig !== false);
+    const manifestFileRelative = typeof manifestConfig === 'string' ? manifestConfig : '.vite/manifest.json';
+    return manifestFileRelative;
+}