From 82dad05540aecc0b80a4c76f44a42d8282c4c26c Mon Sep 17 00:00:00 2001
From: Brad Cornes <brad@parall.ax>
Date: Wed, 29 Apr 2020 19:46:36 +0100
Subject: [PATCH] simplify built-in plugin finder

---
 .../tailwindcss-class-names/src/getPlugins.js   | 17 +++++------------
 .../src/getUtilityConfigMap.js                  |  2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/packages/tailwindcss-class-names/src/getPlugins.js b/packages/tailwindcss-class-names/src/getPlugins.js
index bda9c17..725b4cc 100644
--- a/packages/tailwindcss-class-names/src/getPlugins.js
+++ b/packages/tailwindcss-class-names/src/getPlugins.js
@@ -3,21 +3,14 @@ import stackTrace from 'stack-trace'
 import pkgUp from 'pkg-up'
 import { glob } from './glob'
 import { isObject } from './isObject'
+import importFrom from 'import-from'
 
-export async function getBuiltInPlugins(cwd) {
+export async function getBuiltInPlugins({ cwd, resolvedConfig }) {
   try {
-    // TODO: just require('tailwindcss/lib/corePlugins.js') instead of globbing
     // TODO: add v0 support ("generators")
-    return (
-      await glob(path.resolve(cwd, 'node_modules/tailwindcss/lib/plugins/*.js'))
-    )
-      .map((x) => {
-        try {
-          const mod = __non_webpack_require__(x)
-          return mod.default ? mod.default() : mod()
-        } catch (_) {}
-      })
-      .filter(Boolean)
+    return importFrom(cwd, 'tailwindcss/lib/corePlugins.js').default({
+      corePlugins: resolvedConfig.corePlugins,
+    })
   } catch (_) {
     return []
   }
diff --git a/packages/tailwindcss-class-names/src/getUtilityConfigMap.js b/packages/tailwindcss-class-names/src/getUtilityConfigMap.js
index 9362fea..26ccac7 100644
--- a/packages/tailwindcss-class-names/src/getUtilityConfigMap.js
+++ b/packages/tailwindcss-class-names/src/getUtilityConfigMap.js
@@ -19,7 +19,7 @@ const proxyHandler = (base = []) => ({
 })
 
 export async function getUtilityConfigMap({ cwd, resolvedConfig, postcss }) {
-  const builtInPlugins = await getBuiltInPlugins(cwd)
+  const builtInPlugins = await getBuiltInPlugins({ cwd, resolvedConfig })
   const userPlugins = Array.isArray(resolvedConfig.plugins)
     ? resolvedConfig.plugins
     : []