Skip to content

Commit

Permalink
Merge pull request #668 from ben-rogerson/feature/cjs-tailwind-config…
Browse files Browse the repository at this point in the history
…-fallback

Add `tailwind.config.cjs` fallback
  • Loading branch information
ben-rogerson committed Apr 22, 2022
2 parents 846b1f2 + 9e7a7df commit 642e95d
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/configHelpers.js
Expand Up @@ -30,9 +30,16 @@ const getConfigTailwindProperties = (state, config) => {
const sourceRoot = state.file.opts.sourceRoot || '.'
const configFile = config && config.config

const configPath = resolve(sourceRoot, configFile || `./tailwind.config.js`)
const configPath = resolve(sourceRoot, configFile || './tailwind.config.js')
const configExists = existsSync(configPath)

// Look for a commonjs file as a fallback
if (!configExists && !configFile)
return getConfigTailwindProperties(state, {
...config,
config: './tailwind.config.cjs',
})

const configSelected = configExists
? require(configPath)
: defaultTailwindConfig
Expand Down

0 comments on commit 642e95d

Please sign in to comment.