restore findPluginsInNodeModules

fisker · fisker · commit 170302920849 · 2019-11-01T10:10:33.000+08:00
diff --git a/package.json b/package.json
@@ -37,6 +37,7 @@
     "find-project-root": "1.1.1",
     "flow-parser": "0.89.0",
     "get-stream": "5.1.0",
+    "glob": "7.1.5",
     "globby": "10.0.1",
     "graphql": "14.5.8",
     "html-element-attributes": "2.2.0",
diff --git a/src/common/load-plugins.js b/src/common/load-plugins.js
@@ -2,7 +2,7 @@
 
 const uniqBy = require("lodash.uniqby");
 const fs = require("fs");
-const globby = require("globby");
+const glob = require("glob");
 const path = require("path");
 const resolve = require("resolve");
 const thirdParty = require("./third-party");
@@ -94,42 +94,12 @@ function loadPlugins(plugins, pluginSearchDirs) {
 }
 
 function findPluginsInNodeModules(nodeModulesDir) {
-  // all dirs
-  const dirs = globby.sync(["*"], {
-    cwd: nodeModulesDir,
-    expandDirectories: false,
-    deep: 1,
-    onlyDirectories: true
-  });
-
-  const scopedPackagePattern = "prettier-plugin-*";
-
-  const pluginPackages = Array.prototype.concat.apply(
-    // `prettier-plugin-*` package
-    dirs.filter(dir => dir.startsWith("prettier-plugin-")),
-
-    // scoped plugins
-    dirs
-      .filter(dir => dir[0] === "@")
-      .map(scope => {
-        const pattern =
-          scope === "@prettier"
-            ? [scopedPackagePattern, "plugin-*"]
-            : scopedPackagePattern;
-        const dir = path.join(nodeModulesDir, scope);
-
-        return globby
-          .sync(pattern, {
-            cwd: dir,
-            expandDirectories: false,
-            deep: 1,
-            onlyDirectories: true
-          })
-          .map(dir => scope + "/" + dir);
-      })
+  // `node-glob` is faster in this case
+  const pluginPackageJsonPaths = glob.sync(
+    "{prettier-plugin-*,@*/prettier-plugin-*,@prettier/plugin-*}/package.json",
+    { cwd: nodeModulesDir }
   );
-
-  return pluginPackages.sort((a, b) => a.localeCompare(b));
+  return pluginPackageJsonPaths.map(path.dirname);
 }
 
 function isDirectory(dir) {
diff --git a/yarn.lock b/yarn.lock
@@ -3467,6 +3467,18 @@ glob-parent@^5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
+glob@7.1.5:
+  version "7.1.5"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0"
+  integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
