npm - vike - Versions diffs - 0.4.239 → 0.4.240-commit-a80417c - Mend

vike 0.4.239 → 0.4.240-commit-a80417c

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 (479) hide show

package/dist/esm/node/prerender/runPrerender.d.ts CHANGED Viewed

@@ -74,7 +74,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     url?: string;
     headers?: Record<string, string>;
 } & {
-    _globalContext: {
+    _globalContext: ({
         _globalConfigPublic: {
             pages: {
                 [k: string]: {
@@ -162,7 +162,9 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
                 inject: boolean | undefined;
             };
         };
-    });
+    })) & {
+        prerenderContext: PrerenderContextPublic | undefined;
+    };
     _pageFilesAll: PageFile[];
     _baseServer: string;
     _baseAssets: string;

package/dist/esm/node/prerender/runPrerender.js CHANGED Viewed

@@ -9,7 +9,7 @@ import { prerenderPage } from '../runtime/renderPage/renderPageAfterRoute.js';
 import { createPageContextServerSide } from '../runtime/renderPage/createPageContextServerSide.js';
 import pc from '@brillout/picocolors';
 import { cpus } from 'node:os';
-import { getGlobalContextServerInternal, initGlobalContext_runPrerender, setGlobalContext_isPrerendering, } from '../runtime/globalContext.js';
+import { getGlobalContextServerInternal, initGlobalContext_runPrerender, setGlobalContext_isPrerendering, setGlobalContext_prerenderContext, } from '../runtime/globalContext.js';
 import { resolveConfig as resolveViteConfig } from 'vite';
 import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
