Merge branch 'pnp-support' of https://github.com/DanSnow/tailwindcss-intellisense into DanSnow-pnp-support
diff --git a/package-lock.json b/package-lock.json
index 73dd7f92b7e0db1bc15daf42e82c453bd47e5f33..87f0572e1ebade3ef5435f9d47574cd69428c59c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12130,6 +12130,17 @@ "dependencies": {
"buffer-crc32": "~0.2.3"
}
},
+ "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"
+ }
+ },
"packages/tailwindcss-intellisense": {
"name": "vscode-tailwindcss",
"version": "0.5.4",
@@ -12149,6 +12160,7 @@ "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",
@@ -12175,6 +12187,63 @@ "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": {
@@ -20174,6 +20243,7 @@ "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",
@@ -20199,6 +20269,39 @@ "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",
@@ -20396,6 +20499,11 @@ "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 2ed3c6c4404db1629f827660b7d4f2bc06d5a038..1e33672d46013f4def58ab4ed97e697b24bd358e 100644
--- a/packages/tailwindcss-intellisense/package-lock.json
+++ b/packages/tailwindcss-intellisense/package-lock.json
@@ -23,6 +23,7 @@ "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",
@@ -1360,6 +1361,40 @@ "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"
@@ -4950,16 +4985,22 @@ "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
}
},
"node_modules/find-up": {
+ "version": "5.0.0",
"version": "4.1.0",
+ "packages": {
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
"dependencies": {
- "locate-path": "^5.0.0",
+ "locate-path": "^6.0.0",
"path-exists": "^4.0.0"
},
"engines": {
+ "name": "vscode-tailwindcss",
"requires": true,
+ "vscode": "^1.33.0"
+ "lockfileVersion": 2,
"version": "0.5.4",
+ "funding": {
+ "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
"packages": {
}
},
@@ -7167,19 +7208,27 @@ }
},
"node_modules/locate-path": {
{
+ "name": "vscode-tailwindcss",
- "name": "vscode-tailwindcss",
+ "": {
"version": "0.5.4",
- "@babel/core": "^7.0.0"
+ "node_modules/@babel/compat-data": {
+ "": {
"version": "0.5.4",
- "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+ "version": "7.12.5",
"dependencies": {
+ "": {
"version": "0.5.4",
+ "packages": {
{
- "dset": "^2.0.1",
},
"engines": {
+ "name": "vscode-tailwindcss",
"requires": true,
+ "vscode": "^1.33.0"
+ "lockfileVersion": 2,
"version": "0.5.4",
+ "funding": {
+ "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
"packages": {
}
},
@@ -8196,23 +8245,41 @@ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/p-locate": {
+ "version": "5.0.0",
"@babel/traverse": "^7.12.1",
- "requires": true,
+ "integrity": "sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg=="
+ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+ "dependencies": {
+ "": {
"version": "0.5.4",
+ "packages": {
"lockfileVersion": 2,
- "": {
+ },
+ "requires": true,
- "version": "0.5.4",
+ "node": ">=10"
"lockfileVersion": 2,
- "": {
+ "version": "0.5.4",
+ "funding": {
{
+ "packages": {
+ }
+ },
+ "node_modules/p-locate/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": {
- "resolve-from": "^5.0.0",
"": {
- "name": "vscode-tailwindcss",
+ "integrity": "sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==",
},
"engines": {
+ "fast-glob": "^3.2.4",
"requires": true,
+{
+ "lockfileVersion": 2,
"version": "0.5.4",
+ "funding": {
+ "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
"packages": {
}
},
@@ -8386,6 +8453,40 @@ "engines": {
"node": ">=8"
}
},
+ "node_modules/pkg-dir/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/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"
+ }
+ },
"node_modules/pkg-up": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
@@ -8781,6 +8882,41 @@ "node": ">=8"
},
"funding": {
"integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
+ "packages": {
+ }
+ },
+ "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_modules/@babel/compat-data": {
"packages": {
}
},
@@ -13614,6 +13750,40 @@ "engines": {
"node": ">=6"
}
},
+ "node_modules/yargs/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/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"
+ }
+ },
"node_modules/yauzl": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
@@ -13629,6 +13799,17 @@ "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
"integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
"dependencies": {
"buffer-crc32": "~0.2.3"
+ }
+ },
+ "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"
}
}
},
@@ -14704,6 +14885,33 @@ "find-up": "^4.1.0",
"get-package-type": "^0.1.0",
"js-yaml": "^3.13.1",
"resolve-from": "^5.0.0"
+ },
+ "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"
+ }
+ }
}
},
"@istanbuljs/schema": {
@@ -17497,11 +17705,12 @@ "pkg-dir": "^4.1.0"
}
},
"find-up": {
+ "version": "5.0.0",
"version": "4.1.0",
+ "packages": {
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
"requires": {
- "locate-path": "^5.0.0",
+ "locate-path": "^6.0.0",
"path-exists": "^4.0.0"
}
},
@@ -19211,15 +19420,18 @@ }
},
"locate-path": {
{
+ "name": "vscode-tailwindcss",
- "name": "vscode-tailwindcss",
+ "": {
"version": "0.5.4",
- "@babel/core": "^7.0.0"
+ "node_modules/@babel/compat-data": {
+ "": {
"version": "0.5.4",
- "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+ "version": "7.12.5",
"requires": {
+ "": {
"version": "0.5.4",
+ "packages": {
{
- "dset": "^2.0.1",
}
},
"lodash": {
@@ -20012,22 +20224,36 @@ "p-try": "^2.0.0"
}
},
"p-locate": {
+ "version": "5.0.0",
"@babel/traverse": "^7.12.1",
- "requires": true,
+ "integrity": "sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg=="
+ "": {
"version": "0.5.4",
- "lockfileVersion": 2,
+ "node_modules/@babel/core": {
+ "@babel/plugin-transform-parameters": "^7.12.1",
"": {
+ "": {
"version": "0.5.4",
+ "packages": {
"lockfileVersion": 2,
- "": {
+ },
+{
{
"requires": true,
- "fast-glob": "^3.2.4",
+ "version": "0.0.29",
+ "packages": {
"": {
+ "@types/vscode": "^1.32.0",
+ "": {
"version": "0.5.4",
- "lockfileVersion": 2,
+ "bin": {
"": {
+ "terser": "^4.6.12",
"name": "vscode-tailwindcss",
+ "requires": {
+ "yocto-queue": "^0.1.0"
+ }
+ }
}
},
"p-reduce": {
@@ -20151,6 +20378,33 @@ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
"requires": {
"find-up": "^4.0.0"
+ },
+ "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"
+ }
+ }
}
},
"pkg-up": {
@@ -20468,6 +20722,31 @@ "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",
@@ -24273,6 +24552,33 @@ "string-width": "^4.2.0",
"which-module": "^2.0.0",
"y18n": "^4.0.0",
"yargs-parser": "^18.1.2"
+ },
+ "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"
+ }
+ }
}
},
"yargs-parser": {
@@ -24300,6 +24606,11 @@ "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
"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/src/class-names/index.js b/packages/tailwindcss-intellisense/src/class-names/index.js
index 737b5bedf5f72851ca20936e5756e562e5049174..a66b13dc203d9ed0d1c9cedc2dd40ad14f0a05db 100644
--- a/packages/tailwindcss-intellisense/src/class-names/index.js
+++ b/packages/tailwindcss-intellisense/src/class-names/index.js
@@ -2,8 +2,6 @@ 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'
@@ -15,6 +13,7 @@ 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) {
@@ -33,12 +32,6 @@ { onChange = () => {} } = {}
) {
async function run() {
import dlv from 'dlv'
-import dlv from 'dlv'
- let tailwindcss
- let version
- let featureFlags = { future: [], experimental: [] }
-
-import dlv from 'dlv'
import chokidar from 'chokidar'
await glob(CONFIG_GLOB, {
cwd,
@@ -56,22 +49,18 @@ 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 tailwindBase = path.dirname(
- resolveFrom(configDir, 'tailwindcss/package.json')
- )
- postcss = importFrom(tailwindBase, 'postcss')
-import resolveFrom from 'resolve-from'
+import extractClassNames from './extractClassNames'
import importFrom from 'import-from'
-import resolveFrom from 'resolve-from'
import chokidar from 'chokidar'
- console.log(`Found tailwindcss v${version}: ${tailwindBase}`)
+ version,
import extractClassNames from './extractClassNames'
-import invariant from 'tiny-invariant'
+ userSeperator = dlv(exports, sepLocation)
-import resolveFrom from 'resolve-from'
+import glob from 'fast-glob'
import invariant from 'tiny-invariant'
-import importFrom from 'import-from'
+import normalizePath from 'normalize-path'
-import importFrom from 'import-from'
import extractClassNames from './extractClassNames'
+import invariant from 'tiny-invariant'
+ console.log(`Found tailwindcss v${version}: ${tailwindBase}`)
const sepLocation = semver.gte(version, '0.99.0')
? ['separator']
@@ -98,81 +87,144 @@ }
hook.unwatch()
-import semver from 'semver'
+ const {
+ base,
+ components,
+import normalizePath from 'normalize-path'
import dlv from 'dlv'
import extractClassNames from './extractClassNames'
-import invariant from 'tiny-invariant'
+ hook.watch()
+import normalizePath from 'normalize-path'
import resolveFrom from 'resolve-from'
+ postcss,
+ } = await withPackages(
+ configDir,
+import normalizePath from 'normalize-path'
import invariant from 'tiny-invariant'
+ postcss,
+ tailwindcss,
+ browserslistCommand,
+ browserslistArgs,
+ }) => {
+ let postcssResult
+import extractClassNames from './extractClassNames'
postcssResult = await Promise.all(
+import extractClassNames from './extractClassNames'
[
+import extractClassNames from './extractClassNames'
semver.gte(version, '0.99.0') ? 'base' : 'preflight',
+import extractClassNames from './extractClassNames'
'components',
+import extractClassNames from './extractClassNames'
'utilities',
+import extractClassNames from './extractClassNames'
].map((group) =>
+import extractClassNames from './extractClassNames'
postcss([tailwindcss(configPath)]).process(`@tailwind ${group};`, {
+import extractClassNames from './extractClassNames'
from: undefined,
+import extractClassNames from './extractClassNames'
})
+import extractClassNames from './extractClassNames'
)
+import extractClassNames from './extractClassNames'
)
- } catch (error) {
- throw error
+import extractClassNames from './extractClassNames'
} finally {
- hook.unhook()
- }
-import invariant from 'tiny-invariant'
import importFrom from 'import-from'
-import invariant from 'tiny-invariant'
import chokidar from 'chokidar'
+import extractClassNames from './extractClassNames'
dset(config, sepLocation, userSeperator)
+import extractClassNames from './extractClassNames'
} else {
-import extractClassNames from './extractClassNames'
+import Hook from './hook'
- }
-import extractClassNames from './extractClassNames'
+import Hook from './hook'
import extractClassNames from './extractClassNames'
-import extractClassNames from './extractClassNames'
+import Hook from './hook'
import Hook from './hook'
- } else {
-import extractClassNames from './extractClassNames'
+import Hook from './hook'
import dlv from 'dlv'
- }
-import extractClassNames from './extractClassNames'
+import Hook from './hook'
import dset from 'dset'
-import extractClassNames from './extractClassNames'
+import Hook from './hook'
import resolveFrom from 'resolve-from'
-import resolveFrom from 'resolve-from'
+ dset(config, sepLocation, userSeperator)
+ } else {
+ delete config[sepLocation]
+ }
+function arraysEqual(arr1, arr2) {
import invariant from 'tiny-invariant'
+import Hook from './hook'
import getPlugins from './getPlugins'
-import importFrom from 'import-from'
-import extractClassNames from './extractClassNames'
+import Hook from './hook'
import chokidar from 'chokidar'
+ return (
import extractClassNames from './extractClassNames'
+import Hook from './hook'
-import semver from 'semver'
+import dlv from 'dlv'
import extractClassNames from './extractClassNames'
import invariant from 'tiny-invariant'
- })
+ const resolvedConfig = resolveConfig({ cwd: configDir, config })
import extractClassNames from './extractClassNames'
+import invariant from 'tiny-invariant'
+import Hook from './hook'
import extractClassNames from './extractClassNames'
+import dlv from 'dlv'
+ if (
+import Hook from './hook'
import extractClassNames from './extractClassNames'
+import resolveFrom from 'resolve-from'
+import Hook from './hook'
import extractClassNames from './extractClassNames'
+import importFrom from 'import-from'
+import Hook from './hook'
import extractClassNames from './extractClassNames'
+import chokidar from 'chokidar'
+import Hook from './hook'
import extractClassNames from './extractClassNames'
+import semver from 'semver'
+import Hook from './hook'
import extractClassNames from './extractClassNames'
+import invariant from 'tiny-invariant'
+import Hook from './hook'
import Hook from './hook'
+ JSON.stringify(arr1.concat([]).sort()) ===
import extractClassNames from './extractClassNames'
-import extractClassNames from './extractClassNames'
+ browserslistArgs,
+ JSON.stringify(arr1.concat([]).sort()) ===
import dlv from 'dlv'
+ preferLocal: true,
+ localDir: configDir,
+ cwd: configDir,
+ JSON.stringify(arr1.concat([]).sort()) ===
import chokidar from 'chokidar'
+
import chokidar from 'chokidar'
+ browserslist = stdout.split('\n')
+ } catch (error) {
+ console.error('Failed to load browserslist:', error)
+ JSON.stringify(arr2.concat([]).sort())
import extractClassNames from './extractClassNames'
+ }
import extractClassNames from './extractClassNames'
+import invariant from 'tiny-invariant'
+ return {
+ base,
+ JSON.stringify(arr2.concat([]).sort())
import dset from 'dset'
+ utilities,
+ resolvedConfig,
+ postcss,
+ JSON.stringify(arr2.concat([]).sort())
import semver from 'semver'
+ }
import extractClassNames from './extractClassNames'
+import resolveConfig from './resolveConfig'
+ )
return {
version,
@@ -192,7 +245,6 @@ postcss,
browserslist,
}),
modules: {
- tailwindcss,
postcss,
},
featureFlags,
@@ -241,3 +293,46 @@ 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 })
+ })
+}