vike 0.4.225-commit-b8fc36e → 0.4.225-commit-706a37b

package/dist/cjs/node/api/prepareViteApiCall.js

@@ -62,11 +62,12 @@ function clear() {
 }
 async function resolveConfigs(viteConfigFromUserApiOptions, operation) {
     const viteInfo = await getViteInfo(viteConfigFromUserApiOptions, operation);
-    await assertViteRoot2(viteInfo.root, viteInfo.viteConfigFromUserEnhanced, operation);
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig2)(viteInfo.root, operation === 'dev', viteInfo.vikeVitePluginOptions);
     const viteConfigFromUserEnhanced = applyVikeViteConfig(viteInfo.viteConfigFromUserEnhanced, vikeConfig);
+    const { viteConfigResolved } = await assertViteRoot2(viteInfo.root, viteConfigFromUserEnhanced, operation);
     return {
         vikeConfig,
+        viteConfigResolved, // ONLY USE if strictly necessary. (We plan to remove assertViteRoot2() as explained in the comments of that function.)
         viteConfigFromUserEnhanced
     };
 }
@@ -189,9 +190,10 @@ function normalizeViteRoot(root) {
 const errMsg = `A Vite plugin is modifying Vite's setting ${picocolors_1.default.cyan('root')} which is forbidden`;
 async function assertViteRoot2(root, viteConfigFromUserEnhanced, operation) {
     const args = getResolveConfigArgs(viteConfigFromUserEnhanced, operation);
-    // We can eventually this resolveConfig() call (along with removing the whole assertViteRoot2() function which is redundant with the assertViteRoot() function) so that Vike doesn't make any resolveConfig() (except for pre-rendering which is required). But let's keep it for now, just to see whether calling resolveConfig() can be problematic.
+    // We can eventually remove this resolveConfig() call (along with removing the whole assertViteRoot2() function which is redundant with the assertViteRoot() function) so that Vike doesn't make any resolveConfig() (except for pre-rendering and preview which is required). But let's keep it for now, just to see whether calling resolveConfig() can be problematic.
     const viteConfigResolved = await (0, vite_1.resolveConfig)(...args);
     (0, utils_js_1.assertUsage)(normalizeViteRoot(viteConfigResolved.root) === normalizeViteRoot(root), errMsg);
+    return { viteConfigResolved };
 }
 function assertViteRoot(root, config) {
     if (globalObject.root)

package/dist/cjs/node/api/prerender.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.prerender = prerender;
 const runPrerender_js_1 = require("../prerender/runPrerender.js");
 const prepareViteApiCall_js_1 = require("./prepareViteApiCall.js");
-// TODO/soon use importServerProductionIndex()
 /**
  * Programmatically trigger `$ vike prerender`
  *

package/dist/cjs/node/api/preview.js

@@ -1,18 +1,39 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.preview = preview;
 const prepareViteApiCall_js_1 = require("./prepareViteApiCall.js");
 const vite_1 = require("vite");
+const runtime_1 = require("@brillout/vite-plugin-server-entry/runtime");
+const getOutDirs_js_1 = require("../plugin/shared/getOutDirs.js");
+const utils_js_1 = require("./utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const node_path_1 = __importDefault(require("node:path"));
+const utils_js_2 = require("../runtime/utils.js");
 /**
  * Programmatically trigger `$ vike preview`
  *
  * https://vike.dev/api#preview
  */
 async function preview(options = {}) {
-    const { viteConfigFromUserEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options, 'preview');
-    const server = await (0, vite_1.preview)(viteConfigFromUserEnhanced);
-    return {
-        viteServer: server,
-        viteConfig: server.config
-    };
+    (0, utils_js_2.onSetupPreview)();
+    const { viteConfigFromUserEnhanced, viteConfigResolved } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options, 'preview');
+    if (viteConfigResolved.vitePluginServerEntry?.inject) {
+        const outDir = (0, getOutDirs_js_1.getOutDirs)(viteConfigResolved).outDirRoot;
+        const { outServerIndex } = await (0, runtime_1.importServerProductionIndex)({ outDir });
+        const outServerIndexRelative = node_path_1.default.relative(viteConfigResolved.root, outServerIndex);
+        (0, utils_js_1.assertWarning)(false, `Never run ${picocolors_1.default.cyan('$ vike preview')} in production, run ${picocolors_1.default.cyan(`$ node ${outServerIndexRelative}`)} instead.`, { onlyOnce: true });
+        return {
+            viteConfig: viteConfigResolved
+        };
+    }
+    else {
+        const server = await (0, vite_1.preview)(viteConfigFromUserEnhanced);
+        return {
+            viteServer: server,
+            viteConfig: server.config
+        };
+    }
 }

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

@@ -95,8 +95,10 @@ async function cmdBuild() {
 async function cmdPreview() {
     try {
         const { viteServer } = await (0, index_js_1.preview)();
-        viteServer.printUrls();
-        viteServer.bindCLIShortcuts({ print: true });
+        if (viteServer) {
+            viteServer.printUrls();
+            viteServer.bindCLIShortcuts({ print: true });
+        }
     }
     catch (err) {
         console.error(picocolors_1.default.red(`Error while starting preview server:`));

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

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pluginModuleBanner = pluginModuleBanner;
+const utils_js_1 = require("../../utils.js");
+const virtual_files_js_1 = require("../../../shared/virtual-files.js");
+const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
+// Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
+// But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
+const vikeModuleBannerPlaceholder = 'vikeModuleBannerPlaceholder';
+function pluginModuleBanner() {
+    let config;
+    return {
+        name: 'vike:pluginModuleBanner',
+        enforce: 'post',
+        apply: 'build',
+        configResolved(config_) {
+            config = config_;
+        },
+        generateBundle: {
+            order: 'post',
+            handler(_options, bundle) {
+                for (const module of Object.values(bundle)) {
+                    if (module.type === 'chunk') {
+                        if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {
+                            const codeOld = module.code;
+                            const codeNew = codeOld.replace(/vikeModuleBannerPlaceholder\("([^"]*)"\);/g, '/* $1 [vike:pluginModuleBanner] */');
+                            (0, utils_js_1.assert)(!codeNew.includes(vikeModuleBannerPlaceholder));
+                            module.code = codeNew;
+                        }
+                        else {
+                            (0, utils_js_1.assert)(!module.code.includes(vikeModuleBannerPlaceholder));
+                        }
+                    }
+                }
+            }
+        },
+        transform: {
+            order: 'post',
+            handler(code, id, options) {
+                if (!(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options))
+                    return;
+                if (id.startsWith('\0'))
+                    id = id;
+                id = (0, virtual_files_js_1.removeVirtualIdTag)(id);
+                if (id.startsWith(config.root))
+                    id = id.slice(config.root.length + 1);
+                return `${vikeModuleBannerPlaceholder}(${JSON.stringify(id)}); ${code}`;
+            }
+        }
+    };
+}

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

@@ -8,6 +8,7 @@ const pluginDistFileNames_js_1 = require("./build/pluginDistFileNames.js");
 const pluginAutoFullBuild_js_1 = require("./build/pluginAutoFullBuild.js");
 const pluginBuildEntry_js_1 = require("./build/pluginBuildEntry.js");
 const pluginBuildConfig_js_1 = require("./build/pluginBuildConfig.js");
+const pluginModuleBanner_js_1 = require("./build/pluginModuleBanner.js");
 function build() {
     return [
         ...(0, pluginBuildConfig_js_1.pluginBuildConfig)(),
@@ -16,6 +17,7 @@ function build() {
         ...(0, pluginBuildEntry_js_1.pluginBuildEntry)(),
         (0, pluginDistPackageJsonFile_js_1.pluginDistPackageJsonFile)(),
         (0, pluginSuppressRollupWarning_js_1.pluginSuppressRollupWarning)(),
-        (0, pluginDistFileNames_js_1.pluginDistFileNames)()
+        (0, pluginDistFileNames_js_1.pluginDistFileNames)(),
+        (0, pluginModuleBanner_js_1.pluginModuleBanner)()
     ];
 }

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

@@ -71,6 +71,10 @@ function commonConfig(vikeVitePluginOptions) {
                     assertEsm(config.root);
                     assertVikeCliOrApi(config);
                     temp_supportOldInterface(config);
+                    // Only emit dist/server/entry.mjs if necessary
+                    if (config.vitePluginServerEntry?.inject &&
+                        !(0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(config._vikeConfigObject).isPrerenderingEnabled)
+                        config.vitePluginServerEntry.disableServerEntryEmit = true;
                 }
             },
             config: {

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

@@ -33,4 +33,4 @@ __exportStar(require("../../utils/isArray.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);
 __exportStar(require("../../utils/changeEnumerable.js"), exports);
 __exportStar(require("../../utils/makePublicCopy.js"), exports);
-__exportStar(require("../../utils/isNotNullish.js"), exports);
+__exportStar(require("../../utils/isNullish.js"), exports);

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

@@ -311,10 +311,14 @@ async function loadBuildEntry(outDir) {
             globalObject.buildEntry = globalObject.buildEntryPrevious;
         }
         (0, utils_js_1.assert)(globalObject.buildEntry);
-        (0, utils_js_1.assertWarning)(!globalObject.buildInfo?.viteConfigRuntime.vitePluginServerEntry.inject, 
-        // TODO/soon: show precise path
-        // TODO/soon: make this warning work on test/vike-node/
-        `Run the server production build (e.g. ${picocolors_1.default.cyan('$ node dist/server/index.mjs')}) instead of running the original server entry (e.g. ${picocolors_1.default.cyan('$ ts-node server/index.ts')})`, { onlyOnce: true });
+        (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 });
     }
     const { buildEntry } = globalObject;
     assertBuildEntry(buildEntry);

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

@@ -51,7 +51,7 @@ __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);
 __exportStar(require("../../utils/freezePartial.js"), exports);
 __exportStar(require("../../utils/isNpmPackage.js"), exports);
-__exportStar(require("../../utils/isNotNullish.js"), exports);
+__exportStar(require("../../utils/isNullish.js"), exports);
 __exportStar(require("../../utils/isScriptFile.js"), exports);
 __exportStar(require("../../utils/removeFileExtention.js"), exports);
 __exportStar(require("../../utils/objectKeys.js"), exports);

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

@@ -28,6 +28,6 @@ __exportStar(require("../../utils/parseUrl.js"), exports);
 __exportStar(require("../../utils/parseUrl-extras.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);
 __exportStar(require("../../utils/assertIsNotBrowser.js"), exports);
-__exportStar(require("../../utils/isNotNullish.js"), exports);
+__exportStar(require("../../utils/isNullish.js"), exports);
 __exportStar(require("../../utils/unique.js"), exports);
 __exportStar(require("../../utils/debug.js"), exports);

package/dist/cjs/node/shared/virtual-files.js

@@ -6,32 +6,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isVirtualFileId = isVirtualFileId;
 exports.getVirtualFileId = getVirtualFileId;
 exports.resolveVirtualFileId = resolveVirtualFileId;
+exports.removeVirtualIdTag = removeVirtualIdTag;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("./utils.js");
 const idBase = 'virtual:vike:';
 // https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
-const tag = '\0';
+const virtualIdTag = '\0';
 function isVirtualFileId(id) {
     if (id.startsWith(idBase))
         return true;
-    if (id.startsWith(tag + idBase))
+    if (id.startsWith(virtualIdTag + idBase))
         return true;
     // https://github.com/vikejs/vike/issues/1985
     (0, utils_js_1.assertUsage)(!id.includes(idBase), `Encountered a module ID ${picocolors_1.default.cyan(id)} that is unexpected. Are you using a tool that modifies the ID of modules? For example, the baseUrl setting in tsconfig.json cannot be used.`);
     return false;
 }
 function getVirtualFileId(id) {
-    if (id.startsWith(tag)) {
-        id = id.slice(tag.length);
-    }
-    (0, utils_js_1.assert)(!id.startsWith(tag));
-    return id;
+    return removeVirtualIdTag(id);
 }
 function resolveVirtualFileId(id) {
     (0, utils_js_1.assert)(isVirtualFileId(id));
-    if (!id.startsWith(tag)) {
-        id = tag + id;
+    if (!id.startsWith(virtualIdTag)) {
+        id = virtualIdTag + id;
+    }
+    (0, utils_js_1.assert)(id.startsWith(virtualIdTag));
+    return id;
+}
+function removeVirtualIdTag(id) {
+    if (id.startsWith(virtualIdTag)) {
+        id = id.slice(virtualIdTag.length);
     }
-    (0, utils_js_1.assert)(id.startsWith(tag));
+    (0, utils_js_1.assert)(!id.startsWith(virtualIdTag));
     return id;
 }

package/dist/cjs/shared/modifyUrl.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.modifyUrl = modifyUrl;
+const modifyUrlSameOrigin_js_1 = require("./modifyUrlSameOrigin.js");
 const utils_js_1 = require("./utils.js");
 /**
  * Modify a URL.
@@ -10,9 +11,8 @@ const utils_js_1 = require("./utils.js");
  * https://vike.dev/modifyUrl
  */
 function modifyUrl(url, modify) {
+    url = (0, modifyUrlSameOrigin_js_1.modifyUrlSameOrigin)(url, modify);
     const urlParsed = (0, utils_js_1.parseUrl)(url, '/');
-    // Pathname
-    const pathname = modify.pathname ?? urlParsed.pathname;
     // Origin
     const originParts = [
         modify.protocol ?? urlParsed.protocol ?? '',
@@ -23,8 +23,6 @@ function modifyUrl(url, modify) {
         originParts.push(`:${port}`);
     }
     const origin = originParts.join('');
-    const urlModified = (0, utils_js_1.createUrlFromComponents)(origin, pathname, 
-    // Should we also support modifying search and hash?
-    urlParsed.searchOriginal, urlParsed.hashOriginal);
+    const urlModified = (0, utils_js_1.createUrlFromComponents)(origin, urlParsed.pathname, urlParsed.searchOriginal, urlParsed.hashOriginal);
     return urlModified;
 }

package/dist/cjs/shared/modifyUrlSameOrigin.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modifyUrlSameOrigin = modifyUrlSameOrigin;
+const utils_js_1 = require("./utils.js");
+function modifyUrlSameOrigin(url, modify) {
+    const urlParsed = (0, utils_js_1.parseUrl)(url, '/');
+    // Pathname
+    const pathname = modify.pathname ?? urlParsed.pathnameOriginal;
+    (0, utils_js_1.assertUsageUrlPathnameAbsolute)(pathname, 'modify.pathname');
+    // Search
+    let search = modify.search === null ? '' : !modify.search ? urlParsed.searchOriginal : resolveSearch(urlParsed, modify.search);
+    if (search === '?')
+        search = '';
+    // Hash
+    let hash;
+    if (modify.hash === null) {
+        hash = '';
+    }
+    else if (modify.hash === undefined) {
+        hash = urlParsed.hashOriginal ?? '';
+    }
+    else {
+        hash = modify.hash;
+        if (!hash.startsWith('#'))
+            hash = '#' + hash;
+    }
+    const urlModified = (0, utils_js_1.createUrlFromComponents)(urlParsed.origin, pathname, search, hash);
+    return urlModified;
+}
+function resolveSearch(urlParsed, search) {
+    let searchParams;
+    if (search instanceof URLSearchParams) {
+        // Overwrite
+        searchParams = search;
+    }
+    else {
+        // Merge
+        const searchMap = (0, utils_js_1.objectFilter)({ ...urlParsed.search, ...search }, (utils_js_1.isNotNullish_keyVal));
+        searchParams = new URLSearchParams(searchMap);
+    }
+    return '?' + searchParams.toString();
+}

package/dist/cjs/shared/utils.js

@@ -30,7 +30,7 @@ __exportStar(require("../utils/isBrowser.js"), exports);
 __exportStar(require("../utils/hasProp.js"), exports);
 __exportStar(require("../utils/isPlainObject.js"), exports);
 __exportStar(require("../utils/compareString.js"), exports);
-__exportStar(require("../utils/isNotNullish.js"), exports);
+__exportStar(require("../utils/isNullish.js"), exports);
 __exportStar(require("../utils/stringifyStringArray.js"), exports);
 __exportStar(require("../utils/cast.js"), exports);
 __exportStar(require("../utils/isPropertyGetter.js"), exports);
@@ -42,3 +42,4 @@ __exportStar(require("../utils/isArray.js"), exports);
 __exportStar(require("../utils/changeEnumerable.js"), exports);
 __exportStar(require("../utils/objectDefineProperty.js"), exports);
 __exportStar(require("../utils/isScriptFile.js"), exports);
+__exportStar(require("../utils/objectFilter.js"), exports);

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.225-commit-b8fc36e';
+exports.PROJECT_VERSION = '0.4.225-commit-706a37b';

package/dist/cjs/utils/assertSetup.js

@@ -7,12 +7,12 @@ exports.assertIsNotProductionRuntime = assertIsNotProductionRuntime;
 exports.onSetupRuntime = onSetupRuntime;
 exports.onSetupBuild = onSetupBuild;
 exports.onSetupPrerender = onSetupPrerender;
+exports.onSetupPreview = onSetupPreview;
 exports.setNodeEnvProduction = setNodeEnvProduction;
 exports.markSetup_viteDevServer = markSetup_viteDevServer;
 exports.markSetup_vitePreviewServer = markSetup_vitePreviewServer;
 exports.markSetup_vikeVitePlugin = markSetup_vikeVitePlugin;
 exports.markSetup_isViteDev = markSetup_isViteDev;
-exports.markSetup_isPrerendering = markSetup_isPrerendering;
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 const debug_js_1 = require("./debug.js");
@@ -34,7 +34,7 @@ function onSetupRuntime() {
     if (isTest())
         return;
     assertNodeEnvIsNotUndefinedString();
-    if (!isViteLoaded()) {
+    if (!setup.isViteDev) {
         // TODO: make it assertUsage() again once https://github.com/vikejs/vike/issues/1528 is implemented.
         (0, assert_js_1.assertWarning)(!isNodeEnvDev(), `The ${getEnvDescription()}, which is contradictory because the environment seems to be a production environment (Vite isn't loaded), see https://vike.dev/NODE_ENV`, { onlyOnce: true });
         (0, assert_js_1.assertUsage)(!setup.vikeVitePlugin, `Loading Vike's Vite plugin (the ${picocolors_1.default.cyan('vike/plugin')} module) is prohibited in production.`);
@@ -42,11 +42,12 @@ function onSetupRuntime() {
         (0, assert_js_1.assert)(!setup.shouldNotBeProduction);
     }
     else {
-        if (!setup.vitePreviewServer && !setup.isPrerendering) {
+        if (!setup.isPreview && !setup.vitePreviewServer && !setup.isPrerendering) {
             // TODO: make it assertUsage() again once https://github.com/vikejs/vike/issues/1528 is implemented.
             (0, assert_js_1.assertWarning)(isNodeEnvDev(), `The ${getEnvDescription()}, but Vite is loaded which is prohibited in production, see https://vike.dev/NODE_ENV`, { onlyOnce: true });
         }
-        // These two assert() calls aren't that interesting
+        // These assert() calls aren't that interesting
+        (0, assert_js_1.assert)(setup.viteDevServer);
         (0, assert_js_1.assert)(setup.vikeVitePlugin);
         (0, assert_js_1.assert)(setup.shouldNotBeProduction);
     }
@@ -63,15 +64,19 @@ function onSetupBuild() {
     setNodeEnvProduction()
     */
 }
+// Called by ../node/prerender/runPrerender.ts
 function onSetupPrerender() {
     markSetup_isPrerendering();
     if (getNodeEnv())
         assertUsageNodeEnvIsNotDev('pre-rendering');
     setNodeEnvProduction();
 }
-function isViteLoaded() {
-    // Do we need setup.viteDevServer or setup.vitePreviewServer ?
-    return setup.viteDevServer || setup.vitePreviewServer || setup.isViteDev !== undefined;
+// Called by ../node/api/preview.ts
+function onSetupPreview() {
+    markSetup_isPreview();
+    if (getNodeEnv())
+        assertUsageNodeEnvIsNotDev('pre-rendering');
+    setNodeEnvProduction();
 }
 function isTest() {
     return (0, isVitest_js_1.isVitest)() || isNodeEnv('test');
@@ -100,12 +105,16 @@ function markSetup_isViteDev(isViteDev) {
         debug('markSetup_isViteDev()', new Error().stack);
     setup.isViteDev = isViteDev;
 }
-// Called by ../node/prerender/runPrerender.ts
 function markSetup_isPrerendering() {
     if (debug.isActivated)
         debug('markSetup_isPrerendering()', new Error().stack);
     setup.isPrerendering = true;
 }
+function markSetup_isPreview() {
+    if (debug.isActivated)
+        debug('markSetup_isPreview()', new Error().stack);
+    setup.isPreview = true;
+}
 function assertUsageNodeEnvIsNotDev(operation) {
     if (!isNodeEnvDev())
         return;

package/dist/cjs/utils/isNullish.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isNullish = isNullish;
+exports.isNotNullish = isNotNullish;
+exports.isNotNullish_keyVal = isNotNullish_keyVal;
+function isNullish(val) {
+    return val === null || val === undefined;
+}
+// someArray.filter(isNotNullish)
+function isNotNullish(p) {
+    return !isNullish(p);
+}
+// objectFilter(obj).filter(isNotNullish_keyVal)
+function isNotNullish_keyVal(arg) {
+    return !isNullish(arg[1]);
+}

package/dist/cjs/utils/objectFilter.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.objectFilter = objectFilter;
+// Type inference for:
+// ```js
+// Object.fromEntries(Object.entries(obj).filter(someFilter))
+// ```
+function objectFilter(obj, filter) {
+    return Object.fromEntries(Object.entries(obj).filter(filter));
+}

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

@@ -1,5 +1,10 @@
 export { navigate };
 export { reload };
+type Options = {
+    keepScrollPosition?: boolean;
+    overwriteLastHistoryEntry?: boolean;
+    pageContext?: Record<string, unknown>;
+};
 /** Programmatically navigate to a new page.
  *
  * https://vike.dev/navigate
@@ -8,9 +13,5 @@ export { reload };
  * @param keepScrollPosition - Don't scroll to the top of the page, instead keep the current scroll position.
  * @param overwriteLastHistoryEntry - Don't create a new entry in the browser's history, instead let the new URL replace the current URL. (This effectively removes the current URL from the browser history).
  */
-declare function navigate(url: string, { keepScrollPosition, overwriteLastHistoryEntry, pageContext }?: {
-    keepScrollPosition?: boolean;
-    overwriteLastHistoryEntry?: boolean;
-    pageContext?: Record<string, unknown>;
-}): Promise<void>;
+declare function navigate(url: string, options?: Options): Promise<void>;
 declare function reload(): Promise<void>;

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

@@ -1,5 +1,6 @@
 export { navigate };
 export { reload };
+// import { modifyUrlSameOrigin, ModifyUrlSameOriginOptions } from '../../shared/modifyUrlSameOrigin.js'
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { normalizeUrlArgument } from './normalizeUrlArgument.js';
 import { firstRenderStartPromise, renderPageClientSide } from './renderPageClientSide.js';
@@ -13,11 +14,14 @@ assertClientRouting();
  * @param keepScrollPosition - Don't scroll to the top of the page, instead keep the current scroll position.
  * @param overwriteLastHistoryEntry - Don't create a new entry in the browser's history, instead let the new URL replace the current URL. (This effectively removes the current URL from the browser history).
  */
-async function navigate(url, { keepScrollPosition = false, overwriteLastHistoryEntry = false, pageContext } = {}) {
+async function navigate(url, options) {
+    // let url = normalizeUrlArgument(options.url ?? getCurrentUrl(), 'navigate')
+    // url = modifyUrlSameOrigin(url, options)
     normalizeUrlArgument(url, 'navigate');
     // If `hydrationCanBeAborted === false` (e.g. Vue) then we can apply navigate() only after hydration is done
     await firstRenderStartPromise;
-    const scrollTarget = { preserveScroll: keepScrollPosition };
+    const { keepScrollPosition, overwriteLastHistoryEntry, pageContext } = options ?? {};
+    const scrollTarget = { preserveScroll: keepScrollPosition ?? false };
     await renderPageClientSide({
         scrollTarget,
         urlOriginal: url,

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

@@ -2,7 +2,7 @@ export { normalizeUrlArgument };
 import { assertUsage, isUrl, isUrlRelative } from './utils.js';
 function normalizeUrlArgument(url, fnName) {
     // Succinct error message to save client-side KBs
-    const errMsg = `[${fnName}(url)] Invalid URL ${url}`;
+    const errMsg = `URL ${url} passed to ${fnName}() is invalid`;
     assertUsage(isUrl(url), errMsg);
     if (url.startsWith(location.origin)) {
         // Use normalizeClientSideUrl() instead?

package/dist/esm/node/api/prepareViteApiCall.d.ts

@@ -7,6 +7,7 @@ import type { APIOptions, Operation } from './types.js';
 import { type VikeConfigObject } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
 declare function prepareViteApiCall(options: APIOptions, operation: Operation): Promise<{
     vikeConfig: VikeConfigObject;
+    viteConfigResolved: ResolvedConfig;
     viteConfigFromUserEnhanced: InlineConfig | undefined;
 }>;
 declare function getViteRoot(operation: Operation): Promise<string>;

package/dist/esm/node/api/prepareViteApiCall.js

@@ -24,11 +24,12 @@ function clear() {
 }
 async function resolveConfigs(viteConfigFromUserApiOptions, operation) {
     const viteInfo = await getViteInfo(viteConfigFromUserApiOptions, operation);
-    await assertViteRoot2(viteInfo.root, viteInfo.viteConfigFromUserEnhanced, operation);
     const vikeConfig = await getVikeConfig2(viteInfo.root, operation === 'dev', viteInfo.vikeVitePluginOptions);
     const viteConfigFromUserEnhanced = applyVikeViteConfig(viteInfo.viteConfigFromUserEnhanced, vikeConfig);
+    const { viteConfigResolved } = await assertViteRoot2(viteInfo.root, viteConfigFromUserEnhanced, operation);
     return {
         vikeConfig,
+        viteConfigResolved, // ONLY USE if strictly necessary. (We plan to remove assertViteRoot2() as explained in the comments of that function.)
         viteConfigFromUserEnhanced
     };
 }
@@ -151,9 +152,10 @@ function normalizeViteRoot(root) {
 const errMsg = `A Vite plugin is modifying Vite's setting ${pc.cyan('root')} which is forbidden`;
 async function assertViteRoot2(root, viteConfigFromUserEnhanced, operation) {
     const args = getResolveConfigArgs(viteConfigFromUserEnhanced, operation);
-    // We can eventually this resolveConfig() call (along with removing the whole assertViteRoot2() function which is redundant with the assertViteRoot() function) so that Vike doesn't make any resolveConfig() (except for pre-rendering which is required). But let's keep it for now, just to see whether calling resolveConfig() can be problematic.
+    // We can eventually remove this resolveConfig() call (along with removing the whole assertViteRoot2() function which is redundant with the assertViteRoot() function) so that Vike doesn't make any resolveConfig() (except for pre-rendering and preview which is required). But let's keep it for now, just to see whether calling resolveConfig() can be problematic.
     const viteConfigResolved = await resolveConfig(...args);
     assertUsage(normalizeViteRoot(viteConfigResolved.root) === normalizeViteRoot(root), errMsg);
+    return { viteConfigResolved };
 }
 function assertViteRoot(root, config) {
     if (globalObject.root)

package/dist/esm/node/api/prerender.js

@@ -1,7 +1,6 @@
 export { prerender };
 import { runPrerenderFromAPI } from '../prerender/runPrerender.js';
 import { prepareViteApiCall } from './prepareViteApiCall.js';
-// TODO/soon use importServerProductionIndex()
 /**
  * Programmatically trigger `$ vike prerender`
  *

package/dist/esm/node/api/preview.d.ts

@@ -7,6 +7,6 @@ import type { APIOptions } from './types.js';
  * https://vike.dev/api#preview
  */
 declare function preview(options?: APIOptions): Promise<{
-    viteServer: PreviewServer;
+    viteServer?: PreviewServer;
     viteConfig: ResolvedConfig;
 }>;

package/dist/esm/node/api/preview.js

@@ -1,16 +1,34 @@
 export { preview };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { preview as previewVite } from 'vite';
+import { importServerProductionIndex } from '@brillout/vite-plugin-server-entry/runtime';
+import { getOutDirs } from '../plugin/shared/getOutDirs.js';
+import { assertWarning } from './utils.js';
+import pc from '@brillout/picocolors';
+import path from 'node:path';
+import { onSetupPreview } from '../runtime/utils.js';
 /**
  * Programmatically trigger `$ vike preview`
  *
  * https://vike.dev/api#preview
  */
 async function preview(options = {}) {
-    const { viteConfigFromUserEnhanced } = await prepareViteApiCall(options, 'preview');
-    const server = await previewVite(viteConfigFromUserEnhanced);
-    return {
-        viteServer: server,
-        viteConfig: server.config
-    };
+    onSetupPreview();
+    const { viteConfigFromUserEnhanced, viteConfigResolved } = await prepareViteApiCall(options, 'preview');
+    if (viteConfigResolved.vitePluginServerEntry?.inject) {
+        const outDir = getOutDirs(viteConfigResolved).outDirRoot;
+        const { outServerIndex } = await importServerProductionIndex({ outDir });
+        const outServerIndexRelative = path.relative(viteConfigResolved.root, outServerIndex);
+        assertWarning(false, `Never run ${pc.cyan('$ vike preview')} in production, run ${pc.cyan(`$ node ${outServerIndexRelative}`)} instead.`, { onlyOnce: true });
+        return {
+            viteConfig: viteConfigResolved
+        };
+    }
+    else {
+        const server = await previewVite(viteConfigFromUserEnhanced);
+        return {
+            viteServer: server,
+            viteConfig: server.config
+        };
+    }
 }