Skip to content

Commit 7ba8b4d

Browse files
committed
fix: Add back pnpm support
1 parent e713b2b commit 7ba8b4d

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

src/class-names/getPlugins.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import { isObject } from './isObject'
55
import { withUserEnvironment } from './environment'
66

77
export async function getBuiltInPlugins({ cwd, resolvedConfig }) {
8-
return withUserEnvironment(cwd, ({ require }) => {
8+
return withUserEnvironment(cwd, ({ require, resolve }) => {
9+
const tailwindBase = path.dirname(resolve('tailwindcss/package.json'))
910
try {
10-
return require('tailwindcss/lib/corePlugins.js').default({
11+
return require('./lib/corePlugins.js', tailwindBase).default({
1112
corePlugins: resolvedConfig.corePlugins,
1213
})
1314
} catch (_) {

src/class-names/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ function loadMeta(configDir) {
184184
let featureFlags
185185

186186
try {
187-
featureFlags = require('tailwindcss/lib/featureFlags.js').default
187+
const tailwindBase = path.dirname(resolve('tailwindcss/package.json'))
188+
featureFlags = require('./lib/featureFlags.js', tailwindBase).default
188189
} catch (_) {}
189190

190191
return { version, featureFlags }

src/class-names/resolveConfig.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ export default function resolveConfig({ cwd, config }) {
1212
}
1313

1414
let resolve = (x) => x
15-
withUserEnvironment(cwd, ({ require }) => {
15+
withUserEnvironment(cwd, ({ require, resolve }) => {
16+
const tailwindBase = path.dirname(resolve('tailwindcss/package.json'))
1617
try {
17-
resolve = require('tailwindcss/resolveConfig.js')
18+
resolve = require('./resolveConfig.js', tailwindBase)
1819
} catch (_) {
1920
try {
20-
const resolveConfig = require('tailwindcss/lib/util/resolveConfig.js')
21-
const defaultConfig = require('tailwindcss/stubs/defaultConfig.stub.js')
21+
const resolveConfig = require('./lib/util/resolveConfig.js', tailwindBase)
22+
const defaultConfig = require('./stubs/defaultConfig.stub.js', tailwindBase)
2223
resolve = (config) => resolveConfig([config, defaultConfig])
2324
} catch (_) {}
2425
}

0 commit comments

Comments
 (0)