vike 0.4.160-commit-937d8d5 → 0.4.160-commit-d574f51

package/dist/cjs/node/cli/bin.js

@@ -1,9 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const cac_1 = require("cac");
 const path_1 = require("path");
 const runPrerender_js_1 = require("../prerender/runPrerender.js");
 const utils_js_1 = require("./utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const cli = (0, cac_1.cac)(utils_js_1.projectInfo.projectName);
 cli
     .command('prerender', 'Pre-render the HTML of your pages', { allowUnknownOptions: true })
@@ -30,6 +34,7 @@ function assertOptions() {
                 '--outDir',
                 '--configFile'
             ].includes(option), 'Unknown option: ' + option);
+        (0, utils_js_1.assertWarning)(false, `You set ${picocolors_1.default.cyan(option)}, but passing options to ${picocolors_1.default.cyan('$ vike prerender')} is deprecated: use the config file instead. See https://vike.dev/command-prerender.`, { onlyOnce: true });
     });
 }
 // Listen to unknown commands

package/dist/cjs/node/plugin/plugins/buildConfig/fixServerAssets.js

@@ -0,0 +1,148 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixServerAssets_isEnabled = exports.fixServerAssets = void 0;
+const promises_1 = __importDefault(require("fs/promises"));
+const path_1 = __importDefault(require("path"));
+const fs_1 = require("fs");
+const utils_js_1 = require("../../utils.js");
+const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const buildConfig_js_1 = require("../buildConfig.js");
+/**
+ * true  => use workaround config.build.ssrEmitAssets
+ * false => use workaround extractAssets plugin
+ *
+ * Only used by V1 design.
+ */
+function fixServerAssets_isEnabled() {
+    // We currently apply the workaround iff V1 design.
+    // Shall we allow the user to toggle between the two workarounds? E.g. based on https://vike.dev/includeAssetsImportedByServer.
+    return true;
+}
+exports.fixServerAssets_isEnabled = fixServerAssets_isEnabled;
+/** https://github.com/vikejs/vike/issues/1339 */
+async function fixServerAssets(outDirs) {
+    const clientManifest = await loadManifest(outDirs.outDirClient);
+    const serverManifest = await loadManifest(outDirs.outDirServer);
+    const { clientManifestMod, filesToCopy } = addServerAssets(clientManifest, serverManifest);
+    await copyAssets(filesToCopy, outDirs);
+    return clientManifestMod;
+}
+exports.fixServerAssets = fixServerAssets;
+async function loadManifest(outDir) {
+    const manifestFilePath = path_1.default.posix.join(outDir, buildConfig_js_1.manifestTempFile);
+    const manifestFileContent = await promises_1.default.readFile(manifestFilePath, 'utf-8');
+    (0, utils_js_1.assert)(manifestFileContent);
+    const manifest = JSON.parse(manifestFileContent);
+    (0, utils_js_1.assert)(manifest);
+    return manifest;
+}
+async function copyAssets(filesToCopy, { outDirClient, outDirServer }) {
+    const assetsDirServer = path_1.default.posix.join(outDirServer, 'assets');
+    if (!filesToCopy.length)
+        return;
+    (0, utils_js_1.assert)((0, fs_1.existsSync)(assetsDirServer));
+    const concurrencyLimit = (0, utils_js_1.pLimit)(10);
+    await Promise.all(filesToCopy.map((file) => concurrencyLimit(() => promises_1.default.cp(path_1.default.posix.join(outDirServer, file), path_1.default.posix.join(outDirClient, file), {
+        recursive: true
+    }))));
+    await promises_1.default.rm(assetsDirServer, { recursive: true });
+}
+// Add serverManifest resources to clientManifest
+function addServerAssets(clientManifest, serverManifest) {
+    var _a, _b;
+    const entriesClient = new Map();
+    const entriesServer = new Map();
+    for (const [key, entry] of Object.entries(clientManifest)) {
+        const pageId = getPageId(key);
+        if (!pageId)
+            continue;
+        const resources = collectResources(entry, clientManifest);
+        (0, utils_js_1.assert)(!entriesClient.has(pageId));
+        entriesClient.set(pageId, { key, ...resources });
+    }
+    for (const [key, entry] of Object.entries(serverManifest)) {
+        const pageId = getPageId(key);
+        if (!pageId)
+            continue;
+        const resources = collectResources(entry, serverManifest);
+        (0, utils_js_1.assert)(!entriesServer.has(pageId));
+        entriesServer.set(pageId, resources);
+    }
+    let filesToCopy = [];
+    for (const [pageId, entryClient] of entriesClient.entries()) {
+        const cssToAdd = [];
+        const assetsToAdd = [];
+        const entryServer = entriesServer.get(pageId);
+        if (entryServer) {
+            cssToAdd.push(...entryServer.css
+                .filter((cssServer) => !entryClient.css.some((cssClient) => cssServer.hash === cssClient.hash))
+                .map((css) => css.src));
+            assetsToAdd.push(...entryServer.assets
+                .filter((assertServer) => !entryClient.assets.some((assetClient) => assertServer.hash === assetClient.hash))
+                .map((asset) => asset.src));
+        }
+        const { key } = entryClient;
+        if (cssToAdd.length) {
+            filesToCopy.push(...cssToAdd);
+            (_a = clientManifest[key]).css ?? (_a.css = []);
+            clientManifest[key].css?.push(...cssToAdd);
+        }
+        if (assetsToAdd.length) {
+            filesToCopy.push(...assetsToAdd);
+            (_b = clientManifest[key]).assets ?? (_b.assets = []);
+            clientManifest[key].assets?.push(...assetsToAdd);
+        }
+    }
+    const clientManifestMod = clientManifest;
+    filesToCopy = (0, utils_js_1.unique)(filesToCopy);
+    return { clientManifestMod, filesToCopy };
+}
+function getPageId(key) {
+    // Normalize from:
+    //   ../../virtual:vike:pageConfigValuesAll:client:/pages/index
+    // to:
+    //   virtual:vike:pageConfigValuesAll:client:/pages/index
+    // (This seems to be needed only for vitest tests that use Vite's build() API with an inline config.)
+    key = key.substring(key.indexOf('virtual:vike'));
+    const result = (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(key);
+    return result && result.pageId;
+}
+function collectResources(entryRoot, manifest) {
+    const css = [];
+    const assets = [];
+    const entries = new Set([entryRoot]);
+    for (const entry of entries) {
+        for (const entryImport of entry.imports ?? []) {
+            entries.add(manifest[entryImport]);
+        }
+        const entryCss = entry.css ?? [];
+        if (entry.file.endsWith('.css'))
+            entryCss.push(entry.file);
+        for (const src of entryCss) {
+            const hash = getHash(src);
+            css.push({ src, hash });
+        }
+        const entryAssets = entry.assets ?? [];
+        for (const src of entryAssets) {
+            const hash = getHash(src);
+            assets.push({ src, hash });
+        }
+    }
+    return { css, assets };
+}
+// Use the hash of resources to determine whether they are equal. We need this, otherwise we get:
+// ```html
+// <head>
+//   <link rel="stylesheet" type="text/css" href="/assets/static/onRenderClient.2j6TxKIB.css">
+//   <link rel="stylesheet" type="text/css" href="/assets/static/onRenderHtml.2j6TxKIB.css">
+// </head>
+// ```
+function getHash(src) {
+    // src is guarenteed to end with `.[hash][extname]`, see distFileNames.ts
+    const hash = src.split('.').at(-2);
+    (0, utils_js_1.assert)(hash);
+    return hash;
+}

package/dist/cjs/node/plugin/plugins/buildConfig.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.analyzeClientEntries = exports.assertRollupInput = exports.buildConfig = void 0;
+exports.manifestTempFile = exports.analyzeClientEntries = exports.assertRollupInput = exports.buildConfig = void 0;
 const utils_js_1 = require("../utils.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const helpers_js_1 = require("../../../shared/page-configs/helpers.js");
@@ -15,12 +15,17 @@ const module_1 = require("module");
 const getClientEntryFilePath_js_1 = require("../../shared/getClientEntryFilePath.js");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
+const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
+const index_js_1 = require("./importBuild/index.js");
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 const manifestTempFile = '_temp_manifest.json';
+exports.manifestTempFile = manifestTempFile;
 function buildConfig() {
-    let generateManifest;
+    let isServerAssetsFixEnabled;
+    let isSsrBuild;
+    let outDirs;
     return {
         name: 'vike:buildConfig',
         apply: 'build',
@@ -34,16 +39,26 @@ function buildConfig() {
                 (0, utils_js_1.assert)(Object.keys(entries).length > 0);
                 config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
                 addLogHook();
+                outDirs = (0, utils_js_1.getOutDirs)(config);
+                {
+                    isServerAssetsFixEnabled = (await (0, getVikeConfig_js_1.isV1Design)(config, false)) && (0, fixServerAssets_js_1.fixServerAssets_isEnabled)();
+                    if (isServerAssetsFixEnabled) {
+                        // https://github.com/vikejs/vike/issues/1339
+                        config.build.ssrEmitAssets = true;
+                        // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
+                        config.build.cssMinify = 'esbuild';
+                    }
+                }
             }
         },
         config(config) {
             assertNodeEnv();
-            generateManifest = !(0, utils_js_1.viteIsSSR)(config);
+            isSsrBuild = (0, utils_js_1.viteIsSSR)(config);
             return {
                 build: {
                     outDir: (0, utils_js_1.resolveOutDir)(config),
-                    manifest: generateManifest ? manifestTempFile : false,
-                    copyPublicDir: !(0, utils_js_1.viteIsSSR)(config)
+                    manifest: manifestTempFile,
+                    copyPublicDir: !isSsrBuild
                 }
             };
         },
@@ -51,20 +66,23 @@ function buildConfig() {
             assertNodeEnv();
         },
         async writeBundle(options, bundle) {
-            assertNodeEnv();
-            const manifestEntry = bundle[manifestTempFile];
-            /* Fails with @vitejs/plugin-legacy because writeBundle() is called twice during the client build (once for normal client assets and a second time for legacy assets), see reproduction at https://github.com/vikejs/vike/issues/1154
-            assert(generateManifest === !!manifestEntry)
-            */
-            if (manifestEntry) {
-                const { dir } = options;
-                (0, utils_js_1.assert)(dir);
-                const manifestFilePathOld = path_1.default.join(dir, manifestEntry.fileName);
+            if (isSsrBuild) {
                 // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
                 //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
                 //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
-                const manifestFilePathNew = path_1.default.join(dir, '..', 'assets.json');
-                await promises_1.default.rename(manifestFilePathOld, manifestFilePathNew);
+                const assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
+                const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, manifestTempFile);
+                const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, manifestTempFile);
+                if (!isServerAssetsFixEnabled) {
+                    await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
+                }
+                else {
+                    const clientManifestMod = await (0, fixServerAssets_js_1.fixServerAssets)(outDirs);
+                    await promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
+                }
+                await promises_1.default.rm(clientManifestFilePath);
+                await promises_1.default.rm(serverManifestFilePath);
+                await (0, index_js_1.set_constant_ASSETS_MAP)(options, bundle);
             }
         }
     };

package/dist/cjs/node/plugin/plugins/distFileNames.js

@@ -24,9 +24,17 @@ function distFileNames() {
                 if (!('chunkFileNames' in rollupOutput)) {
                     rollupOutput.chunkFileNames = (chunkInfo) => getChunkFileName(chunkInfo, config);
                 }
-                if (!('assertUsage' in rollupOutput)) {
+                if (!('assetFileNames' in rollupOutput)) {
                     rollupOutput.assetFileNames = (chunkInfo) => getAssetFileName(chunkInfo, config);
                 }
+                else {
+                    // If a user needs this:
+                    //  - assertUsage() that the naming provided by the user ends with `.[hash][extname]`
+                    //    - It's needed for getHash() of fixServerAssets()
+                    //    - Asset URLs should always contain a hash: it's paramount for caching assets.
+                    //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
+                    (0, utils_js_1.assertUsage)(false, "Setting config.build.rollupOptions.output.assetFileNames is currently forbidden. (Contact a maintainer if you need this as it's possible to support this.)");
+                }
             });
         }
     };

