tailwind-ctp-intellisense @master -
refs -
log -
-
https://git.jolheiser.com/tailwind-ctp-intellisense.git
diff --git a/packages/tailwindcss-intellisense/src/class-names/resolveConfig.js b/packages/tailwindcss-intellisense/src/class-names/resolveConfig.js
index 6085a00b9366ac34fc3fca64ea9102823e7cd2e3..f36d11c9f2b72d6bb42b37091959fbfc4d192e7d 100644
--- a/packages/tailwindcss-intellisense/src/class-names/resolveConfig.js
+++ b/packages/tailwindcss-intellisense/src/class-names/resolveConfig.js
@@ -11,19 +11,25 @@ decache(config)
config = __non_webpack_require__(config)
}
- let resolve = (x) => x
- withUserEnvironment(cwd, ({ require, resolve }) => {
+ return withUserEnvironment(cwd, ({ require, resolve }) => {
+ let resolveConfigFn = (config) => config
const tailwindBase = path.dirname(resolve('tailwindcss/package.json'))
try {
- resolve = require('./resolveConfig.js', tailwindBase)
+ resolveConfigFn = require('./resolveConfig.js', tailwindBase)
} catch (_) {
try {
const resolveConfig = require('./lib/util/resolveConfig.js', tailwindBase)
const defaultConfig = require('./stubs/defaultConfig.stub.js', tailwindBase)
- resolve = (config) => resolveConfig([config, defaultConfig])
- } catch (_) {}
+ resolveConfigFn = (config) => resolveConfig([config, defaultConfig])
+ } catch (_) {
+ try {
+ const resolveConfig = require('./lib/util/mergeConfigWithDefaults.js', tailwindBase)
+ .default
+ const defaultConfig = require('./defaultConfig.js', tailwindBase)()
+ resolveConfigFn = (config) => resolveConfig(config, defaultConfig)
+ } catch (_) {}
+ }
}
+ return resolveConfigFn(config)
})
-
- return resolve(config)
}