Skip to content

Commit 41f30ca

Browse files
authored
Load modules from nearest tailwindcss instance (#139)
1 parent 5cc0c7c commit 41f30ca

File tree

3 files changed

+30
-59
lines changed

3 files changed

+30
-59
lines changed

package-lock.json

Lines changed: 22 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"prettier-plugin-svelte": "^2.9.0",
5757
"prettier-plugin-twig-melody": "^0.4.6",
5858
"recast": "^0.20.5",
59+
"resolve-from": "^5.0.0",
5960
"rimraf": "^3.0.2",
6061
"svelte": "^3.55.0",
6162
"tailwindcss": "^3.3.0"

src/index.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import lineColumn from 'line-column'
2121
import jsesc from 'jsesc'
2222
import escalade from 'escalade/sync'
2323
import clearModule from 'clear-module'
24+
import resolveFrom from 'resolve-from'
2425

2526
let base = getBasePlugins()
2627

@@ -165,12 +166,14 @@ function createParser(parserFormat, transform) {
165166
}
166167

167168
try {
168-
resolveConfig = requireFrom(baseDir, 'tailwindcss/resolveConfig')
169-
createContext = requireFrom(baseDir, 'tailwindcss/lib/lib/setupContextUtils').createContext
170-
generateRules = requireFrom(baseDir, 'tailwindcss/lib/lib/generateRules').generateRules
169+
let pkgDir = path.dirname(resolveFrom(baseDir, 'tailwindcss/package.json'))
170+
171+
resolveConfig = require(path.join(pkgDir, 'resolveConfig'))
172+
createContext = require(path.join(pkgDir, 'lib/lib/setupContextUtils')).createContext
173+
generateRules = require(path.join(pkgDir, 'lib/lib/generateRules')).generateRules
171174

172175
// Prior to `[email protected]` this won't exist so we load it last
173-
loadConfig = requireFrom(baseDir, 'tailwindcss/loadConfig')
176+
loadConfig = require(path.join(pkgDir, 'loadConfig'))
174177
} catch {}
175178

176179
if (options.tailwindConfig) {

0 commit comments

Comments
 (0)