From 6423f2601ce9f201b587b8a5a622b0cd3f9205fe Mon Sep 17 00:00:00 2001 From: Remco Haszing Date: Wed, 13 Apr 2022 17:21:15 +0200 Subject: [PATCH] Convert dlv require statements to imports It was already imported in one place, that appears to work fine. Using `require` results in invalid ESM output, because `require` is not defined in ES modules. --- .../src/codeActions/provideInvalidApplyCodeActions.ts | 2 +- packages/tailwindcss-language-service/src/completionProvider.ts | 2 +- .../src/diagnostics/getInvalidConfigPathDiagnostics.ts | 2 +- .../src/diagnostics/getInvalidScreenDiagnostics.ts | 2 +- packages/tailwindcss-language-service/src/hoverProvider.ts | 2 +- packages/tailwindcss-language-service/src/util/color.ts | 2 +- packages/tailwindcss-language-service/src/util/find.ts | 2 +- packages/tailwindcss-language-service/src/util/flagEnabled.ts | 2 +- .../src/util/getClassNameAtPosition.ts | 2 +- .../tailwindcss-language-service/src/util/getClassNameDecls.ts | 2 +- .../tailwindcss-language-service/src/util/getClassNameMeta.ts | 2 +- packages/tailwindcss-language-service/src/util/stringify.ts | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/tailwindcss-language-service/src/codeActions/provideInvalidApplyCodeActions.ts b/packages/tailwindcss-language-service/src/codeActions/provideInvalidApplyCodeActions.ts index faf2eab6..3804ca17 100644 --- a/packages/tailwindcss-language-service/src/codeActions/provideInvalidApplyCodeActions.ts +++ b/packages/tailwindcss-language-service/src/codeActions/provideInvalidApplyCodeActions.ts @@ -7,7 +7,7 @@ import { getClassNameMeta } from '../util/getClassNameMeta' import { getClassNameParts } from '../util/getClassNameAtPosition' import { validateApply } from '../util/validateApply' import { isWithinRange } from '../util/isWithinRange' -const dlv = require('dlv') +import dlv from 'dlv' import type { Root, Source } from 'postcss' import { absoluteRange } from '../util/absoluteRange' import { removeRangesFromString } from '../util/removeRangesFromString' diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts index 6c2ef301..69c46d9d 100644 --- a/packages/tailwindcss-language-service/src/completionProvider.ts +++ b/packages/tailwindcss-language-service/src/completionProvider.ts @@ -9,7 +9,7 @@ import type { Position, CompletionContext, } from 'vscode-languageserver' -const dlv = require('dlv') +import dlv from 'dlv' import removeMeta from './util/removeMeta' import { getColor, getColorFromValue } from './util/color' import { isHtmlContext } from './util/html' diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts index 228eaf6a..553dafe1 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts @@ -9,7 +9,7 @@ import isObject from '../util/isObject' import { closest } from '../util/closest' import { absoluteRange } from '../util/absoluteRange' import { combinations } from '../util/combinations' -const dlv = require('dlv') +import dlv from 'dlv' function pathToString(path: string | string[]): string { if (typeof path === 'string') return path diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts index 32a26169..587f1b1f 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts @@ -6,7 +6,7 @@ import { getLanguageBoundaries } from '../util/getLanguageBoundaries' import { findAll, indexToPosition } from '../util/find' import { closest } from '../util/closest' import { absoluteRange } from '../util/absoluteRange' -const dlv = require('dlv') +import dlv from 'dlv' export function getInvalidScreenDiagnostics( state: State, diff --git a/packages/tailwindcss-language-service/src/hoverProvider.ts b/packages/tailwindcss-language-service/src/hoverProvider.ts index d62c1481..2ac7fcfc 100644 --- a/packages/tailwindcss-language-service/src/hoverProvider.ts +++ b/packages/tailwindcss-language-service/src/hoverProvider.ts @@ -1,7 +1,7 @@ import { State } from './util/state' import type { Hover, TextDocument, Position } from 'vscode-languageserver' import { stringifyCss, stringifyConfigValue } from './util/stringify' -const dlv = require('dlv') +import dlv from 'dlv' import { isCssContext } from './util/css' import { findClassNameAtPosition } from './util/find' import { validateApply } from './util/validateApply' diff --git a/packages/tailwindcss-language-service/src/util/color.ts b/packages/tailwindcss-language-service/src/util/color.ts index 420bda09..8334a180 100644 --- a/packages/tailwindcss-language-service/src/util/color.ts +++ b/packages/tailwindcss-language-service/src/util/color.ts @@ -1,4 +1,4 @@ -const dlv = require('dlv') +import dlv from 'dlv' import { State } from './state' import removeMeta from './removeMeta' import { ensureArray, dedupe, flatten } from './array' diff --git a/packages/tailwindcss-language-service/src/util/find.ts b/packages/tailwindcss-language-service/src/util/find.ts index 84719103..d0ad2668 100644 --- a/packages/tailwindcss-language-service/src/util/find.ts +++ b/packages/tailwindcss-language-service/src/util/find.ts @@ -9,7 +9,7 @@ import { flatten } from './array' import { getClassAttributeLexer, getComputedClassAttributeLexer } from './lexers' import { getLanguageBoundaries } from './getLanguageBoundaries' import { resolveRange } from './resolveRange' -const dlv = require('dlv') +import dlv from 'dlv' import { createMultiRegexp } from './createMultiRegexp' export function findAll(re: RegExp, str: string): RegExpMatchArray[] { diff --git a/packages/tailwindcss-language-service/src/util/flagEnabled.ts b/packages/tailwindcss-language-service/src/util/flagEnabled.ts index 51332c1a..f7962847 100644 --- a/packages/tailwindcss-language-service/src/util/flagEnabled.ts +++ b/packages/tailwindcss-language-service/src/util/flagEnabled.ts @@ -1,5 +1,5 @@ import { State } from './state' -const dlv = require('dlv') +import dlv from 'dlv' export function flagEnabled(state: State, flag: string) { if (state.featureFlags.future.includes(flag)) { diff --git a/packages/tailwindcss-language-service/src/util/getClassNameAtPosition.ts b/packages/tailwindcss-language-service/src/util/getClassNameAtPosition.ts index a920c4f9..0bd35860 100644 --- a/packages/tailwindcss-language-service/src/util/getClassNameAtPosition.ts +++ b/packages/tailwindcss-language-service/src/util/getClassNameAtPosition.ts @@ -1,6 +1,6 @@ import { State } from './state' import { combinations } from './combinations' -const dlv = require('dlv') +import dlv from 'dlv' export function getClassNameParts(state: State, className: string): string[] { let separator = state.separator diff --git a/packages/tailwindcss-language-service/src/util/getClassNameDecls.ts b/packages/tailwindcss-language-service/src/util/getClassNameDecls.ts index 952dd122..7314f6ef 100644 --- a/packages/tailwindcss-language-service/src/util/getClassNameDecls.ts +++ b/packages/tailwindcss-language-service/src/util/getClassNameDecls.ts @@ -1,7 +1,7 @@ import { State } from './state' import { getClassNameParts } from './getClassNameAtPosition' import removeMeta from './removeMeta' -const dlv = require('dlv') +import dlv from 'dlv' export function getClassNameDecls( state: State, diff --git a/packages/tailwindcss-language-service/src/util/getClassNameMeta.ts b/packages/tailwindcss-language-service/src/util/getClassNameMeta.ts index 55aa5479..7d4c0581 100644 --- a/packages/tailwindcss-language-service/src/util/getClassNameMeta.ts +++ b/packages/tailwindcss-language-service/src/util/getClassNameMeta.ts @@ -1,6 +1,6 @@ import { State, ClassNameMeta } from './state' import { getClassNameParts } from './getClassNameAtPosition' -const dlv = require('dlv') +import dlv from 'dlv' export function getClassNameMeta( state: State, diff --git a/packages/tailwindcss-language-service/src/util/stringify.ts b/packages/tailwindcss-language-service/src/util/stringify.ts index 0d756674..443d1adb 100644 --- a/packages/tailwindcss-language-service/src/util/stringify.ts +++ b/packages/tailwindcss-language-service/src/util/stringify.ts @@ -1,5 +1,5 @@ import removeMeta from './removeMeta' -const dlv = require('dlv') +import dlv from 'dlv' import escapeClassName from 'css.escape' import { ensureArray } from './array' import { remToPx } from './remToPx'