Skip to content

Commit 4312b91

Browse files
authoredOct 10, 2021
Update Micromatch (#6958)
1 parent 5afe766 commit 4312b91

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed
 

‎packages/core/utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"is-url": "^1.2.2",
3737
"json5": "^1.0.1",
3838
"lru-cache": "^6.0.0",
39-
"micromatch": "^3.0.4",
39+
"micromatch": "^4.0.4",
4040
"node-forge": "^0.10.0",
4141
"nullthrows": "^1.1.1",
4242
"open": "^7.0.3",

‎packages/utils/node-resolver-core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@parcel/diagnostic": "2.0.0-rc.0",
2323
"@parcel/node-libs-browser": "2.0.0-rc.0",
2424
"@parcel/utils": "2.0.0-rc.0",
25-
"micromatch": "^3.0.4",
25+
"micromatch": "^4.0.4",
2626
"nullthrows": "^1.1.1"
2727
}
2828
}

‎packages/utils/node-resolver-core/src/NodeResolver.js

+4
Original file line numberDiff line numberDiff line change
@@ -1083,6 +1083,10 @@ export default class NodeResolver {
10831083
for (let key in aliases) {
10841084
let val = aliases[key];
10851085
if (typeof val === 'string' && isGlob(key)) {
1086+
// https://github.com/micromatch/picomatch/issues/77
1087+
if (filename.startsWith('./')) {
1088+
filename = filename.slice(2);
1089+
}
10861090
let re = micromatch.makeRe(key, {capture: true});
10871091
if (re.test(filename)) {
10881092
alias = filename.replace(re, val);

‎yarn.lock

+13
Original file line numberDiff line numberDiff line change
@@ -8674,6 +8674,14 @@ micromatch@^4.0.2:
86748674
braces "^3.0.1"
86758675
picomatch "^2.0.5"
86768676

8677+
micromatch@^4.0.4:
8678+
version "4.0.4"
8679+
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
8680+
integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
8681+
dependencies:
8682+
braces "^3.0.1"
8683+
picomatch "^2.2.3"
8684+
86778685
miller-rabin@^4.0.0:
86788686
version "4.0.1"
86798687
resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -9949,6 +9957,11 @@ picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
99499957
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
99509958
integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
99519959

9960+
picomatch@^2.2.3:
9961+
version "2.3.0"
9962+
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
9963+
integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
9964+
99529965
pify@^2.0.0, pify@^2.3.0:
99539966
version "2.3.0"
99549967
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"

0 commit comments

Comments
 (0)
Please sign in to comment.