vike 0.4.158 → 0.4.159-commit-71760c7

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

@@ -28,7 +28,8 @@ const baseUrls_js_1 = require("./plugins/baseUrls.js");
 const envVars_js_1 = require("./plugins/envVars.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const fileEnv_js_1 = require("./plugins/fileEnv.js");
-(0, utils_js_2.markEnvAsVite)();
+assertNodeEnv();
+(0, utils_js_2.markEnvAsVikePluginLoaded)();
 // Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
 function plugin(vikeConfig) {
     const plugins = [
@@ -70,3 +71,21 @@ Object.defineProperty(plugin, 'apply', {
         (0, utils_js_2.assertUsage)(false, `Add ${picocolors_1.default.cyan('vike()')} instead of ${picocolors_1.default.cyan('vike')} to vite.config.js#plugins (i.e. call the function and add the return value instead of adding the function itself)`, { showStackTrace: true });
     }
 });
+function assertNodeEnv() {
+    const nodeEnv = (0, utils_js_2.getNodeEnv)();
+    if (nodeEnv === 'test')
+        return;
+    // 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_2.assertUsage)(
+    /* We can enable this assertion after Vike's CLI is implemented and using Vite's CLI is deprecated (we can then check whether the context is a `$ vike build`).
+    isNodeEnvDev() || isVikeCliBuild(),
+    /*/
+    (0, utils_js_2.isNodeEnvDev)() || true, 
+    ///*/
+    [
+        picocolors_1.default.cyan(`process.env.NODE_ENV === ${JSON.stringify(nodeEnv)}`),
+        '(which Vike interprets as a non-development environment https://vike.dev/NODE_ENV)',
+        'while the vike/plugin module is loaded.',
+        utils_js_2.vikeVitePluginLoadedInProductionError
+    ].join(' '));
+}

package/dist/cjs/node/plugin/plugins/devConfig/index.js

@@ -66,7 +66,7 @@ function devConfig() {
                 }
             },
             configureServer() {
-                (0, utils_js_1.markEnvAsDev)();
+                (0, utils_js_1.markEnvAsViteDev)();
             }
         },
         {

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

@@ -37,7 +37,7 @@ function importBuild() {
             getImporterCode: () => {
                 return getEntryCode(config, configVike);
             },
-            libraryName: utils_js_1.projectInfo.projectName
+            libraryName: 'Vike'
         })
     ];
 }

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

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConfigFileExport = void 0;
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const assertPlusFileExport_js_1 = require("../../../../../shared/page-configs/assertPlusFileExport.js");
+const utils_js_1 = require("../../../utils.js");
+function getConfigFileExport(fileExports, filePathToShowToUser) {
+    (0, assertPlusFileExport_js_1.assertPlusFileExport)(fileExports, filePathToShowToUser, 'config');
+    const fileExport = fileExports.default || fileExports.config;
+    (0, utils_js_1.assert)('default' in fileExports !== 'config' in fileExports);
+    const exportName = picocolors_1.default.cyan('default' in fileExports ? 'export default' : 'export { config }');
+    (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(fileExport), `The ${exportName} of ${filePathToShowToUser} should be an object (but it's ${picocolors_1.default.cyan(`typeof exportedValue === ${JSON.stringify(typeof fileExport)}`)} instead)`);
+    return fileExport;
+}
+exports.getConfigFileExport = getConfigFileExport;

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

@@ -9,17 +9,18 @@ const path_1 = __importDefault(require("path"));
 const configDefinitionsBuiltIn_js_1 = require("./getVikeConfig/configDefinitionsBuiltIn.js");
 const filesystemRouting_js_1 = require("./getVikeConfig/filesystemRouting.js");
 const transpileAndExecuteFile_js_1 = require("./transpileAndExecuteFile.js");
