vike 0.4.181-commit-3fe2549 → 0.4.181-commit-1ff0c6d

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

@@ -293,6 +293,7 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, crawlWithGit) {
 }
 // TODO/soon: refactor
 //  - Dedupe: most of the assertUsageGlobalConfigs() code below is a copy-paste of the assertUsage() logic inside getGlobalConfigs()
+//    - This assertUsage() message is slightly better: use this one for getGlobalConfigs()
 // Global configs should be defined at global locations
 function assertUsageGlobalConfigs(interfaceFilesRelevantList, configDefinitions, interfaceFilesByLocationId) {
     interfaceFilesRelevantList.forEach(async (interfaceFile) => {
@@ -313,20 +314,22 @@ function assertUsageGlobalConfigs(interfaceFilesRelevantList, configDefinitions,
                     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 = [];
+                    const configFilesGlobal = [];
                     (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 } }) => {
+                        interfaceFiles.forEach((interfaceFile) => {
+                            if (!interfaceFile.isConfigFile)
+                                return;
+                            const { filePath: { filePathAbsoluteUserRootDir } } = interfaceFile;
                             if (filePathAbsoluteUserRootDir) {
-                                interfaceFilesGlobalPaths.push(filePathAbsoluteUserRootDir);
+                                configFilesGlobal.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`
+                        configFilesGlobal.length > 0
+                            ? `define ${picocolors_1.default.cyan(configName)} at ${(0, utils_js_1.joinEnglish)(configFilesGlobal, 'or')} instead`
                             : `create a global config (e.g. /pages/+config.js) and define ${picocolors_1.default.cyan(configName)} there instead`
                     ].join(' '));
                 }

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-3fe2549';
+exports.PROJECT_VERSION = '0.4.181-commit-1ff0c6d';

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

@@ -289,6 +289,7 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, crawlWithGit) {
 }
 // TODO/soon: refactor
 //  - Dedupe: most of the assertUsageGlobalConfigs() code below is a copy-paste of the assertUsage() logic inside getGlobalConfigs()
+//    - This assertUsage() message is slightly better: use this one for getGlobalConfigs()
 // Global configs should be defined at global locations
 function assertUsageGlobalConfigs(interfaceFilesRelevantList, configDefinitions, interfaceFilesByLocationId) {
     interfaceFilesRelevantList.forEach(async (interfaceFile) => {
@@ -309,20 +310,22 @@ function assertUsageGlobalConfigs(interfaceFilesRelevantList, configDefinitions,
                     const interfaceFilesGlobal = objectFromEntries(objectEntries(interfaceFilesByLocationId).filter(([locationId]) => {
                         return isGlobalLocation(locationId, locationIds);
                     }));
-                    const interfaceFilesGlobalPaths = [];
+                    const configFilesGlobal = [];
                     objectEntries(interfaceFilesGlobal).forEach(([locationId, interfaceFiles]) => {
                         assert(isGlobalLocation(locationId, locationIds));
-                        interfaceFiles.forEach(({ filePath: { filePathAbsoluteUserRootDir } }) => {
+                        interfaceFiles.forEach((interfaceFile) => {
+                            if (!interfaceFile.isConfigFile)
+                                return;
+                            const { filePath: { filePathAbsoluteUserRootDir } } = interfaceFile;
                             if (filePathAbsoluteUserRootDir) {
-                                interfaceFilesGlobalPaths.push(filePathAbsoluteUserRootDir);
+                                configFilesGlobal.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`
+                        configFilesGlobal.length > 0
+                            ? `define ${pc.cyan(configName)} at ${joinEnglish(configFilesGlobal, 'or')} instead`
                             : `create a global config (e.g. /pages/+config.js) and define ${pc.cyan(configName)} there instead`
                     ].join(' '));
                 }

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

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

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-3fe2549';
+export const PROJECT_VERSION = '0.4.181-commit-1ff0c6d';

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

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

package/package.json

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