vike 0.4.236 → 0.4.237

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

@@ -16,18 +16,11 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = pageContext._globalContext;
     const { _isProduction: isProduction } = globalContext;
     const isDev = !isProduction;
-    let assetUrls;
-    let clientEntriesSrc;
-    if (isDev) {
-        const { _viteDevServer: viteDevServer } = globalContext;
-        clientEntriesSrc = clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer));
-        assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
-    }
-    else {
-        const { assetsManifest } = globalContext;
-        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
-        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, assetsManifest, resolveIncludeAssetsImportedByServer(pageContext._globalContext.config));
-    }
+    const { assetUrls, clientEntriesSrc } = isDev
+        ? !globalContext._viteDevServer
+            ? await (0, utils_js_1.getViteRPC)().retrievePageAssetsDevRPC(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) => {
         const { mediaType = null, assetType = null } = (0, inferMediaType_js_1.inferMediaType)(src) || {};
@@ -61,6 +54,16 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     await (0, sortPageAssetsForEarlyHintsHeader_js_1.sortPageAssetsForEarlyHintsHeader)(pageAssets, isProduction);
     return pageAssets;
 }
+async function retrievePageAssetsDev(viteDevServer, clientDependencies, clientEntries) {
+    const clientEntriesSrc = clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer));
+    const assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
+    return { clientEntriesSrc, assetUrls };
+}
+function retrievePageAssetsProd(assetsManifest, clientDependencies, clientEntries, includeAssetsImportedByServer) {
+    const clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
+    const assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, assetsManifest, resolveIncludeAssetsImportedByServer(includeAssetsImportedByServer));
+    return { clientEntriesSrc, assetUrls };
+}
 function resolveClientEntriesProd(clientEntry, assetsManifest) {
     const { manifestEntry } = (0, getManifestEntry_js_1.getManifestEntry)(clientEntry, assetsManifest);
     (0, utils_js_1.assert)(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });

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

@@ -2,31 +2,67 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlePageContextRequestUrl = handlePageContextRequestUrl;
 const getPageContextRequestUrl_js_1 = require("../../../shared/getPageContextRequestUrl.js");
+const modifyUrl_js_1 = require("../../../shared/modifyUrl.js");
 const utils_js_1 = require("../utils.js");
 // See also shared/getPageContextRequestUrl.ts
 function handlePageContextRequestUrl(url) {
-    if (!hasSuffix(url)) {
-        return { urlWithoutPageContextRequestSuffix: url, isPageContextRequest: false };
+    const urlParsed = (0, utils_js_1.parseUrl)(url, utils_js_1.baseServer);
+    if (!isMatch(urlParsed)) {
+        return {
+            isPageContextJsonRequest: false,
+            urlWithoutPageContextRequestSuffix: url,
+        };
+    }
+    else {
+        const { urlWithoutPageContextRequestSuffix, searchVikeArgs } = processUrl(urlParsed, url);
+        const previousUrl = parseSearchVikeArgs(searchVikeArgs);
+        return {
+            /* TO-DO/soon/once: pass & use previousUrl
+            isPageContextJsonRequest: { previousUrl },
+            /*/
+            isPageContextJsonRequest: true,
+            //*/
+            urlWithoutPageContextRequestSuffix,
+        };
     }
-    return { urlWithoutPageContextRequestSuffix: removePageContextUrlSuffix(url), isPageContextRequest: true };
 }
-function hasSuffix(url) {
-    const { pathnameOriginal, pathname } = (0, utils_js_1.parseUrl)(url, utils_js_1.baseServer);
-    (0, utils_js_1.assert)(pathnameOriginal.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension) === pathname.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension), {
-        url,
-    });
-    return pathnameOriginal.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension);
+function isMatch(urlParsed) {
+    const { pathnameOriginal, pathname } = urlParsed;
+    (0, utils_js_1.assert)(pathname.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension) === pathnameOriginal.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension));
+    return pathname.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension);
 }
