diff --git a/package-lock.json b/package-lock.json index 4a10851d312c7f28b27f234c8eab581129264cd6..7065576c19afd8c62a071aeb40e8df65c476a205 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "vscode-tailwindcss", + "name": "vscode-tailwind", "version": "0.1.0", "lockfileVersion": 1, "requires": true, @@ -1471,9 +1471,9 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", "dev": true }, "js-base64": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.5.tgz", - "integrity": "sha512-aUnNwqMOXw3yvErjMPSQu6qIIzUmT1e5KcU1OZxRDU1g/am6mzBvcrmLAYwzmB59BHPrh5/tKaiF4OPhqRWESQ==" + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.3.tgz", + "integrity": "sha512-H7ErYLM34CvDMto3GbD6xD0JLUGYXR3QTcH6B/tr4Hi/QpSThnCsIp+Sy5FRTw3B0d6py4HcNkW7nO/wdtGWEw==" }, "jsbn": { "version": "0.1.1", @@ -1565,9 +1565,9 @@ "readable-stream": "2.3.4" } }, "lodash": { - "version": "4.17.10", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", - "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==" + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" }, "lodash._basecopy": { "version": "3.0.1", @@ -2010,7 +2010,7 @@ "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "requires": { "chalk": "1.1.3", - "js-base64": "2.4.5", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -2065,11 +2065,11 @@ "extend-shallow": "1.1.4" } }, "postcss": { - "version": "6.0.22", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz", - "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==", + "version": "6.0.21", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz", + "integrity": "sha512-y/bKfbQz2Nn/QBC08bwvYUxEFOVGfPIUOTsJ2CK5inzlXW9SdYR1x4pEsG9blRAF/PX+wRNdOah+gx/hv4q7dw==", "requires": { - "chalk": "2.4.1", + "chalk": "2.4.0", "source-map": "0.6.1", "supports-color": "5.4.0" }, @@ -2083,9 +2083,9 @@ "color-convert": "1.9.1" } }, "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz", + "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==", "requires": { "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", @@ -2114,7 +2114,7 @@ "integrity": "sha1-DpTQFERwCkgd4g3k1V+yZAVkJQ4=", "requires": { "glob": "7.1.2", "object-assign": "4.1.1", - "postcss": "6.0.22", + "postcss": "6.0.21", "postcss-value-parser": "3.3.0" } }, @@ -2124,7 +2124,7 @@ "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-1.0.1.tgz", "integrity": "sha512-smhUUMF5o5W1ZCQSyh5A3lNOXFLdNrxqyhWbLsGolZH2AgVmlyhxhYbIixfsdKE6r1vG5i7O40DPcvEvE1mvjw==", "requires": { "camelcase-css": "1.0.1", - "postcss": "6.0.22" + "postcss": "6.0.21" } }, "postcss-nested": { @@ -2132,7 +2132,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-3.0.0.tgz", "integrity": "sha512-1xxmLHSfubuUi6xZZ0zLsNoiKfk3BWQj6fkNMaBJC529wKKLcdeCxXt6KJmDLva+trNyQNwEaE/ZWMA7cve1fA==", "requires": { - "postcss": "6.0.22", + "postcss": "6.0.21", "postcss-selector-parser": "3.1.1" } }, @@ -2155,7 +2155,7 @@ "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "requires": { "chalk": "1.1.3", - "js-base64": "2.4.5", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -2665,25 +2665,25 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, "tailwind-class-names": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tailwind-class-names/-/tailwind-class-names-0.6.0.tgz", - "integrity": "sha512-3yYn2fFGkgC6GAwUSwmqfm9sZoX9MWj5obpNr7Zx+R73Ff8in4vmkDHaZ/ZQ141N1LMR53dY7RHJbSefak9Ljg==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/tailwind-class-names/-/tailwind-class-names-0.5.0.tgz", + "integrity": "sha512-Z57UBBp5E0/Crut4v2IzGf/3+LtUnxcVxUsaJhH0j3N7ym9mcHqqoDZKmDsCHVGUEixI1/HnhoGzSPAuy7hf8A==", "requires": { - "postcss": "6.0.22", + "postcss": "6.0.21", "postcss-selector-parser": "3.1.1", - "tailwindcss": "0.5.3" + "tailwindcss": "0.5.2" } }, "tailwindcss": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-0.5.3.tgz", - "integrity": "sha512-nR1Ob4oVqlkDGMtA2OHeNWdeXrgZlsErwvxUqg+vI/mqwTtZzCe98H0kyQJANo827UY5gb04KwvFKzkWO943dg==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-0.5.2.tgz", + "integrity": "sha512-KjIXgqE9qjNXoWtS+og5U7wVaXvSETE6J1Zudkaj/GFt3pxczp7jVsWm2qQxplVhxAVJei5/d6hTYjA9uE+D0A==", "requires": { "commander": "2.14.1", "fs-extra": "4.0.3", - "lodash": "4.17.10", + "lodash": "4.17.5", "perfectionist": "2.4.0", - "postcss": "6.0.22", + "postcss": "6.0.21", "postcss-functions": "3.0.0", "postcss-js": "1.0.1", "postcss-nested": "3.0.0", diff --git a/package.json b/package.json index 37a91a74b485ebac45a01aa9d7f72f0e260f785a..0818fa8c7bc9b7ac0d0ecbf48b888d6d40df6bed 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ }, "dependencies": { "color": "^3.0.0", "dlv": "^1.1.1", - "tailwind-class-names": "0.6.0" + "tailwind-class-names": "^0.5.0" }, "homepage": "https://github.com/bradlc/vscode-tailwindcss/blob/master/README.md", diff --git a/src/extension.ts b/src/extension.ts index 9127c1e0519c08b828bcbdc6b31d6af17d7c4366..06afef6bf265763857bc6b71be4046710558d4a7 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -48,7 +48,7 @@ if (!files) return null let configPath = files[0].fsPath - const pluginPath = join( + const plugin = join( vscode.workspace.workspaceFolders[0].uri.fsPath, 'node_modules', 'tailwindcss' @@ -57,12 +57,14 @@ let tw try { - tw = await tailwindClassNames({ + tw = await tailwindClassNames( configPath, - pluginPath, - tree: true, - strings: true - }) + { + tree: true, + strings: true + }, + plugin + ) } catch (err) { return null }