Skip to content

Commit

Permalink
Load modules from nearest tailwindcss instance (#139)
Browse files Browse the repository at this point in the history
  • Loading branch information
bradlc committed Mar 29, 2023
1 parent 5cc0c7c commit 41f30ca
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 59 deletions.
77 changes: 22 additions & 55 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"prettier-plugin-svelte": "^2.9.0",
"prettier-plugin-twig-melody": "^0.4.6",
"recast": "^0.20.5",
"resolve-from": "^5.0.0",
"rimraf": "^3.0.2",
"svelte": "^3.55.0",
"tailwindcss": "^3.3.0"
Expand Down
11 changes: 7 additions & 4 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import lineColumn from 'line-column'
import jsesc from 'jsesc'
import escalade from 'escalade/sync'
import clearModule from 'clear-module'
import resolveFrom from 'resolve-from'

let base = getBasePlugins()

Expand Down Expand Up @@ -165,12 +166,14 @@ function createParser(parserFormat, transform) {
}

try {
resolveConfig = requireFrom(baseDir, 'tailwindcss/resolveConfig')
createContext = requireFrom(baseDir, 'tailwindcss/lib/lib/setupContextUtils').createContext
generateRules = requireFrom(baseDir, 'tailwindcss/lib/lib/generateRules').generateRules
let pkgDir = path.dirname(resolveFrom(baseDir, 'tailwindcss/package.json'))

resolveConfig = require(path.join(pkgDir, 'resolveConfig'))
createContext = require(path.join(pkgDir, 'lib/lib/setupContextUtils')).createContext
generateRules = require(path.join(pkgDir, 'lib/lib/generateRules')).generateRules

// Prior to `tailwindcss@3.3.0` this won't exist so we load it last
loadConfig = requireFrom(baseDir, 'tailwindcss/loadConfig')
loadConfig = require(path.join(pkgDir, 'loadConfig'))
} catch {}

if (options.tailwindConfig) {
Expand Down

0 comments on commit 41f30ca

Please sign in to comment.