npm - vike - Versions diffs - 0.4.236-commit-e752d12 → 0.4.236-commit-79f1ef0 - Mend

vike 0.4.236-commit-e752d12 → 0.4.236-commit-79f1ef0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (114) hide show

package/dist/esm/node/runtime/html/injectAssets/getViteDevScript.js CHANGED Viewed

@@ -1,5 +1,5 @@
 export { getViteDevScript };
-import { assert, assertUsage, assertWarning } from '../../utils.js';
+import { assert, assertUsage, assertWarning, getViteRPC } from '../../utils.js';
 import pc from '@brillout/picocolors';
 const reachOutCTA = 'Create a new GitHub issue to discuss a solution.';
 async function getViteDevScript(pageContext) {
@@ -11,7 +11,9 @@ 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;
-    fakeHtml = await viteDevServer.transformIndexHtml('/', fakeHtml);
+    fakeHtml = viteDevServer
+        ? await viteDevServer.transformIndexHtml('/', fakeHtml)
+        : await getViteRPC().transformIndexHtmlRPC(fakeHtml);
     assertUsage(!fakeHtml.includes('vite-plugin-pwa'), `The HTML transformer of ${pc.cyan('vite-plugin-pwa')} cannot be applied, see workaround at https://github.com/vikejs/vike/issues/388#issuecomment-1199280084`);
     assertUsage(!fakeHtml.startsWith(fakeHtmlBegin.replace(' ', '')), `Vite plugins that minify the HTML cannot be applied, see https://github.com/vikejs/vike/issues/224`);
     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/esm/node/runtime/renderPage/createPageContextServerSide.d.ts CHANGED Viewed

@@ -41,24 +41,12 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         pages: {
             [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
         };
-    } & ({
+    } & (({
         _isProduction: false;
         _isPrerendering: false;
         assetsManifest: null;
-        _viteDevServer: import("vite").ViteDevServer;
-        viteConfig: import("vite").ResolvedConfig;
-        viteConfigRuntime: {
-            root: string;
-            build: {
-                outDir: string;
-            };
-            _baseViteOriginal: string;
-            vitePluginServerEntry: {
-                inject: boolean | undefined;
-            };
-        };
-        baseServer: string;
-        baseAssets: string;
+        _viteDevServer: import("vite").ViteDevServer | undefined;
+        viteConfig: import("vite").ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -68,19 +56,7 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         _isProduction: true;
         assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
-        viteConfigRuntime: {
-            root: string;
-            build: {
-                outDir: string;
-            };
-            _baseViteOriginal: string;
-            vitePluginServerEntry: {
-                inject: boolean | undefined;
-            };
-        };
         _usesClientRouter: boolean;
-        baseServer: string;
-        baseAssets: string;
         isClientSide: false;
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -90,6 +66,13 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         _isProduction: true;
         assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
+        _usesClientRouter: boolean;
+        isClientSide: false;
+        _pageRoutes: import("../../../__internal/index.js").PageRoutes;
+        _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
+    }) & {
+        baseServer: string;
+        baseAssets: string;
         viteConfigRuntime: {
             root: string;
             build: {
@@ -100,12 +83,6 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
                 inject: boolean | undefined;
             };
         };
-        _usesClientRouter: boolean;
-        baseServer: string;
-        baseAssets: string;
-        isClientSide: false;
-        _pageRoutes: import("../../../__internal/index.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
     });
     _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
     _baseServer: string;

package/dist/esm/node/runtime/renderPage/getPageAssets/retrieveAssetsDev.js CHANGED Viewed

@@ -1,11 +1,13 @@
 export { retrieveAssetsDev };
 import { assert, styleFileRE } from '../../utils.js';
+import { isVirtualFileIdEntry } from '../../../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
         assert(id);
+        assert(!isVirtualFileIdEntry(id));
         const { moduleGraph } = viteDevServer;
         const [_, graphId] = await moduleGraph.resolveUrl(id);
         assert(graphId, { id });
@@ -32,6 +34,8 @@ function collectCss(mod, styleUrls, visitedModules, importer) {
     if (visitedModules.has(mod.url))
         return;
     visitedModules.add(mod.url);
+    if (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/esm/node/runtime/renderPage/getPageAssets.js CHANGED Viewed

@@ -1,7 +1,7 @@
 export { getPageAssets };
 export { setResolveClientEntriesDev };
 export { resolveIncludeAssetsImportedByServer };
-import { assert, prependBase, toPosixPath, unique, getGlobalObject } from '../utils.js';
+import { assert, prependBase, toPosixPath, unique, getGlobalObject, getViteRPC } from '../utils.js';
 import { retrieveAssetsDev } from './getPageAssets/retrieveAssetsDev.js';
 import { retrieveAssetsProd } from './getPageAssets/retrieveAssetsProd.js';
 import { inferMediaType } from './inferMediaType.js';
@@ -15,7 +15,9 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const { _isProduction: isProduction } = globalContext;
     const isDev = !isProduction;
     const { assetUrls, clientEntriesSrc } = isDev
-        ? await retrievePageAssetsDev(globalContext._viteDevServer, clientDependencies, clientEntries)
+        ? !globalContext._viteDevServer
+            ? await getViteRPC().retrievePageAssetsDevRPC(clientDependencies, clientEntries)
+            : await retrievePageAssetsDev(globalContext._viteDevServer, clientDependencies, clientEntries)
         : retrievePageAssetsProd(globalContext.assetsManifest, clientDependencies, clientEntries, resolveIncludeAssetsImportedByServer(globalContext.config));
     let pageAssets = [];
     unique([...clientEntriesSrc, ...assetUrls]).forEach((src) => {

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts CHANGED Viewed

@@ -56,24 +56,12 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
             pages: {
                 [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
             };
-        } & ({
+        } & (({
             _isProduction: false;
             _isPrerendering: false;
             assetsManifest: null;
-            _viteDevServer: import("vite").ViteDevServer;
-            viteConfig: import("vite").ResolvedConfig;
-            viteConfigRuntime: {
-                root: string;
-                build: {
-                    outDir: string;
-                };
-                _baseViteOriginal: string;
-                vitePluginServerEntry: {
-                    inject: boolean | undefined;
-                };
-            };
-            baseServer: string;
-            baseAssets: string;
+            _viteDevServer: import("vite").ViteDevServer | undefined;
+            viteConfig: import("vite").ResolvedConfig | undefined;
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -83,19 +71,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
-            viteConfigRuntime: {
-                root: string;
-                build: {
-                    outDir: string;
-                };
-                _baseViteOriginal: string;
-                vitePluginServerEntry: {
-                    inject: boolean | undefined;
-                };
-            };
             _usesClientRouter: boolean;
-            baseServer: string;
-            baseAssets: string;
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -105,6 +81,13 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            _usesClientRouter: boolean;
+            isClientSide: false;
+            _pageRoutes: import("../../../__internal/index.js").PageRoutes;
+            _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
+        }) & {
+            baseServer: string;
+            baseAssets: string;
             viteConfigRuntime: {
                 root: string;
                 build: {
@@ -115,12 +98,6 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
                     inject: boolean | undefined;
                 };
             };
-            _usesClientRouter: boolean;
-            baseServer: string;
-            baseAssets: string;
-            isClientSide: false;
-            _pageRoutes: import("../../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
         });
         _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
         _baseServer: string;
@@ -191,24 +168,12 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
             pages: {
                 [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
             };
-        } & ({
+        } & (({
             _isProduction: false;
             _isPrerendering: false;
             assetsManifest: null;
-            _viteDevServer: import("vite").ViteDevServer;
-            viteConfig: import("vite").ResolvedConfig;
-            viteConfigRuntime: {
-                root: string;
-                build: {
-                    outDir: string;
-                };
-                _baseViteOriginal: string;
-                vitePluginServerEntry: {
-                    inject: boolean | undefined;
-                };
-            };
-            baseServer: string;
-            baseAssets: string;
+            _viteDevServer: import("vite").ViteDevServer | undefined;
+            viteConfig: import("vite").ResolvedConfig | undefined;
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -218,19 +183,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
-            viteConfigRuntime: {
-                root: string;
-                build: {
-                    outDir: string;
-                };
-                _baseViteOriginal: string;
-                vitePluginServerEntry: {
-                    inject: boolean | undefined;
-                };
-            };
             _usesClientRouter: boolean;
-            baseServer: string;
-            baseAssets: string;
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -240,6 +193,13 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            _usesClientRouter: boolean;
+            isClientSide: false;
+            _pageRoutes: import("../../../__internal/index.js").PageRoutes;
+            _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
+        }) & {
+            baseServer: string;
+            baseAssets: string;
             viteConfigRuntime: {
                 root: string;
                 build: {
@@ -250,12 +210,6 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
                     inject: boolean | undefined;
                 };
             };
-            _usesClientRouter: boolean;
-            baseServer: string;
-            baseAssets: string;
-            isClientSide: false;
-            _pageRoutes: import("../../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
         });
         _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
         _baseServer: string;

package/dist/esm/node/runtime/renderPage.d.ts CHANGED Viewed

@@ -46,24 +46,12 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         pages: {
             [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
         };
-    } & ({
+    } & (({
         _isProduction: false;
         _isPrerendering: false;
         assetsManifest: null;
-        _viteDevServer: import("vite").ViteDevServer;
-        viteConfig: import("vite").ResolvedConfig;
-        viteConfigRuntime: {
-            root: string;
-            build: {
-                outDir: string;
-            };
-            _baseViteOriginal: string;
-            vitePluginServerEntry: {
-                inject: boolean | undefined;
-            };
-        };
-        baseServer: string;
-        baseAssets: string;
+        _viteDevServer: import("vite").ViteDevServer | undefined;
+        viteConfig: import("vite").ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
@@ -73,19 +61,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         _isProduction: true;
         assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
-        viteConfigRuntime: {
-            root: string;
-            build: {
-                outDir: string;
-            };
-            _baseViteOriginal: string;
-            vitePluginServerEntry: {
-                inject: boolean | undefined;
-            };
-        };
         _usesClientRouter: boolean;
-        baseServer: string;
-        baseAssets: string;
         isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
@@ -95,6 +71,13 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         _isProduction: true;
         assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
+        _usesClientRouter: boolean;
+        isClientSide: false;
+        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
+        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+    }) & {
+        baseServer: string;
+        baseAssets: string;
         viteConfigRuntime: {
             root: string;
             build: {
@@ -105,12 +88,6 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
                 inject: boolean | undefined;
             };
         };
-        _usesClientRouter: boolean;
-        baseServer: string;
-        baseAssets: string;
-        isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
     });
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _baseServer: string;

package/dist/esm/node/runtime/utils.d.ts CHANGED Viewed

@@ -42,6 +42,7 @@ export * from '../../utils/assertSetup.js';
 export * from '../../utils/path.js';
 export * from '../../utils/isHtml.js';
 export * from '../../utils/warnIfErrorIsNotObject.js';
+export * from '../../utils/virtualFileId.js';
 export * from '../../utils/stripAnsi.js';
 export * from '../../utils/getTerminWidth.js';
 export * from '../../utils/truncateString.js';
@@ -56,3 +57,6 @@ export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/augmentType.js';
 export * from '../../utils/changeEnumerable.js';
+export * from '../../utils/getViteRPC.js';
+export * from '../../utils/isRunnableDevEnvironment.js';
+export * from '../../utils/assertIsNotBrowser.js';

package/dist/esm/node/runtime/utils.js CHANGED Viewed

@@ -46,6 +46,7 @@ export * from '../../utils/assertSetup.js';
 export * from '../../utils/path.js';
 export * from '../../utils/isHtml.js';
 export * from '../../utils/warnIfErrorIsNotObject.js';
+export * from '../../utils/virtualFileId.js';
 export * from '../../utils/stripAnsi.js';
 export * from '../../utils/getTerminWidth.js';
 export * from '../../utils/truncateString.js';
@@ -60,3 +61,6 @@ export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/augmentType.js';
 export * from '../../utils/changeEnumerable.js';
+export * from '../../utils/getViteRPC.js';
+export * from '../../utils/isRunnableDevEnvironment.js';
+export * from '../../utils/assertIsNotBrowser.js';

package/dist/esm/node/shared/utils.d.ts CHANGED Viewed

@@ -14,3 +14,4 @@ export * from '../../utils/assertIsNotBrowser.js';
 export * from '../../utils/isNullish.js';
 export * from '../../utils/unique.js';
 export * from '../../utils/debug.js';
+export * from '../../utils/virtualFileId.js';

package/dist/esm/node/shared/utils.js CHANGED Viewed

@@ -16,3 +16,4 @@ export * from '../../utils/assertIsNotBrowser.js';
 export * from '../../utils/isNullish.js';
 export * from '../../utils/unique.js';
 export * from '../../utils/debug.js';
+export * from '../../utils/virtualFileId.js';

package/dist/esm/node/shared/virtualFiles/virtualFileEntry.js CHANGED Viewed

@@ -2,24 +2,26 @@ export { virtualFileIdEntryServer };
 export { virtualFileIdEntryClientSR };
 export { virtualFileIdEntryClientCR };
 export { isVirtualFileIdEntry };
-import { assert } from '../utils.js';
-import { getVirtualFileId } from '../virtualFiles.js';
+// TODO/now: merge virtualFileEntry.ts and virtualFilePageConfigLazy.ts
+// - One function parseVirtualFileIdEntry() to rule them all?
+import { assert, assertIsNotBrowser, removeVirtualFileIdPrefix } from '../utils.js';
+assertIsNotBrowser();
+// TODO/now: rename:
+// ```diff
+// - virtual:vike:entry:server
+// + virtual:vike:entry:global:server
+// ```
+const virtualFileIdEntryServer = 'virtual:vike:entry:server';
+const virtualFileIdEntryClientSR = 'virtual:vike:entry:client:server-routing';
+const virtualFileIdEntryClientCR = 'virtual:vike:entry:client:client-routing';
+const virtualFileIdEntries = [virtualFileIdEntryServer, virtualFileIdEntryClientCR, virtualFileIdEntryClientSR];
 const idBase = 'virtual:vike:entry';
-const virtualFileIdEntryServer = `${idBase}:server`;
-const virtualFileIdEntryClientSR = `${idBase}:client:server-routing`;
-const virtualFileIdEntryClientCR = `${idBase}:client:client-routing`;
+assert(virtualFileIdEntries.every((v) => v.startsWith(`${idBase}:`)));
 function isVirtualFileIdEntry(id) {
-    id = getVirtualFileId(id);
+    id = removeVirtualFileIdPrefix(id);
     if (!id.startsWith(idBase))
         return false;
-    assert(
-    // prettier-ignore
-    // biome-ignore format:
-    [
-        virtualFileIdEntryServer,
-        virtualFileIdEntryClientCR,
-        virtualFileIdEntryClientSR
-    ].includes(id));
+    assert(virtualFileIdEntries.includes(id));
     const isForClientSide = id !== virtualFileIdEntryServer;
     const isClientRouting = id === virtualFileIdEntryClientCR;
     return { isForClientSide, isClientRouting };

package/dist/esm/node/shared/virtualFiles/virtualFilePageConfigLazy.js CHANGED Viewed

@@ -1,17 +1,23 @@
 export { isVirtualFileIdPageConfigLazy };
 export { getVirtualFileIdPageConfigLazy };
 import { extractAssetsRemoveQuery } from '../extractAssetsQuery.js';
-import { assert } from '../utils.js';
-import { getVirtualFileId } from '../virtualFiles.js';
+import { assert, assertIsNotBrowser, removeVirtualFileIdPrefix } from '../utils.js';
+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 = getVirtualFileId(id);
+    id = removeVirtualFileIdPrefix(id);
     if (!id.includes(idBase))
         return false;
     assert(id.startsWith(idBase));

package/dist/esm/node/vite/index.js CHANGED Viewed

@@ -22,6 +22,7 @@ import { resolveClientEntriesDev } from './shared/resolveClientEntriesDev.js';
 import { pluginWorkaroundCssModuleHmr } from './plugins/pluginWorkaroundCssModuleHmr.js';
 import { pluginWorkaroundVite6HmrRegression } from './plugins/pluginWorkaroundVite6HmrRegression.js';
 import { pluginReplaceConstants } from './plugins/pluginReplaceConstants.js';
+import { pluginNonRunnableDev } from './plugins/pluginNonRunnableDev.js';
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 setResolveClientEntriesDev(resolveClientEntriesDev);
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
@@ -41,6 +42,7 @@ function plugin(vikeVitePluginOptions = {}) {
         pluginWorkaroundCssModuleHmr(),
         pluginWorkaroundVite6HmrRegression(),
         pluginReplaceConstants(),
+        pluginNonRunnableDev(),
     ];
     Object.assign(plugins, { _vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;

package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.d.ts CHANGED Viewed

@@ -11,7 +11,7 @@ declare function handleAssetsManifest_assertUsageCssTarget(config: ResolvedConfi
 declare function handleAssetsManifest_getBuildConfig(config: UserConfig): Promise<{
     readonly ssrEmitAssets: true | undefined;
     readonly cssMinify: "esbuild" | undefined;
-    readonly manifest: "_temp_manifest.json";
+    readonly manifest: true;
     readonly copyPublicDir: boolean | undefined;
 }>;
 declare function handleAssetsManifest(config: ResolvedConfig, viteEnv: Environment | undefined, options: {

package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.js CHANGED Viewed

@@ -9,13 +9,13 @@ import path from 'node:path';
 import { existsSync } from 'node:fs';
 import { assert, assertIsSingleModuleInstance, assertWarning, isEqualStringList, isObject, pLimit, unique, } from '../../utils.js';
 import { isVirtualFileIdPageConfigLazy } from '../../../shared/virtualFiles/virtualFilePageConfigLazy.js';
-import { manifestTempFile } from './pluginBuildConfig.js';
 import { getAssetsDir } from '../../shared/getAssetsDir.js';
 import pc from '@brillout/picocolors';
 import { getVikeConfigInternal, isV1Design } from '../../shared/resolveVikeConfigInternal.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
 import { isViteServerBuild_onlySsrEnv, isViteServerBuild } from '../../shared/isViteServerBuild.js';
 import { set_macro_ASSETS_MANIFEST } from './pluginBuildEntry.js';
+import { getManifestFilePathRelative } from '../../shared/getManifestFilePathRelative.js';
 assertIsSingleModuleInstance('build/handleAssetsManifest.ts');
 let assetsJsonFilePath;
 // true  => use workaround config.build.ssrEmitAssets
@@ -26,9 +26,8 @@ function handleAssetsManifest_isFixEnabled(config) {
 }
 /** https://github.com/vikejs/vike/issues/1339 */
 async function fixServerAssets(config) {
-    const outDirs = 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 };
@@ -265,8 +264,8 @@ function removeEmptyDirectories(dirPath) {
         fs_sync.rmdirSync(dirPath);
     }
 }
-async function readManifestFile(outDir) {
-    const manifestFilePath = path.posix.join(outDir, manifestTempFile);
+async function readManifestFile(config, client) {
+    const manifestFilePath = getManifestFilePath(config, client);
     const manifestFileContent = await fs.readFile(manifestFilePath, 'utf-8');
     assert(manifestFileContent);
     const manifest = JSON.parse(manifestFileContent);
@@ -287,7 +286,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: manifestTempFile,
+        manifest: true,
         copyPublicDir: vikeConfig.config.vite6BuilderApp
             ? // Already set by vike:build:pluginBuildApp
                 undefined
@@ -300,7 +299,7 @@ async function handleAssetsManifest(config, viteEnv, options, bundle) {
         assert(!assetsJsonFilePath);
         const outDirs = getOutDirs(config, viteEnv);
         assetsJsonFilePath = path.posix.join(outDirs.outDirRoot, 'assets.json');
-        await writeAssetsManifestFile(outDirs, assetsJsonFilePath, config);
+        await writeAssetsManifestFile(assetsJsonFilePath, config);
     }
     if (isViteServerBuild(config, viteEnv)) {
         const outDir = options.dir;
@@ -314,10 +313,10 @@ async function handleAssetsManifest(config, viteEnv, options, bundle) {
             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 = path.posix.join(outDirs.outDirClient, manifestTempFile);
-    const serverManifestFilePath = path.posix.join(outDirs.outDirServer, manifestTempFile);
+    const clientManifestFilePath = getManifestFilePath(config, true);
+    const serverManifestFilePath = getManifestFilePath(config, false);
     if (!isFixEnabled) {
         await fs.copyFile(clientManifestFilePath, assetsJsonFilePath);
     }
@@ -328,3 +327,12 @@ async function writeAssetsManifestFile(outDirs, assetsJsonFilePath, config) {
     await fs.rm(clientManifestFilePath);
     await fs.rm(serverManifestFilePath);
 }
+function getManifestFilePath(config, client) {
+    const outDirs = getOutDirs(config);
+    const outDir = client ? outDirs.outDirClient : outDirs.outDirServer;
+    const env = client ? config.environments.client : config.environments.ssr;
+    assert(env);
+    const manifestFilePathRelative = getManifestFilePathRelative(env.build.manifest);
+    const manifestFilePath = path.posix.join(outDir, manifestFilePathRelative);
+    return manifestFilePath;
+}

package/dist/esm/node/vite/plugins/pluginBuild/pluginAutoFullBuild.js CHANGED Viewed

@@ -6,12 +6,12 @@ import { isPrerenderAutoRunEnabled, wasPrerenderRun } from '../../../prerender/c
 import { isViteCliCall, getViteConfigFromCli } from '../../shared/isViteCliCall.js';
 import pc from '@brillout/picocolors';
 import { logErrorHint } from '../../../runtime/renderPage/logErrorHint.js';
-import { manifestTempFile } from './pluginBuildConfig.js';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { isVikeCliOrApi } from '../../../api/context.js';
 import { handleAssetsManifest, handleAssetsManifest_assertUsageCssTarget } from './handleAssetsManifest.js';
 import { isViteClientBuild, isViteServerBuild_onlySsrEnv } from '../../shared/isViteServerBuild.js';
 import { runPrerender_forceExit, runPrerenderFromAutoRun } from '../../../prerender/runPrerenderEntry.js';
+import { getManifestFilePathRelative } from '../../shared/getManifestFilePathRelative.js';
 assertIsSingleModuleInstance('build/pluginAutoFullBuild.ts');
 let forceExit = false;
 function pluginAutoFullBuild() {
@@ -82,7 +82,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[manifestTempFile])
+    if (!bundle[getManifestFilePathRelative(config.build.manifest)])
         return;
     const configInline = getFullBuildInlineConfig(config);
     if (!isBuilderApp) {