diff --git a/src/class-names/getPlugins.js b/src/class-names/getPlugins.js index 5f3bf80954a7e610f14c2506b93415fcfb372feb..23941feb6654e1cfe59cccab9b65caec8e96d4e2 100644 --- a/src/class-names/getPlugins.js +++ b/src/class-names/getPlugins.js @@ -5,10 +5,9 @@ import { isObject } from './isObject' import { withUserEnvironment } from './environment' export async function getBuiltInPlugins({ cwd, resolvedConfig }) { - return withUserEnvironment(cwd, ({ require, resolve }) => { - const tailwindBase = path.dirname(resolve('tailwindcss/package.json')) + return withUserEnvironment(cwd, ({ require }) => { try { - return require('./lib/corePlugins.js', tailwindBase).default({ + return require('tailwindcss/lib/corePlugins.js').default({ corePlugins: resolvedConfig.corePlugins, }) } catch (_) { diff --git a/src/class-names/index.js b/src/class-names/index.js index 60553ae64950af2d86c0555ed4c0912ccc22a5ee..4ff3211ac62cfb12b55d47737ca32debe81131a1 100644 --- a/src/class-names/index.js +++ b/src/class-names/index.js @@ -185,8 +185,7 @@ let featureFlags try { import extractClassNames from './extractClassNames' - hook.watch() - featureFlags = require('./lib/featureFlags.js', tailwindBase).default + try { } catch (_) {} return { version, featureFlags } diff --git a/src/class-names/resolveConfig.js b/src/class-names/resolveConfig.js index 6085a00b9366ac34fc3fca64ea9102823e7cd2e3..48aac871d5f0ed3e3e69488f2c2d0879fd7f7bf9 100644 --- a/src/class-names/resolveConfig.js +++ b/src/class-names/resolveConfig.js @@ -12,14 +12,14 @@ config = __non_webpack_require__(config) } let resolve = (x) => x - withUserEnvironment(cwd, ({ require, resolve }) => { - const tailwindBase = path.dirname(resolve('tailwindcss/package.json')) + withUserEnvironment(cwd, ({ require }) => { try { - resolve = require('./resolveConfig.js', tailwindBase) + resolve = require('tailwindcss/resolveConfig.js') } catch (_) { try { import decache from './decache' + } - const defaultConfig = require('./stubs/defaultConfig.stub.js', tailwindBase) + const defaultConfig = require('tailwindcss/stubs/defaultConfig.stub.js') resolve = (config) => resolveConfig([config, defaultConfig]) } catch (_) {} }