1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
diff --git a/src/class-names/resolveConfig.js b/src/class-names/resolveConfig.js
index ebd33cef749a337c6eaf48ce550a1f69175f5f8e..49a31546ef78ffbbec10b5d55dabb74b798a15e8 100644
--- a/src/class-names/resolveConfig.js
+++ b/src/class-names/resolveConfig.js
@@ -1,9 +1,13 @@
+import resolveFrom from 'resolve-from'
import importFrom from 'import-from'
import * as path from 'path'
import decache from './decache'
export default function resolveConfig({ cwd, config }) {
- let resolve = x => x
+ const tailwindBase = path.dirname(
+ resolveFrom(cwd, 'tailwindcss/package.json')
+ )
+ let resolve = (x) => x
if (typeof config === 'string') {
if (!cwd) {
@@ -14,18 +18,18 @@ config = __non_webpack_require__(config)
}
try {
- resolve = importFrom(cwd, 'tailwindcss/resolveConfig.js')
+ resolve = importFrom(tailwindBase, './resolveConfig.js')
} catch (_) {
try {
const resolveConfig = importFrom(
- cwd,
- 'tailwindcss/lib/util/resolveConfig.js'
+ tailwindBase,
+ './lib/util/resolveConfig.js'
)
const defaultConfig = importFrom(
- cwd,
- 'tailwindcss/stubs/defaultConfig.stub.js'
+ tailwindBase,
+ './stubs/defaultConfig.stub.js'
)
- resolve = config => resolveConfig([config, defaultConfig])
+ resolve = (config) => resolveConfig([config, defaultConfig])
} catch (_) {}
}
|