-const replaceImportStatements_js_1 = require("./replaceImportStatements.js");
+const transformImportStatements_js_1 = require("./transformImportStatements.js");
 const isConfigInvalid_js_1 = require("../../../../runtime/renderPage/isConfigInvalid.js");
 const globalContext_js_1 = require("../../../../runtime/globalContext.js");
 const loggerNotProd_js_1 = require("../../../shared/loggerNotProd.js");
 const removeSuperfluousViteLog_js_1 = require("../../../shared/loggerVite/removeSuperfluousViteLog.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const helpers_js_1 = require("../../../../../shared/page-configs/helpers.js");
-const assertExports_js_1 = require("../../../../../shared/page-configs/assertExports.js");
+const assertPlusFileExport_js_1 = require("../../../../../shared/page-configs/assertPlusFileExport.js");
 const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
 const getConfigValuesSerialized_js_1 = require("./getConfigValuesSerialized.js");
 const crawlPlusFiles_js_1 = require("./getVikeConfig/crawlPlusFiles.js");
+const getConfigFileExport_js_1 = require("./getConfigFileExport.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 let devServerIsCorrupt = false;
 let wasConfigInvalid = null;
@@ -142,7 +143,7 @@ function getConfigDefinitionOptional(configDefinitions, configName) {
 async function loadValueFile(interfaceValueFile, configName, userRootDir) {
     const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(interfaceValueFile.filePath, true, userRootDir);
     const { filePathToShowToUser } = interfaceValueFile.filePath;
-    (0, assertExports_js_1.assertExportsOfValueFile)(fileExports, filePathToShowToUser, configName);
+    (0, assertPlusFileExport_js_1.assertPlusFileExport)(fileExports, filePathToShowToUser, configName);
     Object.entries(fileExports).forEach(([exportName, configValue]) => {
         const configName_ = exportName === 'default' ? configName : exportName;
         interfaceValueFile.configMap[configName_] = { configValue };
@@ -174,9 +175,8 @@ function getInterfaceFileFromConfigFile(configFile, isConfigExtend) {
         isConfigExtend,
         extendsFilePaths
     };
-    const { filePathToShowToUser } = filePath;
-    (0, assertExports_js_1.assertExportsOfConfigFile)(fileExports, filePathToShowToUser);
-    Object.entries(fileExports.default).forEach(([configName, configValue]) => {
+    const fileExport = (0, getConfigFileExport_js_1.getConfigFileExport)(fileExports, filePath.filePathToShowToUser);
+    Object.entries(fileExport).forEach(([configName, configValue]) => {
         interfaceFile.configMap[configName] = { configValue };
     });
     return interfaceFile;
@@ -582,7 +582,7 @@ function isDefiningPageConfig(configName) {
 function resolveImport(configValue, importerFilePath, userRootDir, configEnv, configName) {
     if (typeof configValue !== 'string')
         return null;
-    const importData = (0, replaceImportStatements_js_1.parseImportData)(configValue);
+    const importData = (0, transformImportStatements_js_1.parseImportData)(configValue);
     if (!importData)
         return null;
     const { importPath, exportName } = importData;
@@ -925,24 +925,23 @@ function assertExtendsImportPath(importPath, filePath, configFilePath) {
 }
 function getExtendsImportData(configFileExports, configFilePath) {
     const { filePathToShowToUser } = configFilePath;
-    (0, assertExports_js_1.assertExportsOfConfigFile)(configFileExports, filePathToShowToUser);
-    const defaultExports = configFileExports.default;
+    const configFileExport = (0, getConfigFileExport_js_1.getConfigFileExport)(configFileExports, filePathToShowToUser);
     const wrongUsage = `${filePathToShowToUser} sets the config ${picocolors_1.default.cyan('extends')} to an invalid value, see https://vike.dev/extends`;
     let extendList;
-    if (!('extends' in defaultExports)) {
+    if (!('extends' in configFileExport)) {
         return [];
     }
-    else if ((0, utils_js_1.hasProp)(defaultExports, 'extends', 'string')) {
-        extendList = [defaultExports.extends];
+    else if ((0, utils_js_1.hasProp)(configFileExport, 'extends', 'string')) {
+        extendList = [configFileExport.extends];
     }
-    else if ((0, utils_js_1.hasProp)(defaultExports, 'extends', 'string[]')) {
-        extendList = defaultExports.extends;
+    else if ((0, utils_js_1.hasProp)(configFileExport, 'extends', 'string[]')) {
+        extendList = configFileExport.extends;
     }
     else {
         (0, utils_js_1.assertUsage)(false, wrongUsage);
     }
     const extendsImportData = extendList.map((importDataSerialized) => {
-        const importData = (0, replaceImportStatements_js_1.parseImportData)(importDataSerialized);
+        const importData = (0, transformImportStatements_js_1.parseImportData)(importDataSerialized);
         (0, utils_js_1.assertUsage)(importData, wrongUsage);
         return importData;
     });

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/{replaceImportStatements.js → transformImportStatements.js}

@@ -3,23 +3,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isImportData = exports.parseImportData = exports.replaceImportStatements = void 0;
+exports.isVikeRealImport = exports.isImportData = exports.parseImportData = exports.transformImportStatements = void 0;
 // Playground: https://github.com/brillout/acorn-playground
+// Import attributes support: https://github.com/acornjs/acorn/issues/983
+//  - Isn't stage 4 yet: https://github.com/tc39/proposal-import-attributes
 const acorn_1 = require("acorn");
 const utils_js_1 = require("../../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function replaceImportStatements(code, filePathToShowToUser) {
+function transformImportStatements(code, filePathToShowToUser2) {
     const spliceOperations = [];
-    const fileImports = [];
+    const fileImportsTransformed = [];
+    // Performance trick
+    if (!code.includes('import'))
+        return { noTransformation: true };
     const imports = getImports(code);
     if (imports.length === 0)
-        return { noImportStatement: true };
+        return { noTransformation: true };
     imports.forEach((node) => {
         if (node.type !== 'ImportDeclaration')
             return;
         const importPath = node.source.value;
         (0, utils_js_1.assert)(typeof importPath === 'string');
         const { start, end } = node;
+        if (isVikeRealImport(code, end))
+            return;
         const importStatementCode = code.slice(start, end);
         // No variable imported
         if (node.specifiers.length === 0) {
@@ -32,7 +39,7 @@ function replaceImportStatements(code, filePathToShowToUser) {
                 quote = picocolors_1.default.bold(picocolors_1.default.red(quote));
             }
             const errMsg = [
-                `As explained in https://vike.dev/header-file the following import in ${filePathToShowToUser} has no effect:`,
+                `As explained in https://vike.dev/header-file the following import in ${filePathToShowToUser2} has no effect:`,
                 quote
             ].join('\n');
             if (!isWarning) {
@@ -60,7 +67,7 @@ function replaceImportStatements(code, filePathToShowToUser) {
             })();
             const importString = serializeImportData({ importPath, exportName, importStringWasGenerated: true });
             replacement += `const ${importLocalName} = '${importString}';`;
-            fileImports.push({
+            fileImportsTransformed.push({
                 importStatementCode,
                 importString,
                 importLocalName
@@ -73,9 +80,9 @@ function replaceImportStatements(code, filePathToShowToUser) {
         });
     });
     const codeMod = spliceMany(code, spliceOperations);
-    return { code: codeMod, fileImports, noImportStatement: false };
+    return { code: codeMod, fileImportsTransformed, noTransformation: false };
 }
-exports.replaceImportStatements = replaceImportStatements;
+exports.transformImportStatements = transformImportStatements;
 function getImports(code) {
     const { body } = (0, acorn_1.parse)(code, {
         ecmaVersion: 'latest',
@@ -152,3 +159,11 @@ function indent(str) {
         .map((s) => `  ${s}`)
         .join('\n');
 }
+function isVikeRealImport(code, posStart) {
+    let posEnd = code.indexOf('\n', posStart);
+    if (posEnd === -1)
+        posEnd = code.length;
+    const lineEnd = code.slice(posStart, posEnd);
+    return lineEnd.includes('@vike-real-import');
+}
+exports.isVikeRealImport = isVikeRealImport;

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

@@ -10,14 +10,14 @@ const path_1 = __importDefault(require("path"));
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const import_1 = require("@brillout/import");
 const utils_js_1 = require("../../../utils.js");
-const replaceImportStatements_js_1 = require("./replaceImportStatements.js");
+const transformImportStatements_js_1 = require("./transformImportStatements.js");
 const getVikeConfig_js_1 = require("./getVikeConfig.js");
 require("source-map-support/register.js");
-const assertExports_js_1 = require("../../../../../shared/page-configs/assertExports.js");
+const getConfigFileExport_js_1 = require("./getConfigFileExport.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 async function transpileAndExecuteFile(filePath, isValueFile, userRootDir) {
-    const { code, fileImports } = await transpileFile(filePath, isValueFile, userRootDir);
-    const { fileExports } = await executeFile(filePath, code, fileImports, isValueFile);
+    const { code, fileImportsTransformed } = await transpileFile(filePath, isValueFile, userRootDir);
+    const { fileExports } = await executeFile(filePath, code, fileImportsTransformed, isValueFile);
     return { fileExports };
 }
 exports.transpileAndExecuteFile = transpileAndExecuteFile;
@@ -26,39 +26,40 @@ async function transpileFile(filePath, isValueFile, userRootDir) {
     (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
     getVikeConfig_js_1.vikeConfigDependencies.add(filePathAbsoluteFilesystem);
     let code = await transpileWithEsbuild(filePath, isValueFile, userRootDir);
-    let fileImports = null;
+    let fileImportsTransformed = null;
     {
-        const res = transpileImports(code, filePath, isValueFile);
+        const res = transformImports(code, filePath, isValueFile);
         if (res) {
             code = res.code;
-            fileImports = res.fileImports;
+            fileImportsTransformed = res.fileImportsTransformed;
         }
     }
-    return { code, fileImports };
+    return { code, fileImportsTransformed };
 }
-function transpileImports(codeOriginal, filePath, isValueFile) {
+function transformImports(codeOriginal, filePath, isValueFile) {
     // Do we need to remove the imports?
-    const { filePathAbsoluteFilesystem, filePathToShowToUser } = filePath;
+    const { filePathAbsoluteFilesystem } = filePath;
+    const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
     (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
     const isHeader = isHeaderFile(filePathAbsoluteFilesystem);
     const isPageConfigFile = !isValueFile;
     if (!isHeader && !isPageConfigFile) {
         return null;
     }
-    (0, utils_js_1.assertWarning)(isPageConfigFile, `${filePathToShowToUser} is a JavaScript header file (.h.js), but JavaScript header files should only be used for +config.h.js, see https://vike.dev/header-file`, { onlyOnce: true });
+    (0, utils_js_1.assertWarning)(isPageConfigFile, `${filePathToShowToUser2} is a JavaScript header file (.h.js), but JavaScript header files should only be used for +config.h.js, see https://vike.dev/header-file`, { onlyOnce: true });
     // Remove the imports
-    const res = (0, replaceImportStatements_js_1.replaceImportStatements)(codeOriginal, filePathToShowToUser);
-    if (res.noImportStatement) {
+    const res = (0, transformImportStatements_js_1.transformImportStatements)(codeOriginal, filePathToShowToUser2);
+    if (res.noTransformation) {
         return null;
     }
-    const { code, fileImports } = res;
+    const { code, fileImportsTransformed } = res;
     if (!isHeader) {
-        const filePathCorrect = appendHeaderFileExtension(filePathToShowToUser);
-        (0, utils_js_1.assertWarning)(false, `Rename ${filePathToShowToUser} to ${filePathCorrect}, see https://vike.dev/header-file`, {
+        const filePathCorrect = appendHeaderFileExtension(filePathToShowToUser2);
+        (0, utils_js_1.assertWarning)(false, `Rename ${filePathToShowToUser2} to ${filePathCorrect}, see https://vike.dev/header-file`, {
             onlyOnce: true
         });
     }
-    return { code, fileImports };
+    return { code, fileImportsTransformed };
 }
 async function transpileWithEsbuild(filePath, bundle, userRootDir) {
     const entryFilePath = filePath.filePathAbsoluteFilesystem;
@@ -134,7 +135,7 @@ async function transpileWithEsbuild(filePath, bundle, userRootDir) {
     (0, utils_js_1.assert)(typeof code === 'string');
     return code;
 }
-async function executeFile(filePath, code, fileImports, isValueFile) {
+async function executeFile(filePath, code, fileImportsTransformed, isValueFile) {
     const { filePathAbsoluteFilesystem, filePathRelativeToUserRootDir } = filePath;
     // Alternative to using a temporary file: https://github.com/vitejs/vite/pull/13269
     //  - But seems to break source maps, so I don't think it's worth it
@@ -159,10 +160,10 @@ async function executeFile(filePath, code, fileImports, isValueFile) {
     //  - import() returns `[Module: null prototype] { default: { onRenderClient: '...' }}`
     //  - We don't need this special object
     fileExports = { ...fileExports };
-    if (fileImports && !isValueFile) {
+    if (fileImportsTransformed && !isValueFile) {
         (0, utils_js_1.assert)(filePathRelativeToUserRootDir !== undefined);
-        const filePathToShowToUser = filePathRelativeToUserRootDir ?? filePathAbsoluteFilesystem;
-        assertImportsAreReExported(fileImports, fileExports, filePathToShowToUser);
+        const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
+        assertImportsAreReExported(fileImportsTransformed, fileExports, filePathToShowToUser2);
     }
     return { fileExports };
 }
@@ -211,29 +212,29 @@ function isTmpFile(filePath) {
     return fileName.startsWith(tmpPrefix);
 }
 exports.isTmpFile = isTmpFile;
-function assertImportsAreReExported(fileImports, fileExports, filePathToShowToUser) {
-    (0, assertExports_js_1.assertExportsOfConfigFile)(fileExports, filePathToShowToUser);
-    const exportedStrings = getExportedStrings(fileExports.default);
+function assertImportsAreReExported(fileImportsTransformed, fileExports, filePathToShowToUser2) {
+    const fileExport = (0, getConfigFileExport_js_1.getConfigFileExport)(fileExports, filePathToShowToUser2);
+    const exportedStrings = getExportedStrings(fileExport);
     Object.values(exportedStrings).forEach((exportVal) => {
         if (typeof exportVal !== 'string')
             return;
-        if (!(0, replaceImportStatements_js_1.isImportData)(exportVal))
+        if (!(0, transformImportStatements_js_1.isImportData)(exportVal))
             return;
         const importString = exportVal;
-        fileImports.forEach((fileImport) => {
+        fileImportsTransformed.forEach((fileImport) => {
             if (fileImport.importString === importString) {
                 fileImport.isReExported = true;
             }
         });
     });
-    const fileImportsUnused = fileImports.filter((fi) => !fi.isReExported);
-    if (fileImportsUnused.length === 0)
+    const fileImportsTransformedUnused = fileImportsTransformed.filter((fi) => !fi.isReExported);
+    if (fileImportsTransformedUnused.length === 0)
         return;
-    const importStatements = (0, utils_js_1.unique)(fileImportsUnused.map((fi) => fi.importStatementCode));
-    const importNamesUnused = fileImportsUnused.map((fi) => picocolors_1.default.cyan(fi.importLocalName)).join(', ');
-    const singular = fileImportsUnused.length === 1;
-    (0, utils_js_1.assertWarning)(fileImportsUnused.length === 0, [
-        `${filePathToShowToUser} imports the following:`,
+    const importStatements = (0, utils_js_1.unique)(fileImportsTransformedUnused.map((fi) => fi.importStatementCode));
+    const importNamesUnused = fileImportsTransformedUnused.map((fi) => picocolors_1.default.cyan(fi.importLocalName)).join(', ');
+    const singular = fileImportsTransformedUnused.length === 1;
+    (0, utils_js_1.assertWarning)(fileImportsTransformedUnused.length === 0, [
+        `${filePathToShowToUser2} imports the following:`,
         ...importStatements.map((s) => picocolors_1.default.cyan(`  ${s}`)),
         `But the import${singular ? '' : 's'} ${importNamesUnused} ${singular ? "isn't" : "aren't"} re-exported at ${picocolors_1.default.cyan('export default { ... }')} and therefore ${singular ? 'has' : 'have'} no effect, see explanation at https://vike.dev/header-file`
     ].join('\n'), { onlyOnce: true });
@@ -275,10 +276,19 @@ function triggerPrepareStackTrace(err) {
     }
 }
 function getErrIntroMsg(operation, filePath) {
+    const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
     const msg = [
+        // prettier ignore
         picocolors_1.default.red(`Failed to ${operation}`),
-        picocolors_1.default.bold(picocolors_1.default.red(filePath.filePathToShowToUser)),
+        picocolors_1.default.bold(picocolors_1.default.red(filePathToShowToUser2)),
         picocolors_1.default.red(`because:`)
     ].join(' ');
     return msg;
 }
+/** `filePath.filePathToShowToUser` may show the import path of a package, use `filePathToShowToUser2` instead always show a file path instead. */
+function getFilePathToShowToUser2(filePath) {
+    const { filePathAbsoluteFilesystem, filePathRelativeToUserRootDir } = filePath;
+    const filePathToShowToUser2 = filePathRelativeToUserRootDir || filePathAbsoluteFilesystem;
+    (0, utils_js_1.assert)(filePathToShowToUser2);
+    return filePathToShowToUser2;
+}

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/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/runtime/globalContext.js

@@ -157,7 +157,8 @@ 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 isDevNodeEnv = (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
+    // - 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)(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`);
 }

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,7 +2,7 @@
 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) => {
@@ -23,7 +23,7 @@ function parseConfigValuesImported(configValuesImported) {
         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 }`

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);

package/dist/cjs/utils/assert.js

@@ -22,8 +22,8 @@ const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/assert.ts'
     },
     showStackTraceList: new WeakSet()
 });
-const projectTag = `[${projectInfo_js_1.projectInfo.npmPackageName}]`;
-const projectTagWithVersion = `[${projectInfo_js_1.projectInfo.npmPackageName}@${projectInfo_js_1.projectInfo.projectVersion}]`;
+const projectTag = `[vike]`;
+const projectTagWithVersion = `[vike@${projectInfo_js_1.projectInfo.projectVersion}]`;
 const numberOfStackTraceLinesToRemove = 2;
 function assert(condition, debugInfo) {
     if (condition)
@@ -33,12 +33,11 @@ function assert(condition, debugInfo) {
             return null;
         }
         const debugInfoSerialized = typeof debugInfo === 'string' ? debugInfo : JSON.stringify(debugInfo);
-        return picocolors_1.default.dim(`Debug info (for ${projectInfo_js_1.projectInfo.projectName} maintainers; you can ignore this): ${debugInfoSerialized}`);
+        return picocolors_1.default.dim(`Debug info (for Vike maintainers; you can ignore this): ${debugInfoSerialized}`);
     })();
-    const link = `${projectInfo_js_1.projectInfo.githubRepository}/issues/new`;
     let errMsg = [
-        `You stumbled upon a bug in ${projectInfo_js_1.projectInfo.projectName}'s source code.`,
-        `Go to ${picocolors_1.default.blue(link)} and copy-paste this error. A maintainer will fix the bug (usually under 24 hours).`,
+        `You stumbled upon a Vike bug.`,
+        `Go to ${picocolors_1.default.blue('https://github.com/vikejs/vike/issues/new')} and copy-paste this error. A maintainer will fix the bug (usually under 24 hours).`,
         debugStr
     ]
         .filter(Boolean)

package/dist/cjs/utils/assertIsNotProductionRuntime.js

@@ -1,44 +1,62 @@
 "use strict";
 // Mechanism to ensure code isn't loaded by production runtime
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertEnv = exports.markEnvAsVite = exports.markEnvAsPreview = exports.markEnvAsDev = exports.assertIsNotProductionRuntime = void 0;
+exports.vikeVitePluginLoadedInProductionError = exports.assertEnv = exports.markEnvAsVikePluginLoaded = exports.markEnvAsVitePreview = exports.markEnvAsViteDev = exports.assertIsNotProductionRuntime = void 0;
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+const debug_js_1 = require("./debug.js");
 const getGlobalObject_js_1 = require("./getGlobalObject.js");
 const isVitest_js_1 = require("./isVitest.js");
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
+const debug = (0, debug_js_1.createDebugger)('vike:setup');
+const vikeVitePluginLoadedInProductionError = `Loading Vike's Vite plugin (the vike/plugin module) is prohibited in production.`;
+exports.vikeVitePluginLoadedInProductionError = vikeVitePluginLoadedInProductionError;
 const env = (0, getGlobalObject_js_1.getGlobalObject)('utils/assertIsNotProductionRuntime.ts', {});
-// Called by *.ts that want to ensure that they aren't loaded by the server runtime in production
+// Called by Vike modules that want to ensure that they aren't loaded by the server runtime in production
 function assertIsNotProductionRuntime() {
-    env.shouldBeVite = true;
+    if (debug.isEnabled)
+        debug('assertIsNotProductionRuntime()', new Error().stack);
+    env.shouldNotBeProduction = true;
 }
 exports.assertIsNotProductionRuntime = assertIsNotProductionRuntime;
 // Called by Vite hook configureServer()
-function markEnvAsDev() {
-    env.isDev = true;
+function markEnvAsViteDev() {
+    if (debug.isEnabled)
+        debug('markEnvAsViteDev()', new Error().stack);
+    env.isViteDev = true;
 }
-exports.markEnvAsDev = markEnvAsDev;
+exports.markEnvAsViteDev = markEnvAsViteDev;
 // Called by Vite hook configurePreviewServer()
-function markEnvAsPreview() {
-    env.isPreview = true;
+function markEnvAsVitePreview() {
+    if (debug.isEnabled)
+        debug('markEnvAsVitePreview()', new Error().stack);
+    env.isVitePreview = true;
 }
-exports.markEnvAsPreview = markEnvAsPreview;
+exports.markEnvAsVitePreview = markEnvAsVitePreview;
 // Called by ../node/plugin/index.ts
-function markEnvAsVite() {
-    env.isVite = true;
+function markEnvAsVikePluginLoaded() {
+    if (debug.isEnabled)
+        debug('markEnvAsVikePluginLoaded()', new Error().stack);
+    env.isVikePluginLoaded = true;
 }
-exports.markEnvAsVite = markEnvAsVite;
+exports.markEnvAsVikePluginLoaded = markEnvAsVikePluginLoaded;
 // Called by ../node/runtime/index.ts
 function assertEnv() {
+    if (debug.isEnabled)
+        debug('assertEnv()', new Error().stack);
     if ((0, isVitest_js_1.isVitest)())
         return;
-    if (env.isDev || env.isPreview) {
-        (0, assert_js_1.assert)(env.isVite);
-        (0, assert_js_1.assert)(env.shouldBeVite);
+    const isProduction = !env.isViteDev && !env.isVitePreview;
+    if (isProduction) {
+        // Seems to be the only reliable way to assert that the user doesn't load Vike's Vite plugin in production. (The other assert() that uses process.env.NODE_ENV doesn't work if the user sets the process.env.NODE_ENV value later.)
+        (0, assert_js_1.assertUsage)(!env.isVikePluginLoaded, vikeVitePluginLoadedInProductionError);
+        // This assert() is the main goal of this file: it ensures assertIsNotProductionRuntime()
+        (0, assert_js_1.assert)(!env.shouldNotBeProduction);
     }
     else {
-        (0, assert_js_1.assert)(!env.isVite);
-        (0, assert_js_1.assert)(!env.shouldBeVite);
+        // This assert() is obious and boring
+        (0, assert_js_1.assert)(env.shouldNotBeProduction);
+        (0, assert_js_1.assert)(env.isVikePluginLoaded);
     }
 }
 exports.assertEnv = assertEnv;