vike 0.4.173 → 0.4.174-commit-d226ee7

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

@@ -1,7 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLogicalPath = exports.applyFilesystemRoutingRootEffect = exports.isGlobalLocation = exports.sortAfterInheritanceOrder = exports.getLocationId = exports.isInherited = exports.getFilesystemRouteDefinedBy = exports.getFilesystemRouteString = void 0;
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../../../../utils.js");
+(0, utils_js_1.assertIsNotProductionRuntime)();
 /**
  * `getLocationId('/pages/some-page/+Page.js')` => `'/pages/some-page'`
  * `getLocationId('/renderer/+config.js')` => `'/renderer'`
@@ -30,8 +35,8 @@ function getInheritanceRoot(locationId) {
 /**
  * getLogicalPath('/pages/some-page', ['pages']) => '/some-page'
  */
-function getLogicalPath(locationId, removeDirs) {
-    let logicalPath = removeDirectories(locationId, removeDirs);
+function getLogicalPath(locationId, ignoredDirs) {
+    let logicalPath = removeIgnoredDirectories(locationId, ignoredDirs);
     assertIsPath(logicalPath);
     return logicalPath;
 }
@@ -86,11 +91,32 @@ function isInherited(locationId1, locationId2) {
     return startsWith(inheritanceRoot2, inheritanceRoot1);
 }
 exports.isInherited = isInherited;
-function removeDirectories(somePath, removeDirs) {
+function removeIgnoredDirectories(somePath, ignoredDirs) {
     (0, utils_js_1.assertPosixPath)(somePath);
     somePath = somePath
         .split('/')
-        .filter((p) => !removeDirs.includes(p))
+        .filter((dir) => {
+        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 });
+            }
+            return false;
+        }
+        return true;
+    })
         .join('/');
     if (somePath === '')
         somePath = '/';

package/dist/cjs/utils/isPlainObject.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isPlainObject = void 0;
 function isPlainObject(value) {
+    // Is object?
     if (typeof value !== 'object' || value === null) {
         return false;
     }
@@ -9,6 +10,7 @@ function isPlainObject(value) {
     if (Object.getPrototypeOf(value) === null) {
         return true;
     }
+    // Is plain object?
     return (
     /* Doesn't work in Cloudflare Pages workers
     value.constructor === Object

package/dist/cjs/utils/normalizeHeaders.js

@@ -1,12 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeHeaders = void 0;
+const isObject_js_1 = require("./isObject.js");
 function normalizeHeaders(
 /* This type is precise, too precise which can be annoying: e.g. cannot pass a string[][] argument because it doesn't match the more precise [string,string][] type.
 headersOriginal ConstructorParameters<typeof Headers>[0]
 */
 headersOriginal) {
-    const headersStandard = new Headers(headersOriginal);
+    let headersCleaned = headersOriginal;
+    // Copied from https://github.com/hattipjs/hattip/blob/69237d181300b200a14114df2c3c115c44e0f3eb/packages/adapter/adapter-node/src/request.ts#L78-L83
+    if ((0, isObject_js_1.isObject)(headersCleaned) && headersCleaned[':method'])
+        headersCleaned = Object.fromEntries(Object.entries(headersCleaned).filter(([key]) => !key.startsWith(':')));
+    const headersStandard = new Headers(headersCleaned);
     const headers = Object.fromEntries(headersStandard.entries());
     return headers;
 }

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.173';
+const PROJECT_VERSION = '0.4.174-commit-d226ee7';
 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, removeDirs: string[]): string;
+declare function getLogicalPath(locationId: LocationId, ignoredDirs: string[]): 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

@@ -7,7 +7,9 @@ export { isGlobalLocation };
 export { applyFilesystemRoutingRootEffect };
 // For ./filesystemRouting.spec.ts
 export { getLogicalPath };
-import { assert, assertPosixPath, higherFirst } from '../../../../utils.js';
+import pc from '@brillout/picocolors';
+import { assert, assertIsNotProductionRuntime, assertPosixPath, assertWarning, higherFirst } from '../../../../utils.js';
+assertIsNotProductionRuntime();
 /**
  * `getLocationId('/pages/some-page/+Page.js')` => `'/pages/some-page'`
  * `getLocationId('/renderer/+config.js')` => `'/renderer'`
@@ -34,8 +36,8 @@ function getInheritanceRoot(locationId) {
 /**
  * getLogicalPath('/pages/some-page', ['pages']) => '/some-page'
  */
-function getLogicalPath(locationId, removeDirs) {
-    let logicalPath = removeDirectories(locationId, removeDirs);
+function getLogicalPath(locationId, ignoredDirs) {
+    let logicalPath = removeIgnoredDirectories(locationId, ignoredDirs);
     assertIsPath(logicalPath);
     return logicalPath;
 }
@@ -86,11 +88,32 @@ function isInherited(locationId1, locationId2) {
     const inheritanceRoot2 = getInheritanceRoot(locationId2);
     return startsWith(inheritanceRoot2, inheritanceRoot1);
 }
-function removeDirectories(somePath, removeDirs) {
+function removeIgnoredDirectories(somePath, ignoredDirs) {
     assertPosixPath(somePath);
     somePath = somePath
         .split('/')
-        .filter((p) => !removeDirs.includes(p))
+        .filter((dir) => {
+        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 });
+            }
+            return false;
+        }
+        return true;
+    })
         .join('/');
     if (somePath === '')
         somePath = '/';

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

