chore(dev-scripts): rework options passed to glob (#12829)

jestjs · May 10, 2022 · d0cfb8f · d0cfb8f
1 parent 8e8ee90
commit d0cfb8f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/scripts/build.mjs b/scripts/build.mjs
@@ -62,9 +62,7 @@ function getBuildPath(file, buildFolder) {
 
 function buildNodePackage({packageDir, pkg}) {
   const srcDir = path.resolve(packageDir, SRC_DIR);
-  const files = glob
-    .sync('**/*', {cwd: srcDir, nodir: true})
-    .map(res => path.join(srcDir, res));
+  const files = glob.sync('**/*', {absolute: true, cwd: srcDir, nodir: true});
 
   process.stdout.write(adjustToTerminalWidth(`${pkg.name}\n`));
 

diff --git a/scripts/cleanE2e.mjs b/scripts/cleanE2e.mjs
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {dirname, join, normalize, resolve} from 'path';
+import {dirname, normalize, resolve} from 'path';
 import {fileURLToPath} from 'url';
 import glob from 'glob';
 import rimraf from 'rimraf';
@@ -23,14 +23,11 @@ const excludedModules = [
 
 const rootDir = resolve(dirname(fileURLToPath(import.meta.url)), '..');
 
-const e2eNodeModules = [
-  ...glob.sync('e2e/*/node_modules/', {cwd: rootDir}),
-  ...glob.sync('e2e/*/*/node_modules/', {cwd: rootDir}),
-]
-  .map(res => join(rootDir, res))
-  .filter(dir => !excludedModules.includes(dir))
-  .map(dir => resolve(rootDir, dir))
-  .sort();
+const e2eNodeModules = glob.sync('e2e/{*,*/*}/node_modules/', {
+  absolute: true,
+  cwd: rootDir,
+  ignore: excludedModules,
+});
 
 e2eNodeModules.forEach(dir => {
   rimraf.sync(dir, {glob: false});