Skip to content

Commit 96c86a2

Browse files
authored
Merge pull request #90 from zuoyuanh/1.1
Patch brace and micromatch for 1.1.x
2 parents a9e4eb1 + f897767 commit 96c86a2

File tree

3 files changed

+179
-39
lines changed

3 files changed

+179
-39
lines changed

patched-vscode/extensions/npm/yarn.lock

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,21 @@ brace-expansion@^2.0.1:
3737
balanced-match "^1.0.0"
3838

3939
braces@^3.0.1:
40-
version "3.0.2"
41-
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
42-
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
40+
version "3.0.3"
41+
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
42+
integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
4343
dependencies:
44-
fill-range "^7.0.1"
44+
fill-range "^7.1.1"
4545

4646
esprima@^4.0.0:
4747
version "4.0.1"
4848
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
4949
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
5050

51-
fill-range@^7.0.1:
52-
version "7.0.1"
53-
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
54-
integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
51+
fill-range@^7.1.1:
52+
version "7.1.1"
53+
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
54+
integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
5555
dependencies:
5656
to-regex-range "^5.0.1"
5757

@@ -116,12 +116,12 @@ locate-path@^6.0.0:
116116
p-locate "^5.0.0"
117117

118118
micromatch@^4.0.2:
119-
version "4.0.2"
120-
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
121-
integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
119+
version "4.0.8"
120+
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
121+
integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
122122
dependencies:
123-
braces "^3.0.1"
124-
picomatch "^2.0.5"
123+
braces "^3.0.3"
124+
picomatch "^2.3.1"
125125

126126
minimatch@^5.1.6:
127127
version "5.1.6"
@@ -149,10 +149,10 @@ path-exists@^4.0.0:
149149
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
150150
integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
151151

152-
picomatch@^2.0.5:
153-
version "2.2.2"
154-
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
155-
integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
152+
picomatch@^2.3.1:
153+
version "2.3.1"
154+
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
155+
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
156156

157157
pify@^4.0.1:
158158
version "4.0.1"

patched-vscode/yarn.lock

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2203,11 +2203,11 @@ braces@^2.3.1, braces@^2.3.2:
22032203
to-regex "^3.0.1"
22042204

22052205
braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
2206-
version "3.0.2"
2207-
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
2208-
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
2206+
version "3.0.3"
2207+
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
2208+
integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
22092209
dependencies:
2210-
fill-range "^7.0.1"
2210+
fill-range "^7.1.1"
22112211

22122212
browser-stdout@1.3.1:
22132213
version "1.3.1"
@@ -4376,10 +4376,10 @@ fill-range@^4.0.0:
43764376
repeat-string "^1.6.1"
43774377
to-regex-range "^2.1.0"
43784378

4379-
fill-range@^7.0.1:
4380-
version "7.0.1"
4381-
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
4382-
integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
4379+
fill-range@^7.1.1:
4380+
version "7.1.1"
4381+
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
4382+
integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
43834383
dependencies:
43844384
to-regex-range "^5.0.1"
43854385

@@ -6696,27 +6696,27 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
66966696
to-regex "^3.0.2"
66976697

66986698
micromatch@^4.0.0:
6699-
version "4.0.2"
6700-
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
6701-
integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
6699+
version "4.0.8"
6700+
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
6701+
integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
67026702
dependencies:
6703-
braces "^3.0.1"
6704-
picomatch "^2.0.5"
6703+
braces "^3.0.3"
6704+
picomatch "^2.3.1"
67056705

67066706
micromatch@^4.0.4:
6707-
version "4.0.4"
6708-
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
6709-
integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
6707+
version "4.0.8"
6708+
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
6709+
integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
67106710
dependencies:
6711-
braces "^3.0.1"
6712-
picomatch "^2.2.3"
6711+
braces "^3.0.3"
6712+
picomatch "^2.3.1"
67136713

67146714
micromatch@^4.0.5:
6715-
version "4.0.5"
6716-
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
6717-
integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
6715+
version "4.0.8"
6716+
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
6717+
integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
67186718
dependencies:
6719-
braces "^3.0.2"
6719+
braces "^3.0.3"
67206720
picomatch "^2.3.1"
67216721

67226722
mime-db@1.45.0:

