Skip to content

Commit bb042d8

Browse files
author
Christopher J. Brody
committed
globby@10 update (with fast-glob implementation)
with some minor test snapshot updates in tests_integration since fast-glob does not always keep the same file order as node-glob
1 parent 56a2cd8 commit bb042d8

6 files changed

Lines changed: 239 additions & 84 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"find-project-root": "1.1.1",
3838
"flow-parser": "0.89.0",
3939
"get-stream": "4.1.0",
40-
"globby": "6.1.0",
40+
"globby": "10.0.1",
4141
"graphql": "14.5.8",
4242
"html-element-attributes": "2.2.0",
4343
"html-styles": "1.0.0",

‎tests_integration/__tests__/__snapshots__/config-resolution.js.snap‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,9 @@ exports[`CLI overrides take precedence (stdout) 1`] = `
88
\\"should have tab width 8\\"
99
)
1010
}
11-
function f() {
12-
console.log(
13-
\\"should have space width 2\\"
14-
)
15-
}
16-
function f() {
17-
console.log(
18-
\\"should have space width 8\\"
19-
)
20-
}
21-
function f() {
22-
console.log(
23-
\\"should have space width 2 despite ../.editorconfig specifying 8, because ./.hg is present\\"
24-
)
25-
}
2611
console.log(
2712
\\"should have no semi\\"
2813
)
29-
console.log(
30-
\\"jest/__best-tests__/file.js should have semi\\"
31-
);
3214
console.log(
3315
\\"jest/Component.js should not have semi\\"
3416
)
@@ -87,6 +69,24 @@ function rcYaml() {
8769
],
8870
);
8971
}
72+
function f() {
73+
console.log(
74+
\\"should have space width 2\\"
75+
)
76+
}
77+
function f() {
78+
console.log(
79+
\\"should have space width 8\\"
80+
)
81+
}
82+
function f() {
83+
console.log(
84+
\\"should have space width 2 despite ../.editorconfig specifying 8, because ./.hg is present\\"
85+
)
86+
}
87+
console.log(
88+
\\"jest/__best-tests__/file.js should have semi\\"
89+
);
9090
"
9191
`;
9292

@@ -122,19 +122,7 @@ exports[`resolves configuration from external files (stdout) 1`] = `
122122
"function f() {
123123
console.log(\\"should have tab width 8\\")
124124
}
125-
function f() {
126-
console.log(\\"should have space width 2\\")
127-
}
128-
function f() {
129-
console.log(\\"should have space width 8\\")
130-
}
131-
function f() {
132-
console.log(
133-
\\"should have space width 2 despite ../.editorconfig specifying 8, because ./.hg is present\\"
134-
)
135-
}
136125
console.log(\\"should have no semi\\")
137-
console.log(\\"jest/__best-tests__/file.js should have semi\\");
138126
console.log(\\"jest/Component.js should not have semi\\")
139127
console.log(\\"jest/Component.test.js should have semi\\");
140128
function js() {
@@ -173,6 +161,18 @@ function rcYaml() {
173161
'and single quotes',
174162
]);
175163
}
164+
function f() {
165+
console.log(\\"should have space width 2\\")
166+
}
167+
function f() {
168+
console.log(\\"should have space width 8\\")
169+
}
170+
function f() {
171+
console.log(
172+
\\"should have space width 2 despite ../.editorconfig specifying 8, because ./.hg is present\\"
173+
)
174+
}
175+
console.log(\\"jest/__best-tests__/file.js should have semi\\");
176176
"
177177
`;
178178

‎tests_integration/__tests__/__snapshots__/multiple-patterns.js.snap‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ exports[`multiple patterns (write) 1`] = `Array []`;
1515
exports[`multiple patterns by with ignore pattern, doesn't ignore node_modules with --with-node-modules flag (stderr) 1`] = `""`;
1616

1717
exports[`multiple patterns by with ignore pattern, doesn't ignore node_modules with --with-node-modules flag (stdout) 1`] = `
18-
"node_modules/node-module.js
18+
"other-regular-modules.js
19+
regular-module.js
20+
node_modules/node-module.js
1921
other-directory/file.js
2022
other-directory/nested-directory/nested-directory-file.js
21-
other-regular-modules.js
22-
regular-module.js
2323
"
2424
`;
2525

