vike 0.4.175-commit-fef43b1 → 0.4.176-commit-775d83b

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

@@ -100,19 +100,7 @@ function removeIgnoredDirectories(somePath, ignoredDirs, removeParenthesesDirs)
             return false;
         }
         if (removeParenthesesDirs && dir.startsWith('(') && dir.endsWith(')')) {
-            const dirname = dir.slice(1, -1);
-            if (ignoredDirs.includes(dirname)) {
-                const dirnameActual = dir;
-                const dirnameCorect = dirname;
-                const dirpathActual = somePath.slice(0, somePath.indexOf(dirnameActual) + dirnameActual.length);
-                const dirpathCorect = dirpathActual.replaceAll(dirnameActual, dirnameCorect);
-                const logDir = (d) => picocolors_1.default.bold(d + '/');
-                (0, utils_js_1.assertWarning)(false, [
-                    `The directories ${logDir(dirnameCorect)} are always ignored by Vike's Filesystem Routing`,
-                    '(https://vike.dev/filesystem-routing):',
-                    `rename directory ${logDir(dirpathActual)} to ${logDir(dirpathCorect)}`
-                ].join(' '), { onlyOnce: true });
-            }
+            assertRedundantParentheses(dir, ignoredDirs, somePath);
             return false;
         }
         return true;
@@ -122,6 +110,22 @@ function removeIgnoredDirectories(somePath, ignoredDirs, removeParenthesesDirs)
         somePath = '/';
     return somePath;
 }
