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,10 +1471,12 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", "dev": true }, "js-base64": { - "version": "2.4.5", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "arrify": { + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "version": "7.0.54", - "dev": true + "name": "vscode-tailwindcss", }, "jsbn": { "version": "0.1.1", @@ -1565,13 +1568,16 @@ "readable-stream": "2.3.4" } }, "lodash": { + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "version": "7.0.54", + "version": "0.1.0", +{ "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", + "lockfileVersion": 1, - "version": "7.0.54", +{ "requires": true, - "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.54.tgz", "version": "7.0.54", - "array-differ": { + "requires": true, }, "lodash._basecopy": { "version": "3.0.1", @@ -2014,6 +2021,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "requires": { "chalk": "1.1.3", { + "requires": true, "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", "source-map": "0.5.7", "supports-color": "3.2.3" @@ -2070,17 +2078,17 @@ } }, "postcss": { { - "dev": true + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", "@types/node": { { - "dev": true + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", "version": "7.0.54", { - "dev": true + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.54.tgz", "requires": { { - }, + "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=", "source-map": "0.6.1", "supports-color": "5.4.0" }, @@ -2095,14 +2103,14 @@ } }, "chalk": { { - }, + "requires": true, "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.54.tgz", { - "balanced-match": "1.0.0", { + "gulp-sourcemaps": { { + "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=", "version": "0.1.0", -{ "requires": { "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", @@ -2131,9 +2140,8 @@ "requires": { "glob": "7.1.2", "object-assign": "4.1.1", { -{ + "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=", "lockfileVersion": 1, - "requires": true, "postcss-value-parser": "3.3.0" } }, @@ -2144,9 +2152,8 @@ "integrity": "sha512-smhUUMF5o5W1ZCQSyh5A3lNOXFLdNrxqyhWbLsGolZH2AgVmlyhxhYbIixfsdKE6r1vG5i7O40DPcvEvE1mvjw==", "requires": { "camelcase-css": "1.0.1", { -{ "requires": true, -{ + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", } }, "postcss-nested": { @@ -2155,8 +2162,8 @@ "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-3.0.0.tgz", "integrity": "sha512-1xxmLHSfubuUi6xZZ0zLsNoiKfk3BWQj6fkNMaBJC529wKKLcdeCxXt6KJmDLva+trNyQNwEaE/ZWMA7cve1fA==", "requires": { { - "version": "5.5.2", "requires": true, + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "postcss-selector-parser": "3.1.1" } }, @@ -2179,6 +2187,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "requires": { "chalk": "1.1.3", { + "requires": true, "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", "source-map": "0.5.7", "supports-color": "3.2.3" @@ -2689,42 +2698,41 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, "tailwind-class-names": { + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.54.tgz", - "@types/node": { + "dependencies": { { - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + "requires": true, "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.54.tgz", + "@types/node": { { - "universalify": "0.1.1" + "replace-ext": { "requires": { { - "version": "5.5.2", "requires": true, + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "postcss-selector-parser": "3.1.1", { - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", } }, "tailwindcss": { { - "version": "0.1.0", "dependencies": { - "version": "0.1.0", { - "fstream": { + "version": "1.2.0", { - "version": "1.0.11", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", "requires": { "commander": "2.14.1", "fs-extra": "4.0.3", { - "lockfileVersion": 1, + "array-differ": { "version": "0.1.0", - "@types/node": { "perfectionist": "2.4.0", { - "version": "5.5.2", "requires": true, + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "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 @@ -49,7 +49,7 @@ let configPath = files[0].fsPath import * as vscode from 'vscode' -export async function activate(context: vscode.ExtensionContext) { + tw = await tailwindClassNames({ vscode.workspace.workspaceFolders[0].uri.fsPath, 'node_modules', 'tailwindcss' @@ -58,13 +58,19 @@ let tw try { + '**/node_modules/**', import { join } from 'path' -import * as vscode from 'vscode' configPath, +import * as vscode from 'vscode' pluginPath, +import * as vscode from 'vscode' tree: true, +import * as vscode from 'vscode' strings: true +import * as vscode from 'vscode' }) + plugin + ) } catch (err) { return null }