vike 0.4.181-commit-ddcbf7d → 0.4.181-commit-b6b5064

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

@@ -31,6 +31,10 @@ function fileEnv() {
             order: 'pre',
             */
             async handler(source, importer, options) {
+                // It seems like Vite's scan doesn't apply transformers. (We need the `.telefunc.js` transformer to apply for our analysis to be correct.)
+                // @ts-expect-error Vite's type is wrong
+                if (options.scan)
+                    return;
                 // TODO/v1-release: remove
                 if (extractAssetsPlugin_js_1.extractAssetsRE.test(source) || extractExportNamesPlugin_js_1.extractExportNamesRE.test(source))
                     return;
@@ -58,14 +62,14 @@ function fileEnv() {
                 const envActual = isServerSide ? 'server' : 'client';
                 const envExpect = isServerSide ? 'client' : 'server';
                 const suffix = `.${envExpect}.`;
-                // Everything nonimal
+                // Everything is good
                 if (!modulePath.includes(suffix))
                     return;
                 // Show error message
                 let errMsg;
                 let modulePathPretty = (0, getFilePath_js_1.getModuleFilePath)(moduleId, config);
                 modulePathPretty = modulePathPretty.replaceAll(suffix, picocolors_1.default.bold(suffix));
-                errMsg = `${(0, utils_js_1.capitalizeFirstLetter)(envExpect)}-only module ${modulePathPretty} (https://vike.dev/file-env) imported on the ${envActual}-side`;
+                errMsg = `${(0, utils_js_1.capitalizeFirstLetter)(envExpect)}-only file ${modulePathPretty} (https://vike.dev/file-env) imported on the ${envActual}-side`;
                 if (importer &&
                     // Don't show Vike's virtual modules that import the entry plus files such as /pages/about/+Page.js
                     !importer.includes('virtual:vike:') &&
@@ -75,10 +79,7 @@ function fileEnv() {
                     errMsg += ` by ${importerPath}`;
                 }
                 if (isDev) {
-                    errMsg += ' (building your app for production will be prevented and an error will be thrown)';
-                }
-                errMsg += '.';
-                if (isDev) {
+                    errMsg += ' and, therefore, Vike will prevent building your app for production.';
                     (0, utils_js_1.assertWarning)(false, errMsg, { onlyOnce: true });
                 }
                 else {

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

@@ -255,6 +255,33 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, crawlWithGit) {
             if (isGlobalConfig(configName))
                 return;
             const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
+            // TODO/soon: refactor
+            //  - Dedupe: most of the code below is a copy-paste of the assertUsage() inside getGlobalConfigs()
+            //  - update comment above `await Promise.all`
+            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(' '));
+                }
+            }
             if (!isLoadableAtBuildTime(configDef))
                 return;
             const isAlreadyLoaded = interfacefileIsAlreaydLoaded(interfaceFile);

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
-exports.PROJECT_VERSION = '0.4.181-commit-ddcbf7d';
+// Automatically updated by @brillout/release-me
+exports.PROJECT_VERSION = '0.4.181-commit-b6b5064';

package/dist/esm/node/plugin/plugins/fileEnv.js

@@ -26,6 +26,10 @@ function fileEnv() {
             order: 'pre',
             */
             async handler(source, importer, options) {
+                // It seems like Vite's scan doesn't apply transformers. (We need the `.telefunc.js` transformer to apply for our analysis to be correct.)
+                // @ts-expect-error Vite's type is wrong
+                if (options.scan)
+                    return;
                 // TODO/v1-release: remove
                 if (extractAssetsRE.test(source) || extractExportNamesRE.test(source))
                     return;
@@ -53,14 +57,14 @@ function fileEnv() {
                 const envActual = isServerSide ? 'server' : 'client';
                 const envExpect = isServerSide ? 'client' : 'server';
                 const suffix = `.${envExpect}.`;
-                // Everything nonimal
+                // Everything is good
                 if (!modulePath.includes(suffix))
                     return;
                 // Show error message
                 let errMsg;
                 let modulePathPretty = getModuleFilePath(moduleId, config);
                 modulePathPretty = modulePathPretty.replaceAll(suffix, pc.bold(suffix));
-                errMsg = `${capitalizeFirstLetter(envExpect)}-only module ${modulePathPretty} (https://vike.dev/file-env) imported on the ${envActual}-side`;
+                errMsg = `${capitalizeFirstLetter(envExpect)}-only file ${modulePathPretty} (https://vike.dev/file-env) imported on the ${envActual}-side`;
                 if (importer &&
                     // Don't show Vike's virtual modules that import the entry plus files such as /pages/about/+Page.js
                     !importer.includes('virtual:vike:') &&
@@ -70,10 +74,7 @@ function fileEnv() {
                     errMsg += ` by ${importerPath}`;
                 }
                 if (isDev) {
-                    errMsg += ' (building your app for production will be prevented and an error will be thrown)';
-                }
-                errMsg += '.';
-                if (isDev) {
+                    errMsg += ' and, therefore, Vike will prevent building your app for production.';
                     assertWarning(false, errMsg, { onlyOnce: true });
                 }
                 else {

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

@@ -251,6 +251,33 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, crawlWithGit) {
             if (isGlobalConfig(configName))
                 return;
             const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
+            // TODO/soon: refactor
+            //  - Dedupe: most of the code below is a copy-paste of the assertUsage() inside getGlobalConfigs()
+            //  - update comment above `await Promise.all`
+            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(' '));
+                }
+            }
             if (!isLoadableAtBuildTime(configDef))
                 return;
             const isAlreadyLoaded = interfacefileIsAlreaydLoaded(interfaceFile);

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.181-commit-ddcbf7d";
+export declare const PROJECT_VERSION: "0.4.181-commit-b6b5064";

package/dist/esm/utils/PROJECT_VERSION.js

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.181-commit-ddcbf7d",
+  "version": "0.4.181-commit-b6b5064",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -229,7 +229,7 @@
     "sirv": "^2.0.4",
     "source-map-support": "^0.5.21",
     "typescript": "^5.4.5",
-    "vite": "npm:@brillout/vite@5.1.0-commit-3dc7abd"
+    "vite": "^5.3.5"
   },
   "engines": {
     "node": ">=18.0.0"