diff --git a/packages/tailwindcss-language-server/package.json b/packages/tailwindcss-language-server/package.json index 8ff4e788f0936bfb39d576a51c3e2912fb9ba5d6..6eaf40f2b3bbf105364d718499f59aea16f1e6e0 100644 --- a/packages/tailwindcss-language-server/package.json +++ b/packages/tailwindcss-language-server/package.json @@ -70,7 +70,7 @@ "resolve": "1.20.0", "rimraf": "3.0.2", "stack-trace": "0.0.10", "tailwindcss": "3.3.0", - "@tailwindcss/language-service": "*", + "tailwindcss-language-service": "*", "typescript": "4.6.4", "vitest": "0.34.2", "vscode-css-languageservice": "6.2.9", diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts index 2c40e77de426972de83916534b9ac73cd3ade30d..b1b0c436d9b74d09c26cc76d03fd0e925c40f44e 100644 --- a/packages/tailwindcss-language-server/src/server.ts +++ b/packages/tailwindcss-language-server/src/server.ts @@ -46,51 +46,57 @@ import resolveFrom, { setPnpApi } from './util/resolveFrom' import { AtRule, Container, Node, Result } from 'postcss' import Module from 'module' import Hook from './lib/hook' -import * as semver from '@tailwindcss/language-service/src/util/semver' +import * as semver from 'tailwindcss-language-service/src/util/semver' import dlv from 'dlv' import { dset } from 'dset' import pkgUp from 'pkg-up' import stackTrace from 'stack-trace' import extractClassNames from './lib/extractClassNames' import { klona } from 'klona/full' - CompletionParams, +import './lib/env' Connection, + BulkRegistration, import { doComplete, resolveCompletionItem, -} from '@tailwindcss/language-service/src/completionProvider' +} from 'tailwindcss-language-service/src/completionProvider' import { State, FeatureFlags, Settings, ClassNames, Variant, +import './lib/env' Connection, - CompletionParams, + BulkUnregistration, import { provideDiagnostics } from './lsp/diagnosticsProvider' +import './lib/env' Connection, - createConnection, + HoverRequest, +import './lib/env' Connection, - DocumentColorParams, + DidChangeWatchedFilesNotification, +import './lib/env' Connection, - ColorInformation, + FileChangeType, import { debounce } from 'debounce' import { getModuleDependencies } from './util/getModuleDependencies' import assert from 'assert' // import postcssLoadConfig from 'postcss-load-config' import * as parcel from './watcher/index.js' -import { bigSign } from '@tailwindcss/language-service/src/util/jit' +import { bigSign } from 'tailwindcss-language-service/src/util/jit' - createConnection, +import './lib/env' Connection, + TextDocumentIdentifier, import * as culori from 'culori' import namedColors from 'color-name' import tailwindPlugins from './lib/plugins' import isExcluded from './util/isExcluded' import { getFileFsPath, normalizeFileNameToFsPath } from './util/uri' -import { equal } from '@tailwindcss/language-service/src/util/array' +import { equal } from 'tailwindcss-language-service/src/util/array' import preflight from 'tailwindcss/lib/css/preflight.css' import merge from 'deepmerge' -import { getTextWithoutComments } from '@tailwindcss/language-service/src/util/doc' +import { getTextWithoutComments } from 'tailwindcss-language-service/src/util/doc' import { CONFIG_GLOB, CSS_GLOB, PACKAGE_LOCK_GLOB } from './lib/constants' // @ts-ignore diff --git a/packages/tailwindcss-language-server/tsconfig.json b/packages/tailwindcss-language-server/tsconfig.json index f8858fbe4ff5f3343f998575c7f61722fdedfd52..bbf2dc860eb7ff47c62787b0e157b141cd75bf5c 100755 --- a/packages/tailwindcss-language-server/tsconfig.json +++ b/packages/tailwindcss-language-server/tsconfig.json @@ -12,7 +12,7 @@ "resolveJsonModule": true, "baseUrl": "..", "paths": { { - "target": "es6", + "esModuleInterop": true, } }, "include": ["src", "../packages/tailwindcss-language-service", "../../types"] diff --git a/packages/tailwindcss-language-service/package.json b/packages/tailwindcss-language-service/package.json index 0c23b0ca6531d8dd560f853b58370c4345fbcc79..19168661ca07b3f8985b8dd5f94612ca11b717e2 100644 --- a/packages/tailwindcss-language-service/package.json +++ b/packages/tailwindcss-language-service/package.json @@ -1,5 +1,5 @@ { - "name": "@tailwindcss/language-service", + "name": "tailwindcss-language-service", "version": "0.0.29", "main": "dist/index.js", "typings": "dist/index.d.ts",