Merge branch 'next' into definitions

Author: Brad Cornes

packages/tailwindcss-class-names/src/getPlugins.js

@@ -3,19 +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 {
-    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)
+    // TODO: add v0 support ("generators")
+    return importFrom(cwd, 'tailwindcss/lib/corePlugins.js').default({
+      corePlugins: resolvedConfig.corePlugins,
+    })
   } catch (_) {
     return []
   }

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
     : []

packages/tailwindcss-class-names/src/index.js

@@ -10,6 +10,7 @@ import getPlugins from './getPlugins'
 import getVariants from './getVariants'
 import resolveConfig from './resolveConfig'
 import * as util from 'util'
+import * as path from 'path'
 import { glob } from './glob'
 import { getUtilityConfigMap } from './getUtilityConfigMap'
 
@@ -51,9 +52,10 @@ export default async function getClassNames(
     })
     invariant(configPath.length === 1, 'No Tailwind CSS config found.')
     configPath = configPath[0]
-    postcss = importFrom(cwd, 'postcss')
-    tailwindcss = importFrom(cwd, 'tailwindcss')
-    version = importFrom(cwd, 'tailwindcss/package.json').version
+    const configDir = path.dirname(configPath)
+    postcss = importFrom(configDir, 'postcss')
+    tailwindcss = importFrom(configDir, 'tailwindcss')
+    version = importFrom(configDir, 'tailwindcss/package.json').version
 
     const sepLocation = semver.gte(version, '0.99.0')
       ? ['separator']
@@ -90,9 +92,10 @@ export default async function getClassNames(
       delete config[sepLocation]
     }
 
-    const resolvedConfig = resolveConfig({ cwd, config })
+    const resolvedConfig = resolveConfig({ cwd: configDir, config })
 
     return {
+      version,
       configPath,
       config: resolvedConfig,
       separator: typeof userSeperator === 'undefined' ? ':' : userSeperator,
@@ -101,7 +104,7 @@ export default async function getClassNames(
       plugins: getPlugins(config),
       variants: getVariants({ config, version, postcss }),
       utilityConfigMap: await getUtilityConfigMap({
-        cwd,
+        cwd: configDir,
         resolvedConfig,
         postcss,
       }),
@@ -112,7 +115,7 @@ export default async function getClassNames(
   function watch(files = []) {
     if (watcher) watcher.close()
     watcher = chokidar
-      .watch([CONFIG_GLOB, ...files])
+      .watch([CONFIG_GLOB, ...files], { cwd })
       .on('change', handleChange)
       .on('unlink', handleChange)
   }