From 7c39412f572c394bbebaa91c4828c2ffaacd0fe2 Mon Sep 17 00:00:00 2001 From: Brad Cornes Date: Mon, 28 May 2018 20:15:53 +0100 Subject: [PATCH] update tailwind-class-names dep --- package-lock.json | 58 +++++++++++++++++++++++------------------------ package.json | 2 +- src/extension.ts | 14 +++++------- 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7065576..4a10851 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "vscode-tailwind", + "name": "vscode-tailwindcss", "version": "0.1.0", "lockfileVersion": 1, "requires": true, @@ -1471,9 +1471,9 @@ "dev": true }, "js-base64": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.3.tgz", - "integrity": "sha512-H7ErYLM34CvDMto3GbD6xD0JLUGYXR3QTcH6B/tr4Hi/QpSThnCsIp+Sy5FRTw3B0d6py4HcNkW7nO/wdtGWEw==" + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.5.tgz", + "integrity": "sha512-aUnNwqMOXw3yvErjMPSQu6qIIzUmT1e5KcU1OZxRDU1g/am6mzBvcrmLAYwzmB59BHPrh5/tKaiF4OPhqRWESQ==" }, "jsbn": { "version": "0.1.1", @@ -1565,9 +1565,9 @@ } }, "lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==" }, "lodash._basecopy": { "version": "3.0.1", @@ -2010,7 +2010,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "requires": { "chalk": "1.1.3", - "js-base64": "2.4.3", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -2065,11 +2065,11 @@ } }, "postcss": { - "version": "6.0.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz", - "integrity": "sha512-y/bKfbQz2Nn/QBC08bwvYUxEFOVGfPIUOTsJ2CK5inzlXW9SdYR1x4pEsG9blRAF/PX+wRNdOah+gx/hv4q7dw==", + "version": "6.0.22", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz", + "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==", "requires": { - "chalk": "2.4.0", + "chalk": "2.4.1", "source-map": "0.6.1", "supports-color": "5.4.0" }, @@ -2083,9 +2083,9 @@ } }, "chalk": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz", - "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "requires": { "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", @@ -2114,7 +2114,7 @@ "requires": { "glob": "7.1.2", "object-assign": "4.1.1", - "postcss": "6.0.21", + "postcss": "6.0.22", "postcss-value-parser": "3.3.0" } }, @@ -2124,7 +2124,7 @@ "integrity": "sha512-smhUUMF5o5W1ZCQSyh5A3lNOXFLdNrxqyhWbLsGolZH2AgVmlyhxhYbIixfsdKE6r1vG5i7O40DPcvEvE1mvjw==", "requires": { "camelcase-css": "1.0.1", - "postcss": "6.0.21" + "postcss": "6.0.22" } }, "postcss-nested": { @@ -2132,7 +2132,7 @@ "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-3.0.0.tgz", "integrity": "sha512-1xxmLHSfubuUi6xZZ0zLsNoiKfk3BWQj6fkNMaBJC529wKKLcdeCxXt6KJmDLva+trNyQNwEaE/ZWMA7cve1fA==", "requires": { - "postcss": "6.0.21", + "postcss": "6.0.22", "postcss-selector-parser": "3.1.1" } }, @@ -2155,7 +2155,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "requires": { "chalk": "1.1.3", - "js-base64": "2.4.3", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -2665,25 +2665,25 @@ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, "tailwind-class-names": { - "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==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tailwind-class-names/-/tailwind-class-names-0.6.0.tgz", + "integrity": "sha512-3yYn2fFGkgC6GAwUSwmqfm9sZoX9MWj5obpNr7Zx+R73Ff8in4vmkDHaZ/ZQ141N1LMR53dY7RHJbSefak9Ljg==", "requires": { - "postcss": "6.0.21", + "postcss": "6.0.22", "postcss-selector-parser": "3.1.1", - "tailwindcss": "0.5.2" + "tailwindcss": "0.5.3" } }, "tailwindcss": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-0.5.2.tgz", - "integrity": "sha512-KjIXgqE9qjNXoWtS+og5U7wVaXvSETE6J1Zudkaj/GFt3pxczp7jVsWm2qQxplVhxAVJei5/d6hTYjA9uE+D0A==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-0.5.3.tgz", + "integrity": "sha512-nR1Ob4oVqlkDGMtA2OHeNWdeXrgZlsErwvxUqg+vI/mqwTtZzCe98H0kyQJANo827UY5gb04KwvFKzkWO943dg==", "requires": { "commander": "2.14.1", "fs-extra": "4.0.3", - "lodash": "4.17.5", + "lodash": "4.17.10", "perfectionist": "2.4.0", - "postcss": "6.0.21", + "postcss": "6.0.22", "postcss-functions": "3.0.0", "postcss-js": "1.0.1", "postcss-nested": "3.0.0", diff --git a/package.json b/package.json index 0818fa8..37a91a7 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "dependencies": { "color": "^3.0.0", "dlv": "^1.1.1", - "tailwind-class-names": "^0.5.0" + "tailwind-class-names": "0.6.0" }, "homepage": "https://github.com/bradlc/vscode-tailwindcss/blob/master/README.md", diff --git a/src/extension.ts b/src/extension.ts index 06afef6..9127c1e 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -48,7 +48,7 @@ async function getTailwind() { let configPath = files[0].fsPath - const plugin = join( + const pluginPath = join( vscode.workspace.workspaceFolders[0].uri.fsPath, 'node_modules', 'tailwindcss' @@ -57,14 +57,12 @@ async function getTailwind() { let tw try { - tw = await tailwindClassNames( + tw = await tailwindClassNames({ configPath, - { - tree: true, - strings: true - }, - plugin - ) + pluginPath, + tree: true, + strings: true + }) } catch (err) { return null }