package/dist/cjs/node/plugin/plugins/extractAssetsPlugin.js

@@ -1,6 +1,6 @@
 "use strict";
-// Alternative: use `ssrEmitAssets: true`
-//  - See https://github.com/vitejs/vite/pull/11430
+// Remove this workaround if the other workaround config.build.ssrEmitAssets turns out to be reliable.
+//  - Remove this file then revert this commit: https://github.com/vikejs/vike/commit/805a18974f13420a78fcc30fdd676696e405c3ca
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -9,10 +9,12 @@ exports.extractAssetsRE = exports.extractAssetsPlugin = void 0;
 const utils_js_1 = require("../utils.js");
 const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
 const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
+const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const removeSourceMap_js_1 = require("../shared/removeSourceMap.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 exports.extractAssetsRE = extractAssetsRE;
 const rawRE = /(\?|&)raw(?:&|$)/;
@@ -24,6 +26,7 @@ const debugEnabled = (0, utils_js_1.isDebugEnabled)(debugNamespace);
 function extractAssetsPlugin() {
     let config;
     let configVike;
+    let isServerAssetsFixEnabled;
     return [
         // This plugin removes all JavaScript from server-side only code, so that only CSS imports remains. (And also satic files imports e.g. `import logoURL from './logo.svg.js'`).
         {
@@ -35,6 +38,7 @@ function extractAssetsPlugin() {
                 if (!extractAssetsRE.test(id)) {
                     return;
                 }
+                (0, utils_js_1.assert)(!isServerAssetsFixEnabled);
                 (0, utils_js_1.assert)(configVike.includeAssetsImportedByServer);
                 (0, utils_js_1.assert)(!(0, utils_js_1.viteIsSSR_options)(options));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
@@ -132,6 +136,7 @@ function extractAssetsPlugin() {
             async configResolved(config_) {
                 configVike = await (0, getConfigVike_js_1.getConfigVike)(config_);
                 config = config_;
+                isServerAssetsFixEnabled = (await (0, getVikeConfig_js_1.isV1Design)(config, false)) && (0, fixServerAssets_js_1.fixServerAssets_isEnabled)();
             },
             load(id) {
                 if (!(0, utils_js_1.isVirtualFileId)(id))

package/dist/cjs/node/plugin/plugins/importBuild/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.importBuild = void 0;
+exports.set_constant_ASSETS_MAP = exports.importBuild = void 0;
 const plugin_js_1 = require("@brillout/vite-plugin-server-entry/plugin.js");
 const utils_js_1 = require("../../utils.js");
 const path_1 = __importDefault(require("path"));
@@ -26,11 +26,6 @@ function importBuild() {
             async configResolved(config_) {
                 config = config_;
                 configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
-            },
-            async writeBundle(options, bundle) {
-                if (!(0, utils_js_1.viteIsSSR)(config))
-                    return;
-                await replace_ASSETS_MAP(options, bundle);
             }
         },
         ...(0, plugin_js_1.serverEntryPlugin)({
@@ -64,7 +59,8 @@ function getEntryCode(config, configVike) {
     ].join('\n');
     return importerCode;
 }
-async function replace_ASSETS_MAP(options, bundle) {
+/** Set the value of the ASSETS_MAP constant inside dist/server/entry.js (or dist/server/index.js) */
+async function set_constant_ASSETS_MAP(options, bundle) {
     const { dir } = options;
     (0, utils_js_1.assert)(dir);
     // This will probably fail with @vitejs/plugin-legacy
@@ -80,6 +76,7 @@ async function replace_ASSETS_MAP(options, bundle) {
     (0, utils_js_1.assert)(serverEntryFileContentPatched !== serverEntryFileContent);
     await promises_1.default.writeFile(serverEntryFilePath, serverEntryFileContentPatched);
 }
+exports.set_constant_ASSETS_MAP = set_constant_ASSETS_MAP;
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct
     const filePathAbsolute = (0, utils_js_1.toPosixPath)(

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVikeConfigFile = exports.vikeConfigDependencies = exports.reloadVikeConfig = exports.getVikeConfig = void 0;
+exports.isV1Design = exports.isVikeConfigFile = exports.vikeConfigDependencies = exports.reloadVikeConfig = exports.getVikeConfig = void 0;
 const utils_js_1 = require("../../../utils.js");
 const path_1 = __importDefault(require("path"));
 const configDefinitionsBuiltIn_js_1 = require("./getVikeConfig/configDefinitionsBuiltIn.js");
@@ -75,6 +75,11 @@ async function getVikeConfig(config, isDev, tolerateInvalidConfig = false, exten
     return await vikeConfigPromise;
 }
 exports.getVikeConfig = getVikeConfig;
+async function isV1Design(config, isDev) {
+    const isV1Design = (await getVikeConfig(config, isDev)).pageConfigs.length > 0;
+    return isV1Design;
+}
+exports.isV1Design = isV1Design;
 async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
     const plusFiles = await findPlusFiles(userRootDir, outDirRoot, isDev, extensions);
     const configFiles = [];

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigValuesAll.js

@@ -12,6 +12,7 @@ const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValue_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValue.js");
 const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
 const getConfigValuesSerialized_js_1 = require("./getConfigValuesSerialized.js");
+const fixServerAssets_js_1 = require("../../buildConfig/fixServerAssets.js");
 async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const result = (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id);
     (0, utils_js_1.assert)(result);
@@ -45,7 +46,7 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
         isClientRouting
     })));
     lines.push('};');
-    if (includeAssetsImportedByServer && isForClientSide && !isDev) {
+    if (!(0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && includeAssetsImportedByServer && isForClientSide && !isDev) {
         importStatements.push(`import '${(0, extractAssetsQuery_js_1.extractAssetsAddQuery)((0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, false))}'`);
     }
     const code = [...importStatements, ...lines].join('\n');

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

@@ -41,3 +41,4 @@ __exportStar(require("../../utils/deepEqual.js"), exports);
 __exportStar(require("../../utils/assertKeys.js"), exports);
 __exportStar(require("../../utils/injectRollupInputs.js"), exports);
 __exportStar(require("../../utils/humanizeTime.js"), exports);
+__exportStar(require("../../utils/pLimit.js"), exports);

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

@@ -19,6 +19,44 @@ function getHttpResponseBody(htmlRender, renderHook) {
 exports.getHttpResponseBody = getHttpResponseBody;
 function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
     return {
+        pipe(writable) {
+            const getErrMsgMixingStreamTypes = (writableType) => `The ${getErrMsgBody(htmlRender, renderHook)} while a ${writableType} was passed to pageContext.httpResponse.pipe() which is contradictory. You cannot mix a Web Stream with a Node.js Stream.`;
+            if ((0, stream_js_1.isStreamWritableWeb)(writable)) {
+                const success = (0, stream_js_1.pipeToStreamWritableWeb)(htmlRender, writable);
+                if (success) {
+                    return;
+                }
+                else {
+                    (0, utils_js_1.assert)((0, stream_js_1.isStreamReadableNode)(htmlRender) || (0, stream_js_1.isStreamPipeNode)(htmlRender));
+                    (0, utils_js_1.assertUsage)(false, getErrMsgMixingStreamTypes('Web Writable'));
+                }
+            }
+            if ((0, stream_js_1.isStreamWritableNode)(writable)) {
+                const success = (0, stream_js_1.pipeToStreamWritableNode)(htmlRender, writable);
+                if (success) {
+                    return;
+                }
+                else {
+                    (0, utils_js_1.assert)((0, stream_js_1.isStreamReadableWeb)(htmlRender) || (0, stream_js_1.isStreamPipeWeb)(htmlRender));
+                    (0, utils_js_1.assertUsage)(false, getErrMsgMixingStreamTypes('Node.js Writable'));
+                }
+            }
+            (0, utils_js_1.assertUsage)(false, `The argument ${picocolors_1.default.cyan('writable')} passed to ${picocolors_1.default.cyan('pageContext.httpResponse.pipe(writable)')} doesn't seem to be ${(0, stream_js_1.getStreamName)('writable', 'web')} nor ${(0, stream_js_1.getStreamName)('writable', 'node')}.`);
+        },
+        getReadableWebStream() {
+            const webStream = (0, stream_js_1.getStreamReadableWeb)(htmlRender);
+            if (webStream === null) {
+                (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'getReadableWebStream()', getFixMsg('readable', 'web')));
+            }
+            return webStream;
+        },
+        async getReadableNodeStream() {
+            const nodeStream = await (0, stream_js_1.getStreamReadableNode)(htmlRender);
+            if (nodeStream === null) {
+                (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'getReadableNodeStream()', getFixMsg('readable', 'node')));
+            }
+            return nodeStream;
+        },
         async getBody() {
             const body = await (0, renderHtml_js_1.getHtmlString)(htmlRender);
             return body;
@@ -43,20 +81,6 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             }
             return webStream;
         },
-        async getReadableNodeStream() {
-            const nodeStream = await (0, stream_js_1.getStreamReadableNode)(htmlRender);
-            if (nodeStream === null) {
-                (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'getReadableNodeStream()', getFixMsg('readable', 'node')));
-            }
-            return nodeStream;
-        },
-        getReadableWebStream() {
-            const webStream = (0, stream_js_1.getStreamReadableWeb)(htmlRender);
-            if (webStream === null) {
-                (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'getReadableWebStream()', getFixMsg('readable', 'web')));
-            }
-            return webStream;
-        },
         // TODO/v1-release: remove
         pipeToWebWritable(writable) {
             (0, utils_js_1.assertWarning)(false, '`pageContext.httpResponse.pipeToWebWritable(res)` is outdated, use `pageContext.httpResponse.pipe(res)` instead. ' +
@@ -74,30 +98,6 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             if (!success) {
                 (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'pipeToNodeWritable()'));
             }
-        },
-        pipe(writable) {
-            const getErrMsgMixingStreamTypes = (writableType) => `The ${getErrMsgBody(htmlRender, renderHook)} while a ${writableType} was passed to pageContext.httpResponse.pipe() which is contradictory. You cannot mix a Web Stream with a Node.js Stream.`;
-            if ((0, stream_js_1.isStreamWritableWeb)(writable)) {
-                const success = (0, stream_js_1.pipeToStreamWritableWeb)(htmlRender, writable);
-                if (success) {
-                    return;
-                }
-                else {
-                    (0, utils_js_1.assert)((0, stream_js_1.isStreamReadableNode)(htmlRender) || (0, stream_js_1.isStreamPipeNode)(htmlRender));
-                    (0, utils_js_1.assertUsage)(false, getErrMsgMixingStreamTypes('Web Writable'));
-                }
-            }
-            if ((0, stream_js_1.isStreamWritableNode)(writable)) {
-                const success = (0, stream_js_1.pipeToStreamWritableNode)(htmlRender, writable);
-                if (success) {
-                    return;
-                }
-                else {
-                    (0, utils_js_1.assert)((0, stream_js_1.isStreamReadableWeb)(htmlRender) || (0, stream_js_1.isStreamPipeWeb)(htmlRender));
-                    (0, utils_js_1.assertUsage)(false, getErrMsgMixingStreamTypes('Node.js Writable'));
-                }
-            }
-            (0, utils_js_1.assertUsage)(false, `The argument ${picocolors_1.default.cyan('writable')} passed to ${picocolors_1.default.cyan('pageContext.httpResponse.pipe(writable)')} doesn't seem to be ${(0, stream_js_1.getStreamName)('writable', 'web')} nor ${(0, stream_js_1.getStreamName)('writable', 'node')}.`);
         }
     };
     function getFixMsg(type, standard) {

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.160-commit-937d8d5';
+const PROJECT_VERSION = '0.4.160-commit-d574f51';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -1,6 +1,6 @@
 export { navigate, reload } from './navigate.js';
 export { prefetch } from './prefetch.js';
-export { PROJECT_VERSION } from './utils.js';
+export { PROJECT_VERSION as version } from './utils.js';
 import type { PageContextBuiltInClientWithClientRouting } from '../../shared/types.js';
 /** @deprecated
  * Replace:

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

@@ -5,4 +5,4 @@
 // Use package.json#exports to make the imports isomorphic.
 export { navigate, reload } from './navigate.js';
 export { prefetch } from './prefetch.js';
-export { PROJECT_VERSION } from './utils.js';
+export { PROJECT_VERSION as version } from './utils.js';

package/dist/esm/node/cli/bin.js

@@ -1,7 +1,8 @@
 import { cac } from 'cac';
 import { resolve } from 'path';
 import { runPrerenderFromCLI, runPrerender_forceExit } from '../prerender/runPrerender.js';
-import { projectInfo, assertUsage } from './utils.js';
+import { projectInfo, assertUsage, assertWarning } from './utils.js';
+import pc from '@brillout/picocolors';
 const cli = cac(projectInfo.projectName);
 cli
     .command('prerender', 'Pre-render the HTML of your pages', { allowUnknownOptions: true })
@@ -28,6 +29,7 @@ function assertOptions() {
                 '--outDir',
                 '--configFile'
             ].includes(option), 'Unknown option: ' + option);
+        assertWarning(false, `You set ${pc.cyan(option)}, but passing options to ${pc.cyan('$ vike prerender')} is deprecated: use the config file instead. See https://vike.dev/command-prerender.`, { onlyOnce: true });
     });
 }
 // Listen to unknown commands

package/dist/esm/node/plugin/plugins/buildConfig/fixServerAssets.d.ts

@@ -0,0 +1,13 @@
+export { fixServerAssets };
+export { fixServerAssets_isEnabled };
+import { ViteManifest } from '../../../shared/ViteManifest.js';
+import { OutDirs } from '../../utils.js';
+/**
+ * true  => use workaround config.build.ssrEmitAssets
+ * false => use workaround extractAssets plugin
+ *
+ * Only used by V1 design.
+ */
+declare function fixServerAssets_isEnabled(): boolean;
+/** https://github.com/vikejs/vike/issues/1339 */
+declare function fixServerAssets(outDirs: OutDirs): Promise<ViteManifest>;

package/dist/esm/node/plugin/plugins/buildConfig/fixServerAssets.js

@@ -0,0 +1,142 @@
+export { fixServerAssets };
+export { fixServerAssets_isEnabled };
+import fs from 'fs/promises';
+import path from 'path';
+import { existsSync } from 'fs';
+import { assert, pLimit, unique } from '../../utils.js';
+import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
+import { manifestTempFile } from '../buildConfig.js';
+/**
+ * true  => use workaround config.build.ssrEmitAssets
+ * false => use workaround extractAssets plugin
+ *
+ * Only used by V1 design.
+ */
+function fixServerAssets_isEnabled() {
+    // We currently apply the workaround iff V1 design.
+    // Shall we allow the user to toggle between the two workarounds? E.g. based on https://vike.dev/includeAssetsImportedByServer.
+    return true;
+}
+/** https://github.com/vikejs/vike/issues/1339 */
+async function fixServerAssets(outDirs) {
+    const clientManifest = await loadManifest(outDirs.outDirClient);
+    const serverManifest = await loadManifest(outDirs.outDirServer);
+    const { clientManifestMod, filesToCopy } = addServerAssets(clientManifest, serverManifest);
+    await copyAssets(filesToCopy, outDirs);
+    return clientManifestMod;
+}
+async function loadManifest(outDir) {
+    const manifestFilePath = path.posix.join(outDir, manifestTempFile);
+    const manifestFileContent = await fs.readFile(manifestFilePath, 'utf-8');
+    assert(manifestFileContent);
+    const manifest = JSON.parse(manifestFileContent);
+    assert(manifest);
+    return manifest;
+}
+async function copyAssets(filesToCopy, { outDirClient, outDirServer }) {
+    const assetsDirServer = path.posix.join(outDirServer, 'assets');
+    if (!filesToCopy.length)
+        return;
+    assert(existsSync(assetsDirServer));
+    const concurrencyLimit = pLimit(10);
+    await Promise.all(filesToCopy.map((file) => concurrencyLimit(() => fs.cp(path.posix.join(outDirServer, file), path.posix.join(outDirClient, file), {
+        recursive: true
+    }))));
+    await fs.rm(assetsDirServer, { recursive: true });
+}
+// Add serverManifest resources to clientManifest
+function addServerAssets(clientManifest, serverManifest) {
+    var _a, _b;
+    const entriesClient = new Map();
+    const entriesServer = new Map();
+    for (const [key, entry] of Object.entries(clientManifest)) {
+        const pageId = getPageId(key);
+        if (!pageId)
+            continue;
+        const resources = collectResources(entry, clientManifest);
+        assert(!entriesClient.has(pageId));
+        entriesClient.set(pageId, { key, ...resources });
+    }
+    for (const [key, entry] of Object.entries(serverManifest)) {
+        const pageId = getPageId(key);
+        if (!pageId)
+            continue;
+        const resources = collectResources(entry, serverManifest);
+        assert(!entriesServer.has(pageId));
+        entriesServer.set(pageId, resources);
+    }
+    let filesToCopy = [];
+    for (const [pageId, entryClient] of entriesClient.entries()) {
+        const cssToAdd = [];
+        const assetsToAdd = [];
+        const entryServer = entriesServer.get(pageId);
+        if (entryServer) {
+            cssToAdd.push(...entryServer.css
+                .filter((cssServer) => !entryClient.css.some((cssClient) => cssServer.hash === cssClient.hash))
+                .map((css) => css.src));
+            assetsToAdd.push(...entryServer.assets
+                .filter((assertServer) => !entryClient.assets.some((assetClient) => assertServer.hash === assetClient.hash))
+                .map((asset) => asset.src));
+        }
+        const { key } = entryClient;
+        if (cssToAdd.length) {
+            filesToCopy.push(...cssToAdd);
+            (_a = clientManifest[key]).css ?? (_a.css = []);
+            clientManifest[key].css?.push(...cssToAdd);
+        }
+        if (assetsToAdd.length) {
+            filesToCopy.push(...assetsToAdd);
+            (_b = clientManifest[key]).assets ?? (_b.assets = []);
+            clientManifest[key].assets?.push(...assetsToAdd);
+        }
+    }
+    const clientManifestMod = clientManifest;
+    filesToCopy = unique(filesToCopy);
+    return { clientManifestMod, filesToCopy };
+}
+function getPageId(key) {
+    // Normalize from:
+    //   ../../virtual:vike:pageConfigValuesAll:client:/pages/index
+    // to:
+    //   virtual:vike:pageConfigValuesAll:client:/pages/index
+    // (This seems to be needed only for vitest tests that use Vite's build() API with an inline config.)
+    key = key.substring(key.indexOf('virtual:vike'));
+    const result = isVirtualFileIdPageConfigValuesAll(key);
+    return result && result.pageId;
+}
+function collectResources(entryRoot, manifest) {
+    const css = [];
+    const assets = [];
+    const entries = new Set([entryRoot]);
+    for (const entry of entries) {
+        for (const entryImport of entry.imports ?? []) {
+            entries.add(manifest[entryImport]);
+        }
+        const entryCss = entry.css ?? [];
+        if (entry.file.endsWith('.css'))
+            entryCss.push(entry.file);
+        for (const src of entryCss) {
+            const hash = getHash(src);
+            css.push({ src, hash });
+        }
+        const entryAssets = entry.assets ?? [];
+        for (const src of entryAssets) {
+            const hash = getHash(src);
+            assets.push({ src, hash });
+        }
+    }
+    return { css, assets };
+}
+// Use the hash of resources to determine whether they are equal. We need this, otherwise we get:
+// ```html
+// <head>
+//   <link rel="stylesheet" type="text/css" href="/assets/static/onRenderClient.2j6TxKIB.css">
+//   <link rel="stylesheet" type="text/css" href="/assets/static/onRenderHtml.2j6TxKIB.css">
+// </head>
+// ```
+function getHash(src) {
+    // src is guarenteed to end with `.[hash][extname]`, see distFileNames.ts
+    const hash = src.split('.').at(-2);
+    assert(hash);
+    return hash;
+}

package/dist/esm/node/plugin/plugins/buildConfig.d.ts

@@ -1,8 +1,10 @@
 export { buildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
+export { manifestTempFile };
 import type { ResolvedConfig, Plugin } from 'vite';
 import type { PageConfigBuildTime } from '../../../shared/page-configs/PageConfig.js';
+declare const manifestTempFile = "_temp_manifest.json";
 declare function buildConfig(): Plugin;
 declare function analyzeClientEntries(pageConfigs: PageConfigBuildTime[], config: ResolvedConfig): {
     hasClientRouting: boolean;

package/dist/esm/node/plugin/plugins/buildConfig.js

@@ -1,8 +1,9 @@
 export { buildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
-import { assert, resolveOutDir, viteIsSSR, getFilePathAbsolute, addOnBeforeLogHook, removeFileExtention, unique, assertPosixPath, assertUsage, injectRollupInputs, normalizeRollupInput, assertNodeEnvIsNotDev } from '../utils.js';
-import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
+export { manifestTempFile };
+import { assert, resolveOutDir, viteIsSSR, getFilePathAbsolute, addOnBeforeLogHook, removeFileExtention, unique, assertPosixPath, assertUsage, injectRollupInputs, normalizeRollupInput, assertNodeEnvIsNotDev, getOutDirs } from '../utils.js';
+import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { getConfigValue } from '../../../shared/page-configs/helpers.js';
 import { findPageFiles } from '../shared/findPageFiles.js';
 import { getConfigVike } from '../../shared/getConfigVike.js';
@@ -12,12 +13,16 @@ import { createRequire } from 'module';
 import { getClientEntryFilePath } from '../../shared/getClientEntryFilePath.js';
 import fs from 'fs/promises';
 import path from 'path';
+import { fixServerAssets, fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
+import { set_constant_ASSETS_MAP } from './importBuild/index.js';
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 const manifestTempFile = '_temp_manifest.json';
 function buildConfig() {
-    let generateManifest;
+    let isServerAssetsFixEnabled;
+    let isSsrBuild;
+    let outDirs;
     return {
         name: 'vike:buildConfig',
         apply: 'build',
@@ -31,16 +36,26 @@ function buildConfig() {
                 assert(Object.keys(entries).length > 0);
                 config.build.rollupOptions.input = injectRollupInputs(entries, config);
                 addLogHook();
+                outDirs = getOutDirs(config);
+                {
+                    isServerAssetsFixEnabled = (await isV1Design(config, false)) && fixServerAssets_isEnabled();
+                    if (isServerAssetsFixEnabled) {
+                        // https://github.com/vikejs/vike/issues/1339
+                        config.build.ssrEmitAssets = true;
+                        // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
+                        config.build.cssMinify = 'esbuild';
+                    }
+                }
             }
         },
         config(config) {
             assertNodeEnv();
-            generateManifest = !viteIsSSR(config);
+            isSsrBuild = viteIsSSR(config);
             return {
                 build: {
                     outDir: resolveOutDir(config),
-                    manifest: generateManifest ? manifestTempFile : false,
-                    copyPublicDir: !viteIsSSR(config)
+                    manifest: manifestTempFile,
+                    copyPublicDir: !isSsrBuild
                 }
             };
         },
@@ -48,20 +63,23 @@ function buildConfig() {
             assertNodeEnv();
         },
         async writeBundle(options, bundle) {
-            assertNodeEnv();
-            const manifestEntry = bundle[manifestTempFile];
-            /* Fails with @vitejs/plugin-legacy because writeBundle() is called twice during the client build (once for normal client assets and a second time for legacy assets), see reproduction at https://github.com/vikejs/vike/issues/1154
-            assert(generateManifest === !!manifestEntry)
-            */
-            if (manifestEntry) {
-                const { dir } = options;
-                assert(dir);
-                const manifestFilePathOld = path.join(dir, manifestEntry.fileName);
+            if (isSsrBuild) {
                 // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
                 //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
                 //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
-                const manifestFilePathNew = path.join(dir, '..', 'assets.json');
-                await fs.rename(manifestFilePathOld, manifestFilePathNew);
+                const assetsJsonFilePath = path.posix.join(outDirs.outDirRoot, 'assets.json');
+                const clientManifestFilePath = path.posix.join(outDirs.outDirClient, manifestTempFile);
+                const serverManifestFilePath = path.posix.join(outDirs.outDirServer, manifestTempFile);
+                if (!isServerAssetsFixEnabled) {
+                    await fs.copyFile(clientManifestFilePath, assetsJsonFilePath);
+                }
+                else {
+                    const clientManifestMod = await fixServerAssets(outDirs);
+                    await fs.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
+                }
+                await fs.rm(clientManifestFilePath);
+                await fs.rm(serverManifestFilePath);
+                await set_constant_ASSETS_MAP(options, bundle);
             }
         }
     };

package/dist/esm/node/plugin/plugins/distFileNames.js

@@ -19,9 +19,17 @@ function distFileNames() {
                 if (!('chunkFileNames' in rollupOutput)) {
                     rollupOutput.chunkFileNames = (chunkInfo) => getChunkFileName(chunkInfo, config);
                 }
-                if (!('assertUsage' in rollupOutput)) {
+                if (!('assetFileNames' in rollupOutput)) {
                     rollupOutput.assetFileNames = (chunkInfo) => getAssetFileName(chunkInfo, config);
                 }
+                else {
+                    // If a user needs this:
+                    //  - assertUsage() that the naming provided by the user ends with `.[hash][extname]`
+                    //    - It's needed for getHash() of fixServerAssets()
+                    //    - Asset URLs should always contain a hash: it's paramount for caching assets.
+                    //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
+                    assertUsage(false, "Setting config.build.rollupOptions.output.assetFileNames is currently forbidden. (Contact a maintainer if you need this as it's possible to support this.)");
+                }
             });
         }
     };

package/dist/esm/node/plugin/plugins/extractAssetsPlugin.js

@@ -1,6 +1,6 @@
-// Alternative: use `ssrEmitAssets: true`
-//  - See https://github.com/vitejs/vite/pull/11430
-// This plugin makes client-side bundles include the CSS imports living in server-side-only code.
+// Remove this workaround if the other workaround config.build.ssrEmitAssets turns out to be reliable.
+//  - Remove this file then revert this commit: https://github.com/vikejs/vike/commit/805a18974f13420a78fcc30fdd676696e405c3ca
+// Workaround to make client-side bundles include the CSS imports living in server-side-only code.
 //  - This is needed for HTML-only pages, and React Server Components.
 //  - We recommend using the debug flag to get an idea of how this plugin works: `$ DEBUG=vike:extractAssets pnpm exec vite build`. Then have a look at `dist/client/manifest.json` and see how `.page.server.js` entries have zero JavaScript but only CSS.
 //  - This appraoch supports import path aliases `vite.config.js#resolve.alias` https://vitejs.dev/config/#resolve-alias
@@ -9,10 +9,12 @@ export { extractAssetsRE };
 import { viteIsSSR_options, assert, assertPosixPath, styleFileRE, createDebugger, isDebugEnabled, isScriptFile, resolveVirtualFileId, isVirtualFileId, getVirtualFileId, assertUsage } from '../utils.js';
 import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { getConfigVike } from '../../shared/getConfigVike.js';
+import { isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { isAsset } from '../shared/isAsset.js';
 import { getImportStatements } from '../shared/parseEsModule.js';
 import { removeSourceMap } from '../shared/removeSourceMap.js';
 import pc from '@brillout/picocolors';
+import { fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
@@ -23,6 +25,7 @@ const debugEnabled = isDebugEnabled(debugNamespace);
 function extractAssetsPlugin() {
     let config;
     let configVike;
+    let isServerAssetsFixEnabled;
     return [
         // This plugin removes all JavaScript from server-side only code, so that only CSS imports remains. (And also satic files imports e.g. `import logoURL from './logo.svg.js'`).
         {
@@ -34,6 +37,7 @@ function extractAssetsPlugin() {
                 if (!extractAssetsRE.test(id)) {
                     return;
                 }
+                assert(!isServerAssetsFixEnabled);
                 assert(configVike.includeAssetsImportedByServer);
                 assert(!viteIsSSR_options(options));
                 const importStatements = await getImportStatements(src);
@@ -131,6 +135,7 @@ function extractAssetsPlugin() {
             async configResolved(config_) {
                 configVike = await getConfigVike(config_);
                 config = config_;
+                isServerAssetsFixEnabled = (await isV1Design(config, false)) && fixServerAssets_isEnabled();
             },
             load(id) {
                 if (!isVirtualFileId(id))

package/dist/esm/node/plugin/plugins/importBuild/index.d.ts

@@ -1,3 +1,8 @@
 export { importBuild };
-import type { Plugin } from 'vite';
+export { set_constant_ASSETS_MAP };
+import type { Plugin, Rollup } from 'vite';
+type Bundle = Rollup.OutputBundle;
+type Options = Rollup.NormalizedOutputOptions;
 declare function importBuild(): Plugin[];
+/** Set the value of the ASSETS_MAP constant inside dist/server/entry.js (or dist/server/index.js) */
+declare function set_constant_ASSETS_MAP(options: Options, bundle: Bundle): Promise<void>;

package/dist/esm/node/plugin/plugins/importBuild/index.js

@@ -1,6 +1,7 @@
 export { importBuild };
+export { set_constant_ASSETS_MAP };
 import { serverEntryPlugin, findServerEntry } from '@brillout/vite-plugin-server-entry/plugin.js';
-import { assert, getOutDirs, toPosixPath, viteIsSSR } from '../../utils.js';
+import { assert, getOutDirs, toPosixPath } from '../../utils.js';
 import path from 'path';
 import { createRequire } from 'module';
 import { getConfigVike } from '../../../shared/getConfigVike.js';
@@ -21,11 +22,6 @@ function importBuild() {
             async configResolved(config_) {
                 config = config_;
                 configVike = await getConfigVike(config);
-            },
-            async writeBundle(options, bundle) {
-                if (!viteIsSSR(config))
-                    return;
-                await replace_ASSETS_MAP(options, bundle);
             }
         },
         ...serverEntryPlugin({
@@ -58,7 +54,8 @@ function getEntryCode(config, configVike) {
     ].join('\n');
     return importerCode;
 }
-async function replace_ASSETS_MAP(options, bundle) {
+/** Set the value of the ASSETS_MAP constant inside dist/server/entry.js (or dist/server/index.js) */
+async function set_constant_ASSETS_MAP(options, bundle) {
     const { dir } = options;
     assert(dir);
     // This will probably fail with @vitejs/plugin-legacy

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.d.ts

@@ -2,6 +2,7 @@ export { getVikeConfig };
 export { reloadVikeConfig };
 export { vikeConfigDependencies };
 export { isVikeConfigFile };
+export { isV1Design };
 export type { InterfaceValueFile };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime, FilePathResolved } from '../../../../../shared/page-configs/PageConfig.js';
 import type { ExtensionResolved } from '../../../../../shared/ConfigVike.js';
@@ -28,4 +29,5 @@ type VikeConfig = {
 declare const vikeConfigDependencies: Set<string>;
 declare function reloadVikeConfig(userRootDir: string, outDirRoot: string, extensions: ExtensionResolved[]): void;
 declare function getVikeConfig(config: ResolvedConfig, isDev: boolean, tolerateInvalidConfig?: boolean, extensions?: ExtensionResolved[]): Promise<VikeConfig>;
+declare function isV1Design(config: ResolvedConfig, isDev: boolean): Promise<boolean>;
 declare function isVikeConfigFile(filePath: string): boolean;

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -2,6 +2,7 @@ export { getVikeConfig };
 export { reloadVikeConfig };
 export { vikeConfigDependencies };
 export { isVikeConfigFile };
+export { isV1Design };
 import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, arrayIncludes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, lowerFirst, mergeCumulativeValues, getOutDirs, assertKeys, objectKeys, objectFromEntries, makeFirst, isNpmPackageImport, reverse } from '../../../utils.js';
 import path from 'path';
 import { configDefinitionsBuiltIn, configDefinitionsBuiltInGlobal } from './getVikeConfig/configDefinitionsBuiltIn.js';
@@ -70,6 +71,10 @@ async function getVikeConfig(config, isDev, tolerateInvalidConfig = false, exten
     }
     return await vikeConfigPromise;
 }
+async function isV1Design(config, isDev) {
+    const isV1Design = (await getVikeConfig(config, isDev)).pageConfigs.length > 0;
+    return isV1Design;
+}
 async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
     const plusFiles = await findPlusFiles(userRootDir, outDirRoot, isDev, extensions);
     const configFiles = [];

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigValuesAll.js

@@ -10,6 +10,7 @@ import { isRuntimeEnvMatch } from './isRuntimeEnvMatch.js';
 import { serializeConfigValueImported } from '../../../../../shared/page-configs/serialize/serializeConfigValue.js';
 import { getConfigVike } from '../../../../shared/getConfigVike.js';
 import { getConfigValuesSerialized } from './getConfigValuesSerialized.js';
+import { fixServerAssets_isEnabled } from '../../buildConfig/fixServerAssets.js';
 async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const result = isVirtualFileIdPageConfigValuesAll(id);
     assert(result);
@@ -42,7 +43,7 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
         isClientRouting
     })));
     lines.push('};');
-    if (includeAssetsImportedByServer && isForClientSide && !isDev) {
+    if (!fixServerAssets_isEnabled() && includeAssetsImportedByServer && isForClientSide && !isDev) {
         importStatements.push(`import '${extractAssetsAddQuery(getVirtualFileIdPageConfigValuesAll(pageId, false))}'`);
     }
     const code = [...importStatements, ...lines].join('\n');

package/dist/esm/node/plugin/utils.d.ts

@@ -19,3 +19,4 @@ export * from '../../utils/deepEqual.js';
 export * from '../../utils/assertKeys.js';
 export * from '../../utils/injectRollupInputs.js';
 export * from '../../utils/humanizeTime.js';
+export * from '../../utils/pLimit.js';

package/dist/esm/node/plugin/utils.js

@@ -25,3 +25,4 @@ export * from '../../utils/deepEqual.js';
 export * from '../../utils/assertKeys.js';
 export * from '../../utils/injectRollupInputs.js';
 export * from '../../utils/humanizeTime.js';
+export * from '../../utils/pLimit.js';

package/dist/esm/node/runtime/renderPage/getHttpResponseBody.d.ts

@@ -7,9 +7,10 @@ import { type HtmlRender } from '../html/renderHtml.js';
 import type { RenderHook } from './executeOnRenderHtmlHook.js';
 type HttpResponseBody = {
     body: string;
-    getBody: () => Promise<string>;
-    getReadableWebStream: () => StreamReadableWeb;
     pipe: (writable: StreamWritableWeb | StreamWritableNode) => void;
+    getReadableWebStream: () => StreamReadableWeb;
+    getReadableNodeStream: () => Promise<StreamReadableNode>;
+    getBody: () => Promise<string>;
     /** @deprecated */
     getNodeStream: () => Promise<StreamReadableNode>;
     /** @deprecated */
@@ -21,12 +22,12 @@ type HttpResponseBody = {
 };
 declare function getHttpResponseBody(htmlRender: HtmlRender, renderHook: null | RenderHook): string;
 declare function getHttpResponseBodyStreamHandlers(htmlRender: HtmlRender, renderHook: null | RenderHook): {
+    pipe(writable: StreamWritableNode | StreamWritableWeb): void;
+    getReadableWebStream(): StreamReadableWeb;
+    getReadableNodeStream(): Promise<import("stream").Readable>;
     getBody(): Promise<string>;
     getNodeStream(): Promise<import("stream").Readable>;
     getWebStream(): StreamReadableWeb;
-    getReadableNodeStream(): Promise<import("stream").Readable>;
-    getReadableWebStream(): StreamReadableWeb;
     pipeToWebWritable(writable: StreamWritableWeb): void;
     pipeToNodeWritable(writable: StreamWritableNode): void;
-    pipe(writable: StreamWritableNode | StreamWritableWeb): void;
 };

package/dist/esm/node/runtime/renderPage/getHttpResponseBody.js

@@ -14,6 +14,44 @@ function getHttpResponseBody(htmlRender, renderHook) {
 }
 function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
     return {
+        pipe(writable) {
+            const getErrMsgMixingStreamTypes = (writableType) => `The ${getErrMsgBody(htmlRender, renderHook)} while a ${writableType} was passed to pageContext.httpResponse.pipe() which is contradictory. You cannot mix a Web Stream with a Node.js Stream.`;
+            if (isStreamWritableWeb(writable)) {
+                const success = pipeToStreamWritableWeb(htmlRender, writable);
+                if (success) {
+                    return;
+                }
+                else {
+                    assert(isStreamReadableNode(htmlRender) || isStreamPipeNode(htmlRender));
+                    assertUsage(false, getErrMsgMixingStreamTypes('Web Writable'));
+                }
+            }
+            if (isStreamWritableNode(writable)) {
+                const success = pipeToStreamWritableNode(htmlRender, writable);
+                if (success) {
+                    return;
+                }
+                else {
+                    assert(isStreamReadableWeb(htmlRender) || isStreamPipeWeb(htmlRender));
+                    assertUsage(false, getErrMsgMixingStreamTypes('Node.js Writable'));
+                }
+            }
+            assertUsage(false, `The argument ${pc.cyan('writable')} passed to ${pc.cyan('pageContext.httpResponse.pipe(writable)')} doesn't seem to be ${getStreamName('writable', 'web')} nor ${getStreamName('writable', 'node')}.`);
+        },
+        getReadableWebStream() {
+            const webStream = getStreamReadableWeb(htmlRender);
+            if (webStream === null) {
+                assertUsage(false, getErrMsg(htmlRender, renderHook, 'getReadableWebStream()', getFixMsg('readable', 'web')));
+            }
+            return webStream;
+        },
+        async getReadableNodeStream() {
+            const nodeStream = await getStreamReadableNode(htmlRender);
+            if (nodeStream === null) {
+                assertUsage(false, getErrMsg(htmlRender, renderHook, 'getReadableNodeStream()', getFixMsg('readable', 'node')));
+            }
+            return nodeStream;
+        },
         async getBody() {
             const body = await getHtmlString(htmlRender);
             return body;
@@ -38,20 +76,6 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             }
             return webStream;
         },
-        async getReadableNodeStream() {
-            const nodeStream = await getStreamReadableNode(htmlRender);
-            if (nodeStream === null) {
-                assertUsage(false, getErrMsg(htmlRender, renderHook, 'getReadableNodeStream()', getFixMsg('readable', 'node')));
-            }
-            return nodeStream;
-        },
-        getReadableWebStream() {
-            const webStream = getStreamReadableWeb(htmlRender);
-            if (webStream === null) {
-                assertUsage(false, getErrMsg(htmlRender, renderHook, 'getReadableWebStream()', getFixMsg('readable', 'web')));
-            }
-            return webStream;
-        },
         // TODO/v1-release: remove
         pipeToWebWritable(writable) {
             assertWarning(false, '`pageContext.httpResponse.pipeToWebWritable(res)` is outdated, use `pageContext.httpResponse.pipe(res)` instead. ' +
@@ -69,30 +93,6 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             if (!success) {
                 assertUsage(false, getErrMsg(htmlRender, renderHook, 'pipeToNodeWritable()'));
             }
-        },
-        pipe(writable) {
-            const getErrMsgMixingStreamTypes = (writableType) => `The ${getErrMsgBody(htmlRender, renderHook)} while a ${writableType} was passed to pageContext.httpResponse.pipe() which is contradictory. You cannot mix a Web Stream with a Node.js Stream.`;
-            if (isStreamWritableWeb(writable)) {
-                const success = pipeToStreamWritableWeb(htmlRender, writable);
-                if (success) {
-                    return;
-                }
-                else {
-                    assert(isStreamReadableNode(htmlRender) || isStreamPipeNode(htmlRender));
-                    assertUsage(false, getErrMsgMixingStreamTypes('Web Writable'));
-                }
-            }
-            if (isStreamWritableNode(writable)) {
-                const success = pipeToStreamWritableNode(htmlRender, writable);
-                if (success) {
-                    return;
-                }
-                else {
-                    assert(isStreamReadableWeb(htmlRender) || isStreamPipeWeb(htmlRender));
-                    assertUsage(false, getErrMsgMixingStreamTypes('Node.js Writable'));
-                }
-            }
-            assertUsage(false, `The argument ${pc.cyan('writable')} passed to ${pc.cyan('pageContext.httpResponse.pipe(writable)')} doesn't seem to be ${getStreamName('writable', 'web')} nor ${getStreamName('writable', 'node')}.`);
         }
     };
     function getFixMsg(type, standard) {

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

@@ -1,5 +1,6 @@
 export { getOutDirs };
 export { resolveOutDir };
+export type { OutDirs };
 import type { UserConfig, ResolvedConfig } from 'vite';
 type OutDirs = {
     /** Absolute path to `outDir` */

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.160-commit-937d8d5";
+declare const PROJECT_VERSION: "0.4.160-commit-d574f51";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.160-commit-937d8d5";
+    projectVersion: "0.4.160-commit-d574f51";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
 import { onProjectInfo } from './assertSingleInstance.js';
-const PROJECT_VERSION = '0.4.160-commit-937d8d5';
+const PROJECT_VERSION = '0.4.160-commit-d574f51';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.160-commit-937d8d5",
+  "version": "0.4.160-commit-d574f51",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",