+function assertRedundantParentheses(dir, ignoredDirs, somePath) {
+    const dirWithoutParentheses = dir.slice(1, -1);
+    if (!ignoredDirs.includes(dirWithoutParentheses)) {
+        return;
+    }
+    const dirnameActual = dir;
+    const dirnameCorect = dirWithoutParentheses;
+    const dirpathActual = somePath.slice(0, somePath.indexOf(dirnameActual) + dirnameActual.length);
+    const dirpathCorect = dirpathActual.replaceAll(dirnameActual, dirnameCorect);
+    const logDir = (d) => picocolors_1.default.bold(d + '/');
+    (0, utils_js_1.assertWarning)(false, [
+        `The directories ${logDir(dirnameCorect)} are always ignored by Vike's Filesystem Routing`,
+        '(https://vike.dev/filesystem-routing):',
+        `rename directory ${logDir(dirpathActual)} to ${logDir(dirpathCorect)}`
+    ].join(' '), { onlyOnce: true });
+}
 function removeFilename(filePathAbsoluteUserRootDir) {
     const filePathParts = filePathAbsoluteUserRootDir.split('/');
     {

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

@@ -614,7 +614,7 @@ function getConfigDefinitions(interfaceFilesRelevant) {
             if (!configMeta)
                 return;
             const meta = configMeta.configValue;
-            assertMetaValue(meta, `Config ${picocolors_1.default.cyan('meta')} defined at ${interfaceFile.filePath.filePathToShowToUser}`);
+            assertMetaUsage(meta, `Config ${picocolors_1.default.cyan('meta')} defined at ${interfaceFile.filePath.filePathToShowToUser}`);
             // Set configDef._userEffectDefinedAtFilePath
             Object.entries(meta).forEach(([configName, configDef]) => {
                 if (!configDef.effect)
@@ -637,7 +637,7 @@ function getConfigDefinitions(interfaceFilesRelevant) {
     const configDefinitions = configDefinitionsMerged;
     return configDefinitions;
 }
-function assertMetaValue(metaVal, metaConfigDefinedAt) {
+function assertMetaUsage(metaVal, metaConfigDefinedAt) {
     if (!(0, utils_js_1.isObject)(metaVal)) {
         (0, utils_js_1.assert)(metaConfigDefinedAt); // We expect internal effects to return a valid meta value
         (0, utils_js_1.assertUsage)(false, `${metaConfigDefinedAt} has an invalid type ${picocolors_1.default.cyan(typeof metaVal)}: it should be an object instead.`);
@@ -709,7 +709,7 @@ function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
             else {
                 configDefinedAt = null;
             }
-            assertMetaValue(configValue, configDefinedAt);
+            assertMetaUsage(configValue, configDefinedAt);
             (0, utils_js_1.objectEntries)(configValue).forEach(([configTargetName, configTargetDef]) => {
                 {
                     const keys = Object.keys(configTargetDef);
@@ -726,8 +726,13 @@ function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
         }
         else {
             (0, utils_js_1.assertUsage)(false, notSupported);
-            // If we do end implementing being able to set the value of a config:
-            //  - For setting definedAtFile: we could take the definedAtFile of the effect config while appending '(effect)' to definedAtFile.fileExportPathToShowToUser
+            /* To implement being able to set a config value in an effect:
+             * - Copy and append definedAtFile.fileExportPathToShowToUser with ['meta', configName, 'effect']
+             *   - Copying the definedAtFile of the config that defines the effect
+             * - Same precedence as the config that sets the value triggering the effect (not the config defining the effect)
+             *   - Apply sortConfigValueSources() again?
+            configValueSources.push()
+            */
         }
     });
 }
@@ -900,7 +905,10 @@ function getConfigEnvValue(val, errMsgIntro) {
     (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(val, 'config', 'undefined') || (0, utils_js_1.hasProp)(val, 'config', 'boolean'), errInvalidValue);
     (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(val, 'server', 'undefined') || (0, utils_js_1.hasProp)(val, 'server', 'boolean'), errInvalidValue);
     (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(val, 'client', 'undefined') || (0, utils_js_1.hasProp)(val, 'client', 'boolean'), errInvalidValue);
-    /* Uncomment to allow users to set an eager config. Same for `{ client: 'if-client-routing' }`.
+    /* To allow users to set an eager config:
+     * - Uncomment line below.
+     * - Add 'eager' to assertKeys() call above.
+     * - Add `eager: boolean` to ConfigEnv type.
     assertUsage(hasProp(val, 'eager', 'undefined') || hasProp(val, 'eager', 'boolean'), errInvalidValue)
     */
     return val;

package/dist/cjs/shared/page-configs/getConfigValueBuildTime.js

@@ -25,7 +25,6 @@ function getConfigValue(pageConfig, configName) {
     const sources = configValueSources[configName];
     if (!sources)
         return null;
-    (0, utils_js_1.assert)(sources.every((s) => s.configEnv.config === true));
     const configDef = configDefinitions[configName];
     (0, utils_js_1.assert)(configDef);
     if (!configDef.cumulative) {

package/dist/cjs/utils/projectInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const PROJECT_VERSION = '0.4.175-commit-fef43b1';
+const PROJECT_VERSION = '0.4.176-commit-775d83b';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -97,19 +97,7 @@ function removeIgnoredDirectories(somePath, ignoredDirs, removeParenthesesDirs)
             return false;
         }
         if (removeParenthesesDirs && dir.startsWith('(') && dir.endsWith(')')) {
-            const dirname = dir.slice(1, -1);
-            if (ignoredDirs.includes(dirname)) {
-                const dirnameActual = dir;
-                const dirnameCorect = dirname;
-                const dirpathActual = somePath.slice(0, somePath.indexOf(dirnameActual) + dirnameActual.length);
-                const dirpathCorect = dirpathActual.replaceAll(dirnameActual, dirnameCorect);
-                const logDir = (d) => pc.bold(d + '/');
-                assertWarning(false, [
-                    `The directories ${logDir(dirnameCorect)} are always ignored by Vike's Filesystem Routing`,
-                    '(https://vike.dev/filesystem-routing):',
-                    `rename directory ${logDir(dirpathActual)} to ${logDir(dirpathCorect)}`
-                ].join(' '), { onlyOnce: true });
-            }
+            assertRedundantParentheses(dir, ignoredDirs, somePath);
             return false;
         }
         return true;
@@ -119,6 +107,22 @@ function removeIgnoredDirectories(somePath, ignoredDirs, removeParenthesesDirs)
         somePath = '/';
     return somePath;
 }
+function assertRedundantParentheses(dir, ignoredDirs, somePath) {
+    const dirWithoutParentheses = dir.slice(1, -1);
+    if (!ignoredDirs.includes(dirWithoutParentheses)) {
+        return;
+    }
+    const dirnameActual = dir;
+    const dirnameCorect = dirWithoutParentheses;
+    const dirpathActual = somePath.slice(0, somePath.indexOf(dirnameActual) + dirnameActual.length);
+    const dirpathCorect = dirpathActual.replaceAll(dirnameActual, dirnameCorect);
+    const logDir = (d) => pc.bold(d + '/');
+    assertWarning(false, [
+        `The directories ${logDir(dirnameCorect)} are always ignored by Vike's Filesystem Routing`,
+        '(https://vike.dev/filesystem-routing):',
+        `rename directory ${logDir(dirpathActual)} to ${logDir(dirpathCorect)}`
+    ].join(' '), { onlyOnce: true });
+}
 function removeFilename(filePathAbsoluteUserRootDir) {
     const filePathParts = filePathAbsoluteUserRootDir.split('/');
     {

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

@@ -610,7 +610,7 @@ function getConfigDefinitions(interfaceFilesRelevant) {
             if (!configMeta)
                 return;
             const meta = configMeta.configValue;
-            assertMetaValue(meta, `Config ${pc.cyan('meta')} defined at ${interfaceFile.filePath.filePathToShowToUser}`);
+            assertMetaUsage(meta, `Config ${pc.cyan('meta')} defined at ${interfaceFile.filePath.filePathToShowToUser}`);
             // Set configDef._userEffectDefinedAtFilePath
             Object.entries(meta).forEach(([configName, configDef]) => {
                 if (!configDef.effect)
@@ -633,7 +633,7 @@ function getConfigDefinitions(interfaceFilesRelevant) {
     const configDefinitions = configDefinitionsMerged;
     return configDefinitions;
 }
-function assertMetaValue(metaVal, metaConfigDefinedAt) {
+function assertMetaUsage(metaVal, metaConfigDefinedAt) {
     if (!isObject(metaVal)) {
         assert(metaConfigDefinedAt); // We expect internal effects to return a valid meta value
         assertUsage(false, `${metaConfigDefinedAt} has an invalid type ${pc.cyan(typeof metaVal)}: it should be an object instead.`);
@@ -705,7 +705,7 @@ function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
             else {
                 configDefinedAt = null;
             }
-            assertMetaValue(configValue, configDefinedAt);
+            assertMetaUsage(configValue, configDefinedAt);
             objectEntries(configValue).forEach(([configTargetName, configTargetDef]) => {
                 {
                     const keys = Object.keys(configTargetDef);
@@ -722,8 +722,13 @@ function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
         }
         else {
             assertUsage(false, notSupported);
-            // If we do end implementing being able to set the value of a config:
-            //  - For setting definedAtFile: we could take the definedAtFile of the effect config while appending '(effect)' to definedAtFile.fileExportPathToShowToUser
+            /* To implement being able to set a config value in an effect:
+             * - Copy and append definedAtFile.fileExportPathToShowToUser with ['meta', configName, 'effect']
+             *   - Copying the definedAtFile of the config that defines the effect
+             * - Same precedence as the config that sets the value triggering the effect (not the config defining the effect)
+             *   - Apply sortConfigValueSources() again?
+            configValueSources.push()
+            */
         }
     });
 }
@@ -895,7 +900,10 @@ function getConfigEnvValue(val, errMsgIntro) {
     assertUsage(hasProp(val, 'config', 'undefined') || hasProp(val, 'config', 'boolean'), errInvalidValue);
     assertUsage(hasProp(val, 'server', 'undefined') || hasProp(val, 'server', 'boolean'), errInvalidValue);
     assertUsage(hasProp(val, 'client', 'undefined') || hasProp(val, 'client', 'boolean'), errInvalidValue);
-    /* Uncomment to allow users to set an eager config. Same for `{ client: 'if-client-routing' }`.
+    /* To allow users to set an eager config:
+     * - Uncomment line below.
+     * - Add 'eager' to assertKeys() call above.
+     * - Add `eager: boolean` to ConfigEnv type.
     assertUsage(hasProp(val, 'eager', 'undefined') || hasProp(val, 'eager', 'boolean'), errInvalidValue)
     */
     return val;

package/dist/esm/shared/page-configs/getConfigValueBuildTime.js

@@ -22,7 +22,6 @@ function getConfigValue(pageConfig, configName) {
     const sources = configValueSources[configName];
     if (!sources)
         return null;
-    assert(sources.every((s) => s.configEnv.config === true));
     const configDef = configDefinitions[configName];
     assert(configDef);
     if (!configDef.cumulative) {

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.175-commit-fef43b1";
+declare const PROJECT_VERSION: "0.4.176-commit-775d83b";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.175-commit-fef43b1";
+    projectVersion: "0.4.176-commit-775d83b";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.175-commit-fef43b1';
+const PROJECT_VERSION = '0.4.176-commit-775d83b';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.175-commit-fef43b1",
+  "version": "0.4.176-commit-775d83b",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",