镜像站点 · 本页由第三方 GitHub 只读镜像提供，非 GitHub 官方站点，不接受任何登录或凭据输入。前往 github.com
Skip to content

chore(commonjs): switch to fdir for fewer dependencies #1741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shellscape merged 2 commits into from
Sep 23, 2024
Merged

chore(commonjs): switch to fdir for fewer dependencies #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b19b49
chore(commonjs): switch to fdir for fewer dependencies
benmccann Jun 27, 2024
19d6fce
Merge remote-tracking branch 'upstream/master' into fdir
shellscape Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/commonjs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@
"@rollup/pluginutils": "^5.0.1",
"commondir": "^1.0.1",
"estree-walker": "^2.0.2",
"glob": "^10.4.1",
"fdir": "^6.1.1",
"is-reference": "1.2.1",
"magic-string": "^0.30.3"
"magic-string": "^0.30.3",
"picomatch": "^2.3.1"
},
"devDependencies": {
"@rollup/plugin-json": "^5.0.0",
Expand Down
11 changes: 8 additions & 3 deletions packages/commonjs/src/dynamic-modules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { join, resolve, dirname } from 'path';

import getCommonDir from 'commondir';

import { glob } from 'glob';
import { fdir } from 'fdir';

import { getVirtualPathForDynamicRequirePath, normalizePathSlashes } from './utils';

Expand Down Expand Up @@ -41,8 +41,13 @@ export function getDynamicRequireModules(patterns, dynamicRequireRoot) {
isNegated
? dynamicRequireModules.delete(targetPath)
: dynamicRequireModules.set(targetPath, resolvedPath);
for (const path of glob
.sync(isNegated ? pattern.substr(1) : pattern)
// eslint-disable-next-line new-cap
for (const path of new fdir()
.withBasePath()
.withDirs()
.glob(isNegated ? pattern.substr(1) : pattern)
.crawl()
.sync()
.sort((a, b) => a.localeCompare(b, 'en'))) {
const resolvedPath = resolve(path);
const requirePath = normalizePathSlashes(resolvedPath);
Expand Down
4 changes: 2 additions & 2 deletions packages/commonjs/test/fixtures/function/dynamic-require-instances/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ module.exports = {
},
pluginOptions: {
dynamicRequireTargets: [
'fixtures/function/dynamic-require-instances/direct',
'fixtures/function/dynamic-require-instances/direct/',
'fixtures/function/dynamic-require-instances/direct/index.js',
'fixtures/function/dynamic-require-instances/package',
'fixtures/function/dynamic-require-instances/package/',
'fixtures/function/dynamic-require-instances/package/main.js'
]
}
Expand Down
6 changes: 3 additions & 3 deletions packages/commonjs/test/fixtures/function/dynamic-require-package/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ module.exports = {
},
pluginOptions: {
dynamicRequireTargets: [
'fixtures/function/dynamic-require-package',
'fixtures/function/dynamic-require-package/sub',
'fixtures/function/dynamic-require-package/node_modules/custom-module'
'fixtures/function/dynamic-require-package/',
'fixtures/function/dynamic-require-package/sub/',
'fixtures/function/dynamic-require-package/node_modules/custom-module/'
]
}
};
6 changes: 3 additions & 3 deletions packages/commonjs/test/fixtures/function/dynamic-require-resolve-index/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ module.exports = {
},
pluginOptions: {
dynamicRequireTargets: [
'fixtures/function/dynamic-require-resolve-index',
'fixtures/function/dynamic-require-resolve-index/sub',
'fixtures/function/dynamic-require-resolve-index/node_modules/custom-module'
'fixtures/function/dynamic-require-resolve-index/',
'fixtures/function/dynamic-require-resolve-index/sub/',
'fixtures/function/dynamic-require-resolve-index/node_modules/custom-module/'
]
}
};
2 changes: 1 addition & 1 deletion packages/commonjs/test/fixtures/function/dynamic-require-resolve-reference/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = {
},
pluginOptions: {
dynamicRequireTargets: [
'fixtures/function/dynamic-require-resolve-reference/node_modules/{custom-module,custom-module2}{,/*.js}'
'fixtures/function/dynamic-require-resolve-reference/node_modules/{custom-module,custom-module2}{/,/*.js}'
]
}
};
6 changes: 3 additions & 3 deletions packages/commonjs/test/fixtures/function/dynamic-require-slash-access/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ module.exports = {
},
pluginOptions: {
dynamicRequireTargets: [
'fixtures/function/dynamic-require-slash-access',
'fixtures/function/dynamic-require-slash-access/sub',
'fixtures/function/dynamic-require-slash-access/node_modules/custom-module',
'fixtures/function/dynamic-require-slash-access/',
'fixtures/function/dynamic-require-slash-access/sub/',
'fixtures/function/dynamic-require-slash-access/node_modules/custom-module/',
'fixtures/function/dynamic-require-slash-access/node_modules/custom-module2/*.js'
]
}
Expand Down
Loading