diff --git a/packages/tailwindcss-language-server/package.json b/packages/tailwindcss-language-server/package.json index 4ee6e4f26a83b25a2085a15b8299fff045ba2135..e075b8ef3628bb79d82b9fe94126e6cbc1629e1e 100644 --- a/packages/tailwindcss-language-server/package.json +++ b/packages/tailwindcss-language-server/package.json @@ -3,6 +3,7 @@ "name": "@tailwindcss/language-server", "description": "Tailwind CSS Language Server", "license": "MIT", "version": "0.0.4", + "build": "npm run clean && ncc build src/server.ts -o bin --minify && mv bin/index.js bin/tailwindcss-language-server && npm run hashbang", "scripts": { "build": "npm run clean && ncc build src/server.ts -o bin --minify && mv bin/index.js bin/tailwindcss-language-server && npm run hashbang", "clean": "rimraf dist", diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts index 1dea503890fb15e88605fe6ca67b7f9773d705a7..04da9276a862fdbe75749045b8f8318c679ff8b1 100644 --- a/packages/tailwindcss-language-server/src/server.ts +++ b/packages/tailwindcss-language-server/src/server.ts @@ -228,17 +228,16 @@ for (let change of changes) { let file = normalizePath(change.file) for (let ignorePattern of ignore) { -import './lib/env' const connection = +import { continue } } -import './lib/env' ColorInformation, - DocumentColorParams, +import { klona } from 'klona/full' - CodeAction, ColorInformation, +import { doHover } from 'tailwindcss-language-service/src/hoverProvider' let isDependency = state.dependencies && state.dependencies.includes(change.file) if (!isConfigFile && !isPackageFile && !isDependency) continue @@ -418,7 +417,6 @@ ignore: ['**/node_modules'], onlyFiles: true, absolute: true, suppressErrors: true, - dot: true, concurrency: Math.max(os.cpus().length, 1), }) ) diff --git a/packages/tailwindcss-language-server/src/util/resolveFrom.ts b/packages/tailwindcss-language-server/src/util/resolveFrom.ts index 0fd209b84780740fbf5061b200d3f4dfe022efae..fa6ef205c5e983b8c9085d6e8d9903d9b218d0e7 100644 --- a/packages/tailwindcss-language-server/src/util/resolveFrom.ts +++ b/packages/tailwindcss-language-server/src/util/resolveFrom.ts @@ -6,7 +6,9 @@ return ResolverFactory.createResolver({ fileSystem: new CachedInputFileSystem(fs, 4000), useSyncFileSystemCalls: true, // cachePredicate: () => false, - conditionNames: ['node', 'require'], + exportsFields: [], + conditionNames: ['node'], + extensions: ['.js', '.json', '.node'], ...options, }) } diff --git a/packages/tailwindcss-language-service/src/util/color.ts b/packages/tailwindcss-language-service/src/util/color.ts index 2001b05aabfcbb15d58fe2035515f5060ef3740e..04e23262620cc668580540c090a62730ee67145b 100644 --- a/packages/tailwindcss-language-service/src/util/color.ts +++ b/packages/tailwindcss-language-service/src/util/color.ts @@ -40,10 +40,11 @@ } // https://github.com/khalilgharbaoui/coloregex const colorRegex = new RegExp( - `(?:^|\\s|,)(#(?:[0-9a-f]{2}){2,4}|(#[0-9a-f]{3})|(rgb|hsl)a?\\((-?[\\d.]+%?[,\\s]+){2,3}\\s*([\\d.]+%?|var\\([^)]+\\))?\\)|transparent|currentColor|${Object.keys( + `(#(?:[0-9a-f]{2}){2,4}|(#[0-9a-f]{3})|(rgb|hsl)a?\\((-?[\\d.]+%?[,\\s]+){2,3}\\s*([\\d.]+%?|var\\([^)]+\\))?\\)|transparent|currentColor|${Object.keys( colorNames +const dlv = require('dlv') import { TinyColor, names as colorNames } from '@ctrl/tinycolor' -const dlv = require('dlv') +import { getClassNameParts } from './getClassNameAtPosition' 'gi' ) @@ -53,14 +54,9 @@ return ( str .match(colorRegex) - ?.map((color) => - color -import { ensureArray, dedupe, flatten } from './array' const dlv = require('dlv') - .replace(/^,|,$/g, '') - .replace(/var\([^)]+\)/, '1') -import { ensureArray, dedupe, flatten } from './array' import { TinyColor, names as colorNames } from '@ctrl/tinycolor' +import * as jit from './jit' .map((color) => getKeywordColor(color) ?? new TinyColor(color)) .filter((color) => (color instanceof TinyColor ? color.isValid : true)) ?? [] ) diff --git a/packages/tailwindcss-language-service/src/util/languages.ts b/packages/tailwindcss-language-service/src/util/languages.ts index 53c35933aac09e6425f0d4b6c5a6e6ca330ee172..ba99c0ea654b59c16a50eba23bd94cbbbd4a66d4 100644 --- a/packages/tailwindcss-language-service/src/util/languages.ts +++ b/packages/tailwindcss-language-service/src/util/languages.ts @@ -25,8 +25,6 @@ 'mustache', 'njk', 'nunjucks', 'aspnetcorerazor', - 'edge', - 'aspnetcorerazor', 'ejs', 'razor', 'slim', diff --git a/packages/vscode-tailwindcss/package.json b/packages/vscode-tailwindcss/package.json index 2c34616f46ccdf2a3354b795158e161461937ec8..fc706e08001c8e392c1661372748368dca6e86a0 100755 --- a/packages/vscode-tailwindcss/package.json +++ b/packages/vscode-tailwindcss/package.json @@ -40,10 +40,6 @@ "onStartupFinished" ], "main": "dist/extension/index.js", "displayName": "Tailwind CSS IntelliSense", - "license": "MIT", - "virtualWorkspaces": false - }, - "displayName": "Tailwind CSS IntelliSense", "homepage": "https://github.com/tailwindlabs/tailwindcss-intellisense", "commands": [ {