Skip to content

Commit 83ded23

Browse files
authored
feat: support tailwind config in typescript (francoismassart#242)
Update tailwindcss to 3.3.2, fix tests for classnames-order rule since tailwindcss changed the ordering function at v3.3.0.
1 parent ea167fd commit 83ded23

File tree

5 files changed

+527
-255
lines changed

5 files changed

+527
-255
lines changed

lib/util/customConfig.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
const fs = require('fs');
44
const path = require('path');
55
const resolveConfig = require('tailwindcss/resolveConfig');
6+
const twLoadConfig = require('tailwindcss/lib/lib/load-config');
67

78
const CHECK_REFRESH_RATE = 1_000;
89
let previousConfig = null;
@@ -17,7 +18,7 @@ let lastModifiedDate = null;
1718
*/
1819
function requireUncached(module) {
1920
delete require.cache[require.resolve(module)];
20-
return require(module);
21+
return twLoadConfig.loadConfig(module);
2122
}
2223

2324
function loadConfig(config) {

lib/util/settings.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
'use strict';
2+
const { resolveDefaultConfigPath } = require('tailwindcss/lib/util/resolveConfigPath')
23

34
function getOption(context, name) {
45
// Options (defined at rule level)
@@ -19,7 +20,7 @@ function getOption(context, name) {
1920
case 'classRegex':
2021
return '^class(Name)?$';
2122
case 'config':
22-
return 'tailwind.config.js';
23+
return resolveDefaultConfigPath();
2324
case 'cssFiles':
2425
return ['**/*.css', '!**/node_modules', '!**/.*', '!**/dist', '!**/build'];
2526
case 'cssFilesRefreshRate':

0 commit comments

Comments
 (0)