vike 0.4.159 → 0.4.160-commit-30d535e

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

@@ -33,7 +33,7 @@ function previewConfig() {
                - This ugly hack to set appType for preview won't be need once https://github.com/vitejs/vite/pull/14855 is merged.
             config.appType = 'mpa'
             */
-            (0, utils_js_1.markEnvAsPreview)();
+            (0, utils_js_1.markEnvAsVitePreview)();
             return () => {
                 assertDist();
                 /* We don't use this condition (we wrongfully always use the SSR middleware) because of the regression introduced by https://github.com/vitejs/vite/pull/14756 which stops servering .html files when `appType: 'custom'`.

package/dist/cjs/node/plugin/shared/getHttpRequestAsyncStore.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.installHttpRequestAsyncStore = exports.getHttpRequestAsyncStore = void 0;
 const renderPage_js_1 = require("../../runtime/renderPage.js");
 const utils_js_1 = require("../utils.js");
-const transpileAndExecuteFile_js_1 = require("../plugins/importUserCode/v1-design/transpileAndExecuteFile.js");
+const transpileAndExecuteFile_js_1 = require("../plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js");
 const loggerNotProd_js_1 = require("./loggerNotProd.js");
 const errorWithCodeSnippet_js_1 = require("./loggerNotProd/errorWithCodeSnippet.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();

package/dist/cjs/node/plugin/shared/loggerNotProd/log.js

@@ -22,10 +22,10 @@ exports.logWithVikeTag = logWithVikeTag;
 function getProjectTag(showVikeVersion) {
     let projectTag;
     if (showVikeVersion) {
-        projectTag = `[${utils_js_1.projectInfo.npmPackageName}@${utils_js_1.projectInfo.projectVersion}]`;
+        projectTag = `[vike@${utils_js_1.projectInfo.projectVersion}]`;
     }
     else {
-        projectTag = `[${utils_js_1.projectInfo.npmPackageName}]`;
+        projectTag = `[vike]`;
     }
     return projectTag;
 }
@@ -89,7 +89,7 @@ function prependTags(msg, projectTag, category, logType) {
             return picocolors_1.default.yellow(s);
         if (projectTag === '[vite]')
             return picocolors_1.default.bold(picocolors_1.default.cyan(s));
-        if (projectTag.startsWith(`[${utils_js_1.projectInfo.npmPackageName}`))
+        if (projectTag.startsWith(`[vike`))
             return picocolors_1.default.bold(picocolors_1.default.cyan(s));
         (0, utils_js_1.assert)(false);
     };

package/dist/cjs/node/plugin/shared/loggerNotProd.js

@@ -17,7 +17,7 @@ const utils_js_1 = require("../utils.js");
 const getHttpRequestAsyncStore_js_1 = require("./getHttpRequestAsyncStore.js");
 const isErrorDebug_js_1 = require("./isErrorDebug.js");
 const errorWithCodeSnippet_js_1 = require("./loggerNotProd/errorWithCodeSnippet.js");
-const transpileAndExecuteFile_js_1 = require("../plugins/importUserCode/v1-design/transpileAndExecuteFile.js");
+const transpileAndExecuteFile_js_1 = require("../plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js");
 const log_js_1 = require("./loggerNotProd/log.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isNewError_js_1 = require("../../runtime/renderPage/isNewError.js");

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

@@ -27,7 +27,6 @@ __exportStar(require("../../utils/getDependencyPackageJson.js"), exports);
 __exportStar(require("../../utils/requireResolve.js"), exports);
 __exportStar(require("../../utils/arrayIncludes.js"), exports);
 __exportStar(require("../../utils/isDev.js"), exports);
-__exportStar(require("../../utils/objectKeys.js"), exports);
 __exportStar(require("../../utils/getMostSimilar.js"), exports);
 __exportStar(require("../../utils/getRandomId.js"), exports);
 __exportStar(require("../../utils/joinEnglish.js"), exports);
@@ -35,7 +34,7 @@ __exportStar(require("../../utils/escapeRegex.js"), exports);
 __exportStar(require("../../utils/stripAnsi.js"), exports);
 __exportStar(require("../../utils/trimWithAnsi.js"), exports);
 __exportStar(require("../../utils/removeEmptyLines.js"), exports);
-__exportStar(require("../../utils/findUserPackageJsonPath.js"), exports);
+__exportStar(require("../../utils/findFile.js"), exports);
 __exportStar(require("../../utils/getPropAccessNotation.js"), exports);
 __exportStar(require("../../utils/mergeCumulativeValues.js"), exports);
 __exportStar(require("../../utils/deepEqual.js"), exports);

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

@@ -51,11 +51,11 @@ const loadUserFilesServerSide_js_1 = require("../runtime/renderPage/loadUserFile
 const getHook_js_1 = require("../../shared/hooks/getHook.js");
 const noRouteMatch_js_1 = require("../../shared/route/noRouteMatch.js");
 const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
-const logHintForCjsEsmError_js_1 = require("../runtime/renderPage/logHintForCjsEsmError.js");
+const logErrorHint_js_1 = require("../runtime/renderPage/logErrorHint.js");
 async function runPrerenderFromAPI(options = {}) {
     await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
-    // - We don't use logHintForCjsEsmError() because we don't have control over what happens with the error. For example, if the user land purposely swallows the error then the hint shouldn't be logged. Also, it's best if the hint is shown to the user *after* the error, but we cannot do/guarentee that.
+    // - We don't use logErrorHint() because we don't have control over what happens with the error. For example, if the user land purposely swallows the error then the hint shouldn't be logged. Also, it's best if the hint is shown to the user *after* the error, but we cannot do/guarentee that.
 }
 exports.runPrerenderFromAPI = runPrerenderFromAPI;
 async function runPrerenderFromCLI(options) {
@@ -64,7 +64,7 @@ async function runPrerenderFromCLI(options) {
     }
     catch (err) {
         console.error(err);
-        (0, logHintForCjsEsmError_js_1.logHintForCjsEsmError)(err);
+        (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
 }
@@ -75,7 +75,7 @@ async function runPrerenderFromAutoFullBuild(options) {
     }
     catch (err) {
         console.error(err);
-        (0, logHintForCjsEsmError_js_1.logHintForCjsEsmError)(err);
+        (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
 }
@@ -87,7 +87,7 @@ async function runPrerender(options, manuallyTriggered) {
     if (logLevel === 'info') {
         console.log(`${picocolors_1.default.cyan(`vike v${utils_js_1.projectInfo.projectVersion}`)} ${picocolors_1.default.green('pre-rendering HTML...')}`);
     }
-    (0, utils_js_1.setNodeEnvToProduction)();
+    handleNodeEnv();
     await disableReactStreaming();
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'vike pre-rendering', 'production');
     assertLoadedConfig(viteConfig, options);
@@ -742,3 +742,10 @@ function assertIsNotAbort(err, urlOr404) {
     (0, utils_js_1.assert)(abortCall);
     (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOr404} but ${picocolors_1.default.cyan(abortCaller)} isn't supported for pre-rendered pages`);
 }
+function handleNodeEnv() {
+    const assertNodeEnv = () => (0, utils_js_1.assertNodeEnvIsNotDev)('pre-rendering');
+    if ((0, utils_js_1.getNodeEnv)())
+        assertNodeEnv();
+    (0, utils_js_1.setNodeEnvToProduction)();
+    assertNodeEnv();
+}

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

@@ -157,7 +157,11 @@ function assertNodeEnv(hasViteDevServer) {
     const nodeEnv = (0, utils_js_1.getNodeEnv)();
     if (nodeEnv === null || nodeEnv === 'test')
         return;
-    const isDevNodeEnv = [undefined, '', 'dev', 'development'].includes(nodeEnv);
-    // calling Vite's createServer() is enough for hasViteDevServer to be true, even without actually adding Vite's development middleware to the server: https://github.com/vikejs/vike/issues/792#issuecomment-1516830759
-    (0, utils_js_1.assertWarning)(hasViteDevServer === isDevNodeEnv, `Vite's development server was${hasViteDevServer ? '' : "n't"} instantiated while the environment is set to be a ${isDevNodeEnv ? 'development' : 'production'} environment by ${picocolors_1.default.cyan(`process.env.NODE_ENV === ${JSON.stringify(nodeEnv)}`)} which is contradictory, see https://vike.dev/NODE_ENV`, { onlyOnce: true });
+    const isDev = (0, utils_js_1.isNodeEnvDev)();
+    // Calling Vite's createServer() is enough for hasViteDevServer to be true, even without actually adding Vite's development middleware to the server: https://github.com/vikejs/vike/issues/792#issuecomment-1516830759
+    if (hasViteDevServer === isDev)
+        return;
+    const nodeEnvDesc = (0, utils_js_1.getNodeEnvDesc)();
+    // We should change this to be a warning if it blocks users (e.g. if a bad-citizen tool sets a wrong process.env.NODE_ENV value)
+    (0, utils_js_1.assertUsage)(false, `Vite's development server was${hasViteDevServer ? '' : "n't"} instantiated while the ${nodeEnvDesc} which is contradictory, see https://vike.dev/NODE_ENV`);
 }

package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js

@@ -90,8 +90,8 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     // See https://github.com/vikejs/vike/pull/1271
     const positionJavaScriptEntry = (() => {
         if (pageContext._pageContextPromise) {
-            (0, utils_js_1.assertWarning)(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time as progressive hydration won't work", { onlyOnce: true });
-            // If there is a pageContext._pageContextPromise (which is resolved after the stream has ended) then the pageContext JSON data needs to await for it: https://vike.dev/stream#initial-data-after-stream-end
+            (0, utils_js_1.assertWarning)(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time, because progressive hydration won't work.", { onlyOnce: true });
+            // If there is a pageContext._pageContextPromise (which is resolved after the stream has ended) then the pageContext JSON data needs to await for it: https://vike.dev/streaming#initial-data-after-stream-end
             return 'HTML_END';
         }
         if (injectToStream) {

package/dist/cjs/node/runtime/html/renderHtml.js

@@ -186,7 +186,7 @@ async function renderTemplate(templateContent, pageContext) {
             const varType = typeof templateVar;
             const streamNote = ['boolean', 'number', 'bigint', 'symbol'].includes(varType)
                 ? null
-                : '(See https://vike.dev/stream for HTML streaming.)';
+                : '(See https://vike.dev/streaming for HTML streaming.)';
             (0, utils_js_1.assertUsage)(varType === 'string', getErrMsg(picocolors_1.default.cyan(`typeof htmlVar === "${varType}"`), streamNote));
         }
         {

package/dist/cjs/node/runtime/html/stream.js

@@ -631,7 +631,7 @@ exports.isStream = isStream;
 const __streamPipeWeb = '__streamPipeWeb';
 /** @deprecated */
 function pipeWebStream(pipe) {
-    (0, utils_js_1.assertWarning)(false, 'pipeWebStream() is outdated, use stampPipe() instead. See https://vike.dev/stream', {
+    (0, utils_js_1.assertWarning)(false, 'pipeWebStream() is outdated, use stampPipe() instead. See https://vike.dev/streaming', {
         onlyOnce: true,
         showStackTrace: true
     });
@@ -668,7 +668,7 @@ exports.isStreamPipeWeb = isStreamPipeWeb;
 const __streamPipeNode = '__streamPipeNode';
 /** @deprecated */
 function pipeNodeStream(pipe) {
-    (0, utils_js_1.assertWarning)(false, 'pipeNodeStream() is outdated, use stampPipe() instead. See https://vike.dev/stream', {
+    (0, utils_js_1.assertWarning)(false, 'pipeNodeStream() is outdated, use stampPipe() instead. See https://vike.dev/streaming', {
         onlyOnce: true,
         showStackTrace: true
     });

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

@@ -125,11 +125,11 @@ function processHookReturnValue(hookReturnValue, renderHook) {
         const val = hookReturnValue.pageContext;
         const errBegin = `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext }')}, but ${picocolors_1.default.cyan('pageContext')}`;
         if ((0, utils_js_1.isPromise)(val) || (0, utils_js_1.isCallable)(val)) {
-            (0, utils_js_1.assertWarning)(!(0, utils_js_1.isPromise)(val), `${errBegin} is a promise which is deprecated in favor of async functions, see https://vike.dev/stream#initial-data-after-stream-end`, { onlyOnce: true });
+            (0, utils_js_1.assertWarning)(!(0, utils_js_1.isPromise)(val), `${errBegin} is a promise which is deprecated in favor of async functions, see https://vike.dev/streaming#initial-data-after-stream-end`, { onlyOnce: true });
             pageContextPromise = val;
         }
         else {
-            (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(val), `${errBegin} should be an object or an async function, see https://vike.dev/stream#initial-data-after-stream-end`);
+            (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(val), `${errBegin} should be an object or an async function, see https://vike.dev/streaming#initial-data-after-stream-end`);
             (0, assertPageContextProvidedByUser_js_1.assertPageContextProvidedByUser)(val, renderHook);
             pageContextProvidedByRenderHook = val;
         }

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

@@ -8,7 +8,7 @@ const stream_js_1 = require("../html/stream.js");
 const utils_js_1 = require("../utils.js");
 const renderHtml_js_1 = require("../html/renderHtml.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const streamDocs = 'See https://vike.dev/stream for more information.';
+const streamDocs = 'See https://vike.dev/streaming for more information.';
 function getHttpResponseBody(htmlRender, renderHook) {
     if (typeof htmlRender !== 'string') {
         (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'body', `Use ${picocolors_1.default.cyan('pageContext.httpResponse.pipe()')} instead`));

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

@@ -44,7 +44,7 @@ async function loadUserFilesServerSide(pageContext) {
     // TODO/v1-release: remove
     Object.assign(pageContextAddendum, {
         _getPageAssets: async () => {
-            (0, utils_js_1.assertWarning)(false, 'pageContext._getPageAssets() deprecated, see https://vike.dev/preload', {
+            (0, utils_js_1.assertWarning)(false, 'pageContext._getPageAssets() deprecated, see https://vike.dev/preloading', {
                 onlyOnce: true,
                 showStackTrace: true
             });

package/dist/cjs/node/runtime/renderPage/{logHintForCjsEsmError.js → logErrorHint.js}

@@ -3,22 +3,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHint = exports.isReactInvalidComponentError = exports.isCjsEsmError = exports.logHintForCjsEsmError = void 0;
+exports.getHint = exports.isKnownError = exports.isCjsEsmError = exports.logErrorHint = void 0;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../utils.js");
-function logHintForCjsEsmError(error) {
-    /* Collect errors for ./logHintForCjsEsmError.spec.ts
+const knownErrors = [
+    {
+        errMsg: 'jsxDEV is not a function',
+        link: 'https://github.com/vikejs/vike/issues/1469#issuecomment-1919518096'
+    },
+    {
+        errMsg: 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components)',
+        link: 'https://vike.dev/broken-npm-package#react-invalid-component'
+    }
+];
+function logErrorHint(error) {
+    /* Collect errors for ./logErrorHint.spec.ts
     collectError(error)
     //*/
     const hint = getHint(error);
     if (hint)
         logHint(hint);
 }
-exports.logHintForCjsEsmError = logHintForCjsEsmError;
+exports.logErrorHint = logErrorHint;
 function getHint(error) {
-    if (isReactInvalidComponentError(error)) {
-        const hint = 'To fix this error, see https://vike.dev/broken-npm-package#react-invalid-component';
-        return hint;
+    {
+        const link = isKnownError(error);
+        if (link)
+            return `To fix this error, see ${link}`;
     }
     const res = isCjsEsmError(error);
     if (res) {
@@ -40,44 +51,73 @@ function logHint(hint) {
     hint = (0, utils_js_1.formatHintLog)(hint);
     console.error(hint);
 }
-function isReactInvalidComponentError(error) {
+function isKnownError(error) {
     const anywhere = getAnywhere(error);
-    return includes(anywhere, 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components)');
+    const knownErr = knownErrors.find((knownErorr) => {
+        return includes(anywhere, knownErorr.errMsg);
+    });
+    if (!knownErr)
+        return false;
+    return knownErr.link;
 }
-exports.isReactInvalidComponentError = isReactInvalidComponentError;
-/**
- * `false` -> noop
- * `true` -> generic message
- * `'some-npm-package'` -> add some-npm-package to `ssr.noExternal`
- */
+exports.isKnownError = isKnownError;
+// `false` -> noop
+// `true` -> generic message
+// `'some-npm-package'` -> add some-npm-package to `ssr.noExternal`
 function isCjsEsmError(error) {
+    const res = check(error);
+    if (res === true || res === false)
+        return res;
+    const packageNames = normalizeRes(res);
+    if (packageNames === false)
+        return packageNames;
+    packageNames.forEach((packageName) => {
+        (0, utils_js_1.assert)(!['vite', 'vike'].includes(packageName));
+    });
+    return packageNames;
+}
+exports.isCjsEsmError = isCjsEsmError;
+function normalizeRes(res) {
+    let packageNames = Array.isArray(res) ? res : [res];
+    packageNames = (0, utils_js_1.unique)(packageNames.filter(utils_js_1.isNotNullish).filter((packageName) => packageName !== '@brillout/import'));
+    if (packageNames.length === 0)
+        return false;
+    return packageNames;
+}
+function check(error) {
     const message = getErrMessage(error);
     const anywhere = getAnywhere(error);
     const packageName_stack1 = getPackageName_stack1(error);
     const packageName_stack2 = getPackageName_stack2(error);
     const isRelatedToNodeModules = !!packageName_stack1 || !!packageName_stack2 || includesNodeModules(message);
-    // const relatedNpmPackages = normalize([packageName_stack1, packageName_stack2, extractFromNodeModulesPath(message)])
+    /*
+    const relatedNpmPackages = normalizeArray([
+      packageName_stack1 || null,
+      packageName_stack2 || null,
+      (message && extractFromNodeModulesPath(message)) || null
+    ])
+    */
     // ERR_UNSUPPORTED_DIR_IMPORT
     {
-        const packageNames = parseNodeModulesPathMessage('ERR_UNSUPPORTED_DIR_IMPORT', anywhere);
-        if (packageNames)
-            return packageNames;
+        const packageName = parseNodeModulesPathMessage('ERR_UNSUPPORTED_DIR_IMPORT', anywhere);
+        if (packageName)
+            return packageName;
     }
     // ERR_UNKNOWN_FILE_EXTENSION
     {
-        const packageNames = parseUnkownFileExtensionMessage(anywhere);
-        if (packageNames)
-            return packageNames;
+        const packageName = parseUnkownFileExtensionMessage(anywhere);
+        if (packageName)
+            return packageName;
     }
     {
-        const packageNames = parseNodeModulesPathMessage('ERR_UNKNOWN_FILE_EXTENSION', anywhere);
-        if (packageNames)
-            return packageNames;
+        const packageName = parseNodeModulesPathMessage('ERR_UNKNOWN_FILE_EXTENSION', anywhere);
+        if (packageName)
+            return packageName;
     }
     {
-        const packageNames = parseNodeModulesPathMessage('is not exported', anywhere);
-        if (packageNames)
-            return packageNames;
+        const packageName = parseNodeModulesPathMessage('is not exported', anywhere);
+        if (packageName)
+            return packageName;
     }
     // Using CJS inside ESM modules.
     if (includes(anywhere, 'require is not a function') ||
@@ -98,7 +138,7 @@ function isCjsEsmError(error) {
     if (includes(anywhere, 'ERR_REQUIRE_ESM')) {
         /* The issue is the importer, not the importee.
         if (relatedNpmPackages) return relatedNpmPackages
-        */
+         */
         {
             if (packageName_stack1)
                 return packageName_stack1;
@@ -118,9 +158,9 @@ function isCjsEsmError(error) {
     */
     // `SyntaxError: Named export '${exportName}' not found. The requested module '${packageName}' is a CommonJS module, which may not support all module.exports as named exports.`
     {
-        const packageNames = parseImportFrom(anywhere);
-        if (packageNames)
-            return packageNames;
+        const packageName = parseImportFrom(anywhere);
+        if (packageName)
+            return packageName;
     }
     if (includes(anywhere, 'Cannot read properties of undefined')) {
         if (isRelatedToNodeModules) {
@@ -150,14 +190,13 @@ function isCjsEsmError(error) {
     }
     return false;
 }
-exports.isCjsEsmError = isCjsEsmError;
 function parseCannotFindMessage(str) {
     const match = /Cannot find \S+ '(\S+)' imported from (\S+)/.exec(str);
     if (!match)
         return false;
     // const packageNameCannotFind = extractFromPath(match[1]!)
     const packageNameFrom = extractFromPath(match[2]);
-    return normalize([
+    return normalizeArray([
         // packageNameCannotFind,
         packageNameFrom
     ]);
@@ -168,7 +207,7 @@ function parseUnkownFileExtensionMessage(str) {
         return false;
     const filePath = match[1];
     const packageName = extractFromPath(filePath);
-    return normalize([packageName]);
+    return packageName;
 }
 function parseImportFrom(str) {
     const match = /\bimport\b.*?\bfrom\b\s*?"(.+?)"/.exec(str);
@@ -176,7 +215,7 @@ function parseImportFrom(str) {
         return false;
     const importPath = match[1];
     const packageName = extractFromPath(importPath);
-    return normalize([packageName]);
+    return packageName;
 }
 function parseNodeModulesPathMessage(begin, str) {
     str = str.replaceAll('\\', '/');
@@ -230,7 +269,6 @@ function extractFromPath(filePath) {
         packageName = packageName.split('/')[0];
     }
     packageName = clean(packageName);
-    (0, utils_js_1.assert)(!['vite', 'vike'].includes(packageName));
     return packageName;
 }
 function clean(packageName) {
@@ -248,7 +286,7 @@ function extractFromNodeModulesPath(str) {
         return false;
     const packageName = extractFromPath(str);
     (0, utils_js_1.assert)(packageName);
-    return normalize([packageName]);
+    return packageName;
 }
 function includes(str1, str2) {
     return !!str1 && str1.toLowerCase().includes(str2.toLowerCase());
@@ -263,11 +301,11 @@ function includesNodeModules(str) {
         return false;
     return true;
 }
-function normalize(packageNames) {
-    const result = (0, utils_js_1.unique)(packageNames.filter(utils_js_1.isNotNullish).filter((packageName) => packageName !== '@brillout/import'));
-    if (result.length === 0)
-        return false;
-    return result;
+function normalizeArray(arr) {
+    const arrNormalized = arr.filter(utils_js_1.isNotNullish);
+    if (arrNormalized.length === 0)
+        return null;
+    return arrNormalized;
 }
 function getErrMessage(err) {
     if (!(0, utils_js_1.isObject)(err))

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

@@ -10,7 +10,7 @@ const abort_js_1 = require("../../../shared/route/abort.js");
 const isNewError_js_1 = require("./isNewError.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const logHintForCjsEsmError_js_1 = require("./logHintForCjsEsmError.js");
+const logErrorHint_js_1 = require("./logErrorHint.js");
 function logErrorProd(err, _httpRquestId) {
     (0, utils_js_1.warnIfErrorIsNotObject)(err);
     (0, isNewError_js_1.setAlreadyLogged)(err);
@@ -25,7 +25,7 @@ function logErrorProd(err, _httpRquestId) {
 exports.logErrorProd = logErrorProd;
 // Every server-side runtime error is expected to go through onRuntimeError(). (In principle, any runtime error is (or at least should) be catched by Vike, otherwise Vike couldn't render the error page.)
 function onRuntimeError(err) {
-    // The more runtime errors we pass to logHintForCjsEsmError() the better.
-    (0, logHintForCjsEsmError_js_1.logHintForCjsEsmError)(err);
+    // The more runtime errors we pass to logErrorHint() the better.
+    (0, logErrorHint_js_1.logErrorHint)(err);
 }
 exports.onRuntimeError = onRuntimeError;

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

@@ -55,7 +55,7 @@ __exportStar(require("../../utils/isNpmPackage.js"), exports);
 __exportStar(require("../../utils/isNotNullish.js"), exports);
 __exportStar(require("../../utils/isScriptFile.js"), exports);
 __exportStar(require("../../utils/removeFileExtention.js"), exports);
-__exportStar(require("../../utils/objectEntries.js"), exports);
+__exportStar(require("../../utils/objectKeys.js"), exports);
 __exportStar(require("../../utils/isStringRecord.js"), exports);
 __exportStar(require("../../utils/getFileExtension.js"), exports);
 __exportStar(require("../../utils/assertIsNotProductionRuntime.js"), exports);

package/dist/cjs/shared/page-configs/assertPlusFileExport.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertPlusFileExport = void 0;
+const utils_js_1 = require("../utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const EXPORTS_IGNORE = [
+    // vite-plugin-solid adds `export { $$registrations }`
+    '$$registrations',
+    // @vitejs/plugin-vue adds `export { _rerender_only }`
+    '_rerender_only'
+];
+// Tolerate `export { frontmatter }` in .mdx files
+const TOLERATE_SIDE_EXPORTS = ['.md', '.mdx'];
+function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
+    const exportsAll = Object.keys(fileExports).filter((exportName) => !EXPORTS_IGNORE.includes(exportName));
+    const exportsInvalid = exportsAll.filter((e) => e !== 'default' && e !== configName);
+    if (exportsInvalid.length === 0) {
+        if (exportsAll.length === 1) {
+            return;
+        }
+        const exportDefault = picocolors_1.default.cyan('export default');
+        const exportNamed = picocolors_1.default.cyan(`export { ${configName} }`);
+        if (exportsAll.length === 0) {
+            (0, utils_js_1.assertUsage)(false, `${filePathToShowToUser} doesn't export any value, but it should have a ${exportNamed} or ${exportDefault}`);
+        }
+        else {
+            (0, utils_js_1.assert)(exportsAll.length === 2); // because `exportsInvalid.length === 0`
+            (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser} remove ${exportNamed} or ${exportDefault}`, {
+                onlyOnce: true
+            });
+        }
+    }
+    else {
+        if (TOLERATE_SIDE_EXPORTS.some((ext) => filePathToShowToUser.endsWith(ext)))
+            return;
+        exportsInvalid.forEach((exportInvalid) => {
+            (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser} should have only one export: move ${picocolors_1.default.cyan(`export { ${exportInvalid} }`)} to its own +${exportsInvalid}.js file`, { onlyOnce: true });
+        });
+    }
+}
+exports.assertPlusFileExport = assertPlusFileExport;

package/dist/cjs/shared/page-configs/serialize/parseConfigValuesImported.js

@@ -2,43 +2,70 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseConfigValuesImported = void 0;
 const utils_js_1 = require("../../utils.js");
-const assertExports_js_1 = require("../assertExports.js");
+const assertPlusFileExport_js_1 = require("../assertPlusFileExport.js");
 function parseConfigValuesImported(configValuesImported) {
-    const configValues = {};
-    const addConfigValue = (configName, value, importPath, exportName) => {
-        configValues[configName] = {
-            value,
-            definedAt: {
-                // importPath cannot be relative to the current file, since the current file is a virtual file
-                filePathToShowToUser: importPath,
-                fileExportPathToShowToUser: [configName, 'default'].includes(exportName)
-                    ? []
-                    : // Side-effect config
-                        [exportName]
-            }
-        };
-        assertIsNotNull(value, configName, importPath);
-    };
-    configValuesImported.forEach((configValueLoaded) => {
+    const configValuesUnmerged = {};
+    configValuesImported
+        .filter((c) => c.configName !== 'client')
+        .forEach((configValueLoaded) => {
         if (configValueLoaded.isValueFile) {
             const { exportValues, importPath, configName } = configValueLoaded;
-            if (configName !== 'client') {
-                (0, assertExports_js_1.assertExportsOfValueFile)(exportValues, importPath, configName);
-            }
+            (0, assertPlusFileExport_js_1.assertPlusFileExport)(exportValues, importPath, configName);
             Object.entries(exportValues).forEach(([exportName, exportValue]) => {
                 const isSideExport = exportName !== 'default'; // .md files may have "side-exports" such as `export { frontmatter }`
                 const configName = isSideExport ? exportName : configValueLoaded.configName;
-                if (isSideExport && configName in configValues) {
-                    // We can't avoid side-export conflicts upstream. (Because we cannot know about side-exports upstream at build-time.)
-                    // Side-exports have the lowest priority.
-                    return;
-                }
-                addConfigValue(configName, exportValue, importPath, exportName);
+                configValuesUnmerged[configName] ?? (configValuesUnmerged[configName] = []);
+                configValuesUnmerged[configName].push({
+                    value: exportValue,
+                    importPath,
+                    exportName,
+                    isSideExport
+                });
             });
         }
         else {
             const { configName, importPath, exportValue, exportName } = configValueLoaded;
-            addConfigValue(configName, exportValue, importPath, exportName);
+            configValuesUnmerged[configName] ?? (configValuesUnmerged[configName] = []);
+            configValuesUnmerged[configName].push({
+                value: exportValue,
+                importPath,
+                exportName,
+                isSideExport: false
+            });
+        }
+    });
+    const configValues = {};
+    Object.entries(configValuesUnmerged).forEach(([configName, values]) => {
+        const valuesWithoutSideExports = values.filter((v) => !v.isSideExport);
+        const isCumulative = valuesWithoutSideExports.length > 1;
+        const noSideExports = valuesWithoutSideExports.length === values.length;
+        if (isCumulative) {
+            // Vike currently doesn't support side exports for cumulative configs
+            (0, utils_js_1.assert)(noSideExports);
+            // TODO: implement
+            (0, utils_js_1.assert)(false);
+        }
+        else {
+            const val = valuesWithoutSideExports[0] ??
+                // We can't avoid side-export conflicts upstream. (We cannot know about side-exports at build-time.)
+                // Side-exports have lower precedence.
+                values[0];
+            (0, utils_js_1.assert)(val);
+            const { value, importPath, exportName } = val;
+            configValues[configName] = {
+                value,
+                definedAt: {
+                    // importPath cannot be relative to the current file, since the current file is a virtual file
+                    filePathToShowToUser: importPath,
+                    fileExportPathToShowToUser: [configName, 'default'].includes(exportName)
+                        ? []
+                        : [
+                            // Side-export
+                            exportName
+                        ]
+                }
+            };
+            assertIsNotNull(value, configName, importPath);
         }
     });
     return configValues;

package/dist/cjs/shared/route/abort.js

@@ -136,7 +136,7 @@ function logAbortErrorHandled(err, isProduction, pageContext) {
 exports.logAbortErrorHandled = logAbortErrorHandled;
 function assertStatusCode(statusCode, expected, caller) {
     const expectedEnglish = (0, utils_js_1.joinEnglish)(expected.map((s) => s.toString()), 'or');
-    (0, utils_js_1.assertWarning)(expected.includes(statusCode), `Unepexected status code ${statusCode} passed to ${caller}(), we recommend ${expectedEnglish} instead. (Or reach out at ${utils_js_1.projectInfo.githubRepository}/issues/1008 if you believe ${statusCode} should be added.)`, { onlyOnce: true });
+    (0, utils_js_1.assertWarning)(expected.includes(statusCode), `Unepexected status code ${statusCode} passed to ${caller}(), we recommend ${expectedEnglish} instead. (Or reach out at https://github.com/vikejs/vike/issues/1008 if you believe ${statusCode} should be added.)`, { onlyOnce: true });
 }
 function getPageContextFromAllRewrites(pageContextsFromRewrite) {
     assertNoInfiniteLoop(pageContextsFromRewrite);