vike 0.4.144-commit-756f5d7 → 0.4.144-commit-6aef8a6

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

@@ -32,15 +32,15 @@ function importBuild() {
 }
 exports.importBuild = importBuild;
 function getImporterCode(config, pageFilesEntry) {
-    const importPathAbsolute = (0, utils_js_1.toPosixPath)(
+    const filePathAbsolute = (0, utils_js_1.toPosixPath)(
     // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/importBuild/index.js
     require_.resolve(`../../../../../../dist/esm/node/runtime/globalContext/loadImportBuild.js`));
     const { outDirServer } = (0, utils_js_1.getOutDirs)(config);
-    const importPath = path_1.default.posix.relative(outDirServer, importPathAbsolute);
+    const filePathRelative = path_1.default.posix.relative(outDirServer, filePathAbsolute);
     // The only reason we went for using CJS require() instead of ESM import() is because import() doesn't support .json files
     const importerCode = [
         '(async () => {',
-        `  const { setImportBuildGetters } = await import('${importPath}');`,
+        `  const { setImportBuildGetters } = await import('${filePathRelative}');`,
         '  setImportBuildGetters({',
         `    pageFiles: () => import('./${pageFilesEntry}'),`,
         "    clientManifest: () => require('../assets.json'),",

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

@@ -7,8 +7,8 @@ const utils_js_1 = require("../../../../utils.js");
  * getLocationId('/pages/some-page') => '/pages/some-page'
  * getLocationId('/renderer/+config.js') => '/renderer'
  */
-function getLocationId(somePath) {
-    const locationId = removeFilename(somePath, true);
+function getLocationId(filePathAbsoluteVite) {
+    const locationId = removeFilename(filePathAbsoluteVite, true);
     assertLocationId(locationId);
     return locationId;
 }
@@ -110,21 +110,21 @@ function removeDirectories(somePath, removeDirs) {
         somePath = '/';
     return somePath;
 }
-function removeFilename(filePath, optional) {
-    (0, utils_js_1.assertPosixPath)(filePath);
-    (0, utils_js_1.assert)(filePath.startsWith('/') || (0, utils_js_1.isNpmPackageImport)(filePath));
+function removeFilename(filePathAbsoluteVite, optional) {
+    (0, utils_js_1.assertPosixPath)(filePathAbsoluteVite);
+    (0, utils_js_1.assert)(filePathAbsoluteVite.startsWith('/') || (0, utils_js_1.isNpmPackageImport)(filePathAbsoluteVite));
     {
-        const filename = filePath.split('/').slice(-1)[0];
+        const filename = filePathAbsoluteVite.split('/').slice(-1)[0];
         if (!filename.includes('.')) {
             (0, utils_js_1.assert)(optional);
-            return filePath;
+            return filePathAbsoluteVite;
         }
     }
-    filePath = filePath.split('/').slice(0, -1).join('/');
-    if (filePath === '')
-        filePath = '/';
-    assertLocationId(filePath);
-    return filePath;
+    let locationId = filePathAbsoluteVite.split('/').slice(0, -1).join('/');
+    if (locationId === '')
+        locationId = '/';
+    assertLocationId(locationId);
+    return locationId;
 }
 function getFilesystemRouteDefinedBy(locationId) {
     if (locationId === '/')

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

@@ -15,7 +15,6 @@ const isConfigInvalid_js_1 = require("../../../../runtime/renderPage/isConfigInv
 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 getFilePathToShowToUser_js_1 = require("./getFilePathToShowToUser.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_2 = require("../../../../../shared/page-configs/utils.js");
 const assertExports_js_1 = require("../../../../../shared/page-configs/assertExports.js");
@@ -77,7 +76,7 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
     const configFiles = [];
     const valueFiles = [];
     plusFiles.forEach((f) => {
-        if (getConfigName(f.filePathRelativeToUserRootDir) === 'config') {
+        if (getConfigName(f.filePathAbsoluteFilesystem) === 'config') {
             configFiles.push(f);
         }
         else {
@@ -86,15 +85,10 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
     });
     let interfaceFilesByLocationId = {};
     // Config files
-    await Promise.all(configFiles.map(async ({ filePathAbsoluteFilesystem, filePathRelativeToUserRootDir }) => {
-        const configFilePath = {
-            filePathAbsoluteFilesystem: filePathAbsoluteFilesystem,
-            filePathRelativeToUserRootDir: filePathRelativeToUserRootDir,
-            importPathAbsolute: null
-        };
-        const { configFile, extendsConfigs } = await loadConfigFile(configFilePath, userRootDir, []);
+    await Promise.all(configFiles.map(async (filePath) => {
+        const { configFile, extendsConfigs } = await loadConfigFile(filePath, userRootDir, []);
         const interfaceFile = getInterfaceFileFromConfigFile(configFile, false);
-        const locationId = (0, filesystemRouting_js_1.getLocationId)(filePathRelativeToUserRootDir);
+        const locationId = (0, filesystemRouting_js_1.getLocationId)(filePath.filePathAbsoluteVite);
         interfaceFilesByLocationId[locationId] = interfaceFilesByLocationId[locationId] ?? [];
         interfaceFilesByLocationId[locationId].push(interfaceFile);
         extendsConfigs.forEach((extendsConfig) => {
@@ -103,15 +97,11 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
         });
     }));
     // Value files
-    await Promise.all(valueFiles.map(async ({ filePathAbsoluteFilesystem, filePathRelativeToUserRootDir }) => {
-        const configName = getConfigName(filePathRelativeToUserRootDir);
+    await Promise.all(valueFiles.map(async (filePath) => {
+        const configName = getConfigName(filePath.filePathAbsoluteVite);
         (0, utils_js_1.assert)(configName);
         const interfaceFile = {
-            filePath: {
-                filePathRelativeToUserRootDir,
-                filePathAbsoluteFilesystem,
-                importPathAbsolute: null
-            },
+            filePath,
             configMap: {
                 [configName]: {}
             },
@@ -129,16 +119,16 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
             }
         }
         {
-            const locationId = (0, filesystemRouting_js_1.getLocationId)(filePathRelativeToUserRootDir);
+            const locationId = (0, filesystemRouting_js_1.getLocationId)(filePath.filePathAbsoluteVite);
             interfaceFilesByLocationId[locationId] = interfaceFilesByLocationId[locationId] ?? [];
             interfaceFilesByLocationId[locationId].push(interfaceFile);
         }
     }));
     return interfaceFilesByLocationId;
 }
-function getConfigDefinition(configDefinitionsRelevant, configName, definedByFile) {
+function getConfigDefinition(configDefinitionsRelevant, configName, filePathToShowToUser) {
     const configDef = configDefinitionsRelevant[configName];
-    assertConfigExists(configName, Object.keys(configDefinitionsRelevant), definedByFile);
+    assertConfigExists(configName, Object.keys(configDefinitionsRelevant), filePathToShowToUser);
     (0, utils_js_1.assert)(configDef);
     return configDef;
 }
@@ -147,7 +137,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 = (0, getFilePathToShowToUser_js_1.getFilePathToShowToUser)(interfaceValueFile.filePath);
+    const { filePathToShowToUser } = interfaceValueFile.filePath;
     (0, assertExports_js_1.assertExportsOfValueFile)(fileExports, filePathToShowToUser, configName);
     Object.entries(fileExports).forEach(([exportName, configValue]) => {
         const configName_ = exportName === 'default' ? configName : exportName;
@@ -164,7 +154,7 @@ function getInterfaceFileFromConfigFile(configFile, isConfigExtend) {
         isConfigExtend,
         extendsFilePaths
     };
-    const filePathToShowToUser = (0, getFilePathToShowToUser_js_1.getFilePathToShowToUser)(filePath);
+    const { filePathToShowToUser } = filePath;
     (0, assertExports_js_1.assertExportsOfConfigFile)(fileExports, filePathToShowToUser);
     Object.entries(fileExports.default).forEach(([configName, configValue]) => {
         interfaceFile.configMap[configName] = { configValue };
@@ -227,7 +217,7 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, extensions) {
             const { configName } = interfaceFile;
             if (isGlobalConfig(configName))
                 return;
-            const configDef = getConfigDefinition(configDefinitionsRelevant, configName, (0, getFilePathToShowToUser_js_1.getFilePathToShowToUser)(interfaceFile.filePath));
+            const configDef = getConfigDefinition(configDefinitionsRelevant, configName, interfaceFile.filePath.filePathToShowToUser);
             if (configDef.env !== 'config-only')
                 return;
             const isAlreadyLoaded = interfacefileIsAlreaydLoaded(interfaceFile);
@@ -266,7 +256,7 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, extensions) {
         const configDefinitionsRelevant = getConfigDefinitions(interfaceFilesRelevant);
         interfaceFiles.forEach((interfaceFile) => {
             Object.keys(interfaceFile.configMap).forEach((configName) => {
-                assertConfigExists(configName, Object.keys(configDefinitionsRelevant), (0, getFilePathToShowToUser_js_1.getFilePathToShowToUser)(interfaceFile.filePath));
+                assertConfigExists(configName, Object.keys(configDefinitionsRelevant), interfaceFile.filePath.filePathToShowToUser);
             });
         });
     });
@@ -317,7 +307,7 @@ function getGlobalConfigs(interfaceFilesByLocationId, userRootDir) {
                 Object.keys(interfaceFile.configMap).forEach((configName) => {
                     if (!(0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIds) && isGlobalConfig(configName)) {
                         (0, utils_js_1.assertUsage)(false, [
-                            `${(0, getFilePathToShowToUser_js_1.getFilePathToShowToUser)(interfaceFile.filePath)} defines the config ${picocolors_1.default.cyan(configName)} which is global:`,
+                            `${interfaceFile.filePath.filePathToShowToUser} defines the config ${picocolors_1.default.cyan(configName)} which is global:`,
                             globalPaths.length
                                 ? `define ${picocolors_1.default.cyan(configName)} in ${(0, utils_js_1.joinEnglish)(globalPaths, 'or')} instead`
                                 : `create a global config (e.g. /pages/+config.js) and define ${picocolors_1.default.cyan(configName)} there instead`
@@ -344,9 +334,8 @@ function getGlobalConfigs(interfaceFilesByLocationId, userRootDir) {
             (0, utils_js_1.assert)('value' in configValueSource);
             if (configName === 'prerender' && typeof configValueSource.value === 'boolean')
                 return;
-            const sourceFilePath = getDefinedAtFilePathToShowToUser(configValueSource.definedAtInfo);
-            (0, utils_js_1.assert)(sourceFilePath);
-            (0, utils_js_1.assertWarning)(false, `Being able to define config ${picocolors_1.default.cyan(configName)} in ${sourceFilePath} is experimental and will likely be removed. Define the config ${picocolors_1.default.cyan(configName)} in Vike's Vite plugin options instead.`, { onlyOnce: true });
+            const { filePathToShowToUser } = configValueSource.definedAtInfo;
+            (0, utils_js_1.assertWarning)(false, `Being able to define config ${picocolors_1.default.cyan(configName)} in ${filePathToShowToUser} is experimental and will likely be removed. Define the config ${picocolors_1.default.cyan(configName)} in Vike's Vite plugin options instead.`, { onlyOnce: true });
             globalVikeConfig[configName] = configValueSource.value;
         }
     });
@@ -429,7 +418,7 @@ function warnOverridenConfigValues(interfaceFileWinner, interfaceFilesOverriden,
     interfaceFilesOverriden.forEach((interfaceFileLoser) => {
         const configValueSourceWinner = getConfigValueSource(configName, interfaceFileWinner, configDef, userRootDir);
         const configValueSourceLoser = getConfigValueSource(configName, interfaceFileLoser, configDef, userRootDir);
-        (0, utils_js_1.assertWarning)(false, `${getConfigSourceDefinedAtString(configName, configValueSourceLoser, undefined, true)} overriden by another ${getConfigSourceDefinedAtString(configName, configValueSourceWinner, undefined, false)}, remove one of the two`, { onlyOnce: false });
+        (0, utils_js_1.assertWarning)(false, `${getConfigSourceDefinedAtString(configName, configValueSourceLoser, true)} overriden by another ${getConfigSourceDefinedAtString(configName, configValueSourceWinner, false)}, remove one of the two`, { onlyOnce: false });
     });
 }
 function isInterfaceFileUserLand(interfaceFile) {
@@ -441,7 +430,7 @@ function getConfigValueSource(configName, interfaceFile, configDef, userRootDir)
     const configEnv = configDef.env;
     const definedAtConfigFile = {
         ...interfaceFile.filePath,
-        fileExportPath: ['default', configName]
+        fileExportPathToShowToUser: ['default', configName]
     };
     if (configDef._valueIsFilePath) {
         let definedAtInfo;
@@ -451,15 +440,15 @@ function getConfigValueSource(configName, interfaceFile, configDef, userRootDir)
             const import_ = resolveImport(configValue, interfaceFile.filePath, userRootDir, configEnv, configName);
             const configDefinedAt = getConfigSourceDefinedAtString(configName, { definedAtInfo: definedAtConfigFile });
             (0, utils_js_1.assertUsage)(import_, `${configDefinedAt} should be an import`);
-            valueFilePath = import_.filePathRelativeToUserRootDir ?? import_.importPathAbsolute;
+            valueFilePath = import_.filePathAbsoluteVite;
             definedAtInfo = import_;
         }
         else {
             (0, utils_js_1.assert)(interfaceFile.isValueFile);
-            valueFilePath = interfaceFile.filePath.filePathRelativeToUserRootDir;
+            valueFilePath = interfaceFile.filePath.filePathAbsoluteVite;
             definedAtInfo = {
                 ...interfaceFile.filePath,
-                fileExportPath: []
+                fileExportPathToShowToUser: []
             };
         }
         const configValueSource = {
@@ -500,7 +489,7 @@ function getConfigValueSource(configName, interfaceFile, configDef, userRootDir)
             valueIsImportedAtRuntime: !valueAlreadyLoaded,
             definedAtInfo: {
                 ...interfaceFile.filePath,
-                fileExportPath: configName === interfaceFile.configName
+                fileExportPathToShowToUser: configName === interfaceFile.configName
                     ? []
                     : // Side-effect config (e.g. `export { frontmatter }` of .md files)
                         [configName]
@@ -553,7 +542,7 @@ function resolveImport(configValue, importerFilePath, userRootDir, configEnv, co
     const { importPath, exportName } = importData;
     const filePathAbsoluteFilesystem = resolveImportPath(importData, importerFilePath);
     assertFileEnv(filePathAbsoluteFilesystem ?? importPath, configEnv, configName);
-    const fileExportPath = exportName === 'default' || exportName === configName ? [] : [exportName];
+    const fileExportPathToShowToUser = exportName === 'default' || exportName === configName ? [] : [exportName];
     if (importPath.startsWith('.')) {
         // We need to resolve relative paths into absolute paths. Because the import paths are included in virtual files:
         // ```
@@ -561,25 +550,35 @@ function resolveImport(configValue, importerFilePath, userRootDir, configEnv, co
         // ```
         assertImportPath(filePathAbsoluteFilesystem, importData, importerFilePath);
         const filePathRelativeToUserRootDir = resolveImportPath_relativeToUserRootDir(filePathAbsoluteFilesystem, importData, importerFilePath, userRootDir);
-        return {
-            exportName,
-            fileExportPath,
+        const filePath = {
             filePathAbsoluteFilesystem,
             filePathRelativeToUserRootDir,
+            filePathAbsoluteVite: filePathRelativeToUserRootDir,
+            filePathToShowToUser: filePathRelativeToUserRootDir,
             importPathAbsolute: null
         };
+        return {
+            ...filePath,
+            fileExportName: exportName,
+            fileExportPathToShowToUser
+        };
     }
     else {
         // importPath can be:
         //  - an npm package import
         //  - a path alias
-        return {
-            exportName,
-            fileExportPath,
+        const filePath = {
             filePathAbsoluteFilesystem,
             filePathRelativeToUserRootDir: null,
+            filePathAbsoluteVite: importPath,
+            filePathToShowToUser: importPath,
             importPathAbsolute: importPath
         };
+        return {
+            ...filePath,
+            fileExportName: exportName,
+            fileExportPathToShowToUser
+        };
     }
 }
 function resolveImportPath_relativeToUserRootDir(filePathAbsoluteFilesystem, importData, configFilePath, userRootDir) {
@@ -589,7 +588,7 @@ function resolveImportPath_relativeToUserRootDir(filePathAbsoluteFilesystem, imp
         filePathRelativeToUserRootDir = getVitePathFromAbsolutePath(filePathAbsoluteFilesystem, userRootDir);
     }
     else {
-        (0, utils_js_1.assertUsage)(false, `${(0, getFilePathToShowToUser_js_1.getFilePathToShowToUser)(configFilePath)} imports from a relative path ${picocolors_1.default.cyan(importData.importPath)} outside of ${userRootDir} which is forbidden: import from a relative path inside ${userRootDir}, or import from a dependency's package.json#exports entry instead`);
+        (0, utils_js_1.assertUsage)(false, `${configFilePath.filePathToShowToUser} imports from a relative path ${picocolors_1.default.cyan(importData.importPath)} outside of ${userRootDir} which is forbidden: import from a relative path inside ${userRootDir}, or import from a dependency's package.json#exports entry instead`);
         // None of the following works. Seems to be a Vite bug?
         // /*
         // assert(filePathAbsoluteFilesystem.startsWith('/'))
@@ -622,8 +621,18 @@ function getConfigDefinitions(interfaceFilesRelevant) {
                 return;
             const meta = configMeta.configValue;
             assertMetaValue(meta, 
-            // Maybe we should use the getConfigDefinedAtString() helper?
-            `Config ${picocolors_1.default.cyan('meta')} defined at ${(0, getFilePathToShowToUser_js_1.getFilePathToShowToUser)(interfaceFile.filePath)}`);
+            // TODO: Maybe we should use the getConfigDefinedAtString() helper?
+            `Config ${picocolors_1.default.cyan('meta')} defined at ${interfaceFile.filePath.filePathToShowToUser}`);
+            // Set configDef._userEffectDefinedAt
+            Object.entries(meta).forEach(([configName, configDef]) => {
+                if (!configDef.effect)
+                    return;
+                (0, utils_js_1.assert)(interfaceFile.isConfigFile);
+                configDef._userEffectDefinedAt = {
+                    ...interfaceFile.filePath,
+                    fileExportPathToShowToUser: ['default', 'meta', configName, 'effect']
+                };
+            });
             (0, utils_js_1.objectEntries)(meta).forEach(([configName, configDefinition]) => {
                 // User can override an existing config definition
                 configDefinitions[configName] = {
@@ -636,9 +645,15 @@ function getConfigDefinitions(interfaceFilesRelevant) {
     return configDefinitions;
 }
 function assertMetaValue(metaVal, configMetaDefinedAt) {
-    (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(metaVal), `${configMetaDefinedAt} has an invalid type ${picocolors_1.default.cyan(typeof metaVal)}: it should be an object instead.`);
+    if (!(0, utils_js_1.isObject)(metaVal)) {
+        (0, utils_js_1.assert)(configMetaDefinedAt); // We expect internal effects to return a valid meta value
+        (0, utils_js_1.assertUsage)(false, `${configMetaDefinedAt} has an invalid type ${picocolors_1.default.cyan(typeof metaVal)}: it should be an object instead.`);
+    }
     (0, utils_js_1.objectEntries)(metaVal).forEach(([configName, def]) => {
-        (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(def), `${configMetaDefinedAt} sets meta.${configName} to a value with an invalid type ${picocolors_1.default.cyan(typeof def)}: it should be an object instead.`);
+        if (!(0, utils_js_1.isObject)(def)) {
+            (0, utils_js_1.assert)(configMetaDefinedAt); // We expect internal effects to return a valid meta value
+            (0, utils_js_1.assertUsage)(false, `${configMetaDefinedAt} sets ${picocolors_1.default.cyan(`meta.${configName}`)} to a value with an invalid type ${picocolors_1.default.cyan(typeof def)}: it should be an object instead.`);
+        }
         // env
         {
             const envValues = [
@@ -647,19 +662,34 @@ function assertMetaValue(metaVal, configMetaDefinedAt) {
                 'server-and-client',
                 'config-only'
             ];
-            const hint = [
-                `Set the value of ${picocolors_1.default.cyan('env')} to `,
+            const fix = [
+                `Set the value of ${picocolors_1.default.cyan(`meta.${configName}.env`)} to `,
                 (0, utils_js_1.joinEnglish)(envValues.map((s) => picocolors_1.default.cyan(`'${s}'`)), 'or'),
                 '.'
             ].join('');
-            (0, utils_js_1.assertUsage)('env' in def, `${configMetaDefinedAt} doesn't set meta.${configName}.env but it's required. ${hint}`);
-            (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(def, 'env', 'string'), `${configMetaDefinedAt} sets meta.${configName}.env to an invalid type ${picocolors_1.default.cyan(typeof def.env)}. ${hint}`);
-            (0, utils_js_1.assertUsage)(envValues.includes(def.env), `${configMetaDefinedAt} sets meta.${configName}.env to an invalid value ${picocolors_1.default.cyan(`'${def.env}'`)}. ${hint}`);
+            if (!('env' in def)) {
+                (0, utils_js_1.assert)(configMetaDefinedAt); // We expect internal effects to return a valid meta value
+                (0, utils_js_1.assertUsage)(false, `${configMetaDefinedAt} doesn't set ${picocolors_1.default.cyan(`meta.${configName}.env`)} but it's required. ${fix}`);
+            }
+            if (!(0, utils_js_1.hasProp)(def, 'env', 'string')) {
+                (0, utils_js_1.assert)(configMetaDefinedAt); // We expect internal effects to return a valid meta value
+                (0, utils_js_1.assertUsage)(false, `${configMetaDefinedAt} sets ${picocolors_1.default.cyan(`meta.${configName}.env`)} to an invalid type ${picocolors_1.default.cyan(typeof def.env)}. ${fix}`);
+            }
+            if (!envValues.includes(def.env)) {
+                (0, utils_js_1.assert)(configMetaDefinedAt); // We expect internal effects to return a valid meta value
+                (0, utils_js_1.assertUsage)(false, `${configMetaDefinedAt} sets ${picocolors_1.default.cyan(`meta.${configName}.env`)} to an unknown value ${picocolors_1.default.cyan(`'${def.env}'`)}. ${fix}`);
+            }
         }
         // effect
         if ('effect' in def) {
-            (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(def, 'effect', 'function'), `${configMetaDefinedAt} sets meta.${configName}.effect to an invalid type ${picocolors_1.default.cyan(typeof def.effect)}: it should be a function instead`);
-            (0, utils_js_1.assertUsage)(def.env === 'config-only', `${configMetaDefinedAt} sets meta.${configName}.effect but it's only supported if meta.${configName}.env is ${picocolors_1.default.cyan('config-only')} (but it's ${picocolors_1.default.cyan(def.env)} instead)`);
+            if (!(0, utils_js_1.hasProp)(def, 'effect', 'function')) {
+                (0, utils_js_1.assert)(configMetaDefinedAt); // We expect internal effects to return a valid meta value
+                (0, utils_js_1.assertUsage)(false, `${configMetaDefinedAt} sets ${picocolors_1.default.cyan(`meta.${configName}.effect`)} to an invalid type ${picocolors_1.default.cyan(typeof def.effect)}: it should be a function instead`);
+            }
+            if (def.env !== 'config-only') {
+                (0, utils_js_1.assert)(configMetaDefinedAt); // We expect internal effects to return a valid meta value
+                (0, utils_js_1.assertUsage)(false, `${configMetaDefinedAt} sets ${picocolors_1.default.cyan(`meta.${configName}.effect`)} but it's only supported if meta.${configName}.env is ${picocolors_1.default.cyan('config-only')} (but it's ${picocolors_1.default.cyan(def.env)} instead)`);
+            }
         }
     });
 }
@@ -670,7 +700,7 @@ function applyEffectsAll(configValueSources, configDefinitionsRelevant) {
         // The value needs to be loaded at config time, that's why we only support effect for configs that are config-only for now.
         // (We could support effect for non config-only by always loading its value at config time, regardless of the config's `env` value.)
         (0, utils_js_1.assertUsage)(configDef.env === 'config-only', [
-            `Cannot add effect to ${picocolors_1.default.cyan(configName)} because its ${picocolors_1.default.cyan('env')} is ${picocolors_1.default.cyan(configDef.env)}: effects can only be added to configs with an env that is ${picocolors_1.default.cyan('config-only')}.`
+            `Cannot add effect to ${picocolors_1.default.cyan(configName)} because its ${picocolors_1.default.cyan('env')} is ${picocolors_1.default.cyan(configDef.env)}: effects can only be added to configs with an ${picocolors_1.default.cyan('env')} value of ${picocolors_1.default.cyan('config-only')}.`
         ].join(' '));
         const source = configValueSources[configName]?.[0];
         if (!source)
@@ -685,14 +715,23 @@ function applyEffectsAll(configValueSources, configDefinitionsRelevant) {
         if (!configModFromEffect)
             return;
         (0, utils_js_1.assert)((0, utils_js_1.hasProp)(source, 'value')); // We need to assume that the config value is loaded at build-time
-        applyEffect(configModFromEffect, source, configValueSources);
+        applyEffect(configModFromEffect, configValueSources, configDef);
     });
 }
-function applyEffect(configModFromEffect, configValueEffectSource, configValueSources) {
+function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
     const notSupported = `Effects currently only supports modifying the the ${picocolors_1.default.cyan('env')} of a config.`;
     (0, utils_js_1.objectEntries)(configModFromEffect).forEach(([configName, configValue]) => {
         if (configName === 'meta') {
-            assertMetaValue(configValue, getConfigSourceDefinedAtString(configName, configValueEffectSource, true));
+            let configDefinedAtString;
+            if (configDefEffect._userEffectDefinedAt) {
+                configDefinedAtString = getConfigSourceDefinedAtString(configName, {
+                    definedAtInfo: configDefEffect._userEffectDefinedAt
+                });
+            }
+            else {
+                configDefinedAtString = null;
+            }
+            assertMetaValue(configValue, configDefinedAtString);
             (0, utils_js_1.objectEntries)(configValue).forEach(([configTargetName, configTargetDef]) => {
                 {
                     const keys = Object.keys(configTargetDef);
@@ -710,7 +749,7 @@ function applyEffect(configModFromEffect, configValueEffectSource, configValueSo
         else {
             (0, utils_js_1.assertUsage)(false, notSupported);
             // If we do end implementing being able to set the value of a config:
-            //  - For setting definedAtInfo: we could take the definedAtInfo of the effect config while appending '(effect)' to definedAtInfo.fileExportPath
+            //  - For setting definedAtInfo: we could take the definedAtInfo of the effect config while appending '(effect)' to definedAtInfo.fileExportPathToShowToUser
         }
     });
 }
@@ -762,19 +801,28 @@ async function findPlusFiles(userRootDir, ignoreDirs, isDev, extensions) {
         p = (0, utils_js_1.toPosixPath)(p);
         const filePathRelativeToUserRootDir = path_1.default.posix.join('/', p);
         const filePathAbsoluteFilesystem = path_1.default.posix.join(userRootDir, p);
-        return { filePathRelativeToUserRootDir, filePathAbsoluteFilesystem };
+        return {
+            filePathRelativeToUserRootDir,
+            filePathAbsoluteVite: filePathRelativeToUserRootDir,
+            filePathAbsoluteFilesystem,
+            filePathToShowToUser: filePathRelativeToUserRootDir,
+            importPathAbsolute: null
+        };
     });
+    // TODO/v1-release: remove
     extensions.forEach((extension) => {
         extension.pageConfigsDistFiles?.forEach((pageConfigDistFile) => {
-            // TODO/v1-release: remove
             if (!pageConfigDistFile.importPath.includes('+'))
                 return;
             (0, utils_js_1.assert)(pageConfigDistFile.importPath.includes('+'));
             (0, utils_js_1.assert)(path_1.default.posix.basename(pageConfigDistFile.importPath).startsWith('+'));
             const { importPath, filePath } = pageConfigDistFile;
             plusFiles.push({
-                filePathRelativeToUserRootDir: importPath,
-                filePathAbsoluteFilesystem: filePath
+                filePathRelativeToUserRootDir: null,
+                filePathAbsoluteVite: importPath,
+                filePathAbsoluteFilesystem: filePath,
+                filePathToShowToUser: importPath,
+                importPathAbsolute: importPath
             });
         });
     });
@@ -839,10 +887,12 @@ async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir
         // - filePathRelativeToUserRootDir has no functionality beyond nicer error messages for user
         // - Using importPath would be visually nicer but it's ambigous => we rather pick filePathAbsoluteFilesystem for added clarity
         const filePathRelativeToUserRootDir = determineFilePathRelativeToUserDir(filePathAbsoluteFilesystem, userRootDir);
+        const filePathAbsoluteVite = filePathRelativeToUserRootDir ?? importPath;
         extendsConfigFiles.push({
             filePathAbsoluteFilesystem,
-            // TODO: fix type cast
-            filePathRelativeToUserRootDir: filePathRelativeToUserRootDir,
+            filePathAbsoluteVite,
+            filePathRelativeToUserRootDir,
+            filePathToShowToUser: filePathAbsoluteVite,
             importPathAbsolute: importPath
         });
     });
@@ -878,14 +928,14 @@ function assertExtendsImportPath(importPath, filePath, configFilePath) {
         });
     }
     else {
-        (0, utils_js_1.assertWarning)(false, `${(0, getFilePathToShowToUser_js_1.getFilePathToShowToUser)(configFilePath)} uses ${picocolors_1.default.cyan('extends')} to inherit from ${picocolors_1.default.cyan(importPath)} which is a user-land file: this is experimental and may be remove at any time. Reach out to a maintainer if you need this feature.`, { onlyOnce: true });
+        (0, utils_js_1.assertWarning)(false, `${configFilePath.filePathToShowToUser} uses ${picocolors_1.default.cyan('extends')} to inherit from ${picocolors_1.default.cyan(importPath)} which is a user-land file: this is experimental and may be remove at any time. Reach out to a maintainer if you need this feature.`, { onlyOnce: true });
     }
 }
 function getExtendsImportData(configFileExports, configFilePath) {
-    const filePathToShowToUser = (0, getFilePathToShowToUser_js_1.getFilePathToShowToUser)(configFilePath);
+    const { filePathToShowToUser } = configFilePath;
     (0, assertExports_js_1.assertExportsOfConfigFile)(configFileExports, filePathToShowToUser);
     const defaultExports = configFileExports.default;
-    const wrongUsage = `${filePathToShowToUser} sets the config 'extends' to an invalid value, see https://vike.dev/extends`;
+    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)) {
         return [];
@@ -906,38 +956,6 @@ function getExtendsImportData(configFileExports, configFilePath) {
     });
     return extendsImportData;
 }
-// TODO: re-use this
-function handleUserFileError(err, isDev) {
-    // Properly handle error during transpilation so that we can use assertUsage() during transpilation
-    if (isDev) {
-        throw err;
-    }
-    else {
-        // Avoid ugly error format:
-        // ```
-        // [vike:importUserCode] Could not load virtual:vike:importUserCode:server: [vike@0.4.70][Wrong Usage] /pages/+config.ts sets the config 'onRenderHtml' to the value './+config/onRenderHtml-i-dont-exist.js' but no file was found at /home/rom/code/vike/examples/v1/pages/+config/onRenderHtml-i-dont-exist.js
-        // Error: [vike@0.4.70][Wrong Usage] /pages/+config.ts sets the config 'onRenderHtml' to the value './+config/onRenderHtml-i-dont-exist.js' but no file was found at /home/rom/code/vike/examples/v1/pages/+config/onRenderHtml-i-dont-exist.js
-        //     at ...
-        //     at ...
-        //     at ...
-        //     at ...
-        //     at ...
-        //     at ...
-        //   code: 'PLUGIN_ERROR',
-        //   plugin: 'vike:importUserCode',
-        //   hook: 'load',
-        //   watchFiles: [
-        //     '/home/rom/code/vike/vike/dist/esm/node/importBuild.js',
-        //     '\x00virtual:vike:importUserCode:server'
-        //   ]
-        // }
-        //  ELIFECYCLE  Command failed with exit code 1.
-        // ```
-        console.log('');
-        console.error(err);
-        process.exit(1);
-    }
-}
 function isGlobalConfig(configName) {
     if (configName === 'prerender')
         return false;
@@ -947,15 +965,15 @@ function isGlobalConfig(configName) {
 function getConfigNamesGlobal() {
     return Object.keys(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInGlobal);
 }
-function assertConfigExists(configName, configNamesRelevant, definedByFile) {
+function assertConfigExists(configName, configNamesRelevant, filePathToShowToUser) {
     const configNames = [...configNamesRelevant, ...getConfigNamesGlobal()];
     if (configNames.includes(configName))
         return;
-    handleUnknownConfig(configName, configNames, definedByFile);
+    handleUnknownConfig(configName, configNames, filePathToShowToUser);
     (0, utils_js_1.assert)(false);
 }
-function handleUnknownConfig(configName, configNames, definedByFile) {
-    let errMsg = `${definedByFile} defines an unknown config ${picocolors_1.default.cyan(configName)}`;
+function handleUnknownConfig(configName, configNames, filePathToShowToUser) {
+    let errMsg = `${filePathToShowToUser} defines an unknown config ${picocolors_1.default.cyan(configName)}`;
     let configNameSimilar = null;
     if (configName === 'page') {
         configNameSimilar = 'Page';
@@ -987,11 +1005,11 @@ function determineRouteFilesystem(locationId, configValueSources) {
     if (configFilesystemRoutingRoot) {
         const routingRoot = getFilesystemRoutingRootEffect(configFilesystemRoutingRoot, configName);
         if (routingRoot) {
-            const { filesystemRoutingRootEffect, filesystemRoutingRootDefinedAt } = routingRoot;
+            const { filesystemRoutingRootEffect /*, filesystemRoutingRootDefinedAt*/ } = routingRoot;
             const debugInfo = { locationId, routeFilesystem: filesystemRouteString, configFilesystemRoutingRoot };
             (0, utils_js_1.assert)(filesystemRouteString.startsWith(filesystemRoutingRootEffect.before), debugInfo);
             filesystemRouteString = (0, filesystemRouting_js_1.applyFilesystemRoutingRootEffect)(filesystemRouteString, filesystemRoutingRootEffect);
-            filesystemRouteDefinedBy = `${filesystemRouteDefinedBy} (with ${filesystemRoutingRootDefinedAt})`;
+            // filesystemRouteDefinedBy = `${filesystemRouteDefinedBy} (with ${filesystemRoutingRootDefinedAt})`
         }
     }
     (0, utils_js_1.assert)(filesystemRouteString.startsWith('/'));
@@ -1030,7 +1048,7 @@ function resolveImportPath(importData, importerFilePath) {
 }
 function assertImportPath(filePathAbsoluteFilesystem, importData, importerFilePath) {
     const { importPath: importPath, importStringWasGenerated, importString } = importData;
-    const filePathToShowToUser = (0, getFilePathToShowToUser_js_1.getFilePathToShowToUser)(importerFilePath);
+    const { filePathToShowToUser } = importerFilePath;
     if (!filePathAbsoluteFilesystem) {
         const importPathString = picocolors_1.default.cyan(`'${importPath}'`);
         const errIntro = importStringWasGenerated
@@ -1082,6 +1100,17 @@ function getConfigValues(configValueSources, configValuesComputed, configDefinit
     });
     return configValues;
 }
+function getDefinedAtFile(configValueSource) {
+    return {
+        filePathToShowToUser: configValueSource.definedAtInfo.filePathToShowToUser,
+        fileExportPathToShowToUser: configValueSource.definedAtInfo.fileExportPathToShowToUser
+    };
+}
+function getDefinedAt(configValueSource) {
+    return {
+        file: getDefinedAtFile(configValueSource)
+    };
+}
 function mergeCumulative(configName, configValueSources) {
     const valuesArr = [];
     const valuesSet = [];
@@ -1105,7 +1134,7 @@ function mergeCumulative(configName, configValueSources) {
             if (vals2.length === 0)
                 return;
             (0, utils_js_1.assert)(configValueSourcePrevious);
-            const configPreviousDefinedAt = getConfigSourceDefinedAtString(configName, configValueSourcePrevious, undefined, false);
+            const configPreviousDefinedAt = getConfigSourceDefinedAtString(configName, configValueSourcePrevious, false);
             (0, utils_js_1.assertUsage)(false, `${configDefinedAt} sets ${t1} but another ${configPreviousDefinedAt} sets ${t2} which is forbidden: the values must be all arrays or all sets (you cannot mix).`);
         };
         const { value } = configValueSource;
@@ -1136,30 +1165,14 @@ function mergeCumulative(configName, configValueSources) {
     }
     (0, utils_js_1.assert)(false);
 }
-// TODO: rename
-// TODO: refactor
-function getConfigSourceDefinedAtString(configName, { definedAtInfo }, isEffect = undefined, sentenceBegin = true) {
+// TODO: rename and/or refactor
+function getConfigSourceDefinedAtString(configName, { definedAtInfo }, sentenceBegin = true) {
     return (0, utils_js_2.getConfigDefinedAtString)(configName, {
         definedAt: {
-            isEffect,
             file: {
-                filePathToShowToUser: getDefinedAtFilePathToShowToUser(definedAtInfo),
-                fileExportPath: definedAtInfo.fileExportPath
+                filePathToShowToUser: definedAtInfo.filePathToShowToUser,
+                fileExportPathToShowToUser: definedAtInfo.fileExportPathToShowToUser
             }
         }
     }, sentenceBegin);
 }
-function getDefinedAtFilePathToShowToUser(definedAtInfo) {
-    return definedAtInfo.filePathRelativeToUserRootDir ?? definedAtInfo.importPathAbsolute;
-}
-function getDefinedAtFile(source) {
-    return {
-        filePathToShowToUser: getDefinedAtFilePathToShowToUser(source.definedAtInfo),
-        fileExportPath: source.definedAtInfo.fileExportPath
-    };
-}
-function getDefinedAt(configValueSource) {
-    return {
-        file: getDefinedAtFile(configValueSource)
-    };
-}