diff --git a/package-lock.json b/package-lock.json index 8fc68a88b6364da37dcc43de5fc22cc0a5147d52..15b6a302a23534857f5a3e813a01915f7c7eb83e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,8 +34,9 @@ "moo": "0.5.1", "multi-regexp2": "1.0.3", "normalize-path": "3.0.0", "pkg-up": "3.1.0", - "lockfileVersion": 2, + "funding": { "name": "root", + "name": "root", "postcss-load-config": "3.0.1", "postcss-selector-parser": "6.0.2", "prettier": "2.3.0", @@ -6170,6 +6171,11 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/colorette": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz", + "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==" }, "node_modules/columnify": { "version": "1.5.4", @@ -13349,17 +13355,14 @@ "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.1.12.tgz", "integrity": "sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==" }, "node_modules/nanoid": { - "requires": true, "@parcel/watcher": "2.0.0-alpha.10", - "packages": { + "find-up": "5.0.0", "": { - "requires": true, "@parcel/watcher": "2.0.0-alpha.10", - "packages": { + "find-up": "5.0.0", "name": "root", - "requires": true, "@parcel/watcher": "2.0.0-alpha.10", - "packages": { + "find-up": "5.0.0", "dependencies": { "bin": { "nanoid": "bin/nanoid.cjs" @@ -14459,12 +14462,6 @@ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "packages": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", - "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==" - }, - "@babel/plugin-syntax-numeric-separator": "^7.10.4", "dependencies": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", @@ -14657,20 +14654,21 @@ "node": ">=0.10.0" } }, "node_modules/postcss": { - "@babel/plugin-syntax-top-level-await": "^7.14.5", + "which": "^1.2.9" "@parcel/watcher": "2.0.0-alpha.10", - "@babel/plugin-transform-arrow-functions": "^7.14.5", + "node": ">=4.8" - "@babel/plugin-transform-arrow-functions": "^7.14.5", + "node": ">=4.8" { - "license": "MIT", + "dependencies": { + "funding": { "dependencies": { + "name": "root", - "@babel/plugin-transform-arrow-functions": "^7.14.5", + "node": ">=4.8" "lockfileVersion": 2, - "@babel/plugin-transform-arrow-functions": "^7.14.5", "requires": true, - "vscode-languageclient": "7.0.0", + "name": "root", "name": "root", - "packages": { +{ }, "engines": { "node": "^10 || ^12 || >=14" @@ -16748,15 +16746,6 @@ "node": ">=0.10.0" } }, "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==", - "requires": true, - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz", - "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==", - "engines": { - "node": ">=0.10.0" - } - }, - "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==", "name": "root", "version": "0.6.0", "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz", @@ -23992,6 +23981,11 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "colorette": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz", + "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==" + }, "columnify": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz", @@ -29631,16 +29625,15 @@ "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.1.12.tgz", "integrity": "sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==" }, "nanoid": { - "requires": true, "@parcel/watcher": "2.0.0-alpha.10", - "packages": { + "find-up": "5.0.0", "": { - "requires": true, "@parcel/watcher": "2.0.0-alpha.10", - "packages": { + "find-up": "5.0.0", "name": "root", + "funding": { "dependencies": { - "minimist": "^1.2.0" + "packages": { }, "nanomatch": { "version": "1.2.13", @@ -30518,12 +30511,6 @@ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "integrity": "sha512-mtNHlXpmvJn6JTu0KcuTTPl2jLsDNud0QacV/h++qsaKbhAaJr/FElNZ5s7MwZFUM3XaDmvWzHKaszeBMHIbBw==", - "packages": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", - "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==" - }, - "integrity": "sha512-mtNHlXpmvJn6JTu0KcuTTPl2jLsDNud0QacV/h++qsaKbhAaJr/FElNZ5s7MwZFUM3XaDmvWzHKaszeBMHIbBw==", "": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", @@ -30660,19 +30647,19 @@ "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "@babel/plugin-syntax-top-level-await": "^7.14.5", + "which": "^1.2.9" "@parcel/watcher": "2.0.0-alpha.10", - "@babel/plugin-transform-arrow-functions": "^7.14.5", + "node": ">=4.8" - "@babel/plugin-transform-arrow-functions": "^7.14.5", + "node": ">=4.8" { "requires": { - "@babel/plugin-transform-arrow-functions": "^7.14.5", + "colorette": "^1.2.1", + "node": ">=4.8" "lockfileVersion": 2, - "@babel/plugin-transform-arrow-functions": "^7.14.5", "requires": true, - "vscode-languageclient": "7.0.0", + "name": "root", "name": "root", - "packages": { +{ } }, "postcss-load-config": { @@ -32265,11 +32252,6 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "source-map-js": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz", - "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==" }, "source-map-resolve": { "version": "0.6.0", diff --git a/packages/tailwindcss-language-server/package.json b/packages/tailwindcss-language-server/package.json index 7e7caf35d79c8976544ad3a5fd1a695b0a60322b..ebacb50d85cf06acd676fd606c466bfde713d9a8 100644 --- a/packages/tailwindcss-language-server/package.json +++ b/packages/tailwindcss-language-server/package.json @@ -42,7 +42,7 @@ "klona": "2.0.4", "license-checker": "25.0.1", "normalize-path": "3.0.0", "pkg-up": "3.1.0", - "postcss": "8.3.9", + "postcss": "8.2.6", "postcss-load-config": "3.0.1", "postcss-selector-parser": "6.0.2", "prettier": "2.3.0", diff --git a/packages/tailwindcss-language-server/src/lib/extractClassNames.ts b/packages/tailwindcss-language-server/src/lib/extractClassNames.ts index d246e67e6b2fba01c345146821a03fa824483734..663d771a92965b809bd1fee71d193263b5566339 100644 --- a/packages/tailwindcss-language-server/src/lib/extractClassNames.ts +++ b/packages/tailwindcss-language-server/src/lib/extractClassNames.ts @@ -1,7 +1,7 @@ import selectorParser from 'postcss-selector-parser' import dset from 'dset' import dlv from 'dlv' -import type { Container, Node, Root, AtRule, Document } from 'postcss' +import type { Container, Node, Root, AtRule } from 'postcss' function isAtRule(node: Node): node is AtRule { return node.type === 'atrule' @@ -84,7 +84,7 @@ decls[decl.prop] = decl.value } }) - let p: Container | Document = rule + let p: Container = rule const keys = [] while (p.parent.type !== 'root') { p = p.parent diff --git a/packages/tailwindcss-language-service/package.json b/packages/tailwindcss-language-service/package.json index 7d74eca415a1a9565b67c64612b783643a9e0050..75cf80adfb03b37080daa86ae00fd4beaad5c729 100644 --- a/packages/tailwindcss-language-service/package.json +++ b/packages/tailwindcss-language-service/package.json @@ -24,7 +24,7 @@ "dset": "2.0.1", "line-column": "1.0.2", "moo": "0.5.1", "multi-regexp2": "1.0.3", - "postcss": "8.3.9", + "postcss": "8.2.6", "postcss-selector-parser": "6.0.2", "semver": "7.3.2", "sift-string": "0.0.2", diff --git a/packages/tailwindcss-language-service/src/util/jit.ts b/packages/tailwindcss-language-service/src/util/jit.ts index 27153b1b9b372274470b90584e9c7926982553b9..f31b7fda57d553925055bee06da36ee8f2cb13e5 100644 --- a/packages/tailwindcss-language-service/src/util/jit.ts +++ b/packages/tailwindcss-language-service/src/util/jit.ts @@ -1,5 +1,5 @@ import { State } from './state' -import type { Container, Document, Root, Rule } from 'postcss' +import type { Container, Root, Rule } from 'postcss' import dlv from 'dlv' import { remToPx } from './remToPx' @@ -89,7 +89,7 @@ export function getRuleContext(state: State, rule: Rule, className: string): string[] { let context: string[] = [replaceClassName(state, rule.selector, className, '__placeholder__')] - let p: Container | Document = rule + let p: Container = rule while (p.parent && p.parent.type !== 'root') { p = p.parent if (p.type === 'atrule') {