vike 0.4.236-commit-64431e7 → 0.4.236-commit-08fbc10

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

@@ -32,7 +32,7 @@ function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGl
                 /**
                  * Whether the environment is client-side or server-side / pre-rendering.
                  *
-                 * We recommend using `({}).SSR` instead, see https://vike.dev/globalContext
+                 * We recommend using `import.meta.env.SSR` instead, see https://vike.dev/globalContext
                  */
                 isClientSide: true,
             };

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

@@ -155,9 +155,6 @@ function setGlobalContext_isPrerendering() {
     setIsProduction(true);
 }
 function setGlobalContext_isProduction(isProduction, tolerateContraditction = false) {
-    // TODO/now: try to remove globalObject.isProduction ?
-    // TODO/now: `rename tolerateContraditction tolerateContradiction`
-    tolerateContraditction = true;
     if (debug.isActivated)
         debug('setGlobalContext_isProduction()', { isProduction, tolerateContraditction });
     if (globalObject.isProduction === undefined) {
@@ -208,12 +205,7 @@ async function initGlobalContext() {
     const { isProduction } = globalObject;
     (0, utils_js_1.assert)(typeof isProduction === 'boolean');
     if (!isProduction) {
-        if (isProcessSharedWithVite()) {
-            await globalObject.viteDevServerPromise;
-        }
-        else {
-            await updateUserFiles();
-        }
+        await globalObject.viteDevServerPromise;
         (0, utils_js_1.assert)(globalObject.waitForUserFilesUpdate);
         await globalObject.waitForUserFilesUpdate;
     }
@@ -347,27 +339,16 @@ async function updateUserFiles() {
         // Avoid race condition: abort if there is a new globalObject.viteDevServer (happens when vite.config.js is modified => Vite's dev server is fully reloaded).
         viteDevServer !== globalObject.viteDevServer;
     const { viteDevServer } = globalObject;
+    (0, utils_js_1.assert)(viteDevServer);
     let hasError = false;
     let virtualFileExports;
     let err;
-    if (viteDevServer) {
-        try {
-            virtualFileExports = await viteDevServer.ssrLoadModule(virtualFileEntry_js_1.virtualFileIdEntryServer);
-        }
-        catch (err_) {
-            hasError = true;
-            err = err_;
-        }
+    try {
+        virtualFileExports = await viteDevServer.ssrLoadModule(virtualFileEntry_js_1.virtualFileIdEntryServer);
     }
-    else {
-        try {
-            // We don't directly use import() to workaround what seems to be a Vite HMR bug: using import() breaks the HMR of normal non-worker apps.
-            virtualFileExports = await __VIKE__DYNAMIC_IMPORT('virtual:vike:entry:server');
-        }
-        catch (err_) {
-            hasError = true;
-            err = err_;
-        }
+    catch (err_) {
+        hasError = true;
+        err = err_;
     }
     if (isOutdated())
         return { success: false };
@@ -393,7 +374,7 @@ async function updateUserFiles() {
 async function setGlobalContext(virtualFileExports) {
     debug('setGlobalContext()');
     (0, utils_js_1.assert)(!(0, getVikeConfigError_js_1.getVikeConfigErrorBuild)());
-    const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, addGlobalContext, addGlobalContextTmp, addGlobalContextAsync);
+    const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, addGlobalContext, addGlobalContextTmp);
     (0, assertV1Design_js_1.assertV1Design)(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
@@ -419,18 +400,23 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
         _pageRoutes: pageRoutes,
         _onBeforeRouteHook: onBeforeRouteHook,
     };
-    const { viteDevServer, viteConfig, isPrerendering, isProduction } = globalObject;
+    const { viteDevServer, viteConfig, viteConfigRuntime, isPrerendering, isProduction } = globalObject;
     (0, utils_js_1.assert)(typeof isProduction === 'boolean');
     if (!isProduction) {
+        (0, utils_js_1.assert)(viteDevServer);
         (0, utils_js_1.assert)(globalContext); // main common requirement
+        (0, utils_js_1.assert)(viteConfig);
+        (0, utils_js_1.assert)(viteConfigRuntime);
         (0, utils_js_1.assert)(!isPrerendering);
         return {
             ...globalContextBase,
+            ...resolveBaseRuntime(viteConfigRuntime, globalContext.config),
             _isProduction: false,
             _isPrerendering: false,
             assetsManifest: null,
             _viteDevServer: viteDevServer,
             viteConfig,
+            viteConfigRuntime,
         };
     }
     else {
@@ -441,9 +427,11 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
         (0, utils_js_1.assert)(assetsManifest);
         const globalContextBase2 = {
             ...globalContextBase,
+            ...resolveBaseRuntime(buildInfo.viteConfigRuntime, globalContext.config),
             _isProduction: true,
             assetsManifest,
             _viteDevServer: null,
+            viteConfigRuntime: buildInfo.viteConfigRuntime,
             _usesClientRouter: buildInfo.usesClientRouter,
         };
         if (isPrerendering) {
@@ -463,45 +451,14 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
         }
     }
 }
-async function addGlobalContextAsync(globalContext) {
-    debug('addGlobalContextAsync()');
-    let { viteConfigRuntime, buildInfo } = globalObject;
-    if (!viteConfigRuntime) {
-        if (buildInfo) {
-            viteConfigRuntime = buildInfo.viteConfigRuntime;
-        }
-        else {
-            if (!isProcessSharedWithVite()) {
-                if (!globalObject.isProduction) {
-                    const rpc = (0, utils_js_1.getViteRPC)();
-                    viteConfigRuntime = await rpc.getViteConfigRuntimeRPC();
-                }
-                else {
-                    (0, utils_js_1.assert)(false); // production => globalObject.buildInfo should be set
-                }
-            }
-            else {
-                (0, utils_js_1.assert)(false); // process shared with Vite => globalObject.viteConfigRuntime should be set
-            }
-        }
-    }
-    (0, utils_js_1.assert)(viteConfigRuntime);
-    return {
-        viteConfigRuntime,
-        ...resolveBaseRuntime(viteConfigRuntime, globalContext.config),
-    };
-}
 function clearGlobalContext() {
     debug('clearGlobalContext()');
     (0, utils_js_1.objectReplace)(globalObject, getInitialGlobalObject(), ['buildEntryPrevious']);
 }
 function getInitialGlobalObject() {
-    const isProduction = getIsProductionStatic();
-    if (debug.isActivated)
-        debug('getInitialGlobalObject()', { isProduction });
+    debug('getInitialGlobalObject()');
     const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = (0, utils_js_1.genPromise)();
     return {
-        isProduction,
         viteDevServerPromise,
         viteDevServerPromiseResolve,
     };
@@ -512,22 +469,3 @@ function resolveBaseRuntime(viteConfigRuntime, config) {
     const baseAssetsUnresolved = config.baseAssets ?? null;
     return (0, resolveBase_js_1.resolveBase)(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved);
 }
-function getIsProductionStatic() {
-    // TODO/now add @ts-ignore comments
-    // @ts-ignore
-    if (!({}))
-        return undefined;
-    // @ts-ignore
-    const PROD = ({}).PROD;
-    return PROD;
-}
-function isProcessSharedWithVite() {
-    const ret = globalThis.__VIKE__IS_PROCESS_SHARED_WITH_VITE;
-    if (globalObject.isProcessSharedWithVite !== undefined) {
-        (0, utils_js_1.assert)(globalObject.isProcessSharedWithVite === ret);
-    }
-    else {
-        globalObject.isProcessSharedWithVite = ret;
-    }
-    return ret;
-}

package/dist/cjs/node/runtime/html/injectAssets/getViteDevScript.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getViteDevScript = getViteDevScript;
-const getViteRPC_js_1 = require("../../../../utils/getViteRPC.js");
 const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const reachOutCTA = 'Create a new GitHub issue to discuss a solution.';
@@ -17,13 +16,7 @@ async function getViteDevScript(pageContext) {
     const fakeHtmlBegin = '<html> <head>'; // White space to test whether user is using a minifier
     const fakeHtmlEnd = '</head><body></body></html>';
     let fakeHtml = fakeHtmlBegin + fakeHtmlEnd;
-    if (viteDevServer) {
-        fakeHtml = await viteDevServer.transformIndexHtml('/', fakeHtml);
-    }
-    else {
-        const rpc = (0, getViteRPC_js_1.getViteRPC)();
-        fakeHtml = await rpc.transformIndexHtmlRPC(fakeHtml);
-    }
+    fakeHtml = await viteDevServer.transformIndexHtml('/', fakeHtml);
     (0, utils_js_1.assertUsage)(!fakeHtml.includes('vite-plugin-pwa'), `The HTML transformer of ${picocolors_1.default.cyan('vite-plugin-pwa')} cannot be applied, see workaround at https://github.com/vikejs/vike/issues/388#issuecomment-1199280084`);
     (0, utils_js_1.assertUsage)(!fakeHtml.startsWith(fakeHtmlBegin.replace(' ', '')), `Vite plugins that minify the HTML cannot be applied, see https://github.com/vikejs/vike/issues/224`);
     (0, utils_js_1.assertUsage)(fakeHtml.startsWith(fakeHtmlBegin) && fakeHtml.endsWith(fakeHtmlEnd), `You are using a Vite Plugin that transforms the HTML in a way that conflicts with Vike. ${reachOutCTA}`);

package/dist/cjs/node/runtime/renderPage/getPageAssets/retrieveAssetsDev.js

@@ -2,12 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.retrieveAssetsDev = retrieveAssetsDev;
 const utils_js_1 = require("../../utils.js");
+const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
 async function retrieveAssetsDev(clientDependencies, viteDevServer) {
     const assetUrls = new Set();
     await Promise.all(clientDependencies.map(async ({ id }) => {
         if (id.startsWith('@@vike'))
             return; // vike doesn't have any CSS
         (0, utils_js_1.assert)(id);
+        (0, utils_js_1.assert)(!(0, virtualFileEntry_js_1.isVirtualFileIdEntry)(id));
         const { moduleGraph } = viteDevServer;
         const [_, graphId] = await moduleGraph.resolveUrl(id);
         (0, utils_js_1.assert)(graphId, { id });
@@ -34,6 +36,8 @@ function collectCss(mod, styleUrls, visitedModules, importer) {
     if (visitedModules.has(mod.url))
         return;
     visitedModules.add(mod.url);
+    if ((0, virtualFileEntry_js_1.isVirtualFileIdEntry)(mod.id || mod.url))
+        return; // virtual:vike:entry:server dependency list includes all pages
     if (isStyle(mod) && (!importer || !isStyle(importer))) {
         if (mod.url.startsWith('/')) {
             styleUrls.add(mod.url);

package/dist/cjs/node/runtime/renderPage/getPageAssets.js

@@ -17,9 +17,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const { _isProduction: isProduction } = globalContext;
     const isDev = !isProduction;
     const { assetUrls, clientEntriesSrc } = isDev
-        ? !globalContext._viteDevServer
-            ? await (0, utils_js_1.getViteRPC)().retrievePageAssetsDevRPC(clientDependencies, clientEntries)
-            : await retrievePageAssetsDev(globalContext._viteDevServer, clientDependencies, clientEntries)
+        ? await retrievePageAssetsDev(globalContext._viteDevServer, clientDependencies, clientEntries)
         : retrievePageAssetsProd(globalContext.assetsManifest, clientDependencies, clientEntries, resolveIncludeAssetsImportedByServer(globalContext.config));
     let pageAssets = [];
     (0, utils_js_1.unique)([...clientEntriesSrc, ...assetUrls]).forEach((src) => {

package/dist/cjs/node/runtime/utils.js

@@ -62,6 +62,7 @@ __exportStar(require("../../utils/assertSetup.js"), exports);
 __exportStar(require("../../utils/path.js"), exports);
 __exportStar(require("../../utils/isHtml.js"), exports);
 __exportStar(require("../../utils/warnIfErrorIsNotObject.js"), exports);
+__exportStar(require("../../utils/virtualFileId.js"), exports);
 __exportStar(require("../../utils/stripAnsi.js"), exports);
 __exportStar(require("../../utils/getTerminWidth.js"), exports);
 __exportStar(require("../../utils/truncateString.js"), exports);
@@ -76,4 +77,3 @@ __exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
 __exportStar(require("../../utils/genPromise.js"), exports);
 __exportStar(require("../../utils/augmentType.js"), exports);
 __exportStar(require("../../utils/changeEnumerable.js"), exports);
-__exportStar(require("../../utils/getViteRPC.js"), exports);

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

@@ -32,3 +32,4 @@ __exportStar(require("../../utils/assertIsNotBrowser.js"), exports);
 __exportStar(require("../../utils/isNullish.js"), exports);
 __exportStar(require("../../utils/unique.js"), exports);
 __exportStar(require("../../utils/debug.js"), exports);
+__exportStar(require("../../utils/virtualFileId.js"), exports);

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

@@ -2,27 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.virtualFileIdEntryClientCR = exports.virtualFileIdEntryClientSR = exports.virtualFileIdEntryServer = void 0;
 exports.isVirtualFileIdEntry = isVirtualFileIdEntry;
+// TODO/now: merge virtualFileEntry.ts and virtualFilePageConfigLazy.ts
+// - One function parseVirtualFileIdEntry() to rule them all?
 const utils_js_1 = require("../utils.js");
-const virtualFiles_js_1 = require("../virtualFiles.js");
-const idBase = 'virtual:vike:entry';
-const virtualFileIdEntryServer = `${idBase}:server`;
+(0, utils_js_1.assertIsNotBrowser)();
+// TODO/now: rename:
+// ```diff
+// - virtual:vike:entry:server
+// + virtual:vike:entry:global:server
+// ```
+const virtualFileIdEntryServer = 'virtual:vike:entry:server';
 exports.virtualFileIdEntryServer = virtualFileIdEntryServer;
-const virtualFileIdEntryClientSR = `${idBase}:client:server-routing`;
+const virtualFileIdEntryClientSR = 'virtual:vike:entry:client:server-routing';
 exports.virtualFileIdEntryClientSR = virtualFileIdEntryClientSR;
-const virtualFileIdEntryClientCR = `${idBase}:client:client-routing`;
+const virtualFileIdEntryClientCR = 'virtual:vike:entry:client:client-routing';
 exports.virtualFileIdEntryClientCR = virtualFileIdEntryClientCR;
+const virtualFileIdEntries = [virtualFileIdEntryServer, virtualFileIdEntryClientCR, virtualFileIdEntryClientSR];
+const idBase = 'virtual:vike:entry';
+(0, utils_js_1.assert)(virtualFileIdEntries.every((v) => v.startsWith(`${idBase}:`)));
 function isVirtualFileIdEntry(id) {
-    id = (0, virtualFiles_js_1.getVirtualFileId)(id);
+    id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
     if (!id.startsWith(idBase))
         return false;
-    (0, utils_js_1.assert)(
-    // prettier-ignore
-    // biome-ignore format:
-    [
-        virtualFileIdEntryServer,
-        virtualFileIdEntryClientCR,
-        virtualFileIdEntryClientSR
-    ].includes(id));
+    (0, utils_js_1.assert)(virtualFileIdEntries.includes(id));
     const isForClientSide = id !== virtualFileIdEntryServer;
     const isClientRouting = id === virtualFileIdEntryClientCR;
     return { isForClientSide, isClientRouting };

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

@@ -4,16 +4,22 @@ exports.isVirtualFileIdPageConfigLazy = isVirtualFileIdPageConfigLazy;
 exports.getVirtualFileIdPageConfigLazy = getVirtualFileIdPageConfigLazy;
 const extractAssetsQuery_js_1 = require("../extractAssetsQuery.js");
 const utils_js_1 = require("../utils.js");
-const virtualFiles_js_1 = require("../virtualFiles.js");
+(0, utils_js_1.assertIsNotBrowser)();
+// TODO/now: rename:
+// ```diff
+// - virtual:vike:pageConfigLazy:server:
+// + virtual:vike:entry:page:server:
+// ```
+const idBaseClient = 'virtual:vike:pageConfigLazy:client:';
+const idBaseServer = 'virtual:vike:pageConfigLazy:server:';
 const idBase = 'virtual:vike:pageConfigLazy:';
-const idBaseClient = `${idBase}client:`;
-const idBaseServer = `${idBase}server:`;
+// TODO/now: rename to generateVirtualFileIdEntry()
 function getVirtualFileIdPageConfigLazy(pageId, isForClientSide) {
     const id = `${isForClientSide ? idBaseClient : idBaseServer}${pageId}`;
     return id;
 }
 function isVirtualFileIdPageConfigLazy(id) {
-    id = (0, virtualFiles_js_1.getVirtualFileId)(id);
+    id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
     if (!id.includes(idBase))
         return false;
     (0, utils_js_1.assert)(id.startsWith(idBase));

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

@@ -29,7 +29,6 @@ const resolveClientEntriesDev_js_1 = require("./shared/resolveClientEntriesDev.j
 const pluginWorkaroundCssModuleHmr_js_1 = require("./plugins/pluginWorkaroundCssModuleHmr.js");
 const pluginWorkaroundVite6HmrRegression_js_1 = require("./plugins/pluginWorkaroundVite6HmrRegression.js");
 const pluginReplaceConstants_js_1 = require("./plugins/pluginReplaceConstants.js");
-const pluginViteRPC_js_1 = require("./plugins/pluginViteRPC.js");
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 (0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
@@ -49,7 +48,6 @@ function plugin(vikeVitePluginOptions = {}) {
         (0, pluginWorkaroundCssModuleHmr_js_1.pluginWorkaroundCssModuleHmr)(),
         (0, pluginWorkaroundVite6HmrRegression_js_1.pluginWorkaroundVite6HmrRegression)(),
         (0, pluginReplaceConstants_js_1.pluginReplaceConstants)(),
-        (0, pluginViteRPC_js_1.pluginViteRPC)(),
     ];
     Object.assign(plugins, { _vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;

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

@@ -8,6 +8,34 @@ const pluginAutoFullBuild_js_1 = require("./pluginAutoFullBuild.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 function pluginBuildApp() {
     return [
+        {
+            name: 'vike:build:pluginBuildApp:pre',
+            apply: 'build',
+            enforce: 'pre',
+            config: {
+                order: 'pre',
+                async handler(_config) {
+                    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+                    if (!vikeConfig.config.vite6BuilderApp)
+                        return;
+                    return {
+                        builder: {
+                            // Can be overridden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
+                            async buildApp(builder) {
+                                (0, utils_js_1.assert)(builder.environments.client);
+                                (0, utils_js_1.assert)(builder.environments.ssr);
+                                await builder.build(builder.environments.client);
+                                await builder.build(builder.environments.ssr);
+                                if ((0, pluginAutoFullBuild_js_1.isPrerenderForceExit)()) {
+                                    (0, runPrerenderEntry_js_1.runPrerender_forceExit)();
+                                    (0, utils_js_1.assert)(false);
+                                }
+                            },
+                        },
+                    };
+                },
+            },
+        },
         {
             name: 'vike:build:pluginBuildApp',
             apply: 'build',
@@ -16,19 +44,6 @@ function pluginBuildApp() {
                 if (!vikeConfig.config.vite6BuilderApp)
                     return;
                 return {
-                    builder: {
-                        // Can be overridden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
-                        async buildApp(builder) {
-                            (0, utils_js_1.assert)(builder.environments.client);
-                            (0, utils_js_1.assert)(builder.environments.ssr);
-                            await builder.build(builder.environments.client);
-                            await builder.build(builder.environments.ssr);
-                            if ((0, pluginAutoFullBuild_js_1.isPrerenderForceExit)()) {
-                                (0, runPrerenderEntry_js_1.runPrerender_forceExit)();
-                                (0, utils_js_1.assert)(false);
-                            }
-                        },
-                    },
                     environments: {
                         ssr: {
                             consumer: 'server',

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

@@ -16,8 +16,7 @@ const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
 const getPageAssets_js_1 = require("../../../runtime/renderPage/getPageAssets.js");
-// TODO/now: stop setting `manifest` altogether and use the resolved value instead? So that other tools can easily read the manifest (e.g. @cloudflare/plugin-vite reads the manifest).
-const manifestTempFile = '.vite/manifest.json';
+const manifestTempFile = '_temp_manifest.json';
 exports.manifestTempFile = manifestTempFile;
 function pluginBuildConfig() {
     let config;

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

@@ -18,8 +18,6 @@ function pluginDistFileNames() {
         apply: 'build',
         enforce: 'post',
         configResolved(config) {
-            // TODO/now remove
-            // if (true as boolean) return
             const rollupOutputs = getRollupOutputs(config);
             // We need to support multiple outputs: @vite/plugin-legacy adds an output, see https://github.com/vikejs/vike/issues/477#issuecomment-1406434802
             rollupOutputs.forEach((rollupOutput) => {
@@ -158,13 +156,8 @@ function getEntryFileName(chunkInfo, config, isEntry) {
         return `${name}.${isEntry ? 'mjs' : 'js'}`;
     }
 }
-function removePathSeparators(name, userRootDir) {
+function removePathSeparators(name) {
     (0, utils_js_1.assertPosixPath)(name);
-    if (name.startsWith(userRootDir)) {
-        name = name.slice(userRootDir.length);
-        if (name.startsWith('/'))
-            name = name.slice(1);
-    }
     (0, utils_js_1.assert)(!name.startsWith('/'), { name });
     const entryDir = 'entries/';
     const hasEntryDir = name.startsWith(entryDir);
@@ -178,14 +171,24 @@ function removePathSeparators(name, userRootDir) {
     }
     return name;
 }
+function removeUserRootDir(name, userRootDir) {
+    if (name.startsWith(userRootDir)) {
+        name = name.slice(userRootDir.length);
+        if (name.startsWith('/'))
+            name = name.slice(1);
+    }
+    (0, utils_js_1.assert)(!name.startsWith('/'), { name });
+    return name;
+}
 function clean(name, userRootDir, removePathSep, fixGlob) {
+    name = removeUserRootDir(name, userRootDir);
     name = fixExtractAssetsQuery(name);
     if (fixGlob) {
         name = workaroundGlob(name);
     }
     name = replaceNonLatinCharacters(name);
     if (removePathSep) {
-        name = removePathSeparators(name, userRootDir);
+        name = removePathSeparators(name);
     }
     name = removeLeadingUnderscoreInFilename(name);
     name = removeUnderscoreDoublets(name);

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,7 +16,6 @@ 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 [
         {