vike 0.4.228-commit-13824ea → 0.4.228-commit-1553dee

package/dist/cjs/node/plugin/plugins/build/handleAssetsManifest.js

@@ -301,16 +301,21 @@ function handleAssetsManifest_getBuildConfig(config) {
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
-    if ((0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv)) {
+    const isSsREnv = (0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv);
+    if (isSsREnv) {
         (0, utils_js_1.assert)(!assetsJsonFilePath);
         const outDirs = (0, getOutDirs_js_1.getOutDirs)(config, viteEnv);
         assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
         await writeAssetsManifestFile(outDirs, assetsJsonFilePath, config);
     }
     if ((0, isViteServerBuild_js_1.isViteServerBuild)(config, viteEnv)) {
-        (0, utils_js_1.assert)(assetsJsonFilePath);
-        // Replace __VITE_ASSETS_MANIFEST__ in all server-side bundles
-        await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(options, bundle, assetsJsonFilePath);
+        // Replace __VITE_ASSETS_MANIFEST__ in server builds
+        // - Always replace it in dist/server/
+        // - Also in some other server builds such as dist/vercel/ from vike-vercel
+        // - Don't replace it in dist/rsc/ from vike-react-rsc since __VITE_ASSETS_MANIFEST__ doesn't exist there
+        const noop = await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(options, bundle, assetsJsonFilePath);
+        if (isSsREnv)
+            (0, utils_js_1.assert)(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
     }
 }
 async function writeAssetsManifestFile(outDirs, assetsJsonFilePath, config) {

package/dist/cjs/node/plugin/plugins/build/pluginBuildEntry.js

@@ -68,6 +68,12 @@ async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
     const { dir } = options;
     (0, utils_js_1.assert)(dir);
     const chunkPath = find_ASSETS_MANIFEST(bundle);
+    // Some server builds don't contain __VITE_ASSETS_MANIFEST__ such as dist/rsc/ from vike-react-rsc
+    if (!chunkPath) {
+        const noop = true; // no operation
+        return noop;
+    }
+    (0, utils_js_1.assert)(assetsJsonFilePath);
     const chunkFilePath = path_1.default.join(dir, chunkPath);
     const [assetsJsonString, chunkFileContent] = await Promise.all([
         await promises_1.default.readFile(assetsJsonFilePath, 'utf8'),
@@ -76,6 +82,8 @@ async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
     const serverEntryFileContentPatched = chunkFileContent.replace(ASSETS_MANIFEST, assetsJsonString);
     (0, utils_js_1.assert)(serverEntryFileContentPatched !== chunkFileContent);
     await promises_1.default.writeFile(chunkFilePath, serverEntryFileContentPatched);
+    const noop = false;
+    return noop;
 }
 function find_ASSETS_MANIFEST(bundle) {
     let chunkPath;
@@ -86,7 +94,6 @@ function find_ASSETS_MANIFEST(bundle) {
             chunkPath = filePath;
         }
     }
-    (0, utils_js_1.assert)(chunkPath);
     return chunkPath;
 }
 function getImportPath(config) {

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

@@ -904,6 +904,7 @@ function assertKnownConfig(configName, configNamesKnownRelevant, configDefinitio
     const errMsg = isPlusFile
         ? `${sourceName} sets an unknown config ${configNameColored}`
         : `${sourceName} sets an unknown Vike config, see ${picocolors_1.default.underline('https://vike.dev/cli')} for the list of CLI options`;
+    (0, utils_js_1.assert)(errMsg.includes(configName));
     // Missing vike-{react,vue,solid} installation
     {
         const ui = ['vike-react', 'vike-vue', 'vike-solid'];

package/dist/cjs/node/runtime/globalContext.js

@@ -345,14 +345,12 @@ async function loadBuildEntry(outDir) {
             globalObject.buildEntry = globalObject.buildEntryPrevious;
         }
         (0, utils_js_1.assert)(globalObject.buildEntry);
+        // If using `inject` then dist/server/index.js imports dist/server/entry.js and loadBuildEntry() isn't needed.
+        // If dist/server/entry.js isn't imported then this means the user is running the original server entry `$ ts-node server/index.ts`.
         (0, utils_js_1.assertWarning)(
-        // vike-server => `vitePluginServerEntry.inject === true`
-        // vike-node => `vitePluginServerEntry.inject === [ 'index' ]`
-        globalObject.buildInfo?.viteConfigRuntime.vitePluginServerEntry.inject !== true, 
-        /* TO-DO/eventually:
-        !!globalObject.buildInfo?.viteConfigRuntime.vitePluginServerEntry.inject,
-        */
-        `Run the built server entry (e.g. ${picocolors_1.default.cyan('$ node dist/server/index.mjs')}) instead of the original server entry (e.g. ${picocolors_1.default.cyan('$ ts-node server/index.ts')})`, { onlyOnce: true });
+        // vike-server => `inject === true`
+        // vike-node => `inject === [ 'index' ]` => we don't show the warning to vike-node users (I don't remember why).
+        globalObject.buildInfo?.viteConfigRuntime.vitePluginServerEntry.inject !== true || globalObject.isPrerendering, `Run the built server entry (e.g. ${picocolors_1.default.cyan('$ node dist/server/index.mjs')}) instead of the original server entry (e.g. ${picocolors_1.default.cyan('$ ts-node server/index.ts')})`, { onlyOnce: true });
     }
     const { buildEntry } = globalObject;
     assertBuildEntry(buildEntry);

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.228-commit-13824ea';
+exports.PROJECT_VERSION = '0.4.228-commit-1553dee';

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

@@ -3,9 +3,9 @@ import { isSameAsCurrentUrl, skipLink } from './skipLink.js';
 import { renderPageClientSide } from './renderPageClientSide.js';
 import { scrollToHashOrTop } from './setScrollPosition.js';
 function initOnLinkClick() {
-    document.addEventListener('click', onClick);
+    document.addEventListener('click', onLinkClick);
 }
-async function onClick(ev) {
+async function onLinkClick(ev) {
     if (!isNormalLeftClick(ev))
         return;
     const linkTag = findLinkTag(ev.target);

package/dist/esm/node/plugin/plugins/build/handleAssetsManifest.js

@@ -296,16 +296,21 @@ function handleAssetsManifest_getBuildConfig(config) {
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
-    if (isViteServerBuild_onlySsrEnv(config, viteEnv)) {
+    const isSsREnv = isViteServerBuild_onlySsrEnv(config, viteEnv);
+    if (isSsREnv) {
         assert(!assetsJsonFilePath);
         const outDirs = getOutDirs(config, viteEnv);
         assetsJsonFilePath = path.posix.join(outDirs.outDirRoot, 'assets.json');
         await writeAssetsManifestFile(outDirs, assetsJsonFilePath, config);
     }
     if (isViteServerBuild(config, viteEnv)) {
-        assert(assetsJsonFilePath);
-        // Replace __VITE_ASSETS_MANIFEST__ in all server-side bundles
-        await set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath);
+        // Replace __VITE_ASSETS_MANIFEST__ in server builds
+        // - Always replace it in dist/server/
+        // - Also in some other server builds such as dist/vercel/ from vike-vercel
+        // - Don't replace it in dist/rsc/ from vike-react-rsc since __VITE_ASSETS_MANIFEST__ doesn't exist there
+        const noop = await set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath);
+        if (isSsREnv)
+            assert(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
     }
 }
 async function writeAssetsManifestFile(outDirs, assetsJsonFilePath, config) {

package/dist/esm/node/plugin/plugins/build/pluginBuildEntry.d.ts

@@ -4,4 +4,4 @@ import type { Plugin, Rollup } from 'vite';
 type Bundle = Rollup.OutputBundle;
 type Options = Rollup.NormalizedOutputOptions;
 declare function pluginBuildEntry(): Plugin[];
-declare function set_macro_ASSETS_MANIFEST(options: Options, bundle: Bundle, assetsJsonFilePath: string): Promise<void>;
+declare function set_macro_ASSETS_MANIFEST(options: Options, bundle: Bundle, assetsJsonFilePath: string | undefined): Promise<boolean>;

package/dist/esm/node/plugin/plugins/build/pluginBuildEntry.js

@@ -63,6 +63,12 @@ async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
     const { dir } = options;
     assert(dir);
     const chunkPath = find_ASSETS_MANIFEST(bundle);
+    // Some server builds don't contain __VITE_ASSETS_MANIFEST__ such as dist/rsc/ from vike-react-rsc
+    if (!chunkPath) {
+        const noop = true; // no operation
+        return noop;
+    }
+    assert(assetsJsonFilePath);
     const chunkFilePath = path.join(dir, chunkPath);
     const [assetsJsonString, chunkFileContent] = await Promise.all([
         await fs.readFile(assetsJsonFilePath, 'utf8'),
@@ -71,6 +77,8 @@ async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
     const serverEntryFileContentPatched = chunkFileContent.replace(ASSETS_MANIFEST, assetsJsonString);
     assert(serverEntryFileContentPatched !== chunkFileContent);
     await fs.writeFile(chunkFilePath, serverEntryFileContentPatched);
+    const noop = false;
+    return noop;
 }
 function find_ASSETS_MANIFEST(bundle) {
     let chunkPath;
@@ -81,7 +89,6 @@ function find_ASSETS_MANIFEST(bundle) {
             chunkPath = filePath;
         }
     }
-    assert(chunkPath);
     return chunkPath;
 }
 function getImportPath(config) {

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

@@ -899,6 +899,7 @@ function assertKnownConfig(configName, configNamesKnownRelevant, configDefinitio
     const errMsg = isPlusFile
         ? `${sourceName} sets an unknown config ${configNameColored}`
         : `${sourceName} sets an unknown Vike config, see ${pc.underline('https://vike.dev/cli')} for the list of CLI options`;
+    assert(errMsg.includes(configName));
     // Missing vike-{react,vue,solid} installation
     {
         const ui = ['vike-react', 'vike-vue', 'vike-solid'];

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

@@ -342,14 +342,12 @@ async function loadBuildEntry(outDir) {
             globalObject.buildEntry = globalObject.buildEntryPrevious;
         }
         assert(globalObject.buildEntry);
+        // If using `inject` then dist/server/index.js imports dist/server/entry.js and loadBuildEntry() isn't needed.
+        // If dist/server/entry.js isn't imported then this means the user is running the original server entry `$ ts-node server/index.ts`.
         assertWarning(
-        // vike-server => `vitePluginServerEntry.inject === true`
-        // vike-node => `vitePluginServerEntry.inject === [ 'index' ]`
-        globalObject.buildInfo?.viteConfigRuntime.vitePluginServerEntry.inject !== true, 
-        /* TO-DO/eventually:
-        !!globalObject.buildInfo?.viteConfigRuntime.vitePluginServerEntry.inject,
-        */
-        `Run the built server entry (e.g. ${pc.cyan('$ node dist/server/index.mjs')}) instead of the original server entry (e.g. ${pc.cyan('$ ts-node server/index.ts')})`, { onlyOnce: true });
+        // vike-server => `inject === true`
+        // vike-node => `inject === [ 'index' ]` => we don't show the warning to vike-node users (I don't remember why).
+        globalObject.buildInfo?.viteConfigRuntime.vitePluginServerEntry.inject !== true || globalObject.isPrerendering, `Run the built server entry (e.g. ${pc.cyan('$ node dist/server/index.mjs')}) instead of the original server entry (e.g. ${pc.cyan('$ ts-node server/index.ts')})`, { onlyOnce: true });
     }
     const { buildEntry } = globalObject;
     assertBuildEntry(buildEntry);

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.228-commit-13824ea";
+export declare const PROJECT_VERSION: "0.4.228-commit-1553dee";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.228-commit-13824ea';
+export const PROJECT_VERSION = '0.4.228-commit-1553dee';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.228-commit-13824ea",
+  "version": "0.4.228-commit-1553dee",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {