Skip to content

Commit 89afb48

Browse files
committed
refactor: migrate to ES module syntax for imports across utility and rule files
1 parent c5fd61b commit 89afb48

File tree

9 files changed

+24
-24
lines changed

9 files changed

+24
-24
lines changed

src/rules/classnames-order.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
*/
55
'use strict';
66

7+
import { createContext as createContextFallback } from 'tailwindcss/lib/lib/setupContextUtils';
78
import astUtil from '../util/ast';
89
import customConfig from '../util/customConfig';
910
import docsUrl from '../util/docsUrl';
1011
import parserUtil from '../util/parser';
1112
import order from '../util/prettier/order';
1213
import removeDuplicatesFromClassnamesAndWhitespaces from '../util/removeDuplicatesFromClassnamesAndWhitespaces';
1314
import getOption from '../util/settings';
14-
const createContextFallback = require('tailwindcss/lib/lib/setupContextUtils').createContext;
1515

1616
//------------------------------------------------------------------------------
1717
// Rule Definition

src/rules/migration-from-tailwind-2.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
*/
55
'use strict';
66

7-
const docsUrl = require('../util/docsUrl');
8-
const customConfig = require('../util/customConfig');
9-
const astUtil = require('../util/ast');
10-
const groupUtil = require('../util/groupMethods');
11-
const getOption = require('../util/settings');
12-
const parserUtil = require('../util/parser');
7+
import astUtil from '../util/ast';
8+
import customConfig from '../util/customConfig';
9+
import docsUrl from '../util/docsUrl';
10+
import groupUtil from '../util/groupMethods';
11+
import parserUtil from '../util/parser';
12+
import getOption from '../util/settings';
1313

1414
//------------------------------------------------------------------------------
1515
// Rule Definition

src/rules/no-arbitrary-value.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
*/
55
'use strict';
66

7-
const docsUrl = require('../util/docsUrl');
8-
const customConfig = require('../util/customConfig');
9-
const astUtil = require('../util/ast');
10-
const groupUtil = require('../util/groupMethods');
11-
const getOption = require('../util/settings');
12-
const parserUtil = require('../util/parser');
7+
import astUtil from '../util/ast';
8+
import customConfig from '../util/customConfig';
9+
import docsUrl from '../util/docsUrl';
10+
import groupUtil from '../util/groupMethods';
11+
import parserUtil from '../util/parser';
12+
import getOption from '../util/settings';
1313

1414
//------------------------------------------------------------------------------
1515
// Rule Definition

src/rules/no-custom-classname.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*/
55
'use strict';
66

7+
import { createContext as createContextFallback } from 'tailwindcss/lib/lib/setupContextUtils';
78
import { groups as defaultGroups } from '../configs/groups';
89
import astUtil from '../util/ast';
910
import getClassnamesFromCSS from '../util/cssFiles';
@@ -12,9 +13,8 @@ import docsUrl from '../util/docsUrl';
1213
import generated from '../util/generated';
1314
import groupUtil from '../util/groupMethods';
1415
import parserUtil from '../util/parser';
16+
import { escapeRegex } from '../util/regex';
1517
import getOption from '../util/settings';
16-
const createContextFallback = require('tailwindcss/lib/lib/setupContextUtils').createContext;
17-
const escapeRegex = require('../util/regex').escapeRegex;
1818

1919
//------------------------------------------------------------------------------
2020
// Rule Definition

src/util/ast.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { separatorRegEx } from './regex';
99
// /.../eslint-plugin-tailwindcss/node_modules/espree/espree.js
1010
// /.../eslint-plugin-tailwindcss/node_modules/@angular-eslint/template-parser/dist/index.js
1111

12-
const removeDuplicatesFromArray = require('./removeDuplicatesFromArray');
12+
import removeDuplicatesFromArray from './removeDuplicatesFromArray';
1313

1414
function calleeToString(calleeNode) {
1515
if (calleeNode.type === 'Identifier') {

src/util/cssFiles.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
'use strict';
22

3-
const fg = require('fast-glob');
4-
const fs = require('fs');
5-
const postcss = require('postcss');
3+
import fg from 'fast-glob';
4+
import fs from 'fs';
5+
import postcss from 'postcss';
6+
import removeDuplicatesFromArray from './removeDuplicatesFromArray';
67
const lastClassFromSelectorRegexp = /\.([^\.\,\s\n\:\(\)\[\]\'~\+\>\*\\]*)/gim;
7-
const removeDuplicatesFromArray = require('./removeDuplicatesFromArray');
88

99
const cssFilesInfos = new Map();
1010
let lastUpdate = null;

src/util/customConfig.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import resolveConfig from 'tailwindcss/resolveConfig';
66
let twLoadConfig: { loadConfig: (arg0: any) => any } | null;
77

88
try {
9-
twLoadConfig = require('tailwindcss/lib/lib/load-config');
9+
twLoadConfig = await import('tailwindcss/lib/lib/load-config');
1010
} catch (err) {
1111
twLoadConfig = null;
1212
}
1313

1414
const CHECK_REFRESH_RATE = 1_000;
1515
let previousConfig: null = null;
1616
let lastCheck: number | null = null;
17-
let mergedConfig: null = null;
17+
let mergedConfig: null | ReturnType<typeof resolveConfig> = null;
1818
let lastModifiedDate: string | null = null;
1919

2020
/**

src/util/generated.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var generateRulesFallback = require('tailwindcss/lib/lib/generateRules').generateRules;
1+
import { generateRules as generateRulesFallback } from 'tailwindcss/lib/lib/generateRules';
22

33
function generate(className, context) {
44
// const order = generateRulesFallback(new Set([className]), context).sort(([a], [z]) => bigSign(z - a))[0]?.[0] ?? null;

src/util/settings.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
let resolveDefaultConfigPathAlias: (() => any) | null;
33

44
try {
5-
const { resolveDefaultConfigPath } = require('tailwindcss/lib/util/resolveConfigPath');
5+
const { resolveDefaultConfigPath } = await import('tailwindcss/lib/util/resolveConfigPath');
66
resolveDefaultConfigPathAlias = resolveDefaultConfigPath;
77
} catch (err) {
88
resolveDefaultConfigPathAlias = null;

0 commit comments

Comments
 (0)