@@ -1,3 +1 @@
-export { isPlainObject };
-type PlainObject = Record<string, unknown>;
-declare function isPlainObject(value: unknown): value is PlainObject;
+export declare function isPlainObject(value: unknown): value is Record<string, unknown>;

package/dist/esm/utils/isPlainObject.js

@@ -1,5 +1,5 @@
-export { isPlainObject };
-function isPlainObject(value) {
+export function isPlainObject(value) {
+    // Is object?
     if (typeof value !== 'object' || value === null) {
         return false;
     }
@@ -7,6 +7,7 @@ function isPlainObject(value) {
     if (Object.getPrototypeOf(value) === null) {
         return true;
     }
+    // Is plain object?
     return (
     /* Doesn't work in Cloudflare Pages workers
     value.constructor === Object

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

@@ -1 +1,2 @@
-export declare function normalizeHeaders(headersOriginal: unknown): Record<string, string>;
+export { normalizeHeaders };
+declare function normalizeHeaders(headersOriginal: unknown): Record<string, string>;

package/dist/esm/utils/normalizeHeaders.js

@@ -1,9 +1,15 @@
-export function normalizeHeaders(
+export { normalizeHeaders };
+import { isObject } from './isObject.js';
+function normalizeHeaders(
 /* This type is precise, too precise which can be annoying: e.g. cannot pass a string[][] argument because it doesn't match the more precise [string,string][] type.
 headersOriginal ConstructorParameters<typeof Headers>[0]
 */
 headersOriginal) {
-    const headersStandard = new Headers(headersOriginal);
+    let headersCleaned = headersOriginal;
+    // Copied from https://github.com/hattipjs/hattip/blob/69237d181300b200a14114df2c3c115c44e0f3eb/packages/adapter/adapter-node/src/request.ts#L78-L83
+    if (isObject(headersCleaned) && headersCleaned[':method'])
+        headersCleaned = Object.fromEntries(Object.entries(headersCleaned).filter(([key]) => !key.startsWith(':')));
+    const headersStandard = new Headers(headersCleaned);
     const headers = Object.fromEntries(headersStandard.entries());
     return headers;
 }

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.173";
+declare const PROJECT_VERSION: "0.4.174-commit-d226ee7";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.173";
+    projectVersion: "0.4.174-commit-d226ee7";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.173';
+const PROJECT_VERSION = '0.4.174-commit-d226ee7';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.173",
+  "version": "0.4.174-commit-d226ee7",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -23,6 +23,7 @@
     "es-module-lexer": "^1.0.0",
     "esbuild": "^0.19.0",
     "fast-glob": "^3.0.0",
+    "semver": "^7.6.2",
     "sirv": "^2.0.0",
     "source-map-support": "^0.5.0"
   },