vike 0.4.239-commit-33e55d4 → 0.4.239-commit-59f1017

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

@@ -8,6 +8,8 @@ exports.handleAssetsManifest_getBuildConfig = handleAssetsManifest_getBuildConfi
 exports.handleAssetsManifest_isFixEnabled = handleAssetsManifest_isFixEnabled;
 exports.handleAssetsManifest_assertUsageCssCodeSplit = handleAssetsManifest_assertUsageCssCodeSplit;
 exports.handleAssetsManifest_assertUsageCssTarget = handleAssetsManifest_assertUsageCssTarget;
+exports.handleAssetsManifest_workaroundCssTarget_part1 = handleAssetsManifest_workaroundCssTarget_part1;
+exports.handleAssetsManifest_workaroundCssTarget_part2 = handleAssetsManifest_workaroundCssTarget_part2;
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -21,8 +23,11 @@ const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
 const pluginProdBuildEntry_js_1 = require("./pluginProdBuildEntry.js");
 const getManifestFilePathRelative_js_1 = require("../../shared/getManifestFilePathRelative.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('build/handleAssetsManifest.ts', {
+const globalObject = (0, utils_js_1.getGlobalObject)('handleAssetsManifest.ts', {
     assetsJsonFilePath: undefined,
+    cssTarget: '__VIKE__UNSET',
+    targetsAll: [],
+    configsAll: [],
 });
 // yes  => use workaround config.build.ssrEmitAssets
 // false => use workaround extractAssets plugin
@@ -221,16 +226,26 @@ function handleAssetsManifest_assertUsageCssCodeSplit(config) {
         return;
     (0, utils_js_1.assertWarning)(config.build.cssCodeSplit, `${picocolors_1.default.cyan('build.cssCodeSplit')} shouldn't be set to ${picocolors_1.default.cyan('false')} (https://github.com/vikejs/vike/issues/1993)`, { onlyOnce: true });
 }
-const targets = [];
+function handleAssetsManifest_workaroundCssTarget_part1(config) {
+    globalObject.configsAll.push(config);
+    if (!(0, isViteServerSide_js_1.isViteServerSide_viteEnvOptional)(config, undefined)) {
+        globalObject.cssTarget = config.build.cssTarget;
+    }
+}
+function handleAssetsManifest_workaroundCssTarget_part2() {
+    (0, utils_js_1.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 = (0, isViteServerSide_js_1.isViteServerSide)(config, env);
     (0, utils_js_1.assert)(typeof isServerSide === 'boolean');
     (0, utils_js_1.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/cjs/node/vite/plugins/pluginBuild/pluginBuildConfig.js

@@ -18,14 +18,26 @@ function pluginBuildConfig() {
     let config;
     return [
         {
-            name: 'vike:build:pluginBuildConfig',
+            name: 'vike:build:pluginBuildConfig:post1',
             apply: 'build',
             enforce: 'post',
             configResolved: {
                 order: 'post',
-                async handler(config_) {
-                    (0, utils_js_1.onSetupBuild)();
+                handler(config_) {
                     config = config_;
+                    (0, handleAssetsManifest_js_1.handleAssetsManifest_workaroundCssTarget_part1)(config);
+                },
+            },
+        },
+        {
+            name: 'vike:build:pluginBuildConfig:post2',
+            apply: 'build',
+            enforce: 'post',
+            configResolved: {
+                order: 'post',
+                async handler() {
+                    (0, handleAssetsManifest_js_1.handleAssetsManifest_workaroundCssTarget_part2)();
+                    (0, utils_js_1.onSetupBuild)();
                     assertRollupInput(config);
                     const entries = await getEntries(config);
                     (0, utils_js_1.assert)(Object.keys(entries).length > 0);

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

@@ -8,6 +8,7 @@ const pluginDistFileNames_js_1 = require("./pluginBuild/pluginDistFileNames.js")
 const pluginProdBuildEntry_js_1 = require("./pluginBuild/pluginProdBuildEntry.js");
 const pluginBuildConfig_js_1 = require("./pluginBuild/pluginBuildConfig.js");
 const pluginModuleBanner_js_1 = require("./pluginBuild/pluginModuleBanner.js");
+// TODO/now refactor
 function pluginBuild() {
     return [
         ...(0, pluginBuildConfig_js_1.pluginBuildConfig)(),

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.239-commit-33e55d4';
+exports.PROJECT_VERSION = '0.4.239-commit-59f1017';

package/dist/esm/client/runtime-client-routing/renderPageClientSide.d.ts

@@ -7,7 +7,7 @@ export type { PageContextBegin };
 import { type PageContextFromRewrite } from '../../shared/route/abort.js';
 import { type ScrollTarget } from './setScrollPosition.js';
 import type { PageContextConfig } from '../../shared/getPageFiles.js';
-import type { PageContextClient } from '../../types/PageContext.js';
+import type { PageContextClient, PageContextInternalClient } from '../../types/PageContext.js';
 import type { VikeGlobalInternal } from '../../types/VikeGlobalInternal.js';
 declare const firstRenderStartPromise: Promise<void>;
 type PageContextRouted = {
@@ -107,7 +107,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
     isHydration: boolean;
     previousPageContext: ({
         pageId: string;
-    } & PageContextConfig & PageContextRouted & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
+    } & PageContextConfig & PageContextRouted & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & PageContextInternalClient & Omit<Partial<PageContextConfig & {
         isPageContext: true;
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;

package/dist/esm/client/runtime-client-routing/renderPageClientSide.js

@@ -16,7 +16,7 @@ import { route } from '../../shared/route/index.js';
 import { isClientSideRoutable } from './isClientSideRoutable.js';
 import { setScrollPosition } from './setScrollPosition.js';
 import { scrollRestoration_initialRenderIsDone } from './scrollRestoration.js';
-import { getErrorPageId } from '../../shared/error-page.js';
+import { getErrorPageId, isErrorPage } from '../../shared/error-page.js';
 import { setPageContextCurrent } from './getPageContextCurrent.js';
 import { getRouteStringParameterList } from '../../shared/route/resolveRouteString.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
@@ -644,3 +644,16 @@ function handleErrorFetchingStaticAssets(err, pageContext, isFirstRender) {
     redirectHard(pageContext.urlOriginal);
     return true;
 }
+// [HMR] If error page is shown => re-render whole page
+if (import.meta.env.DEV && import.meta.hot)
+    import.meta.hot.on('vite:beforeUpdate', () => {
+        const pageContext = globalObject.renderedPageContext;
+        if (pageContext?.pageId && isErrorPage(pageContext.pageId, pageContext._globalContext._pageConfigs)) {
+            renderPageClientSide({
+                scrollTarget: { preserveScroll: false },
+                urlOriginal: getCurrentUrl(),
+                overwriteLastHistoryEntry: true,
+                isBackwardNavigation: false,
+            });
+        }
+    });

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

@@ -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/handleAssetsManifest.js

@@ -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/pluginBuildConfig.js

@@ -10,20 +10,32 @@ import { prependEntriesDir } from '../../../shared/prependEntriesDir.js';
 import { getFilePathResolved } from '../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../shared/page-configs/getConfigValueBuildTime.js';
 import { isViteServerSide_viteEnvOptional } from '../../shared/isViteServerSide.js';
-import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_getBuildConfig, } from './handleAssetsManifest.js';
+import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_getBuildConfig, handleAssetsManifest_workaroundCssTarget_part1, handleAssetsManifest_workaroundCssTarget_part2, } from './handleAssetsManifest.js';
 import { resolveIncludeAssetsImportedByServer } from '../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js';
 function pluginBuildConfig() {
     let config;
     return [
         {
-            name: 'vike:build:pluginBuildConfig',
+            name: 'vike:build:pluginBuildConfig:post1',
             apply: 'build',
             enforce: 'post',
             configResolved: {
                 order: 'post',
-                async handler(config_) {
-                    onSetupBuild();
+                handler(config_) {
                     config = config_;
+                    handleAssetsManifest_workaroundCssTarget_part1(config);
+                },
+            },
+        },
+        {
+            name: 'vike:build:pluginBuildConfig:post2',
+            apply: 'build',
+            enforce: 'post',
+            configResolved: {
+                order: 'post',
+                async handler() {
+                    handleAssetsManifest_workaroundCssTarget_part2();
+                    onSetupBuild();
                     assertRollupInput(config);
                     const entries = await getEntries(config);
                     assert(Object.keys(entries).length > 0);

package/dist/esm/node/vite/plugins/pluginBuild.js

@@ -6,6 +6,7 @@ import { pluginDistFileNames } from './pluginBuild/pluginDistFileNames.js';
 import { pluginProdBuildEntry } from './pluginBuild/pluginProdBuildEntry.js';
 import { pluginBuildConfig } from './pluginBuild/pluginBuildConfig.js';
 import { pluginModuleBanner } from './pluginBuild/pluginModuleBanner.js';
+// TODO/now refactor
 function pluginBuild() {
     return [
         ...pluginBuildConfig(),

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

@@ -1,5 +1,5 @@
 export { pluginCommon };
-import { assert, assertUsage, assertWarning, hasProp, isDevCheck, isDocker, isObject, isVitest, } from '../utils.js';
+import { assert, assertUsage, assertWarning, hasProp, isDevCheck, isDocker, isObject, isVitest } from '../utils.js';
 import { assertRollupInput } from './pluginBuild/pluginBuildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.239-commit-33e55d4";
+export declare const PROJECT_VERSION: "0.4.239-commit-59f1017";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.239-commit-33e55d4';
+export const PROJECT_VERSION = '0.4.239-commit-59f1017';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.239-commit-33e55d4",
+  "version": "0.4.239-commit-59f1017",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -263,7 +263,7 @@
     "react-streaming": "^0.4.3",
     "rimraf": "^5.0.5",
     "typescript": "^5.8.3",
-    "vite": "^7.1.3"
+    "vite": "^7.1.5"
   },
   "scripts": {
     "dev": "tsc --watch",