vike 0.4.225-commit-2b7971f → 0.4.225-commit-6fc12fc

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

@@ -5,6 +5,7 @@ export { reloadVikeConfig };
 export { isV1Design };
 export { getConfVal };
 export { getConfigDefinitionOptional };
+export { getVikeConfigFromCliOrEnv };
 export { isOverriden };
 export type { VikeConfigObject };
 import type { PageConfigGlobalBuildTime, ConfigValueSource, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
@@ -26,6 +27,13 @@ declare function getVikeConfig(config: ResolvedConfig, { doNotRestartViteOnError
 declare function getVikeConfig2(userRootDir: string, isDev: boolean, vikeVitePluginOptions: unknown): Promise<VikeConfigObject>;
 declare function getVikeConfigOptional(): Promise<null | VikeConfigObject>;
 declare function isV1Design(config: ResolvedConfig | UserConfig): boolean;
+declare function getVikeConfigFromCliOrEnv(): {
+    vikeConfigFromCliOrEnv: {
+        [x: string]: unknown;
+    };
+    configFromCliOptions: import("../../../../cli/parseCli.js").CliOptions | null;
+    configFromEnvVar: Record<string, unknown> | null;
+};
 declare function getConfigDefinitionOptional(configDefinitions: ConfigDefinitions, configName: string): ConfigDefinitionInternal | null;
 declare function getConfVal(plusFile: PlusFile, configName: string): null | {
     value: unknown;

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

@@ -5,6 +5,7 @@ export { reloadVikeConfig };
 export { isV1Design };
 export { getConfVal };
 export { getConfigDefinitionOptional };
+export { getVikeConfigFromCliOrEnv };
 export { isOverriden };
 import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, includes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, assertKeys, objectKeys, objectFromEntries, unique, isCallable, makeFirst, lowerFirst, makeLast, assertIsSingleModuleInstance } from '../../../utils.js';
 import { configDefinitionsBuiltIn } from './getVikeConfig/configDefinitionsBuiltIn.js';
@@ -390,15 +391,14 @@ function setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved) {
     if (apiOperation?.options.vikeConfig) {
         addSources(apiOperation.options.vikeConfig, { definedBy: 'api', operation: apiOperation.operation }, false);
     }
+    const { configFromCliOptions, configFromEnvVar } = getVikeConfigFromCliOrEnv();
     // Vike CLI options
-    const cliOptions = getCliOptions();
-    if (cliOptions) {
-        addSources(cliOptions, { definedBy: 'cli' }, true);
+    if (configFromCliOptions) {
+        addSources(configFromCliOptions, { definedBy: 'cli' }, true);
     }
     // VIKE_CONFIG [highest precedence]
-    const configFromEnv = getEnvVarObject('VIKE_CONFIG');
-    if (configFromEnv) {
-        addSources(configFromEnv, { definedBy: 'env' }, false);
+    if (configFromEnvVar) {
+        addSources(configFromEnvVar, { definedBy: 'env' }, false);
     }
     return;
     function addSources(configValues, definedBy, exitOnError) {
@@ -411,6 +411,19 @@ function setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved) {
         });
     }
 }
+function getVikeConfigFromCliOrEnv() {
+    const configFromCliOptions = getCliOptions();
+    const configFromEnvVar = getEnvVarObject('VIKE_CONFIG');
+    const vikeConfigFromCliOrEnv = {
+        ...configFromCliOptions, // Lower precedence
+        ...configFromEnvVar // Higher precedence
+    };
+    return {
+        vikeConfigFromCliOrEnv,
+        configFromCliOptions,
+        configFromEnvVar
+    };
+}
 function getSourceNonConfigFile(configName, value, definedAt) {
     assert(includes(objectKeys(configDefinitionsBuiltIn), configName));
     const configDef = configDefinitionsBuiltIn[configName];

package/dist/esm/node/plugin/shared/getEnvVarObject.js

@@ -18,8 +18,15 @@ function parseJson5(valueStr, what) {
         value = JSON5.parse(valueStr);
     }
     catch (err) {
+        if (isNotJavaScriptLike(valueStr)) {
+            // Interpret as string
+            return valueStr;
+        }
         console.error(err);
         assertUsage(false, `Cannot parse ${pc.cyan(what)} (see error above) because it's set to the following which isn't a valid JSON5 string: ${pc.bold(valueStr)}`);
     }
     return value;
 }
+function isNotJavaScriptLike(valueStr) {
+    return ![':', ',', '{', '}', '(', ')'].some((c) => valueStr.includes(c));
+}

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

@@ -38,8 +38,8 @@ async function runPrerenderFromAPI(options = {}) {
 }
 async function runPrerenderFromCLIPrerenderCommand() {
     try {
-        const { viteConfigEnhanced } = await prepareViteApiCall({}, 'prerender');
-        await runPrerender({ viteConfig: viteConfigEnhanced }, '$ vike prerender');
+        const { viteConfigFromUserEnhanced } = await prepareViteApiCall({}, 'prerender');
+        await runPrerender({ viteConfig: viteConfigFromUserEnhanced }, '$ vike prerender');
     }
     catch (err) {
         console.error(err);

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

@@ -15,4 +15,4 @@ export * from '../../utils/isArray.js';
 export * from '../../utils/isObject.js';
 export * from '../../utils/changeEnumerable.js';
 export * from '../../utils/makePublicCopy.js';
-export * from '../../utils/isNotNullish.js';
+export * from '../../utils/isNullish.js';

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

@@ -17,4 +17,4 @@ export * from '../../utils/isArray.js';
 export * from '../../utils/isObject.js';
 export * from '../../utils/changeEnumerable.js';
 export * from '../../utils/makePublicCopy.js';
-export * from '../../utils/isNotNullish.js';
+export * from '../../utils/isNullish.js';

package/dist/esm/node/runtime/globalContext.d.ts

@@ -21,7 +21,6 @@ export type { GlobalContextPublic };
 import type { ViteManifest } from '../shared/ViteManifest.js';
 import type { ResolvedConfig, ViteDevServer } from 'vite';
 import type { PageConfigUserFriendly, PageConfigsUserFriendly } from '../../shared/page-configs/getPageConfigUserFriendly.js';
-import type { ConfigVitePluginServerEntry } from '@brillout/vite-plugin-server-entry/plugin';
 import { type BaseUrlsResolved } from '../shared/resolveBase.js';
 type PageRuntimeInfo = Awaited<ReturnType<typeof getUserFiles>>;
 type GlobalContextInternal = GlobalContext & {
@@ -84,11 +83,11 @@ type BuildInfo = {
     viteConfigRuntime: {
         _baseViteOriginal: string;
         vitePluginServerEntry: {
-            inject?: NonNullable<ConfigVitePluginServerEntry['vitePluginServerEntry']>['inject'];
+            inject?: boolean;
         };
     };
 };
 declare function assertBuildInfo(buildInfo: unknown): asserts buildInfo is BuildInfo;
-declare function getViteConfigRuntime(viteConfig: ResolvedConfig & ConfigVitePluginServerEntry): BuildInfo['viteConfigRuntime'];
+declare function getViteConfigRuntime(viteConfig: ResolvedConfig): BuildInfo['viteConfigRuntime'];
 declare function updateUserFiles(): Promise<void>;
 declare function clearGlobalContext(): void;

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

@@ -308,10 +308,14 @@ async function loadBuildEntry(outDir) {
             globalObject.buildEntry = globalObject.buildEntryPrevious;
         }
         assert(globalObject.buildEntry);
-        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. ${pc.cyan('$ node dist/server/index.mjs')}) instead of running the original server entry (e.g. ${pc.cyan('$ ts-node server/index.ts')})`, { onlyOnce: true });
+        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 });
     }
     const { buildEntry } = globalObject;
     assertBuildEntry(buildEntry);

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

@@ -31,7 +31,7 @@ export * from '../../utils/urlToFile.js';
 export * from '../../utils/getGlobalObject.js';
 export * from '../../utils/freezePartial.js';
 export * from '../../utils/isNpmPackage.js';
-export * from '../../utils/isNotNullish.js';
+export * from '../../utils/isNullish.js';
 export * from '../../utils/isScriptFile.js';
 export * from '../../utils/removeFileExtention.js';
 export * from '../../utils/objectKeys.js';

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

@@ -35,7 +35,7 @@ export * from '../../utils/urlToFile.js';
 export * from '../../utils/getGlobalObject.js';
 export * from '../../utils/freezePartial.js';
 export * from '../../utils/isNpmPackage.js';
-export * from '../../utils/isNotNullish.js';
+export * from '../../utils/isNullish.js';
 export * from '../../utils/isScriptFile.js';
 export * from '../../utils/removeFileExtention.js';
 export * from '../../utils/objectKeys.js';

package/dist/esm/node/runtime-dev/createDevMiddleware.js

@@ -20,8 +20,8 @@ async function createDevMiddleware(options = {}) {
             }
         }
     };
-    const { viteConfigEnhanced } = await prepareViteApiCall(optionsMod, 'dev');
-    const server = await createServer(viteConfigEnhanced);
+    const { viteConfigFromUserEnhanced } = await prepareViteApiCall(optionsMod, 'dev');
+    const server = await createServer(viteConfigFromUserEnhanced);
     const devMiddleware = server.middlewares;
     return { devMiddleware, viteServer: server, viteConfig: server.config };
 }

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

@@ -10,6 +10,6 @@ export * from '../../utils/parseUrl.js';
 export * from '../../utils/parseUrl-extras.js';
 export * from '../../utils/isObject.js';
 export * from '../../utils/assertIsNotBrowser.js';
-export * from '../../utils/isNotNullish.js';
+export * from '../../utils/isNullish.js';
 export * from '../../utils/unique.js';
 export * from '../../utils/debug.js';

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

@@ -12,6 +12,6 @@ export * from '../../utils/parseUrl.js';
 export * from '../../utils/parseUrl-extras.js';
 export * from '../../utils/isObject.js';
 export * from '../../utils/assertIsNotBrowser.js';
-export * from '../../utils/isNotNullish.js';
+export * from '../../utils/isNullish.js';
 export * from '../../utils/unique.js';
 export * from '../../utils/debug.js';

package/dist/esm/node/shared/virtual-files.d.ts

@@ -1,6 +1,8 @@
 export { isVirtualFileId };
 export { getVirtualFileId };
 export { resolveVirtualFileId };
+export { removeVirtualIdTag };
 declare function isVirtualFileId(id: string): boolean;
 declare function getVirtualFileId(id: string): string;
 declare function resolveVirtualFileId(id: string): string;
+declare function removeVirtualIdTag(id: string): string;

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

@@ -1,32 +1,36 @@
 export { isVirtualFileId };
 export { getVirtualFileId };
 export { resolveVirtualFileId };
+export { removeVirtualIdTag };
 import pc from '@brillout/picocolors';
 import { assert, assertUsage } from './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
     assertUsage(!id.includes(idBase), `Encountered a module ID ${pc.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);
-    }
-    assert(!id.startsWith(tag));
-    return id;
+    return removeVirtualIdTag(id);
 }
 function resolveVirtualFileId(id) {
     assert(isVirtualFileId(id));
-    if (!id.startsWith(tag)) {
-        id = tag + id;
+    if (!id.startsWith(virtualIdTag)) {
+        id = virtualIdTag + id;
+    }
+    assert(id.startsWith(virtualIdTag));
+    return id;
+}
+function removeVirtualIdTag(id) {
+    if (id.startsWith(virtualIdTag)) {
+        id = id.slice(virtualIdTag.length);
     }
-    assert(id.startsWith(tag));
+    assert(!id.startsWith(virtualIdTag));
     return id;
 }

package/dist/esm/shared/modifyUrl.d.ts

@@ -1,4 +1,5 @@
 export { modifyUrl };
+import { type ModifyUrlSameOriginOptions } from './modifyUrlSameOrigin.js';
 /**
  * Modify a URL.
  *
@@ -6,8 +7,7 @@ export { modifyUrl };
  *
  * https://vike.dev/modifyUrl
  */
-declare function modifyUrl(url: string, modify: {
-    pathname?: string;
+declare function modifyUrl(url: string, modify: ModifyUrlSameOriginOptions & {
     hostname?: string;
     port?: number;
     protocol?: string;

package/dist/esm/shared/modifyUrl.js

@@ -1,4 +1,5 @@
 export { modifyUrl };
+import { modifyUrlSameOrigin } from './modifyUrlSameOrigin.js';
 import { createUrlFromComponents, parseUrl } from './utils.js';
 /**
  * Modify a URL.
@@ -8,9 +9,8 @@ import { createUrlFromComponents, parseUrl } from './utils.js';
  * https://vike.dev/modifyUrl
  */
 function modifyUrl(url, modify) {
+    url = modifyUrlSameOrigin(url, modify);
     const urlParsed = parseUrl(url, '/');
-    // Pathname
-    const pathname = modify.pathname ?? urlParsed.pathname;
     // Origin
     const originParts = [
         modify.protocol ?? urlParsed.protocol ?? '',
@@ -21,8 +21,6 @@ function modifyUrl(url, modify) {
         originParts.push(`:${port}`);
     }
     const origin = originParts.join('');
-    const urlModified = createUrlFromComponents(origin, pathname, 
-    // Should we also support modifying search and hash?
-    urlParsed.searchOriginal, urlParsed.hashOriginal);
+    const urlModified = createUrlFromComponents(origin, urlParsed.pathname, urlParsed.searchOriginal, urlParsed.hashOriginal);
     return urlModified;
 }

package/dist/esm/shared/modifyUrlSameOrigin.d.ts

@@ -0,0 +1,9 @@
+export { modifyUrlSameOrigin };
+export { ModifyUrlSameOriginOptions };
+type ModifyUrlSameOriginOptions = {
+    hash?: string | null;
+    search?: Search | null;
+    pathname?: string;
+};
+type Search = Record<string, string | null> | URLSearchParams;
+declare function modifyUrlSameOrigin(url: string, modify: ModifyUrlSameOriginOptions): string;

package/dist/esm/shared/modifyUrlSameOrigin.js

@@ -0,0 +1,40 @@
+export { modifyUrlSameOrigin };
+import { createUrlFromComponents, isNotNullish_keyVal, parseUrl, objectFilter, assertUsageUrlPathnameAbsolute } from './utils.js';
+function modifyUrlSameOrigin(url, modify) {
+    const urlParsed = parseUrl(url, '/');
+    // Pathname
+    const pathname = modify.pathname ?? urlParsed.pathnameOriginal;
+    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 = 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 = objectFilter({ ...urlParsed.search, ...search }, (isNotNullish_keyVal));
+        searchParams = new URLSearchParams(searchMap);
+    }
+    return '?' + searchParams.toString();
+}

package/dist/esm/shared/page-configs/Config.d.ts

@@ -491,6 +491,12 @@ type ConfigBuiltIn = {
      * https://vike.dev/port
      */
     port?: number;
+    /**
+     * Set the mode to run in.
+     *
+     * https://vike.dev/mode
+     */
+    mode?: string;
     /** Where scripts are injected in the HTML.
      *
      * https://vike.dev/injectScriptsAt

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

@@ -10,7 +10,7 @@ export * from '../utils/isBrowser.js';
 export * from '../utils/hasProp.js';
 export * from '../utils/isPlainObject.js';
 export * from '../utils/compareString.js';
-export * from '../utils/isNotNullish.js';
+export * from '../utils/isNullish.js';
 export * from '../utils/stringifyStringArray.js';
 export * from '../utils/cast.js';
 export * from '../utils/isPropertyGetter.js';
@@ -22,3 +22,4 @@ export * from '../utils/isArray.js';
 export * from '../utils/changeEnumerable.js';
 export * from '../utils/objectDefineProperty.js';
 export * from '../utils/isScriptFile.js';
+export * from '../utils/objectFilter.js';

package/dist/esm/shared/utils.js

@@ -14,7 +14,7 @@ export * from '../utils/isBrowser.js';
 export * from '../utils/hasProp.js';
 export * from '../utils/isPlainObject.js';
 export * from '../utils/compareString.js';
-export * from '../utils/isNotNullish.js';
+export * from '../utils/isNullish.js';
 export * from '../utils/stringifyStringArray.js';
 export * from '../utils/cast.js';
 export * from '../utils/isPropertyGetter.js';
@@ -26,3 +26,4 @@ export * from '../utils/isArray.js';
 export * from '../utils/changeEnumerable.js';
 export * from '../utils/objectDefineProperty.js';
 export * from '../utils/isScriptFile.js';
+export * from '../utils/objectFilter.js';

package/dist/esm/types/index.d.ts

@@ -3,7 +3,6 @@ export type { PageContextServer } from '../shared/types.js';
 export type { PageContextClient } from '../shared/types.js';
 export type { PageContextWithServerRouting } from '../shared/types.js';
 export type { PageContextClientWithServerRouting } from '../shared/types.js';
-export type { ConfigVitePluginServerEntry } from '@brillout/vite-plugin-server-entry/plugin';
 export type { PageContextBuiltInServer } from '../shared/types.js';
 export type { PageContextBuiltInClientWithClientRouting } from '../shared/types.js';
 export type { PageContextBuiltInClientWithServerRouting } from '../shared/types.js';

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.225-commit-2b7971f";
+export declare const PROJECT_VERSION: "0.4.225-commit-6fc12fc";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.225-commit-2b7971f';
+export const PROJECT_VERSION = '0.4.225-commit-6fc12fc';

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

@@ -0,0 +1,3 @@
+export declare function isNullish(val: unknown): val is null | undefined;
+export declare function isNotNullish<T>(p: T | null | undefined): p is T;
+export declare function isNotNullish_keyVal<T>(arg: [string, T | null | undefined]): arg is [string, T];

package/dist/esm/utils/isNullish.js

@@ -0,0 +1,11 @@
+export function isNullish(val) {
+    return val === null || val === undefined;
+}
+// someArray.filter(isNotNullish)
+export function isNotNullish(p) {
+    return !isNullish(p);
+}
+// objectFilter(obj).filter(isNotNullish_keyVal)
+export function isNotNullish_keyVal(arg) {
+    return !isNullish(arg[1]);
+}

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

@@ -0,0 +1 @@
+export declare function objectFilter<Val, Val2 extends Val, Obj extends Record<string, Val>>(obj: Obj, filter: (arg: [string, Val]) => arg is [string, Val2]): Record<string, Val2>;

package/dist/esm/utils/objectFilter.js

@@ -0,0 +1,7 @@
+// Type inference for:
+// ```js
+// Object.fromEntries(Object.entries(obj).filter(someFilter))
+// ```
+export function objectFilter(obj, filter) {
+    return Object.fromEntries(Object.entries(obj).filter(filter));
+}

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

@@ -0,0 +1 @@
+export declare function pick<Obj extends Record<string, unknown>, Keys extends keyof Obj>(obj: Obj, keys: Keys[]): Pick<Obj, Keys>;

package/dist/esm/utils/pick.js

@@ -0,0 +1,9 @@
+export function pick(obj, keys) {
+    const result = {};
+    for (const key of keys) {
+        if (key in obj) {
+            result[key] = obj[key];
+        }
+    }
+    return result;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.225-commit-2b7971f",
+  "version": "0.4.225-commit-6fc12fc",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -123,7 +123,7 @@
     "@brillout/json-serializer": "^0.5.15",
     "@brillout/picocolors": "^1.0.26",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.6.3",
+    "@brillout/vite-plugin-server-entry": "0.6.3-commit-0c67c6a",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",

package/dist/cjs/utils/isNotNullish.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNotNullish = void 0;
-const isNotNullish = (p) => p !== null && p !== undefined;
-exports.isNotNullish = isNotNullish;

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

@@ -1 +0,0 @@
-export declare const isNotNullish: <T>(p: T | null | undefined) => p is T;

package/dist/esm/utils/isNotNullish.js

@@ -1 +0,0 @@
-export const isNotNullish = (p) => p !== null && p !== undefined;