vike 0.4.181-commit-2f53249 → 0.4.181-commit-3fe2549

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

@@ -277,6 +277,7 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, crawlWithGit) {
         const { routeFilesystem, isErrorPage } = determineRouteFilesystem(locationId, configValueSources);
         applyEffectsAll(configValueSources, configDefinitions);
         const configValuesComputed = getComputed(configValueSources, configDefinitions);
+        assertUsageGlobalConfigs(interfaceFilesRelevantList, configDefinitions, interfaceFilesByLocationId);
         const pageConfig = {
             pageId: locationId,
             isErrorPage,
@@ -290,6 +291,49 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, crawlWithGit) {
     assertPageConfigs(pageConfigs);
     return { pageConfigs, pageConfigGlobal, globalVikeConfig };
 }
+// TODO/soon: refactor
+//  - Dedupe: most of the assertUsageGlobalConfigs() code below is a copy-paste of the assertUsage() logic inside getGlobalConfigs()
+// Global configs should be defined at global locations
+function assertUsageGlobalConfigs(interfaceFilesRelevantList, configDefinitions, interfaceFilesByLocationId) {
+    interfaceFilesRelevantList.forEach(async (interfaceFile) => {
+        const configNames = [];
+        if (interfaceFile.isValueFile) {
+            configNames.push(interfaceFile.configName);
+        }
+        else {
+            configNames.push(...Object.keys(interfaceFile.fileExportsByConfigName));
+        }
+        configNames.forEach((configName) => {
+            if (isGlobalConfig(configName))
+                return;
+            const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
+            if (configDef.global) {
+                const locationIds = (0, utils_js_1.objectKeys)(interfaceFilesByLocationId);
+                if (!(0, filesystemRouting_js_1.isGlobalLocation)(interfaceFile.locationId, locationIds)) {
+                    const interfaceFilesGlobal = (0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(interfaceFilesByLocationId).filter(([locationId]) => {
+                        return (0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIds);
+                    }));
+                    const interfaceFilesGlobalPaths = [];
+                    (0, utils_js_1.objectEntries)(interfaceFilesGlobal).forEach(([locationId, interfaceFiles]) => {
+                        (0, utils_js_1.assert)((0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIds));
+                        interfaceFiles.forEach(({ filePath: { filePathAbsoluteUserRootDir } }) => {
+                            if (filePathAbsoluteUserRootDir) {
+                                interfaceFilesGlobalPaths.push(filePathAbsoluteUserRootDir);
+                            }
+                        });
+                    });
+                    const globalPaths = Array.from(new Set(interfaceFilesGlobalPaths.map((p) => path_1.default.posix.dirname(p))));
+                    (0, utils_js_1.assertUsage)(false, [
+                        `${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`
+                    ].join(' '));
+                }
+            }
+        });
+    });
+}
 function deriveConfigEnvFromFileName(env, fileName) {
     env = { ...env };
     if (fileName.includes('.server.')) {

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.181-commit-2f53249';
+exports.PROJECT_VERSION = '0.4.181-commit-3fe2549';

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

@@ -31,6 +31,14 @@ type ConfigDefinition = {
      * https://vike.dev/meta
      */
     effect?: ConfigEffect;
+    /**
+     * Whether the configuration always applies to all pages (no config inheritance).
+     *
+     * @default false
+     *
+     * https://vike.dev/extends#inheritance
+     */
+    global?: boolean;
 };
 /**
  * Function called when the config value is defined.

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

@@ -273,6 +273,7 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, crawlWithGit) {
         const { routeFilesystem, isErrorPage } = determineRouteFilesystem(locationId, configValueSources);
         applyEffectsAll(configValueSources, configDefinitions);
         const configValuesComputed = getComputed(configValueSources, configDefinitions);
+        assertUsageGlobalConfigs(interfaceFilesRelevantList, configDefinitions, interfaceFilesByLocationId);
         const pageConfig = {
             pageId: locationId,
             isErrorPage,
@@ -286,6 +287,49 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, crawlWithGit) {
     assertPageConfigs(pageConfigs);
     return { pageConfigs, pageConfigGlobal, globalVikeConfig };
 }
+// TODO/soon: refactor
+//  - Dedupe: most of the assertUsageGlobalConfigs() code below is a copy-paste of the assertUsage() logic inside getGlobalConfigs()
+// Global configs should be defined at global locations
+function assertUsageGlobalConfigs(interfaceFilesRelevantList, configDefinitions, interfaceFilesByLocationId) {
+    interfaceFilesRelevantList.forEach(async (interfaceFile) => {
+        const configNames = [];
+        if (interfaceFile.isValueFile) {
+            configNames.push(interfaceFile.configName);
+        }
+        else {
+            configNames.push(...Object.keys(interfaceFile.fileExportsByConfigName));
+        }
+        configNames.forEach((configName) => {
+            if (isGlobalConfig(configName))
+                return;
+            const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
+            if (configDef.global) {
+                const locationIds = objectKeys(interfaceFilesByLocationId);
+                if (!isGlobalLocation(interfaceFile.locationId, locationIds)) {
+                    const interfaceFilesGlobal = objectFromEntries(objectEntries(interfaceFilesByLocationId).filter(([locationId]) => {
+                        return isGlobalLocation(locationId, locationIds);
+                    }));
+                    const interfaceFilesGlobalPaths = [];
+                    objectEntries(interfaceFilesGlobal).forEach(([locationId, interfaceFiles]) => {
+                        assert(isGlobalLocation(locationId, locationIds));
+                        interfaceFiles.forEach(({ filePath: { filePathAbsoluteUserRootDir } }) => {
+                            if (filePathAbsoluteUserRootDir) {
+                                interfaceFilesGlobalPaths.push(filePathAbsoluteUserRootDir);
+                            }
+                        });
+                    });
+                    const globalPaths = Array.from(new Set(interfaceFilesGlobalPaths.map((p) => path.posix.dirname(p))));
+                    assertUsage(false, [
+                        `${interfaceFile.filePath.filePathToShowToUser} defines the config ${pc.cyan(configName)} which is global:`,
+                        globalPaths.length
+                            ? `define ${pc.cyan(configName)} in ${joinEnglish(globalPaths, 'or')} instead`
+                            : `create a global config (e.g. /pages/+config.js) and define ${pc.cyan(configName)} there instead`
+                    ].join(' '));
+                }
+            }
+        });
+    });
+}
 function deriveConfigEnvFromFileName(env, fileName) {
     env = { ...env };
     if (fileName.includes('.server.')) {

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.181-commit-2f53249";
+export declare const PROJECT_VERSION: "0.4.181-commit-3fe2549";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.181-commit-2f53249';
+export const PROJECT_VERSION = '0.4.181-commit-3fe2549';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.181-commit-2f53249";
+    projectVersion: "0.4.181-commit-3fe2549";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.181-commit-2f53249",
+  "version": "0.4.181-commit-3fe2549",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",