vike 0.4.192 → 0.4.193

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

@@ -74,7 +74,7 @@ function buildConfig() {
             name: 'vike:buildConfig:writeBundle',
             apply: 'build',
             // Make sure other writeBundle() hooks are called after this writeBundle() hook.
-            //  - set_constant_ASSETS_MAP() needs to be called before dist/server/ code is executed.
+            //  - set_ASSETS_MAP() needs to be called before dist/server/ code is executed.
             //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527
             enforce: 'pre',
             writeBundle: {
@@ -97,7 +97,7 @@ function buildConfig() {
                         }
                         await promises_1.default.rm(clientManifestFilePath);
                         await promises_1.default.rm(serverManifestFilePath);
-                        await (0, index_js_1.set_constant_ASSETS_MAP)(options, bundle);
+                        await (0, index_js_1.set_ASSETS_MAP)(options, bundle);
                     }
                 }
             }

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.set_constant_ASSETS_MAP = exports.importBuild = void 0;
+exports.set_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"));
@@ -59,23 +59,33 @@ function getEntryCode(config, configVike) {
     return importerCode;
 }
 /** 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) {
+async function set_ASSETS_MAP(options, bundle) {
     const { dir } = options;
     (0, utils_js_1.assert)(dir);
-    // This will probably fail with @vitejs/plugin-legacy
-    //  - See `git log -p` for how we used to workaround the @vitejs/plugin-legacy issue.
-    const serverEntry = (0, plugin_js_1.findServerEntry)(bundle);
-    const serverEntryFilePath = path_1.default.join(dir, serverEntry.fileName);
+    const chunkPath = find_ASSETS_MAP(bundle);
+    const chunkFilePath = path_1.default.join(dir, chunkPath);
     const assetsJsonFilePath = path_1.default.join(dir, '..', 'assets.json');
-    const [assetsJsonString, serverEntryFileContent] = await Promise.all([
+    const [assetsJsonString, chunkFileContent] = await Promise.all([
         await promises_1.default.readFile(assetsJsonFilePath, 'utf8'),
-        await promises_1.default.readFile(serverEntryFilePath, 'utf8')
+        await promises_1.default.readFile(chunkFilePath, 'utf8')
     ]);
-    const serverEntryFileContentPatched = serverEntryFileContent.replace(ASSETS_MAP, assetsJsonString);
-    (0, utils_js_1.assert)(serverEntryFileContentPatched !== serverEntryFileContent);
-    await promises_1.default.writeFile(serverEntryFilePath, serverEntryFileContentPatched);
+    const serverEntryFileContentPatched = chunkFileContent.replace(ASSETS_MAP, assetsJsonString);
+    (0, utils_js_1.assert)(serverEntryFileContentPatched !== chunkFileContent);
+    await promises_1.default.writeFile(chunkFilePath, serverEntryFileContentPatched);
+}
+exports.set_ASSETS_MAP = set_ASSETS_MAP;
+function find_ASSETS_MAP(bundle) {
+    let chunkPath;
+    for (const filePath in bundle) {
+        const chunk = bundle[filePath];
+        if ('code' in chunk && chunk.code.includes(ASSETS_MAP)) {
+            (0, utils_js_1.assert)(!chunkPath);
+            chunkPath = filePath;
+        }
+    }
+    (0, utils_js_1.assert)(chunkPath);
+    return chunkPath;
 }
-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/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.192';
+exports.PROJECT_VERSION = '0.4.193';

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

@@ -12,7 +12,7 @@ import { createRequire } from 'module';
 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';
+import { set_ASSETS_MAP } from './importBuild/index.js';
 import { prependEntriesDir } from '../../shared/prependEntriesDir.js';
 import { getFilePathResolved } from '../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../shared/page-configs/getConfigValueBuildTime.js';
@@ -71,7 +71,7 @@ function buildConfig() {
             name: 'vike:buildConfig:writeBundle',
             apply: 'build',
             // Make sure other writeBundle() hooks are called after this writeBundle() hook.
-            //  - set_constant_ASSETS_MAP() needs to be called before dist/server/ code is executed.
+            //  - set_ASSETS_MAP() needs to be called before dist/server/ code is executed.
             //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527
             enforce: 'pre',
             writeBundle: {
@@ -94,7 +94,7 @@ function buildConfig() {
                         }
                         await fs.rm(clientManifestFilePath);
                         await fs.rm(serverManifestFilePath);
-                        await set_constant_ASSETS_MAP(options, bundle);
+                        await set_ASSETS_MAP(options, bundle);
                     }
                 }
             }

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

@@ -1,8 +1,8 @@
 export { importBuild };
-export { set_constant_ASSETS_MAP };
+export { set_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>;
+declare function set_ASSETS_MAP(options: Options, bundle: Bundle): Promise<void>;

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

@@ -1,6 +1,6 @@
 export { importBuild };
-export { set_constant_ASSETS_MAP };
-import { serverEntryPlugin, findServerEntry } from '@brillout/vite-plugin-server-entry/plugin.js';
+export { set_ASSETS_MAP };
+import { serverEntryPlugin } from '@brillout/vite-plugin-server-entry/plugin.js';
 import { assert, getOutDirs, toPosixPath } from '../../utils.js';
 import path from 'path';
 import { createRequire } from 'module';
@@ -54,21 +54,31 @@ function getEntryCode(config, configVike) {
     return importerCode;
 }
 /** 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) {
+async function set_ASSETS_MAP(options, bundle) {
     const { dir } = options;
     assert(dir);
-    // This will probably fail with @vitejs/plugin-legacy
-    //  - See `git log -p` for how we used to workaround the @vitejs/plugin-legacy issue.
-    const serverEntry = findServerEntry(bundle);
-    const serverEntryFilePath = path.join(dir, serverEntry.fileName);
+    const chunkPath = find_ASSETS_MAP(bundle);
+    const chunkFilePath = path.join(dir, chunkPath);
     const assetsJsonFilePath = path.join(dir, '..', 'assets.json');
-    const [assetsJsonString, serverEntryFileContent] = await Promise.all([
+    const [assetsJsonString, chunkFileContent] = await Promise.all([
         await fs.readFile(assetsJsonFilePath, 'utf8'),
-        await fs.readFile(serverEntryFilePath, 'utf8')
+        await fs.readFile(chunkFilePath, 'utf8')
     ]);
-    const serverEntryFileContentPatched = serverEntryFileContent.replace(ASSETS_MAP, assetsJsonString);
-    assert(serverEntryFileContentPatched !== serverEntryFileContent);
-    await fs.writeFile(serverEntryFilePath, serverEntryFileContentPatched);
+    const serverEntryFileContentPatched = chunkFileContent.replace(ASSETS_MAP, assetsJsonString);
+    assert(serverEntryFileContentPatched !== chunkFileContent);
+    await fs.writeFile(chunkFilePath, serverEntryFileContentPatched);
+}
+function find_ASSETS_MAP(bundle) {
+    let chunkPath;
+    for (const filePath in bundle) {
+        const chunk = bundle[filePath];
+        if ('code' in chunk && chunk.code.includes(ASSETS_MAP)) {
+            assert(!chunkPath);
+            chunkPath = filePath;
+        }
+    }
+    assert(chunkPath);
+    return chunkPath;
 }
 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

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.192";
+export declare const PROJECT_VERSION: "0.4.193";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.192';
+export const PROJECT_VERSION = '0.4.193';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.192";
+    projectVersion: "0.4.193";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.192",
+  "version": "0.4.193",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -17,7 +17,7 @@
     "@brillout/json-serializer": "^0.5.13",
     "@brillout/picocolors": "^1.0.14",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.4.9",
+    "@brillout/vite-plugin-server-entry": "^0.4.10",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",