Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
refactor: migrate to ES module syntax for imports across utility and …
…rule files
  • Loading branch information
ImBIOS committed Jan 24, 2025
commit 89afb48202493a1b14c66971edf54d968ca9f477
2 changes: 1 addition & 1 deletion src/rules/classnames-order.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
*/
'use strict';

import { createContext as createContextFallback } from 'tailwindcss/lib/lib/setupContextUtils';
import astUtil from '../util/ast';
import customConfig from '../util/customConfig';
import docsUrl from '../util/docsUrl';
import parserUtil from '../util/parser';
import order from '../util/prettier/order';
import removeDuplicatesFromClassnamesAndWhitespaces from '../util/removeDuplicatesFromClassnamesAndWhitespaces';
import getOption from '../util/settings';
const createContextFallback = require('tailwindcss/lib/lib/setupContextUtils').createContext;

//------------------------------------------------------------------------------
// Rule Definition
Expand Down
12 changes: 6 additions & 6 deletions src/rules/migration-from-tailwind-2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
*/
'use strict';

const docsUrl = require('../util/docsUrl');
const customConfig = require('../util/customConfig');
const astUtil = require('../util/ast');
const groupUtil = require('../util/groupMethods');
const getOption = require('../util/settings');
const parserUtil = require('../util/parser');
import astUtil from '../util/ast';
import customConfig from '../util/customConfig';
import docsUrl from '../util/docsUrl';
import groupUtil from '../util/groupMethods';
import parserUtil from '../util/parser';
import getOption from '../util/settings';

//------------------------------------------------------------------------------
// Rule Definition
Expand Down
12 changes: 6 additions & 6 deletions src/rules/no-arbitrary-value.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
*/
'use strict';

const docsUrl = require('../util/docsUrl');
const customConfig = require('../util/customConfig');
const astUtil = require('../util/ast');
const groupUtil = require('../util/groupMethods');
const getOption = require('../util/settings');
const parserUtil = require('../util/parser');
import astUtil from '../util/ast';
import customConfig from '../util/customConfig';
import docsUrl from '../util/docsUrl';
import groupUtil from '../util/groupMethods';
import parserUtil from '../util/parser';
import getOption from '../util/settings';

//------------------------------------------------------------------------------
// Rule Definition
Expand Down
4 changes: 2 additions & 2 deletions src/rules/no-custom-classname.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/
'use strict';

import { createContext as createContextFallback } from 'tailwindcss/lib/lib/setupContextUtils';
import { groups as defaultGroups } from '../configs/groups';
import astUtil from '../util/ast';
import getClassnamesFromCSS from '../util/cssFiles';
Expand All @@ -12,9 +13,8 @@ import docsUrl from '../util/docsUrl';
import generated from '../util/generated';
import groupUtil from '../util/groupMethods';
import parserUtil from '../util/parser';
import { escapeRegex } from '../util/regex';
import getOption from '../util/settings';
const createContextFallback = require('tailwindcss/lib/lib/setupContextUtils').createContext;
const escapeRegex = require('../util/regex').escapeRegex;

//------------------------------------------------------------------------------
// Rule Definition
Expand Down
2 changes: 1 addition & 1 deletion src/util/ast.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { separatorRegEx } from './regex';
// /.../eslint-plugin-tailwindcss/node_modules/espree/espree.js
// /.../eslint-plugin-tailwindcss/node_modules/@angular-eslint/template-parser/dist/index.js

const removeDuplicatesFromArray = require('./removeDuplicatesFromArray');
import removeDuplicatesFromArray from './removeDuplicatesFromArray';

function calleeToString(calleeNode) {
if (calleeNode.type === 'Identifier') {
Expand Down
8 changes: 4 additions & 4 deletions src/util/cssFiles.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
'use strict';

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

const cssFilesInfos = new Map();
let lastUpdate = null;
Expand Down
4 changes: 2 additions & 2 deletions src/util/customConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import resolveConfig from 'tailwindcss/resolveConfig';
let twLoadConfig: { loadConfig: (arg0: any) => any } | null;

try {
twLoadConfig = require('tailwindcss/lib/lib/load-config');
twLoadConfig = await import('tailwindcss/lib/lib/load-config');
} catch (err) {
twLoadConfig = null;
}

const CHECK_REFRESH_RATE = 1_000;
let previousConfig: null = null;
let lastCheck: number | null = null;
let mergedConfig: null = null;
let mergedConfig: null | ReturnType<typeof resolveConfig> = null;
let lastModifiedDate: string | null = null;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/util/generated.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var generateRulesFallback = require('tailwindcss/lib/lib/generateRules').generateRules;
import { generateRules as generateRulesFallback } from 'tailwindcss/lib/lib/generateRules';

function generate(className, context) {
// const order = generateRulesFallback(new Set([className]), context).sort(([a], [z]) => bigSign(z - a))[0]?.[0] ?? null;
Expand Down
2 changes: 1 addition & 1 deletion src/util/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
let resolveDefaultConfigPathAlias: (() => any) | null;

try {
const { resolveDefaultConfigPath } = require('tailwindcss/lib/util/resolveConfigPath');
const { resolveDefaultConfigPath } = await import('tailwindcss/lib/util/resolveConfigPath');
resolveDefaultConfigPathAlias = resolveDefaultConfigPath;
} catch (err) {
resolveDefaultConfigPathAlias = null;
Expand Down