@@ -28,10 +28,10 @@ exports[`multiple patterns by with ignore pattern, doesn't ignore node_modules w
2828
exports[`multiple patterns by with ignore pattern, ignores node_modules by default (stderr) 1`] = `""`;
2929

3030
exports[`multiple patterns by with ignore pattern, ignores node_modules by default (stdout) 1`] = `
31-
"other-directory/file.js
32-
other-directory/nested-directory/nested-directory-file.js
33-
other-regular-modules.js
31+
"other-regular-modules.js
3432
regular-module.js
33+
other-directory/file.js
34+
other-directory/nested-directory/nested-directory-file.js
3535
"
3636
`;
3737

@@ -40,10 +40,10 @@ exports[`multiple patterns by with ignore pattern, ignores node_modules by defau
4040
exports[`multiple patterns by with ignore pattern, ignores node_modules by with ./**/*.js (stderr) 1`] = `""`;
4141

4242
exports[`multiple patterns by with ignore pattern, ignores node_modules by with ./**/*.js (stdout) 1`] = `
43-
"other-directory/file.js
44-
other-directory/nested-directory/nested-directory-file.js
45-
other-regular-modules.js
43+
"other-regular-modules.js
4644
regular-module.js
45+
other-directory/file.js
46+
other-directory/nested-directory/nested-directory-file.js
4747
"
4848
`;
4949

@@ -52,10 +52,10 @@ exports[`multiple patterns by with ignore pattern, ignores node_modules by with
5252
exports[`multiple patterns with ignore nested directories pattern (stderr) 1`] = `""`;
5353

5454
exports[`multiple patterns with ignore nested directories pattern (stdout) 1`] = `
55-
"directory/file.js
56-
other-directory/file.js
57-
other-regular-modules.js
55+
"other-regular-modules.js
5856
regular-module.js
57+
directory/file.js
58+
other-directory/file.js
5959
"
6060
`;
6161

‎tests_integration/__tests__/__snapshots__/with-config-precedence.js.snap‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -87,27 +87,9 @@ exports[`CLI overrides take precedence with --config-precedence cli-override (st
8787
\\"should have tab width 8\\"
8888
)
8989
}
90-
function f() {
91-
console.log(
92-
\\"should have space width 2\\"
93-
)
94-
}
95-
function f() {
96-
console.log(
97-
\\"should have space width 8\\"
98-
)
99-
}
100-
function f() {
101-
console.log(
102-
\\"should have space width 2 despite ../.editorconfig specifying 8, because ./.hg is present\\"
103-
)
104-
}
10590
console.log(
10691
\\"should have no semi\\"
10792
)
108-
console.log(
109-
\\"jest/__best-tests__/file.js should have semi\\"
110-
);
11193
console.log(
11294
\\"jest/Component.js should not have semi\\"
11395
)
@@ -166,19 +148,6 @@ function rcYaml() {
166148
],
167149
);
168150
}
169-
"
170-
`;
171-
172-
exports[`CLI overrides take precedence with --config-precedence cli-override (write) 1`] = `Array []`;
173-
174-
exports[`CLI overrides take precedence without --config-precedence (stderr) 1`] = `""`;
175-
176-
exports[`CLI overrides take precedence without --config-precedence (stdout) 1`] = `
177-
"function f() {
178-
console.log(
179-
\\"should have tab width 8\\"
180-
)
181-
}
182151
function f() {
183152
console.log(
184153
\\"should have space width 2\\"
@@ -194,12 +163,25 @@ function f() {
194163
\\"should have space width 2 despite ../.editorconfig specifying 8, because ./.hg is present\\"
195164
)
196165
}
197-
console.log(
198-
\\"should have no semi\\"
199-
)
200166
console.log(
201167
\\"jest/__best-tests__/file.js should have semi\\"
202168
);
169+
"
170+
`;
171+
172+
exports[`CLI overrides take precedence with --config-precedence cli-override (write) 1`] = `Array []`;
173+
174+
exports[`CLI overrides take precedence without --config-precedence (stderr) 1`] = `""`;
175+
176+
exports[`CLI overrides take precedence without --config-precedence (stdout) 1`] = `
177+
"function f() {
178+
console.log(
179+
\\"should have tab width 8\\"
180+
)
181+
}
182+
console.log(
183+
\\"should have no semi\\"
184+
)
203185
console.log(
204186
\\"jest/Component.js should not have semi\\"
205187
)
@@ -258,6 +240,24 @@ function rcYaml() {
258240
],
259241
);
260242
}
243+
function f() {
244+
console.log(
245+
\\"should have space width 2\\"
246+
)
247+
}
248+
function f() {
249+
console.log(
250+
\\"should have space width 8\\"
251+
)
252+
}
253+
function f() {
254+
console.log(
255+
\\"should have space width 2 despite ../.editorconfig specifying 8, because ./.hg is present\\"
256+
)
257+
}
258+
console.log(
259+
\\"jest/__best-tests__/file.js should have semi\\"
260+
);
261261
"
262262
`;
263263

‎tests_integration/__tests__/__snapshots__/with-node-modules.js.snap‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
exports[`doesn't ignore node_modules with --with-node-modules flag (stderr) 1`] = `""`;
44

55
exports[`doesn't ignore node_modules with --with-node-modules flag (stdout) 1`] = `
6-
"node_modules/node-module.js
6+
"regular-module.js
7+
node_modules/node-module.js
78
not_node_modules/file.js
8-
regular-module.js
99
"
1010
`;
1111

@@ -25,8 +25,8 @@ exports[`doesn't ignore node_modules with --with-node-modules flag for file list
2525
exports[`ignores node_modules by default (stderr) 1`] = `""`;
2626

2727
exports[`ignores node_modules by default (stdout) 1`] = `
28-
"not_node_modules/file.js
29-
regular-module.js
28+
"regular-module.js
29+
not_node_modules/file.js
3030
"
3131
`;
3232

@@ -45,8 +45,8 @@ exports[`ignores node_modules by default for file list (write) 1`] = `Array []`;
4545
exports[`ignores node_modules by with ./**/*.js (stderr) 1`] = `""`;
4646

4747
exports[`ignores node_modules by with ./**/*.js (stdout) 1`] = `
48-
"not_node_modules/file.js
49-
regular-module.js
48+
"regular-module.js
49+
not_node_modules/file.js
5050
"
5151
`;
5252

0 commit comments

Comments
 (0)