patches/security.diff

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,37 @@ Index: sagemaker-code-editor/vscode/yarn.lock
3636
===================================================================
3737
--- sagemaker-code-editor.orig/vscode/yarn.lock
3838
+++ sagemaker-code-editor/vscode/yarn.lock
39+
@@ -2203,11 +2203,11 @@ braces@^2.3.1, braces@^2.3.2:
40+
to-regex "^3.0.1"
41+
42+
braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
43+
- version "3.0.2"
44+
- resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
45+
- integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
46+
+ version "3.0.3"
47+
+ resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
48+
+ integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
49+
dependencies:
50+
- fill-range "^7.0.1"
51+
+ fill-range "^7.1.1"
52+
53+
browser-stdout@1.3.1:
54+
version "1.3.1"
55+
@@ -4376,10 +4376,10 @@ fill-range@^4.0.0:
56+
repeat-string "^1.6.1"
57+
to-regex-range "^2.1.0"
58+
59+
-fill-range@^7.0.1:
60+
- version "7.0.1"
61+
- resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
62+
- integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
63+
+fill-range@^7.1.1:
64+
+ version "7.1.1"
65+
+ resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
66+
+ integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
67+
dependencies:
68+
to-regex-range "^5.0.1"
69+
3970
@@ -5567,9 +5567,9 @@ invert-kv@^2.0.0:
4071
integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
4172

@@ -49,3 +80,112 @@ Index: sagemaker-code-editor/vscode/yarn.lock
4980

5081
is-absolute-url@^2.0.0:
5182
version "2.1.0"
83+
@@ -6696,27 +6696,27 @@ micromatch@^3.0.4, micromatch@^3.1.10, m
84+
to-regex "^3.0.2"
85+
86+
micromatch@^4.0.0:
87+
- version "4.0.2"
88+
- resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
89+
- integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
90+
+ version "4.0.8"
91+
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
92+
+ integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
93+
dependencies:
94+
- braces "^3.0.1"
95+
- picomatch "^2.0.5"
96+
+ braces "^3.0.3"
97+
+ picomatch "^2.3.1"
98+
99+
micromatch@^4.0.4:
100+
- version "4.0.4"
101+
- resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
102+
- integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
103+
+ version "4.0.8"
104+
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
105+
+ integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
106+
dependencies:
107+
- braces "^3.0.1"
108+
- picomatch "^2.2.3"
109+
+ braces "^3.0.3"
110+
+ picomatch "^2.3.1"
111+
112+
micromatch@^4.0.5:
113+
- version "4.0.5"
114+
- resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
115+
- integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
116+
+ version "4.0.8"
117+
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
118+
+ integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
119+
dependencies:
120+
- braces "^3.0.2"
121+
+ braces "^3.0.3"
122+
picomatch "^2.3.1"
123+
124+
mime-db@1.45.0:
125+
Index: sagemaker-code-editor/vscode/extensions/npm/yarn.lock
126+
===================================================================
127+
--- sagemaker-code-editor.orig/vscode/extensions/npm/yarn.lock
128+
+++ sagemaker-code-editor/vscode/extensions/npm/yarn.lock
129+
@@ -37,21 +37,21 @@ brace-expansion@^2.0.1:
130+
balanced-match "^1.0.0"
131+
132+
braces@^3.0.1:
133+
- version "3.0.2"
134+
- resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
135+
- integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
136+
+ version "3.0.3"
137+
+ resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
138+
+ integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
139+
dependencies:
140+
- fill-range "^7.0.1"
141+
+ fill-range "^7.1.1"
142+
143+
esprima@^4.0.0:
144+
version "4.0.1"
145+
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
146+
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
147+
148+
-fill-range@^7.0.1:
149+
- version "7.0.1"
150+
- resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
151+
- integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
152+
+fill-range@^7.1.1:
153+
+ version "7.1.1"
154+
+ resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
155+
+ integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
156+
dependencies:
157+
to-regex-range "^5.0.1"
158+
159+
@@ -116,12 +116,12 @@ locate-path@^6.0.0:
160+
p-locate "^5.0.0"
161+
162+
micromatch@^4.0.2:
163+
- version "4.0.2"
164+
- resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
165+
- integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
166+
+ version "4.0.8"
167+
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
168+
+ integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
169+
dependencies:
170+
- braces "^3.0.1"
171+
- picomatch "^2.0.5"
172+
+ braces "^3.0.3"
173+
+ picomatch "^2.3.1"
174+
175+
minimatch@^5.1.6:
176+
version "5.1.6"
177+
@@ -149,10 +149,10 @@ path-exists@^4.0.0:
178+
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
179+
integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
180+
181+
-picomatch@^2.0.5:
182+
- version "2.2.2"
183+
- resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
184+
- integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
185+
+picomatch@^2.3.1:
186+
+ version "2.3.1"
187+
+ resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
188+
+ integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
189+
190+
pify@^4.0.1:
191+
version "4.0.1"

0 commit comments

Comments
 (0)