@@ -108,6 +108,7 @@ async function runPrerender(options = {}, trigger) {
     await warnMissingPages(prerenderContext._prerenderedPageContexts, globalContext, doNotPrerenderList, partial);
     const prerenderContextPublic = preparePrerenderContextForPublicUsage(prerenderContext);
     objectAssign(vikeConfig.prerenderContext, prerenderContextPublic, true);
+    setGlobalContext_prerenderContext(prerenderContextPublic);
     if (prerenderConfigGlobal.isPrerenderingEnabledForAllPages && !prerenderConfigGlobal.keepDistServer) {
         fs.rmSync(outDirServer, { recursive: true });
     }
@@ -714,12 +715,14 @@ async function prerenderRedirects(globalContext, onComplete, showWarningUponDyna
 }
 function getRedirectHtml(urlTarget) {
     const urlTargetSafe = escapeHtml(urlTarget);
-    // To test it: /test/playground => http://localhost:3000/download
+    // - Test: /test/playground => http://localhost:3000/download
+    // - Adding `<link rel="canonical">` for SEO, see https://github.com/vikejs/vike/pull/2711
     const htmlString = `<!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="UTF-8">
   <meta http-equiv="refresh" content="0;url=${urlTargetSafe}">
+  <link rel="canonical" href="${urlTargetSafe}" />
   <title>Redirect ${urlTargetSafe}</title>
   <style>body{opacity:0}</style>
   <noscript>

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

@@ -10,11 +10,13 @@ export { initGlobalContext_getPagesAndRoutes };
 export { setGlobalContext_viteDevServer };
 export { setGlobalContext_viteConfig };
 export { setGlobalContext_isPrerendering };
+export { setGlobalContext_prerenderContext };
 export { setGlobalContext_isProductionAccordingToVite };
 export { setGlobalContext_prodBuildEntry };
 export { clearGlobalContext };
 export { assertBuildInfo };
 export { updateUserFiles };
+export { isRunnable };
 export { vikeConfigErrorRecoverMsg };
 export type { BuildInfo };
 export type { GlobalContextServerInternal as GlobalContextServerInternal };
@@ -25,6 +27,7 @@ import { type PageRoutes } from '../../shared/route/loadPageRoutes.js';
 import type { ViteConfigRuntime } from '../vite/shared/getViteConfigRuntime.js';
 import type { GlobalContext } from '../../types/PageContext.js';
 import type { Hook } from '../../shared/hooks/getHook.js';
+import type { PrerenderContext } from '../../types/index.js';
 declare const vikeConfigErrorRecoverMsg: "Vike config loaded";
 type GlobalContextServer = Pick<GlobalContextServerInternal, 'assetsManifest' | 'config' | 'viteConfig' | 'viteConfigRuntime' | 'pages' | 'baseServer' | 'baseAssets' | 'isClientSide'> & Vike.GlobalContext & Vike.GlobalContextServer;
 type GlobalContextServerInternal = Awaited<ReturnType<typeof createGlobalContext>>;
@@ -97,6 +100,8 @@ declare function getGlobalContextServerInternal(): Promise<{
                 inject: boolean | undefined;
             };
         };
+    } & {
+        prerenderContext: PrerenderContext | undefined;
     }) | (Record<string, unknown> & {
         _globalConfigPublic: {
             pages: {
@@ -166,6 +171,8 @@ declare function getGlobalContextServerInternal(): Promise<{
                 inject: boolean | undefined;
             };
         };
+    } & {
+        prerenderContext: PrerenderContext | undefined;
     }) | (Record<string, unknown> & {
         _globalConfigPublic: {
             pages: {
@@ -235,6 +242,8 @@ declare function getGlobalContextServerInternal(): Promise<{
                 inject: boolean | undefined;
             };
         };
+    } & {
+        prerenderContext: PrerenderContext | undefined;
     });
 }>;
 /**
@@ -258,6 +267,7 @@ declare function getGlobalContextSync(): GlobalContext;
 declare function setGlobalContext_viteDevServer(viteDevServer: ViteDevServer): Promise<void>;
 declare function setGlobalContext_viteConfig(viteConfig: ResolvedConfig, viteConfigRuntime: ViteConfigRuntime): void;
 declare function setGlobalContext_isPrerendering(): void;
+declare function setGlobalContext_prerenderContext(prerenderContextPublic: PrerenderContext): void;
 declare function setGlobalContext_isProductionAccordingToVite(isProductionAccordingToVite: boolean): void;
 declare function getViteDevServer(): ViteDevServer | null;
 declare function getViteConfig(): ResolvedConfig | null;
@@ -274,7 +284,7 @@ declare function assertBuildInfo(buildInfo: unknown): asserts buildInfo is Build
 declare function updateUserFiles(): Promise<{
     success: boolean;
 }>;
-declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Promise<{
+declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Promise<({
     _globalConfigPublic: {
         pages: {
             [k: string]: {
@@ -362,5 +372,8 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
             inject: boolean | undefined;
         };
     };
-})>;
+})) & {
+    prerenderContext: PrerenderContext | undefined;
+}>;
 declare function clearGlobalContext(): void;
+declare function isRunnable(viteDevServer: ViteDevServer): boolean;

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

@@ -12,11 +12,13 @@ export { initGlobalContext_getPagesAndRoutes };
 export { setGlobalContext_viteDevServer };
 export { setGlobalContext_viteConfig };
 export { setGlobalContext_isPrerendering };
+export { setGlobalContext_prerenderContext };
 export { setGlobalContext_isProductionAccordingToVite };
 export { setGlobalContext_prodBuildEntry }; // production entry
 export { clearGlobalContext };
 export { assertBuildInfo };
 export { updateUserFiles };
+export { isRunnable };
 export { vikeConfigErrorRecoverMsg };
 // The core logic revolves around:
 // - virtualFileExportsGlobalEntry is the main requirement
@@ -26,7 +28,7 @@ export { vikeConfigErrorRecoverMsg };
 //   - Without vike-server it's manually loaded here using importServerProductionEntry() which uses @brillout/vite-plugin-server-entry's autoImporter or crawler
 // - In development: globalObject.viteDevServer which is Vite's development server
 //   - globalObject.viteDevServer is used by updateUserFiles() which then sets virtualFileExportsGlobalEntry
-import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, getGlobalObject, genPromise, createDebugger, checkType, PROJECT_VERSION, getViteRPC, isRunnableDevEnvironment, assertIsNotBrowser, isNonRunnableDev, } from './utils.js';
+import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, getGlobalObject, genPromise, createDebugger, checkType, PROJECT_VERSION, getViteRPC, isRunnableDevEnvironment, assertIsNotBrowser, isNonRunnableDev, objectAssign, } from './utils.js';
 import { importServerProductionEntry } from '@brillout/vite-plugin-server-entry/runtime';
 import { virtualFileIdGlobalEntryServer } from '../shared/virtualFileId.js';
 import pc from '@brillout/picocolors';
@@ -149,6 +151,13 @@ function assertIsNotInitializedYet() {
 function setGlobalContext_isPrerendering() {
     globalObject.isPrerendering = true;
 }
+function setGlobalContext_prerenderContext(prerenderContextPublic) {
+    globalObject.prerenderContextPublic = prerenderContextPublic;
+    // Ugly redundancy, which we can remove after globalContext is a proxy
+    const { globalContext } = globalObjectTyped;
+    if (globalContext)
+        globalContext.prerenderContext = prerenderContextPublic;
+}
 function setGlobalContext_isProductionAccordingToVite(isProductionAccordingToVite) {
     globalObject.isProductionAccordingToVite = isProductionAccordingToVite;
 }
@@ -252,6 +261,7 @@ async function loadProdBuildEntry(outDir) {
 // https://github.com/vikejs/vike/blob/8c350e8105a626469e87594d983090919e82099b/packages/vike/node/vite/plugins/pluginBuild/pluginProdBuildEntry.ts#L47
 async function setGlobalContext_prodBuildEntry(prodBuildEntry) {
     debug('setGlobalContext_prodBuildEntry()');
+    assert(!isNonRunnableDev());
     assertProdBuildEntry(prodBuildEntry);
     globalObject.prodBuildEntry = prodBuildEntry;
     globalObject.prodBuildEntryPrevious = prodBuildEntry;
@@ -350,13 +360,14 @@ async function updateUserFiles() {
     }
     else {
         try {
-            /* We use __VIKE__DYNAMIC_IMPORT instead of directly using import() to workaround what seems to be a Vite HMR bug:
-               ```js
-               assert(false)
-               // This line breaks the HMR of regular (runnable) apps, even though (as per the assert() above) it's never run. It seems to be a Vite bug: handleHotUpdate() receives an empty `modules` list.
-               import('virtual:vike:global-entry:server')
-               ```
-            */
+            // We don't directly use import() because:
+            // - Avoid Cloudflare Workers (without @cloudflare/vite-plugin) to try to bundle `import('virtual:id')`.
+            // - Using import() seems to lead to a Vite HMR bug:
+            //   ```js
+            //   assert(false)
+            //   // This line breaks the HMR of regular (runnable) apps, even though (as per the assert() above) it's never run. It seems to be a Vite bug: handleHotUpdate() receives an empty `modules` list.
+            //   import('virtual:vike:global-entry:server')
+            //   ```
             virtualFileExportsGlobalEntry = await __VIKE__DYNAMIC_IMPORT('virtual:vike:global-entry:server');
         }
         catch (err_) {
@@ -400,6 +411,7 @@ async function createGlobalContext(virtualFileExportsGlobalEntry) {
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
     assertGlobalContextIsDefined();
     onSetupRuntime();
+    objectAssign(globalContext, { prerenderContext: globalObject.prerenderContextPublic });
     // Never actually used, only used for TypeScript `ReturnType<typeof createGlobalContext>`
     return globalContext;
 }
@@ -533,35 +545,37 @@ function isProd() {
 }
 function isProdOptional() {
     const vikeApiOperation = getVikeApiOperation()?.operation ?? null;
-    const yes =
     // setGlobalContext_prodBuildEntry() was called
-    !!globalObject.prodBuildEntry ||
-        globalObject.isPrerendering === true ||
-        // Vike CLI & Vike API
-        (!!vikeApiOperation && vikeApiOperation !== 'dev') ||
-        // Vite command
-        globalObject.isProductionAccordingToVite === true ||
-        // getGlobalContextAsync(isProduction)
-        globalObject.isProductionAccordingToUser === true ||
-        // vite-plugin-vercel
-        globalObject.isProductionAccordingToPhotonVercel === true;
-    assert(typeof yes === 'boolean');
-    const no = !!globalObject.viteDevServer ||
-        // Vike CLI & Vike API
-        vikeApiOperation === 'dev' ||
-        // Vite command
-        globalObject.isProductionAccordingToVite === false ||
-        // getGlobalContextAsync(isProduction)
-        globalObject.isProductionAccordingToUser === false ||
-        // @cloudflare/vite-plugin
-        isNonRunnableDev() === true;
-    assert(typeof no === 'boolean');
+    const yes1 = !!globalObject.prodBuildEntry;
+    const yes2 = globalObject.isPrerendering === true;
+    // Vike CLI & Vike API
+    const yes3 = !!vikeApiOperation && vikeApiOperation !== 'dev';
+    // Vite command
+    const yes4 = globalObject.isProductionAccordingToVite === true;
+    // getGlobalContextAsync(isProduction)
+    const yes5 = globalObject.isProductionAccordingToUser === true;
+    // vite-plugin-vercel
+    const yes6 = globalObject.isProductionAccordingToPhotonVercel === true;
+    const yes = yes1 || yes2 || yes3 || yes4 || yes5 || yes6;
+    const no1 = !!globalObject.viteDevServer;
+    // Vike CLI & Vike API
+    const no2 = vikeApiOperation === 'dev';
+    // Vite command
+    const no3 = globalObject.isProductionAccordingToVite === false;
+    // getGlobalContextAsync(isProduction)
+    const no4 = globalObject.isProductionAccordingToUser === false;
+    // @cloudflare/vite-plugin
+    const no5 = isNonRunnableDev();
+    const no = no1 || no2 || no3 || no4 || no5;
+    const debug = { yes1, yes2, yes3, yes4, yes5, yes6, no1, no2, no3, no4, no5 };
+    assert(typeof yes === 'boolean', debug);
+    assert(typeof no === 'boolean', debug);
     if (yes) {
-        assert(no === false);
+        assert(no === false, debug);
         return true;
     }
     if (no) {
-        assert(yes === false);
+        assert(yes === false, debug);
         return false;
     }
     return null;

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

@@ -23,7 +23,7 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
     url?: string;
     headers?: Record<string, string>;
 } & {
-    _globalContext: {
+    _globalContext: ({
         _globalConfigPublic: {
             pages: {
                 [k: string]: {
@@ -111,7 +111,9 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
                 inject: boolean | undefined;
             };
         };
-    });
+    })) & {
+        prerenderContext: import("../../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+    };
     _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;

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

@@ -24,7 +24,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     url?: string;
     headers?: Record<string, string>;
 } & {
-    _globalContext: {
+    _globalContext: ({
         _globalConfigPublic: {
             pages: {
                 [k: string]: {
@@ -112,7 +112,9 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
                 inject: boolean | undefined;
             };
         };
-    });
+    })) & {
+        prerenderContext: import("../../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+    };
     _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;

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

@@ -39,7 +39,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         url?: string;
         headers?: Record<string, string>;
     } & {
-        _globalContext: {
+        _globalContext: ({
             _globalConfigPublic: {
                 pages: {
                     [k: string]: {
@@ -127,7 +127,9 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
                     inject: boolean | undefined;
                 };
             };
-        });
+        })) & {
+            prerenderContext: import("../../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+        };
         _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
@@ -201,7 +203,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         url?: string;
         headers?: Record<string, string>;
     } & {
-        _globalContext: {
+        _globalContext: ({
             _globalConfigPublic: {
                 pages: {
                     [k: string]: {
@@ -289,7 +291,9 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
                     inject: boolean | undefined;
                 };
             };
-        });
+        })) & {
+            prerenderContext: import("../../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+        };
         _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;

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

@@ -31,7 +31,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
     /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
 } & {
-    _globalContext: {
+    _globalContext: ({
         _globalConfigPublic: {
             pages: {
                 [k: string]: {
@@ -119,7 +119,9 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
                 inject: boolean | undefined;
             };
         };
-    });
+    })) & {
+        prerenderContext: import("../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+    };
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;

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

@@ -4,8 +4,10 @@ export { plugin };
 export { plugin as ssr };
 export { getVikeConfig } from './shared/resolveVikeConfigInternal.js';
 export { PROJECT_VERSION as version } from './utils.js';
-import { assertUsage } from './utils.js';
-import { pluginBuild } from './plugins/pluginBuild.js';
+import { getClientEntrySrcDev } from './shared/getClientEntrySrcDev.js';
+import { setGetClientEntrySrcDev } from '../runtime/renderPage/getPageAssets/retrievePageAssetsDev.js';
+import { assertIsNotProductionRuntime, assertUsage } from './utils.js';
+import pc from '@brillout/picocolors';
 import { pluginPreview } from './plugins/pluginPreview.js';
 import { pluginDev } from './plugins/pluginDev.js';
 import { pluginVirtualFiles } from './plugins/pluginVirtualFiles.js';
@@ -14,39 +16,61 @@ import { pluginExtractExportNames } from './plugins/pluginExtractExportNames.js'
 import { pluginSetGlobalContext } from './plugins/pluginSetGlobalContext.js';
 import { pluginCommon } from './plugins/pluginCommon.js';
 import { pluginBaseUrls } from './plugins/pluginBaseUrls.js';
-import { pluginEnvVars } from './plugins/pluginEnvVars.js';
-import pc from '@brillout/picocolors';
+import { pluginReplaceConstantsEnvVars } from './plugins/pluginReplaceConstantsEnvVars.js';
 import { pluginFileEnv } from './plugins/pluginFileEnv.js';
-import { getClientEntrySrcDev } from './shared/getClientEntrySrcDev.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';
-import { setGetClientEntrySrcDev } from '../runtime/renderPage/getPageAssets/retrievePageAssetsDev.js';
+import { pluginReplaceConstantsPageContext } from './plugins/pluginReplaceConstantsPageContext.js';
+import { pluginReplaceConstantsGlobalThis } from './plugins/pluginReplaceConstantsGlobalThis.js';
+import { pluginViteRPC } from './plugins/non-runnable-dev/pluginViteRPC.js';
+import { pluginBuildApp } from './plugins/build/pluginBuildApp.js';
+import { pluginDistPackageJsonFile } from './plugins/build/pluginDistPackageJsonFile.js';
+import { pluginSuppressRollupWarning } from './plugins/build/pluginSuppressRollupWarning.js';
+import { pluginDistFileNames } from './plugins/build/pluginDistFileNames.js';
+import { pluginProdBuildEntry } from './plugins/build/pluginProdBuildEntry.js';
+import { pluginBuildConfig } from './plugins/build/pluginBuildConfig.js';
+import { pluginModuleBanner } from './plugins/build/pluginModuleBanner.js';
+import { pluginReplaceConstantsNonRunnableDev } from './plugins/non-runnable-dev/pluginReplaceConstantsNonRunnableDev.js';
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 setGetClientEntrySrcDev(getClientEntrySrcDev);
+assertIsNotProductionRuntime();
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
 function plugin(vikeVitePluginOptions = {}) {
     const plugins = [
         ...pluginCommon(vikeVitePluginOptions),
-        pluginVirtualFiles(),
+        ...pluginVirtualFiles(),
         ...pluginDev(),
         ...pluginBuild(),
-        pluginPreview(),
+        ...pluginPreview(),
         ...pluginExtractAssets(),
-        pluginExtractExportNames(),
+        ...pluginExtractExportNames(),
         ...pluginSetGlobalContext(),
-        pluginBaseUrls(),
-        pluginEnvVars(),
-        pluginFileEnv(),
-        pluginWorkaroundCssModuleHmr(),
-        pluginWorkaroundVite6HmrRegression(),
-        pluginReplaceConstants(),
-        pluginNonRunnableDev(),
+        ...pluginBaseUrls(),
+        ...pluginReplaceConstantsEnvVars(),
+        ...pluginFileEnv(),
+        ...pluginWorkaroundCssModuleHmr(),
+        ...pluginWorkaroundVite6HmrRegression(),
+        ...pluginReplaceConstantsPageContext(),
+        ...pluginReplaceConstantsGlobalThis(),
+        ...pluginNonRunnabeDev(),
     ];
     Object.assign(plugins, { _vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;
 }
+function pluginBuild() {
+    return [
+        ...pluginBuildConfig(),
+        ...pluginBuildApp(),
+        ...pluginProdBuildEntry(),
+        ...pluginDistPackageJsonFile(),
+        ...pluginSuppressRollupWarning(),
+        ...pluginDistFileNames(),
+        ...pluginModuleBanner(),
+    ];
+}
+function pluginNonRunnabeDev() {
+    return [...pluginViteRPC(), ...pluginReplaceConstantsNonRunnableDev()];
+}
 // Error upon wrong usage
 Object.defineProperty(plugin, 'apply', {
     enumerable: true,

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

@@ -13,7 +13,7 @@ function onLoad() {
     // TO-DO/eventually: let's also use this.meta.viteVersion
     // - https://github.com/vitejs/vite/pull/20088
     // - https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md#700-2025-06-24
-    assertVersion('Vite', version, ['6.0.0']);
+    assertVersion('Vite', version, ['6.3.0']);
     // Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
     assertIsNotProductionRuntime();
 }

package/dist/esm/node/vite/plugins/{pluginBuild → build}/handleAssetsManifest.d.ts RENAMED Viewed

@@ -3,10 +3,14 @@ export { handleAssetsManifest_getBuildConfig };
 export { handleAssetsManifest_isFixEnabled };
 export { handleAssetsManifest_assertUsageCssCodeSplit };
 export { handleAssetsManifest_assertUsageCssTarget };
+export { handleAssetsManifest_workaroundCssTarget_part1 };
+export { handleAssetsManifest_workaroundCssTarget_part2 };
 import type { Environment, ResolvedConfig, Rollup } from 'vite';
 type Bundle = Rollup.OutputBundle;
 declare function handleAssetsManifest_isFixEnabled(): boolean;
 declare function handleAssetsManifest_assertUsageCssCodeSplit(config: ResolvedConfig): void;
+declare function handleAssetsManifest_workaroundCssTarget_part1(config: ResolvedConfig): void;
+declare function handleAssetsManifest_workaroundCssTarget_part2(): void;
 declare function handleAssetsManifest_assertUsageCssTarget(config: ResolvedConfig, env: Environment): void;
 declare function handleAssetsManifest_getBuildConfig(): Promise<{
     readonly ssrEmitAssets: true | undefined;

package/dist/esm/node/vite/plugins/{pluginBuild → build}/handleAssetsManifest.js RENAMED Viewed

@@ -3,6 +3,8 @@ export { handleAssetsManifest_getBuildConfig };
 export { handleAssetsManifest_isFixEnabled };
 export { handleAssetsManifest_assertUsageCssCodeSplit };
 export { handleAssetsManifest_assertUsageCssTarget };
+export { handleAssetsManifest_workaroundCssTarget_part1 };
+export { handleAssetsManifest_workaroundCssTarget_part2 };
 import fs from 'node:fs/promises';
 import fs_sync from 'node:fs';
 import path from 'node:path';
@@ -13,11 +15,14 @@ import { getAssetsDir } from '../../shared/getAssetsDir.js';
 import pc from '@brillout/picocolors';
 import { isV1Design } from '../../shared/resolveVikeConfigInternal.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
-import { isViteServerSide_onlySsrEnv, isViteServerSide } from '../../shared/isViteServerSide.js';
+import { isViteServerSide_onlySsrEnv, isViteServerSide, isViteServerSide_viteEnvOptional, } from '../../shared/isViteServerSide.js';
 import { set_macro_ASSETS_MANIFEST } from './pluginProdBuildEntry.js';
 import { getManifestFilePathRelative } from '../../shared/getManifestFilePathRelative.js';
-const globalObject = getGlobalObject('build/handleAssetsManifest.ts', {
+const globalObject = getGlobalObject('handleAssetsManifest.ts', {
     assetsJsonFilePath: undefined,
+    cssTarget: '__VIKE__UNSET',
+    targetsAll: [],
+    configsAll: [],
 });
 // yes  => use workaround config.build.ssrEmitAssets
 // false => use workaround extractAssets plugin
@@ -216,16 +221,26 @@ function handleAssetsManifest_assertUsageCssCodeSplit(config) {
         return;
     assertWarning(config.build.cssCodeSplit, `${pc.cyan('build.cssCodeSplit')} shouldn't be set to ${pc.cyan('false')} (https://github.com/vikejs/vike/issues/1993)`, { onlyOnce: true });
 }
-const targets = [];
+function handleAssetsManifest_workaroundCssTarget_part1(config) {
+    globalObject.configsAll.push(config);
+    if (!isViteServerSide_viteEnvOptional(config, undefined)) {
+        globalObject.cssTarget = config.build.cssTarget;
+    }
+}
+function handleAssetsManifest_workaroundCssTarget_part2() {
+    assert(globalObject.cssTarget !== '__VIKE__UNSET');
+    globalObject.configsAll.forEach((c) => (c.build.cssTarget = globalObject.cssTarget));
+}
 function handleAssetsManifest_assertUsageCssTarget(config, env) {
     if (!handleAssetsManifest_isFixEnabled())
         return;
     const isServerSide = isViteServerSide(config, env);
     assert(typeof isServerSide === 'boolean');
     assert(config.build.target !== undefined);
-    targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
-    const targetsServer = targets.filter((t) => t.isServerSide);
-    const targetsClient = targets.filter((t) => !t.isServerSide);
+    const { targetsAll } = globalObject;
+    targetsAll.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
+    const targetsServer = targetsAll.filter((t) => t.isServerSide);
+    const targetsClient = targetsAll.filter((t) => !t.isServerSide);
     targetsClient.forEach((targetClient) => {
         const targetCssResolvedClient = resolveCssTarget(targetClient);
         targetsServer.forEach((targetServer) => {

package/dist/esm/node/vite/plugins/{pluginBuild → build}/pluginBuildApp.js RENAMED Viewed

@@ -46,35 +46,39 @@ function pluginBuildApp() {
         {
             name: 'vike:build:pluginBuildApp',
             apply: 'build',
-            config(config) {
-                return {
-                    environments: {
-                        ssr: {
-                            consumer: 'server',
-                            build: {
-                                outDir: resolveOutDir(config, true),
-                                ssr: true,
+            config: {
+                handler(config) {
+                    return {
+                        environments: {
+                            ssr: {
+                                consumer: 'server',
+                                build: {
+                                    outDir: resolveOutDir(config, true),
+                                    ssr: true,
+                                },
                             },
-                        },
-                        client: {
-                            consumer: 'client',
-                            build: {
-                                outDir: resolveOutDir(config, false),
-                                copyPublicDir: true,
-                                ssr: false,
+                            client: {
+                                consumer: 'client',
+                                build: {
+                                    outDir: resolveOutDir(config, false),
+                                    copyPublicDir: true,
+                                    ssr: false,
+                                },
                             },
                         },
-                    },
-                };
+                    };
+                },
             },
         },
         {
             name: 'vike:build:pluginBuildApp:autoFullBuild:pre',
             apply: 'build',
             enforce: 'pre',
-            async configResolved(config_) {
-                config = config_;
-                await abortViteBuildSsr();
+            configResolved: {
+                async handler(config_) {
+                    config = config_;
+                    await abortViteBuildSsr();
+                },
             },
             // TO-DO/eventually: stop using this writeBundle() hack and, instead, use the buildApp() implementation above.
             // - Could it cause issues if a tool uses the writeBundle() hack together with getVikeConfig() ?