diff --git a/package-lock.json b/package-lock.json index 87f0572e1ebade3ef5435f9d47574cd69428c59c..73dd7f92b7e0db1bc15daf42e82c453bd47e5f33 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12131,18 +12131,6 @@ "buffer-crc32": "~0.2.3" } }, "node_modules/@cnakazawa/watch": { - "name": "vscode-tailwindcss", - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@cnakazawa/watch": { "packages": { "name": "vscode-tailwindcss", "version": "0.5.4", @@ -12162,7 +12150,6 @@ "dset": "^2.0.1", "esm": "^3.2.25", "execa": "^3.4.0", "fast-glob": "^3.2.4", - "find-up": "^5.0.0", "glob-exec": "^0.1.1", "import-from": "^3.0.0", "jest": "^25.5.4", @@ -12189,63 +12176,6 @@ "vscode-uri": "^2.1.1" }, "engines": { "vscode": "^1.33.0" - } - }, - "packages/tailwindcss-intellisense/node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "packages/tailwindcss-intellisense/node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "packages/tailwindcss-intellisense/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "packages/tailwindcss-intellisense/node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "packages/tailwindcss-intellisense/node_modules/tailwindcss-language-service": { @@ -20246,8 +20176,6 @@ "esm": "^3.2.25", "execa": "^3.4.0", "fast-glob": "^3.2.4", "license": "Apache-2.0", -{ - "license": "Apache-2.0", "name": "vscode-tailwindcss", "import-from": "^3.0.0", "jest": "^25.5.4", @@ -20273,39 +20201,6 @@ "vscode-languageserver-textdocument": "^1.0.1", "vscode-uri": "^2.1.1" }, "dependencies": { - "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "requires": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "requires": { - "p-locate": "^5.0.0" - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "requires": { - "p-limit": "^3.0.2" - } - }, "tailwindcss-language-service": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/tailwindcss-language-service/-/tailwindcss-language-service-0.0.8.tgz", @@ -20503,11 +20398,6 @@ "version": "2.5.1", "requires": { "buffer-crc32": "~0.2.3" } - }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" } } } diff --git a/packages/tailwindcss-intellisense/package-lock.json b/packages/tailwindcss-intellisense/package-lock.json index 1e33672d46013f4def58ab4ed97e697b24bd358e..2ed3c6c4404db1629f827660b7d4f2bc06d5a038 100644 --- a/packages/tailwindcss-intellisense/package-lock.json +++ b/packages/tailwindcss-intellisense/package-lock.json @@ -24,8 +24,6 @@ "esm": "^3.2.25", "execa": "^3.4.0", "fast-glob": "^3.2.4", "name": "vscode-tailwindcss", - "packages": { - "name": "vscode-tailwindcss", "": { "import-from": "^3.0.0", "jest": "^25.5.4", @@ -1363,40 +1361,6 @@ "find-up": "^4.1.0", "get-package-type": "^0.1.0", "js-yaml": "^3.13.1", "resolve-from": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dependencies": { - "p-limit": "^2.2.0" }, "engines": { "node": ">=8" @@ -4987,23 +4951,18 @@ "url": "https://github.com/avajs/find-cache-dir?sponsor=1" } }, "node_modules/find-up": { + "version": "4.1.0", "node_modules/@babel/compat-data": { - "requires": true, - "esm": "^3.2.25", - "name": "vscode-tailwindcss", - "esm": "^3.2.25", + "packages": { - "version": "0.5.4", +{ "dependencies": { - "esm": "^3.2.25", + "packages": { - "lockfileVersion": 2, + "name": "vscode-tailwindcss", "path-exists": "^4.0.0" }, "engines": { - "supports-color": "^5.3.0" "requires": true, - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", } }, "node_modules/flat-cache": { @@ -7209,20 +7168,17 @@ "node": ">=4" } }, "node_modules/locate-path": { - "version": "6.0.0", + "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dependencies": { - "p-locate": "^5.0.0" - "requires": true, + "packages": { + "name": "vscode-tailwindcss", "requires": true, -{ - "esm": "^3.2.25", - "requires": true, "requires": true, +{ - "name": "vscode-tailwindcss", "requires": true, - "url": "https://github.com/sponsors/sindresorhus" + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", } }, "node_modules/lodash": { @@ -8237,39 +8194,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-locate": { - "node_modules/@babel/compat-data": { "requires": true, - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "node_modules/@babel/generator": { -{ + "packages": { { - "p-limit": "^3.0.2" - "requires": true, - "requires": true, + "version": "7.12.5", { - "node": ">=10" - }, - "funding": { { - "name": "vscode-tailwindcss", { - } - }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { "packages": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", { -{ - "yocto-queue": "^0.1.0" + "name": "vscode-tailwindcss", }, "engines": { - "supports-color": "^5.3.0" "requires": true, - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", } }, "node_modules/p-reduce": { @@ -8443,41 +8382,6 @@ "node": ">=8" } }, "resolve-from": "^5.0.0", - "@babel/highlight": "^7.10.4" - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-dir/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-dir/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "resolve-from": "^5.0.0", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz", "version": "3.1.0", "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", @@ -8873,40 +8777,6 @@ "node": ">=8" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/read-pkg-up/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/read-pkg-up/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" } }, "node_modules/read-pkg-up/node_modules/type-fest": { @@ -13740,41 +13610,6 @@ "node": ">=6" } }, "@babel/plugin-transform-parameters": "^7.12.1", - "packages": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "@babel/plugin-transform-parameters": "^7.12.1", "version": "0.5.4", "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", @@ -13792,18 +13627,6 @@ "dependencies": { "buffer-crc32": "~0.2.3" } "requires": true, - "lockfileVersion": 2, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - "requires": true, "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { }, "dependencies": { @@ -14878,34 +14701,6 @@ "find-up": "^4.1.0", "get-package-type": "^0.1.0", "js-yaml": "^3.13.1", "@babel/highlight": "^7.10.4" - "packages": { - }, - "dependencies": { - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "requires": { - "p-limit": "^2.2.0" - } - "node_modules/@babel/core/node_modules/source-map": { "packages": { } }, @@ -17700,15 +17495,14 @@ "pkg-dir": "^4.1.0" } }, "find-up": { - "node_modules/@babel/compat-data": { "requires": true, + "node_modules/@babel/generator": { - "esm": "^3.2.25", + "node_modules/@babel/compat-data": { - "name": "vscode-tailwindcss", - "esm": "^3.2.25", + "packages": { - "version": "0.5.4", +{ "requires": { + "node_modules/@babel/compat-data": { "name": "vscode-tailwindcss", - "node_modules/@babel/plugin-proposal-private-methods": { "path-exists": "^4.0.0" } }, @@ -19417,11 +19211,11 @@ } } }, "locate-path": { - "version": "6.0.0", + "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "requires": { - "p-locate": "^5.0.0" + "p-locate": "^4.1.0" } }, "lodash": { @@ -20214,30 +20008,17 @@ "p-try": "^2.0.0" } }, "p-locate": { - "node_modules/@babel/compat-data": { "requires": true, + "node_modules/@babel/generator": { - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "@babel/plugin-transform-regenerator": "^7.12.1", "packages": { - "p-limit": "^3.0.2" - }, - "dependencies": { - "@babel/highlight": "^7.10.4" "license": "MIT", - "node_modules/@babel/core": { "version": "7.12.5", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", +{ "requires": true, - "version": "0.5.4", "import-from": "^3.0.0", - "node_modules/@babel/core": { "packages": { - "lockfileVersion": 2, - } - "node_modules/@babel/core/node_modules/source-map": { "packages": { + "@types/debounce": "^1.2.0", } }, "p-reduce": { @@ -20363,33 +20144,6 @@ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "requires": { "find-up": "^4.0.0" "requires": true, - "dependencies": { - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "requires": { - "p-limit": "^2.2.0" - } - } - "requires": true, "version": "0.5.4", }, "pkg-up": { @@ -20707,31 +20461,6 @@ "read-pkg": "^5.2.0", "type-fest": "^0.8.1" }, "dependencies": { - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "requires": { - "p-limit": "^2.2.0" - } - }, "type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", @@ -24538,33 +24267,6 @@ "which-module": "^2.0.0", "y18n": "^4.0.0", "yargs-parser": "^18.1.2" "requires": true, - "dependencies": { - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "requires": { - "p-limit": "^2.2.0" - } - } - "requires": true, "version": "0.5.4", }, "yargs-parser": { @@ -24592,12 +24294,6 @@ "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==", "requires": { "buffer-crc32": "~0.2.3" "requires": true, - "version": "0.5.4", - }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "version": "11.1.0", "version": "0.5.4", } } diff --git a/packages/tailwindcss-intellisense/package.json b/packages/tailwindcss-intellisense/package.json index f4c863307b0c89f226a5b7e892e9f6f5da53953f..67747882975806896643926b9810f858ce7ea475 100755 --- a/packages/tailwindcss-intellisense/package.json +++ b/packages/tailwindcss-intellisense/package.json @@ -194,8 +194,6 @@ "esm": "^3.2.25", "execa": "^3.4.0", "fast-glob": "^3.2.4", }, -{ - }, "name": "vscode-tailwindcss", "import-from": "^3.0.0", "jest": "^25.5.4", diff --git a/packages/tailwindcss-intellisense/src/class-names/environment.js b/packages/tailwindcss-intellisense/src/class-names/environment.js deleted file mode 100644 index da905bec3130fc632697695f12ab7e3b0da82f94..0000000000000000000000000000000000000000 --- a/packages/tailwindcss-intellisense/src/class-names/environment.js +++ /dev/null @@ -1,72 +0,0 @@ -import * as path from 'path' -import Module from 'module' -import findUp from 'find-up' -import resolveFrom from 'resolve-from' -import importFrom from 'import-from' - -export function withUserEnvironment(base, cb) { - const pnpPath = findUp.sync('.pnp.js', { cwd: base }) - if (pnpPath) { - return withPnpEnvironment(pnpPath, cb) - } - return withNonPnpEnvironment(base, cb) -} - -function withPnpEnvironment(pnpPath, cb) { - const basePath = path.dirname(pnpPath) - - // pnp will patch `module` and `fs` to load package in pnp environment - // backup the functions which will be patched here - const originalModule = Object.create(null) - originalModule._load = Module._load - originalModule._resolveFilename = Module._resolveFilename - originalModule._findPath = Module._findPath - - const pnpapi = __non_webpack_require__(pnpPath) - - // get into pnp environment - pnpapi.setup() - - // restore the patched function, we can not load any package after called this - const restore = () => Object.assign(Module, originalModule) - - const pnpResolve = (request, from = basePath) => { - return pnpapi.resolveRequest(request, from + '/') - } - - const pnpRequire = (request, from) => { - return __non_webpack_require__(pnpResolve(request, from)) - } - - const res = cb({ isPnP: true, resolve: pnpResolve, require: pnpRequire }) - - // check if it return a thenable - if (res != null && res.then) { - return res.then( - (x) => { - restore() - return x - }, - (err) => { - restore() - throw err - } - ) - } - - restore() - - return res -} - -function withNonPnpEnvironment(base, cb) { - return cb({ - isPnP: false, - require(request, from = base) { - return importFrom(from, request) - }, - resolve(request, from = base) { - return resolveFrom(from, request) - }, - }) -} diff --git a/packages/tailwindcss-intellisense/src/class-names/getPlugins.js b/packages/tailwindcss-intellisense/src/class-names/getPlugins.js index ee27469707f7685e047c33a498079a4bbedf5ade..1fa3e50458f82284ed466a4f27251857d2dc76f1 100644 --- a/packages/tailwindcss-intellisense/src/class-names/getPlugins.js +++ b/packages/tailwindcss-intellisense/src/class-names/getPlugins.js @@ -2,21 +2,23 @@ import * as path from 'path' import stackTrace from 'stack-trace' import pkgUp from 'pkg-up' import { isObject } from './isObject' -import { withUserEnvironment } from './environment' +import resolveFrom from 'resolve-from' +import importFrom from 'import-from' export async function getBuiltInPlugins({ cwd, resolvedConfig }) { - return withUserEnvironment(cwd, ({ require, resolve }) => { + const tailwindBase = path.dirname( - const tailwindBase = path.dirname(resolve('tailwindcss/package.json')) + resolveFrom(cwd, 'tailwindcss/package.json') - try { + ) - return require('./lib/corePlugins.js', tailwindBase).default({ + - corePlugins: resolvedConfig.corePlugins, + try { - }) + // TODO: add v0 support ("generators") - } catch (_) { + return importFrom(tailwindBase, './lib/corePlugins.js').default({ - return [] + corePlugins: resolvedConfig.corePlugins, -import * as path from 'path' + const tailwindBase = path.dirname(resolve('tailwindcss/package.json')) -import * as path from 'path' export async function getBuiltInPlugins({ cwd, resolvedConfig }) { + return [] + } } export default function getPlugins(config) { diff --git a/packages/tailwindcss-intellisense/src/class-names/index.js b/packages/tailwindcss-intellisense/src/class-names/index.js index a66b13dc203d9ed0d1c9cedc2dd40ad14f0a05db..737b5bedf5f72851ca20936e5756e562e5049174 100644 --- a/packages/tailwindcss-intellisense/src/class-names/index.js +++ b/packages/tailwindcss-intellisense/src/class-names/index.js @@ -2,6 +2,8 @@ import extractClassNames from './extractClassNames' import Hook from './hook' import dlv from 'dlv' import dset from 'dset' +import resolveFrom from 'resolve-from' +import importFrom from 'import-from' import chokidar from 'chokidar' import semver from 'semver' import invariant from 'tiny-invariant' @@ -13,7 +15,6 @@ import * as fs from 'fs' import { getUtilityConfigMap } from './getUtilityConfigMap' import glob from 'fast-glob' import normalizePath from 'normalize-path' -import { withUserEnvironment } from './environment' import execa from 'execa' function arraysEqual(arr1, arr2) { @@ -31,6 +32,11 @@ cwd = process.cwd(), { onChange = () => {} } = {} ) { async function run() { + let postcss + let tailwindcss + let version + let featureFlags = { future: [], experimental: [] } + const configPaths = ( await glob(CONFIG_GLOB, { cwd, @@ -48,17 +54,21 @@ invariant(configPaths.length > 0, 'No Tailwind CSS config found.') const configPath = configPaths[0] console.log(`Found Tailwind config file: ${configPath}`) const configDir = path.dirname(configPath) - const { + const tailwindBase = path.dirname( + resolveFrom(configDir, 'tailwindcss/package.json') import dset from 'dset' -import getVariants from './getVariants' - featureFlags = { future: [], experimental: [] }, + postcss = importFrom(tailwindBase, 'postcss') + tailwindcss = importFrom(configDir, 'tailwindcss') + ) import chokidar from 'chokidar' -import extractClassNames from './extractClassNames' import chokidar from 'chokidar' -import Hook from './hook' +import dlv from 'dlv' -import chokidar from 'chokidar' + try { +import Hook from './hook' import dlv from 'dlv' +import semver from 'semver' + } catch (_) {} const sepLocation = semver.gte(version, '0.99.0') ? ['separator'] @@ -85,145 +94,106 @@ } hook.unwatch() - const { - base, - components, - utilities, - resolvedConfig, - browserslist, - postcss, -import getPlugins from './getPlugins' import Hook from './hook' -import getPlugins from './getPlugins' import dlv from 'dlv' +import invariant from 'tiny-invariant' +import extractClassNames from './extractClassNames' import getPlugins from './getPlugins' -import dset from 'dset' - postcss, -import getPlugins from './getPlugins' import semver from 'semver' - browserslistCommand, - browserslistArgs, import getPlugins from './getPlugins' -import getVariants from './getVariants' - let postcssResult - try { -import getVariants from './getVariants' import Hook from './hook' -import getVariants from './getVariants' import dlv from 'dlv' - semver.gte(version, '0.99.0') ? 'base' : 'preflight', - 'components', - 'utilities', - ].map((group) => -import getVariants from './getVariants' import getPlugins from './getPlugins' -import getVariants from './getVariants' + ) import getVariants from './getVariants' -import resolveConfig from './resolveConfig' +} -import resolveConfig from './resolveConfig' +} import extractClassNames from './extractClassNames' -import resolveConfig from './resolveConfig' +} import Hook from './hook' -import resolveConfig from './resolveConfig' +} import dlv from 'dlv' -import resolveConfig from './resolveConfig' +} import dset from 'dset' -import resolveConfig from './resolveConfig' +} import chokidar from 'chokidar' -import resolveConfig from './resolveConfig' +} import semver from 'semver' -import resolveConfig from './resolveConfig' +} import invariant from 'tiny-invariant' +import Hook from './hook' import extractClassNames from './extractClassNames' -import getPlugins from './getPlugins' +import invariant from 'tiny-invariant' -import extractClassNames from './extractClassNames' +import invariant from 'tiny-invariant' -import getVariants from './getVariants' - } - - const [base, components, utilities] = postcssResult - - if (typeof userSeperator !== 'undefined') { -import * as path from 'path' +import invariant from 'tiny-invariant' import dlv from 'dlv' -import * as path from 'path' +import Hook from './hook' import dset from 'dset' +import getPlugins from './getPlugins' - delete config[sepLocation] + hook.unhook() - } - if (typeof userPurge !== 'undefined') { -import * as path from 'path' import invariant from 'tiny-invariant' -import * as path from 'path' import dset from 'dset' import extractClassNames from './extractClassNames' -import extractClassNames from './extractClassNames' import getPlugins from './getPlugins' - } - -import * as path from 'path' +} import getVariants from './getVariants' -import extractClassNames from './extractClassNames' import Hook from './hook' +import chokidar from 'chokidar' -import extractClassNames from './extractClassNames' import Hook from './hook' +import chokidar from 'chokidar' import extractClassNames from './extractClassNames' -import extractClassNames from './extractClassNames' import Hook from './hook' +import chokidar from 'chokidar' import Hook from './hook' -import extractClassNames from './extractClassNames' import Hook from './hook' +import chokidar from 'chokidar' import dlv from 'dlv' -import extractClassNames from './extractClassNames' + } import Hook from './hook' +import chokidar from 'chokidar' import dset from 'dset' -import extractClassNames from './extractClassNames' + config.purge = userPurge const CONFIG_GLOB = +import Hook from './hook' -import extractClassNames from './extractClassNames' import Hook from './hook' +import chokidar from 'chokidar' import semver from 'semver' -import * as fs from 'fs' import invariant from 'tiny-invariant' +import dset from 'dset' import extractClassNames from './extractClassNames' -import Hook from './hook' import getPlugins from './getPlugins' -import extractClassNames from './extractClassNames' import Hook from './hook' -import getVariants from './getVariants' - { + let userSeperator import extractClassNames from './extractClassNames' - async function run() { +import getPlugins from './getPlugins' -import { getUtilityConfigMap } from './getUtilityConfigMap' import Hook from './hook' + let userPurge - cwd: configDir, + try { - } - ) -import { getUtilityConfigMap } from './getUtilityConfigMap' +import Hook from './hook' import chokidar from 'chokidar' +import getVariants from './getVariants' -import { getUtilityConfigMap } from './getUtilityConfigMap' +import Hook from './hook' import semver from 'semver' - console.error('Failed to load browserslist:', error) + '**/{tailwind,tailwind.config,tailwind-config,.tailwindrc}.js' import extractClassNames from './extractClassNames' - suppressErrors: true, import extractClassNames from './extractClassNames' -import extractClassNames from './extractClassNames' +import semver from 'semver' - -import extractClassNames from './extractClassNames' }) - base, - components, -import glob from 'fast-glob' + '**/{tailwind,tailwind.config,tailwind-config,.tailwindrc}.js' import Hook from './hook' -import glob from 'fast-glob' + '**/{tailwind,tailwind.config,tailwind-config,.tailwindrc}.js' import dlv from 'dlv' import glob from 'fast-glob' -import dset from 'dset' +import semver from 'semver' -import extractClassNames from './extractClassNames' + '**/{tailwind,tailwind.config,tailwind-config,.tailwindrc}.js' import dset from 'dset' -import chokidar from 'chokidar' -import * as path from 'path' +import invariant from 'tiny-invariant' -import glob from 'fast-glob' +import Hook from './hook' import semver from 'semver' +import chokidar from 'chokidar' +import invariant from 'tiny-invariant' import dset from 'dset' return { version, @@ -244,6 +214,7 @@ postcss, browserslist, }), modules: { + tailwindcss, postcss, }, featureFlags, @@ -292,46 +263,3 @@ watch([result.configPath, ...result.dependencies]) return result } - -function loadMeta(configDir) { - return withUserEnvironment(configDir, ({ require, resolve }) => { - const tailwindBase = path.dirname(resolve('tailwindcss/package.json')) - const version = require('tailwindcss/package.json').version - let featureFlags - - try { - featureFlags = require('./lib/featureFlags.js', tailwindBase).default - } catch (_) {} - - return { version, featureFlags, tailwindBase } - }) -} - -function withPackages(configDir, cb) { - return withUserEnvironment(configDir, async ({ isPnP, require, resolve }) => { - const tailwindBase = path.dirname(resolve('tailwindcss/package.json')) - const postcss = require('postcss', tailwindBase) - const tailwindcss = require('tailwindcss') - - let browserslistCommand - let browserslistArgs = [] - try { - const browserslistBin = resolve( - path.join( - 'browserslist', - require('browserslist/package.json', tailwindBase).bin.browserslist - ), - tailwindBase - ) - if (isPnP) { - browserslistCommand = 'yarn' - browserslistArgs = ['node', browserslistBin] - } else { - browserslistCommand = process.execPath - browserslistArgs = [browserslistBin] - } - } catch (_) {} - - return cb({ postcss, tailwindcss, browserslistCommand, browserslistArgs }) - }) -} diff --git a/packages/tailwindcss-intellisense/src/class-names/resolveConfig.js b/packages/tailwindcss-intellisense/src/class-names/resolveConfig.js index 6085a00b9366ac34fc3fca64ea9102823e7cd2e3..49a31546ef78ffbbec10b5d55dabb74b798a15e8 100644 --- a/packages/tailwindcss-intellisense/src/class-names/resolveConfig.js +++ b/packages/tailwindcss-intellisense/src/class-names/resolveConfig.js @@ -1,8 +1,15 @@ -import * as path from 'path' +import resolveFrom from 'resolve-from' import decache from './decache' + cwd = path.dirname(config) -import { withUserEnvironment } from './environment' +import * as path from 'path' +import decache from './decache' export default function resolveConfig({ cwd, config }) { + const tailwindBase = path.dirname( + resolveFrom(cwd, 'tailwindcss/package.json') + ) + let resolve = (x) => x + if (typeof config === 'string') { if (!cwd) { cwd = path.dirname(config) @@ -11,28 +18,31 @@ decache(config) config = __non_webpack_require__(config) } -import * as path from 'path' import { withUserEnvironment } from './environment' +import decache from './decache' -import * as path from 'path' + resolve = importFrom(tailwindBase, './resolveConfig.js') +import { withUserEnvironment } from './environment' import * as path from 'path' + if (typeof config === 'string') { +import { withUserEnvironment } from './environment' export default function resolveConfig({ cwd, config }) { -import * as path from 'path' +import { withUserEnvironment } from './environment' if (typeof config === 'string') { -import * as path from 'path' +import { withUserEnvironment } from './environment' if (!cwd) { -import * as path from 'path' +import { withUserEnvironment } from './environment' cwd = path.dirname(config) -import * as path from 'path' +import { withUserEnvironment } from './environment' } -import decache from './decache' + tailwindBase, + - const defaultConfig = require('./stubs/defaultConfig.stub.js', tailwindBase) + ) - resolve = (config) => resolveConfig([config, defaultConfig]) + resolve = (config) => resolveConfig([config, defaultConfig]) + import decache from './decache' -import { withUserEnvironment } from './environment' - } +import * as path from 'path' import decache from './decache' - return resolve(config) }