vike 0.4.175 → 0.4.176

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

@@ -25,7 +25,7 @@ filePathAbsoluteUserRootDir) {
 exports.getLocationId = getLocationId;
 /** Filesystem Routing: get the URL */
 function getFilesystemRouteString(locationId) {
-    return getLogicalPath(locationId, ['renderer', 'pages', 'src', 'index']);
+    return getLogicalPath(locationId, ['renderer', 'pages', 'src', 'index'], true);
 }
 exports.getFilesystemRouteString = getFilesystemRouteString;
 /** Filesystem Inheritance: get the apply root */
@@ -35,8 +35,8 @@ function getInheritanceRoot(locationId) {
 /**
  * getLogicalPath('/pages/some-page', ['pages']) => '/some-page'
  */
-function getLogicalPath(locationId, ignoredDirs) {
-    let logicalPath = removeIgnoredDirectories(locationId, ignoredDirs);
+function getLogicalPath(locationId, ignoredDirs, removeParenthesesDirs) {
+    let logicalPath = removeIgnoredDirectories(locationId, ignoredDirs, removeParenthesesDirs);
     assertIsPath(logicalPath);
     return logicalPath;
 }
@@ -91,7 +91,7 @@ function isInherited(locationId1, locationId2) {
     return startsWith(inheritanceRoot2, inheritanceRoot1);
 }
 exports.isInherited = isInherited;
-function removeIgnoredDirectories(somePath, ignoredDirs) {
+function removeIgnoredDirectories(somePath, ignoredDirs, removeParenthesesDirs) {
     (0, utils_js_1.assertPosixPath)(somePath);
     somePath = somePath
         .split('/')
@@ -99,20 +99,8 @@ function removeIgnoredDirectories(somePath, ignoredDirs) {
         if (ignoredDirs.includes(dir)) {
             return false;
         }
-        if (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 });
-            }
+        if (removeParenthesesDirs && dir.startsWith('(') && dir.endsWith(')')) {
+            assertRedundantParentheses(dir, ignoredDirs, somePath);
             return false;
         }
         return true;
@@ -122,6 +110,22 @@ function removeIgnoredDirectories(somePath, ignoredDirs) {
         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/shared/page-configs/assertPlusFileExport.js

@@ -15,27 +15,30 @@ const EXPORTS_IGNORE = [
 // Tolerate `export { frontmatter }` in .mdx files
 const TOLERATE_SIDE_EXPORTS = ['.md', '.mdx'];
 function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
-    const exportsAll = Object.keys(fileExports).filter((exportName) => !EXPORTS_IGNORE.includes(exportName));
-    const exportsInvalid = exportsAll.filter((e) => e !== 'default' && e !== configName);
-    if (exportsInvalid.length === 0) {
-        if (exportsAll.length === 1) {
-            return;
-        }
-        const exportDefault = picocolors_1.default.cyan('export default');
-        const exportNamed = picocolors_1.default.cyan(`export { ${configName} }`);
-        if (exportsAll.length === 0) {
-            (0, utils_js_1.assertUsage)(false, `${filePathToShowToUser} doesn't export any value, but it should have a ${exportNamed} or ${exportDefault}`);
-        }
-        else {
-            (0, utils_js_1.assert)(exportsAll.length === 2); // because `exportsInvalid.length === 0`
-            (0, utils_js_1.assertWarning)(false, `The exports of ${filePathToShowToUser} are ambiguous: remove ${exportDefault} or ${exportNamed}`, { onlyOnce: true });
-        }
+    const exportNames = Object.keys(fileExports).filter((exportName) => !EXPORTS_IGNORE.includes(exportName));
+    const isValid = (exportName) => exportName === 'default' || exportName === configName;
+    const exportNamesValid = exportNames.filter(isValid);
+    const exportNamesInvalid = exportNames.filter((e) => !isValid(e));
+    if (exportNamesValid.length === 1 && exportNamesInvalid.length === 0) {
+        return;
     }
-    else {
-        if (TOLERATE_SIDE_EXPORTS.some((ext) => filePathToShowToUser.endsWith(ext)))
-            return;
-        exportsInvalid.forEach((exportInvalid) => {
-            (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser} should have only one export: move ${picocolors_1.default.cyan(`export { ${exportInvalid} }`)} to its own +${exportsInvalid}.js file`, { onlyOnce: true });
+    const exportDefault = picocolors_1.default.code('export default');
+    const exportNamed = picocolors_1.default.code(`export { ${configName} }`);
+    if (exportNamesValid.length === 0) {
+        (0, utils_js_1.assertUsage)(false, `${filePathToShowToUser} should have a ${exportNamed} or ${exportDefault}`);
+    }
+    if (exportNamesValid.length === 2) {
+        (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser} is ambiguous: remove ${exportDefault} or ${exportNamed}`, {
+            onlyOnce: true
+        });
+    }
+    (0, utils_js_1.assert)(exportNamesValid.length === 1);
+    (0, utils_js_1.assert)(exportNamesInvalid.length > 0);
+    if (!TOLERATE_SIDE_EXPORTS.some((ext) => filePathToShowToUser.endsWith(ext))) {
+        exportNamesInvalid.forEach((exportInvalid) => {
+            (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser} unexpected ${picocolors_1.default.cyan(`export { ${exportInvalid} }`)}`, {
+                onlyOnce: true
+            });
         });
     }
 }

package/dist/cjs/shared/page-configs/serialize/parsePageConfigs.js

@@ -132,6 +132,7 @@ function parseValueSerialized(valueSerialized, configName, getDefinedAtFile) {
                 });
             }
         });
+        // Already validated by assertPlusFileExport() call above.
         (0, utils_js_1.assert)(valueWasFound);
         return { value, sideExports };
     }

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';
+const PROJECT_VERSION = '0.4.176';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -45,7 +45,7 @@ declare function getFilesystemRouteString(locationId: LocationId): string;
 /**
  * getLogicalPath('/pages/some-page', ['pages']) => '/some-page'
  */
-declare function getLogicalPath(locationId: LocationId, ignoredDirs: string[]): string;
+declare function getLogicalPath(locationId: LocationId, ignoredDirs: string[], removeParenthesesDirs?: true): string;
 /** Whether configs defined in `locationId` apply in every `locationIds` */
 declare function isGlobalLocation(locationId: LocationId, locationIds: LocationId[]): boolean;
 declare function sortAfterInheritanceOrder(locationId1: LocationId, locationId2: LocationId, locationIdPage: LocationId): -1 | 1 | 0;

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

@@ -27,7 +27,7 @@ filePathAbsoluteUserRootDir) {
 }
 /** Filesystem Routing: get the URL */
 function getFilesystemRouteString(locationId) {
-    return getLogicalPath(locationId, ['renderer', 'pages', 'src', 'index']);
+    return getLogicalPath(locationId, ['renderer', 'pages', 'src', 'index'], true);
 }
 /** Filesystem Inheritance: get the apply root */
 function getInheritanceRoot(locationId) {
@@ -36,8 +36,8 @@ function getInheritanceRoot(locationId) {
 /**
  * getLogicalPath('/pages/some-page', ['pages']) => '/some-page'
  */
-function getLogicalPath(locationId, ignoredDirs) {
-    let logicalPath = removeIgnoredDirectories(locationId, ignoredDirs);
+function getLogicalPath(locationId, ignoredDirs, removeParenthesesDirs) {
+    let logicalPath = removeIgnoredDirectories(locationId, ignoredDirs, removeParenthesesDirs);
     assertIsPath(logicalPath);
     return logicalPath;
 }
@@ -88,7 +88,7 @@ function isInherited(locationId1, locationId2) {
     const inheritanceRoot2 = getInheritanceRoot(locationId2);
     return startsWith(inheritanceRoot2, inheritanceRoot1);
 }
-function removeIgnoredDirectories(somePath, ignoredDirs) {
+function removeIgnoredDirectories(somePath, ignoredDirs, removeParenthesesDirs) {
     assertPosixPath(somePath);
     somePath = somePath
         .split('/')
@@ -96,20 +96,8 @@ function removeIgnoredDirectories(somePath, ignoredDirs) {
         if (ignoredDirs.includes(dir)) {
             return false;
         }
-        if (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 });
-            }
+        if (removeParenthesesDirs && dir.startsWith('(') && dir.endsWith(')')) {
+            assertRedundantParentheses(dir, ignoredDirs, somePath);
             return false;
         }
         return true;
@@ -119,6 +107,22 @@ function removeIgnoredDirectories(somePath, ignoredDirs) {
         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/shared/page-configs/assertPlusFileExport.js

@@ -10,27 +10,30 @@ const EXPORTS_IGNORE = [
 // Tolerate `export { frontmatter }` in .mdx files
 const TOLERATE_SIDE_EXPORTS = ['.md', '.mdx'];
 function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
-    const exportsAll = Object.keys(fileExports).filter((exportName) => !EXPORTS_IGNORE.includes(exportName));
-    const exportsInvalid = exportsAll.filter((e) => e !== 'default' && e !== configName);
-    if (exportsInvalid.length === 0) {
-        if (exportsAll.length === 1) {
-            return;
-        }
-        const exportDefault = pc.cyan('export default');
-        const exportNamed = pc.cyan(`export { ${configName} }`);
-        if (exportsAll.length === 0) {
-            assertUsage(false, `${filePathToShowToUser} doesn't export any value, but it should have a ${exportNamed} or ${exportDefault}`);
-        }
-        else {
-            assert(exportsAll.length === 2); // because `exportsInvalid.length === 0`
-            assertWarning(false, `The exports of ${filePathToShowToUser} are ambiguous: remove ${exportDefault} or ${exportNamed}`, { onlyOnce: true });
-        }
+    const exportNames = Object.keys(fileExports).filter((exportName) => !EXPORTS_IGNORE.includes(exportName));
+    const isValid = (exportName) => exportName === 'default' || exportName === configName;
+    const exportNamesValid = exportNames.filter(isValid);
+    const exportNamesInvalid = exportNames.filter((e) => !isValid(e));
+    if (exportNamesValid.length === 1 && exportNamesInvalid.length === 0) {
+        return;
     }
-    else {
-        if (TOLERATE_SIDE_EXPORTS.some((ext) => filePathToShowToUser.endsWith(ext)))
-            return;
-        exportsInvalid.forEach((exportInvalid) => {
-            assertWarning(false, `${filePathToShowToUser} should have only one export: move ${pc.cyan(`export { ${exportInvalid} }`)} to its own +${exportsInvalid}.js file`, { onlyOnce: true });
+    const exportDefault = pc.code('export default');
+    const exportNamed = pc.code(`export { ${configName} }`);
+    if (exportNamesValid.length === 0) {
+        assertUsage(false, `${filePathToShowToUser} should have a ${exportNamed} or ${exportDefault}`);
+    }
+    if (exportNamesValid.length === 2) {
+        assertWarning(false, `${filePathToShowToUser} is ambiguous: remove ${exportDefault} or ${exportNamed}`, {
+            onlyOnce: true
+        });
+    }
+    assert(exportNamesValid.length === 1);
+    assert(exportNamesInvalid.length > 0);
+    if (!TOLERATE_SIDE_EXPORTS.some((ext) => filePathToShowToUser.endsWith(ext))) {
+        exportNamesInvalid.forEach((exportInvalid) => {
+            assertWarning(false, `${filePathToShowToUser} unexpected ${pc.cyan(`export { ${exportInvalid} }`)}`, {
+                onlyOnce: true
+            });
         });
     }
 }

package/dist/esm/shared/page-configs/serialize/parsePageConfigs.js

@@ -129,6 +129,7 @@ function parseValueSerialized(valueSerialized, configName, getDefinedAtFile) {
                 });
             }
         });
+        // Already validated by assertPlusFileExport() call above.
         assert(valueWasFound);
         return { value, sideExports };
     }

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

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

package/dist/esm/utils/projectInfo.js

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

package/package.json

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