From 199a0dd6331e8cf92bbfa295c4fbefef695d912d Mon Sep 17 00:00:00 2001 From: renkei <30912473+renkei@users.noreply.github.com> Date: Fri, 2 Jun 2023 15:06:14 +0200 Subject: [PATCH 1/7] Fixes backslash issue on Windows Fix #868 and #871 --- packages/fs-routes/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fs-routes/index.ts b/packages/fs-routes/index.ts index 0eb695d0..a75a1785 100644 --- a/packages/fs-routes/index.ts +++ b/packages/fs-routes/index.ts @@ -55,7 +55,7 @@ export default function fsRoutes( .sort(compare) .map((file) => ({ path: path.resolve(dir, file), - route: '/' + file.replace(options.indexFileRegExp, ''), + route: '/' + file.replace(options.indexFileRegExp, '').replace(/\\/g, '/'), })); } From 81d9622e357cb4e4398dc6524db730b123a6e20e Mon Sep 17 00:00:00 2001 From: renkei <30912473+renkei@users.noreply.github.com> Date: Thu, 8 Jun 2023 12:01:36 +0200 Subject: [PATCH 2/7] Update package.json glob >= 10.2.7 --- packages/fs-routes/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fs-routes/package.json b/packages/fs-routes/package.json index 2fbb896b..9716bc1d 100644 --- a/packages/fs-routes/package.json +++ b/packages/fs-routes/package.json @@ -28,6 +28,6 @@ }, "homepage": "https://github.com/kogosoftwarellc/open-api/tree/master/packages/fs-routes#readme", "peerDependencies": { - "glob": ">=7.1.6" + "glob": ">=10.2.7" } } From 8f3516b8e8720c7ece4c54518b1ace2f0c61b8e0 Mon Sep 17 00:00:00 2001 From: renkei <30912473+renkei@users.noreply.github.com> Date: Thu, 8 Jun 2023 12:08:57 +0200 Subject: [PATCH 3/7] Update package-lock.json set glob version to 10.2.7 --- packages/fs-routes/package-lock.json | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/fs-routes/package-lock.json b/packages/fs-routes/package-lock.json index 699fd74f..526d70c0 100644 --- a/packages/fs-routes/package-lock.json +++ b/packages/fs-routes/package-lock.json @@ -9,7 +9,7 @@ "version": "12.0.0", "license": "MIT", "peerDependencies": { - "glob": ">=7.1.6" + "glob": ">=10.2.7" } }, "node_modules/balanced-match": { @@ -41,20 +41,22 @@ "peer": true }, "node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "peer": true, + "version": "10.2.7", + "resolved": "https://devnexus.krohne.com/repository/npm-krohne/glob/-/glob-10.2.7.tgz", + "integrity": "sha512-jTKehsravOJo8IJxUGfZILnkvVJM/MOfHRs8QcXolVef2zNI9Tqyy5+SeuOAZd3upViEZQLyFpQhYiHLrMUNmA==", + "license": "ISC", "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.0.3", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2", + "path-scurry": "^1.7.0" + }, + "bin": { + "glob": "dist/cjs/src/bin.js" }, "engines": { - "node": "*" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" From eafd00f233ae517f79b5f3dc6de720682a3cb7cb Mon Sep 17 00:00:00 2001 From: renkei <30912473+renkei@users.noreply.github.com> Date: Thu, 8 Jun 2023 12:10:44 +0200 Subject: [PATCH 4/7] Update index.ts Improved backslash fix on Windows platforms based on glob option "posix: true" --- packages/fs-routes/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fs-routes/index.ts b/packages/fs-routes/index.ts index a75a1785..8fd5e9ab 100644 --- a/packages/fs-routes/index.ts +++ b/packages/fs-routes/index.ts @@ -51,11 +51,11 @@ export default function fsRoutes( if (!memo[cacheKey]) { memo[cacheKey] = glob - .sync(options.glob, { cwd: dir }) + .sync(options.glob, { cwd: dir, posix: true }) .sort(compare) .map((file) => ({ path: path.resolve(dir, file), - route: '/' + file.replace(options.indexFileRegExp, '').replace(/\\/g, '/'), + route: '/' + file.replace(options.indexFileRegExp, ''), })); } From d8892534e232bdd63c89cc4891d802ed8586445d Mon Sep 17 00:00:00 2001 From: renkei <30912473+renkei@users.noreply.github.com> Date: Thu, 8 Jun 2023 12:46:50 +0200 Subject: [PATCH 5/7] Update package-lock.json use pulbic npmjs registry --- packages/fs-routes/package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fs-routes/package-lock.json b/packages/fs-routes/package-lock.json index 526d70c0..1d807bb3 100644 --- a/packages/fs-routes/package-lock.json +++ b/packages/fs-routes/package-lock.json @@ -42,7 +42,7 @@ }, "node_modules/glob": { "version": "10.2.7", - "resolved": "https://devnexus.krohne.com/repository/npm-krohne/glob/-/glob-10.2.7.tgz", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.2.7.tgz", "integrity": "sha512-jTKehsravOJo8IJxUGfZILnkvVJM/MOfHRs8QcXolVef2zNI9Tqyy5+SeuOAZd3upViEZQLyFpQhYiHLrMUNmA==", "license": "ISC", "dependencies": { From c5f0fe675586675fb41544d85826234e214a6df3 Mon Sep 17 00:00:00 2001 From: renkei <30912473+renkei@users.noreply.github.com> Date: Thu, 8 Jun 2023 12:48:02 +0200 Subject: [PATCH 6/7] Update package-lock.json cleanup --- packages/fs-routes/package-lock.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/fs-routes/package-lock.json b/packages/fs-routes/package-lock.json index 1d807bb3..78cbe685 100644 --- a/packages/fs-routes/package-lock.json +++ b/packages/fs-routes/package-lock.json @@ -44,7 +44,6 @@ "version": "10.2.7", "resolved": "https://registry.npmjs.org/glob/-/glob-10.2.7.tgz", "integrity": "sha512-jTKehsravOJo8IJxUGfZILnkvVJM/MOfHRs8QcXolVef2zNI9Tqyy5+SeuOAZd3upViEZQLyFpQhYiHLrMUNmA==", - "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^2.0.3", From 86bcb8c9ec7d47bd2d86d90a2151d71803b70764 Mon Sep 17 00:00:00 2001 From: renkei <30912473+renkei@users.noreply.github.com> Date: Thu, 8 Jun 2023 12:50:15 +0200 Subject: [PATCH 7/7] Update package-lock.json peer: true restored --- packages/fs-routes/package-lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/fs-routes/package-lock.json b/packages/fs-routes/package-lock.json index 78cbe685..36b21bd7 100644 --- a/packages/fs-routes/package-lock.json +++ b/packages/fs-routes/package-lock.json @@ -44,6 +44,7 @@ "version": "10.2.7", "resolved": "https://registry.npmjs.org/glob/-/glob-10.2.7.tgz", "integrity": "sha512-jTKehsravOJo8IJxUGfZILnkvVJM/MOfHRs8QcXolVef2zNI9Tqyy5+SeuOAZd3upViEZQLyFpQhYiHLrMUNmA==", + "peer": true, "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^2.0.3",