-function removePageContextUrlSuffix(url) {
-    const urlParsed = (0, utils_js_1.parseUrl)(url, utils_js_1.baseServer);
+function processUrl(urlParsed, url) {
     // We cannot use `urlParsed.pathname` because it would break the `urlParsed.pathnameOriginal` value of subsequent `parseUrl()` calls.
-    const { origin, pathnameOriginal, searchOriginal, hashOriginal } = urlParsed;
+    const { pathnameOriginal, search } = urlParsed;
     (0, utils_js_1.assert)(getPageContextRequestUrl_js_1.doNotCreateExtraDirectory === false);
     const urlSuffix = `/index${getPageContextRequestUrl_js_1.pageContextJsonFileExtension}`;
     (0, utils_js_1.assert)(pathnameOriginal.endsWith(urlSuffix), { url });
     let pathnameModified = (0, utils_js_1.slice)(pathnameOriginal, 0, -1 * urlSuffix.length);
     if (pathnameModified === '')
         pathnameModified = '/';
-    (0, utils_js_1.assert)(url === `${origin || ''}${pathnameOriginal}${searchOriginal || ''}${hashOriginal || ''}`, { url });
-    return `${origin || ''}${pathnameModified}${searchOriginal || ''}${hashOriginal || ''}`;
+    const searchVikeArgs = search?._vike;
+    const urlWithoutPageContextRequestSuffix = (0, modifyUrl_js_1.modifyUrl)(url, {
+        pathname: pathnameModified,
+        search: {
+            _vike: searchVikeArgs ? null : undefined,
+        },
+    });
+    return {
+        searchVikeArgs,
+        urlWithoutPageContextRequestSuffix,
+    };
+}
+function parseSearchVikeArgs(searchVikeArgs) {
+    const args = {
+        previousUrl: null,
+    };
+    if (searchVikeArgs) {
+        const parsed = JSON.parse(searchVikeArgs);
+        (0, utils_js_1.assert)((0, utils_js_1.isObject)(parsed));
+        if ('previousUrl' in parsed) {
+            (0, utils_js_1.assert)((0, utils_js_1.hasProp)(parsed, 'previousUrl', 'string'));
+            args.previousUrl = parsed.previousUrl;
+        }
+    }
+    return args;
 }

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

@@ -18,6 +18,7 @@ async function loadPageConfigsLazyServerSideAndExecHook(pageContext) {
     await (0, execHookServer_js_1.execHookServer)('onCreatePageContext', pageContext);
     return pageContext;
 }
+// TODO/now: define new function resolveAfterLoad() ?
 async function loadPageConfigsLazyServerSide(pageContext) {
     const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._globalContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig ?
     const globalContext = pageContext._globalContext;
@@ -30,19 +31,32 @@ async function loadPageConfigsLazyServerSide(pageContext) {
     const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._globalContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
     const isV1Design = !!pageConfig;
     const passToClient = [];
-    const errMsg = ' should be an array of strings.';
+    const errMsgSuffix = ' should be an array of strings.';
     if (!isV1Design) {
         configPublicPageLazy.exportsAll.passToClient?.forEach((e) => {
-            (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(e, 'exportValue', 'string[]'), `${e.exportSource}${errMsg}`);
+            (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(e, 'exportValue', 'string[]'), `${e.exportSource}${errMsgSuffix}`);
             passToClient.push(...e.exportValue);
         });
     }
     else {
         configPublicPageLazy.from.configsCumulative.passToClient?.values.forEach((v) => {
-            const { value } = v;
-            // const { definedAt } = v
-            // assertUsage(isArrayOfStrings(value), `+passToClient value defined at ${definedAt}${errMsg}`)
-            passToClient.push(...value);
+            const { value, definedAt } = v;
+            const errMsg = `+passToClient value defined at ${definedAt}${errMsgSuffix}`;
+            //*/ TO-DO/next-major-release: remove the passToClient once setting from the public API
+            (0, utils_js_1.assertUsage)((0, utils_js_1.isArray)(value), `+passToClient value defined at ${definedAt} should be an array`);
+            const valS = value.map((el) => {
+                if ((0, utils_js_1.isObject)(el)) {
+                    (0, utils_js_1.assertWarning)(!('once' in el), 'The passToClient once setting is deprecated and no longer has any effect. Instead, see the upcoming .once.js suffix (see https://github.com/vikejs/vike/issues/2566 for more information).', { onlyOnce: true });
+                    (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(el, 'prop', 'string'), errMsg);
+                    return el.prop;
+                }
+                (0, utils_js_1.assertUsage)(typeof el === 'string', errMsg);
+                return el;
+            });
+            /*/
+            assertUsage(isArrayOfStrings(value), errMsg)
+            //*/
+            passToClient.push(...valS);
         });
     }
     const pageContextAddendum = {};

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

@@ -50,7 +50,7 @@ async function renderPageAlreadyRouted(pageContext) {
         if (isError) {
             (0, utils_js_1.objectAssign)(pageContext, { [isServerSideError_js_1.isServerSideError]: true });
         }
-        const pageContextSerialized = (0, serializeContext_js_1.getPageContextClientSerialized)(pageContext);
+        const pageContextSerialized = (0, serializeContext_js_1.getPageContextClientSerialized)(pageContext, false);
         const httpResponse = await (0, createHttpResponse_js_1.createHttpResponsePageContextJson)(pageContextSerialized);
         (0, utils_js_1.objectAssign)(pageContext, { httpResponse });
         return pageContext;
@@ -63,8 +63,7 @@ async function renderPageAlreadyRouted(pageContext) {
 }
 async function prerenderPage(pageContext) {
     (0, utils_js_1.objectAssign)(pageContext, {
-        isClientSideNavigation: false,
-        _urlHandler: null,
+        _isPageContextJsonRequest: null,
     });
     /* Should we execute the guard() hook upon pre-rendering? Is there a use case for this?
      *  - It isn't trivial to implement, as it requires to duplicate / factor out the isAbortError() handling
@@ -73,14 +72,13 @@ async function prerenderPage(pageContext) {
     await (0, execHookDataAndOnBeforeRender_js_1.execHookDataAndOnBeforeRender)(pageContext);
     const { htmlRender, renderHook } = await (0, execHookOnRenderHtml_js_1.execHookOnRenderHtml)(pageContext);
     (0, utils_js_1.assertUsage)(htmlRender !== null, `Cannot pre-render ${picocolors_1.default.cyan(pageContext.urlOriginal)} because the ${renderHook.hookName}() hook defined by ${renderHook.hookFilePath} didn't return an HTML string.`);
-    (0, utils_js_1.assert)(pageContext.isClientSideNavigation === false);
     const documentHtml = await (0, renderHtml_js_1.getHtmlString)(htmlRender);
     (0, utils_js_1.assert)(typeof documentHtml === 'string');
     if (!pageContext._usesClientRouter) {
         return { documentHtml, pageContextSerialized: null, pageContext };
     }
     else {
-        const pageContextSerialized = (0, serializeContext_js_1.getPageContextClientSerialized)(pageContext);
+        const pageContextSerialized = (0, serializeContext_js_1.getPageContextClientSerialized)(pageContext, false);
         return { documentHtml, pageContextSerialized, pageContext };
     }
 }

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

@@ -312,7 +312,7 @@ async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pag
     return pageContext;
 }
 function getPageContextBegin(pageContextInit, globalContext, httpRequestId) {
-    const { isClientSideNavigation, _urlHandler } = handlePageContextUrl(pageContextInit.urlOriginal);
+    const { isClientSideNavigation, _urlHandler, _isPageContextJsonRequest } = handlePageContextUrl(pageContextInit.urlOriginal);
     const pageContextBegin = (0, createPageContextServerSide_js_1.createPageContextServerSide)(pageContextInit, globalContext, {
         isPrerendering: false,
         ssr: {
@@ -320,13 +320,14 @@ function getPageContextBegin(pageContextInit, globalContext, httpRequestId) {
             isClientSideNavigation,
         },
     });
-    (0, utils_js_1.objectAssign)(pageContextBegin, { _httpRequestId: httpRequestId });
+    (0, utils_js_1.objectAssign)(pageContextBegin, { _httpRequestId: httpRequestId, _isPageContextJsonRequest });
     return pageContextBegin;
 }
 function handlePageContextUrl(urlOriginal) {
-    const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
+    const { isPageContextJsonRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
     return {
-        isClientSideNavigation: isPageContextRequest,
+        isClientSideNavigation: !!isPageContextJsonRequest,
+        _isPageContextJsonRequest: isPageContextJsonRequest,
         _urlHandler: (url) => (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(url).urlWithoutPageContextRequestSuffix,
     };
 }
@@ -350,8 +351,8 @@ async function normalizeUrl(pageContextBegin, globalContext, httpRequestId) {
     if (disableUrlNormalization)
         return null;
     const { urlOriginal } = pageContext;
-    const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
-    if (isPageContextRequest)
+    const { isPageContextJsonRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
+    if (isPageContextJsonRequest)
         return null;
     const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash ?? false, globalContext.baseServer);
     if (!urlNormalized)
@@ -424,10 +425,10 @@ pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalCont
             (0, utils_js_1.objectAssign)(pageContext, pageContextErrorPageInit, true);
             (0, utils_js_1.augmentType)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSideAndExecHook)(pageContext));
             // We include pageContextInit: we don't only serialize pageContextAbort because the error page may need to access pageContextInit
-            pageContextSerialized = (0, serializeContext_js_1.getPageContextClientSerialized)(pageContext);
+            pageContextSerialized = (0, serializeContext_js_1.getPageContextClientSerialized)(pageContext, false);
         }
         else {
-            pageContextSerialized = (0, serializeContext_js_1.getPageContextClientSerializedAbort)(pageContextAbort);
+            pageContextSerialized = (0, serializeContext_js_1.getPageContextClientSerializedAbort)(pageContextAbort, false);
         }
         const httpResponse = await (0, createHttpResponse_js_1.createHttpResponsePageContextJson)(pageContextSerialized);
         const pageContextReturn = { httpResponse };

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,3 +77,6 @@ __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);
+__exportStar(require("../../utils/isRunnableDevEnvironment.js"), exports);
+__exportStar(require("../../utils/assertIsNotBrowser.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,6 +29,7 @@ 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 pluginNonRunnableDev_js_1 = require("./plugins/pluginNonRunnableDev.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
@@ -48,6 +49,7 @@ function plugin(vikeVitePluginOptions = {}) {
         (0, pluginWorkaroundCssModuleHmr_js_1.pluginWorkaroundCssModuleHmr)(),
         (0, pluginWorkaroundVite6HmrRegression_js_1.pluginWorkaroundVite6HmrRegression)(),
         (0, pluginReplaceConstants_js_1.pluginReplaceConstants)(),
+        (0, pluginNonRunnableDev_js_1.pluginNonRunnableDev)(),
     ];
     Object.assign(plugins, { _vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;

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

@@ -14,13 +14,13 @@ const node_path_1 = __importDefault(require("node:path"));
 const node_fs_2 = require("node:fs");
 const utils_js_1 = require("../../utils.js");
 const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
-const pluginBuildConfig_js_1 = require("./pluginBuildConfig.js");
 const getAssetsDir_js_1 = require("../../shared/getAssetsDir.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 const pluginBuildEntry_js_1 = require("./pluginBuildEntry.js");
+const getManifestFilePathRelative_js_1 = require("../../shared/getManifestFilePathRelative.js");
 (0, utils_js_1.assertIsSingleModuleInstance)('build/handleAssetsManifest.ts');
 let assetsJsonFilePath;
 // true  => use workaround config.build.ssrEmitAssets
@@ -31,9 +31,8 @@ function handleAssetsManifest_isFixEnabled(config) {
 }
 /** https://github.com/vikejs/vike/issues/1339 */
 async function fixServerAssets(config) {
-    const outDirs = (0, getOutDirs_js_1.getOutDirs)(config);
-    const clientManifest = await readManifestFile(outDirs.outDirClient);
-    const serverManifest = await readManifestFile(outDirs.outDirServer);
+    const clientManifest = await readManifestFile(config, true);
+    const serverManifest = await readManifestFile(config, false);
     const { clientManifestMod, serverManifestMod, filesToMove, filesToRemove } = addServerAssets(clientManifest, serverManifest);
     await copyAssets(filesToMove, filesToRemove, config);
     return { clientManifestMod, serverManifestMod };
@@ -270,8 +269,8 @@ function removeEmptyDirectories(dirPath) {
         node_fs_1.default.rmdirSync(dirPath);
     }
 }
-async function readManifestFile(outDir) {
-    const manifestFilePath = node_path_1.default.posix.join(outDir, pluginBuildConfig_js_1.manifestTempFile);
+async function readManifestFile(config, client) {
+    const manifestFilePath = getManifestFilePath(config, client);
     const manifestFileContent = await promises_1.default.readFile(manifestFilePath, 'utf-8');
     (0, utils_js_1.assert)(manifestFileContent);
     const manifest = JSON.parse(manifestFileContent);
@@ -292,7 +291,7 @@ async function handleAssetsManifest_getBuildConfig(config) {
         ssrEmitAssets: isFixEnabled ? true : undefined,
         // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
         cssMinify: isFixEnabled ? 'esbuild' : undefined,
-        manifest: pluginBuildConfig_js_1.manifestTempFile,
+        manifest: true,
         copyPublicDir: vikeConfig.config.vite6BuilderApp
             ? // Already set by vike:build:pluginBuildApp
                 undefined
@@ -300,12 +299,12 @@ async function handleAssetsManifest_getBuildConfig(config) {
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
-    const isSsREnv = (0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv);
-    if (isSsREnv) {
+    const isSsrEnv = (0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv);
+    if (isSsrEnv) {
         (0, utils_js_1.assert)(!assetsJsonFilePath);
         const outDirs = (0, getOutDirs_js_1.getOutDirs)(config, viteEnv);
         assetsJsonFilePath = node_path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
-        await writeAssetsManifestFile(outDirs, assetsJsonFilePath, config);
+        await writeAssetsManifestFile(assetsJsonFilePath, config);
     }
     if ((0, isViteServerBuild_js_1.isViteServerBuild)(config, viteEnv)) {
         const outDir = options.dir;
@@ -315,14 +314,14 @@ async function handleAssetsManifest(config, viteEnv, options, bundle) {
         // - Also in some other server builds such as dist/vercel/ from vike-vercel
         // - Don't replace it in dist/rsc/ from vike-react-rsc since __VITE_ASSETS_MANIFEST__ doesn't exist there
         const noop = await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(assetsJsonFilePath, bundle, outDir);
-        if (isSsREnv)
+        if (isSsrEnv)
             (0, utils_js_1.assert)(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
     }
 }
-async function writeAssetsManifestFile(outDirs, assetsJsonFilePath, config) {
+async function writeAssetsManifestFile(assetsJsonFilePath, config) {
     const isFixEnabled = handleAssetsManifest_isFixEnabled(config);
-    const clientManifestFilePath = node_path_1.default.posix.join(outDirs.outDirClient, pluginBuildConfig_js_1.manifestTempFile);
-    const serverManifestFilePath = node_path_1.default.posix.join(outDirs.outDirServer, pluginBuildConfig_js_1.manifestTempFile);
+    const clientManifestFilePath = getManifestFilePath(config, true);
+    const serverManifestFilePath = getManifestFilePath(config, false);
     if (!isFixEnabled) {
         await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
     }
@@ -333,3 +332,12 @@ async function writeAssetsManifestFile(outDirs, assetsJsonFilePath, config) {
     await promises_1.default.rm(clientManifestFilePath);
     await promises_1.default.rm(serverManifestFilePath);
 }
+function getManifestFilePath(config, client) {
+    const outDirs = (0, getOutDirs_js_1.getOutDirs)(config);
+    const outDir = client ? outDirs.outDirClient : outDirs.outDirServer;
+    const env = client ? config.environments.client : config.environments.ssr;
+    (0, utils_js_1.assert)(env);
+    const manifestFilePathRelative = (0, getManifestFilePathRelative_js_1.getManifestFilePathRelative)(env.build.manifest);
+    const manifestFilePath = node_path_1.default.posix.join(outDir, manifestFilePathRelative);
+    return manifestFilePath;
+}

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

@@ -11,12 +11,12 @@ const context_js_1 = require("../../../prerender/context.js");
 const isViteCliCall_js_1 = require("../../shared/isViteCliCall.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const logErrorHint_js_1 = require("../../../runtime/renderPage/logErrorHint.js");
-const pluginBuildConfig_js_1 = require("./pluginBuildConfig.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const context_js_2 = require("../../../api/context.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 const runPrerenderEntry_js_1 = require("../../../prerender/runPrerenderEntry.js");
+const getManifestFilePathRelative_js_1 = require("../../shared/getManifestFilePathRelative.js");
 (0, utils_js_1.assertIsSingleModuleInstance)('build/pluginAutoFullBuild.ts');
 let forceExit = false;
 function pluginAutoFullBuild() {
@@ -87,7 +87,7 @@ async function triggerFullBuild(config, viteEnv, bundle) {
     //  - The legacy plugin triggers its own Rollup build for the client-side.
     //  - The legacy plugin doesn't generate a manifest => we can use that to detect the legacy plugin build.
     //  - Issue & reproduction: https://github.com/vikejs/vike/issues/1154#issuecomment-1965954636
-    if (!bundle[pluginBuildConfig_js_1.manifestTempFile])
+    if (!bundle[(0, getManifestFilePathRelative_js_1.getManifestFilePathRelative)(config.build.manifest)])
         return;
     const configInline = getFullBuildInlineConfig(config);
     if (!isBuilderApp) {

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.manifestTempFile = void 0;
 exports.pluginBuildConfig = pluginBuildConfig;
 exports.assertRollupInput = assertRollupInput;
 exports.analyzeClientEntries = analyzeClientEntries;
@@ -16,8 +15,6 @@ 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");
-const manifestTempFile = '_temp_manifest.json';
-exports.manifestTempFile = manifestTempFile;
 function pluginBuildConfig() {
     let config;
     return [

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

@@ -106,6 +106,7 @@ function getIdHash(id) {
     return node_crypto_1.default.createHash('md5').update(id).digest('hex').slice(0, 8);
 }
 function getAssetFileName(assetInfo, config) {
+    const userRootDir = config.root;
     const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
     const dir = assetsDir + '/static';
     let { name } = assetInfo;
@@ -123,11 +124,11 @@ function getAssetFileName(assetInfo, config) {
         // Vite 3
         name?.endsWith('?extractAssets&lang.css')) {
         name = name.split('.').slice(0, -2).join('.');
-        name = clean(name);
+        name = clean(name, userRootDir);
         return `${dir}/${name}.[hash][extname]`;
     }
     name = name.split('.').slice(0, -1).join('.');
-    name = clean(name);
+    name = clean(name, userRootDir);
     return `${dir}/${name}.[hash][extname]`;
 }
 function getChunkFileName(_chunkInfo, config) {
@@ -140,11 +141,12 @@ function getChunkFileName(_chunkInfo, config) {
     return name;
 }
 function getEntryFileName(chunkInfo, config, isEntry) {
+    const userRootDir = config.root;
     const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
     const isForClientSide = !config.build.ssr;
     let { name } = chunkInfo;
     (0, utils_js_1.assertPosixPath)(name);
-    name = clean(name, true, 
+    name = clean(name, userRootDir, true, 
     // Not needed for client-side because dist/ filenames contain `.[hash].js`
     !isForClientSide);
     if (isForClientSide) {
@@ -156,7 +158,7 @@ function getEntryFileName(chunkInfo, config, isEntry) {
 }
 function removePathSeparators(name) {
     (0, utils_js_1.assertPosixPath)(name);
-    (0, utils_js_1.assert)(!name.startsWith('/'));
+    (0, utils_js_1.assert)(!name.startsWith('/'), { name });
     const entryDir = 'entries/';
     const hasEntryDir = name.startsWith(entryDir);
     if (hasEntryDir) {
@@ -169,7 +171,17 @@ function removePathSeparators(name) {
     }
     return name;
 }
-function clean(name, removePathSep, fixGlob) {
+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);