diff --git a/.vscode/settings.json b/.vscode/settings.json index b4519c4..3cc5a57 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,5 +9,8 @@ "files.eol": "\n", "editor.codeActionsOnSave": { "source.fixAll.eslint": true + }, + "[svelte]": { + "editor.defaultFormatter": "svelte.svelte-vscode" } } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 082ab79..6e1d379 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3603,6 +3603,12 @@ "path-type": "^4.0.0" } }, + "dlv": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", + "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", + "dev": true + }, "dns-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", @@ -5419,6 +5425,42 @@ "path-is-absolute": "^1.0.0" } }, + "glob-base": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "dev": true, + "requires": { + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" + }, + "dependencies": { + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, + "requires": { + "is-glob": "^2.0.0" + } + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "^1.0.0" + } + } + } + }, "glob-parent": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", @@ -6170,6 +6212,12 @@ "dev": true, "optional": true }, + "is-dotfile": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", + "dev": true + }, "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", @@ -7729,6 +7777,12 @@ "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=", "dev": true }, + "lodash.topath": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/lodash.topath/-/lodash.topath-4.5.2.tgz", + "integrity": "sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak=", + "dev": true + }, "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -8352,9 +8406,9 @@ "dev": true }, "modern-normalize": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/modern-normalize/-/modern-normalize-1.0.0.tgz", - "integrity": "sha512-1lM+BMLGuDfsdwf3rsgBSrxJwAZHFIrQ8YR61xIqdHo0uNKI9M52wNpHSrliZATJp51On6JD0AfRxd4YGSU0lw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/modern-normalize/-/modern-normalize-1.1.0.tgz", + "integrity": "sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA==", "dev": true }, "moment": { @@ -8928,6 +8982,35 @@ } } }, + "parse-glob": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "dev": true, + "requires": { + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "^1.0.0" + } + } + } + }, "parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", @@ -11883,6 +11966,12 @@ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz", "integrity": "sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==" }, + "quick-lru": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", + "dev": true + }, "randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -13680,37 +13769,44 @@ } }, "tailwindcss": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-2.0.4.tgz", - "integrity": "sha512-WhgR0oiBxGOZ9jY0yVfaJCHnckR7U74Fs/BMsYxGdwGJQ5Hd/HlaKD26bEJFZOvYScJo0QcUj2ImldzedsG7Bw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-2.1.2.tgz", + "integrity": "sha512-T5t+wwd+/hsOyRw2HJuFuv0LTUm3MUdHm2DJ94GPVgzqwPPFa9XxX0KlwLWupUuiOUj6uiKURCzYPHFcuPch/w==", "dev": true, "requires": { "@fullhuman/postcss-purgecss": "^3.1.3", "bytes": "^3.0.0", "chalk": "^4.1.0", + "chokidar": "^3.5.1", "color": "^3.1.3", "detective": "^5.2.0", "didyoumean": "^1.2.1", + "dlv": "^1.1.3", + "fast-glob": "^3.2.5", "fs-extra": "^9.1.0", "html-tags": "^3.1.0", "lodash": "^4.17.21", + "lodash.topath": "^4.5.2", "modern-normalize": "^1.0.0", "node-emoji": "^1.8.1", + "normalize-path": "^3.0.0", "object-hash": "^2.1.1", + "parse-glob": "^3.0.4", "postcss-functions": "^3", "postcss-js": "^3.0.3", - "postcss-nested": "^5.0.5", + "postcss-nested": "5.0.5", "postcss-selector-parser": "^6.0.4", "postcss-value-parser": "^4.1.0", "pretty-hrtime": "^1.0.3", + "quick-lru": "^5.1.1", "reduce-css-calc": "^2.1.8", "resolve": "^1.20.0" }, "dependencies": { "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", "dev": true, "requires": { "ansi-styles": "^4.1.0", diff --git a/package.json b/package.json index eb1e340..451ee76 100644 --- a/package.json +++ b/package.json @@ -220,7 +220,7 @@ "svelte-jester": "1.3.0", "svelte-loader": "^3.0.0", "svelte-preprocess": "^4.6.9", - "tailwindcss": "^2.0.3", + "tailwindcss": "^2.1.2", "ts-jest": "^26.5.3", "ts-loader": "^8.0.17", "ts-node": "^9.1.1", diff --git a/src/webview-ui/App.svelte b/src/webview-ui/App.svelte index 16b9a6e..96ab7dc 100644 --- a/src/webview-ui/App.svelte +++ b/src/webview-ui/App.svelte @@ -1,12 +1,9 @@ - - -
{#if $snapshotData}
@@ -52,9 +46,14 @@ {/if}
- diff --git a/src/webview-ui/common/DiffBadge.svelte b/src/webview-ui/common/DiffBadge.svelte index a48192f..a7d72d4 100644 --- a/src/webview-ui/common/DiffBadge.svelte +++ b/src/webview-ui/common/DiffBadge.svelte @@ -1,6 +1,3 @@ - + DIFF diff --git a/src/webview-ui/common/Image.svelte b/src/webview-ui/common/Image.svelte index 290cd06..3835f80 100644 --- a/src/webview-ui/common/Image.svelte +++ b/src/webview-ui/common/Image.svelte @@ -3,6 +3,6 @@ export let alt: string; -
+
diff --git a/src/webview-ui/common/NoResource.svelte b/src/webview-ui/common/NoResource.svelte index 507000b..4ca26b0 100644 --- a/src/webview-ui/common/NoResource.svelte +++ b/src/webview-ui/common/NoResource.svelte @@ -3,9 +3,7 @@
-

- Resource Does Not Exist -

+

Resource Does Not Exist

diff --git a/src/webview-ui/common/Tumbleweed.svelte b/src/webview-ui/common/Tumbleweed.svelte index b191c05..3316c45 100644 --- a/src/webview-ui/common/Tumbleweed.svelte +++ b/src/webview-ui/common/Tumbleweed.svelte @@ -1,11 +1,20 @@ - + - - + - + - + - + - + - - + + - + - + + -1 -140 -7 -181 -14z" + /> + 124 -149 87z" /> diff --git a/src/webview-ui/diff/Default.svelte b/src/webview-ui/diff/Default.svelte index 13d68e4..6165e6c 100644 --- a/src/webview-ui/diff/Default.svelte +++ b/src/webview-ui/diff/Default.svelte @@ -1,5 +1,5 @@ diff --git a/src/webview-ui/diff/DiffContainer.svelte b/src/webview-ui/diff/DiffContainer.svelte index e0b8408..d3a9adf 100644 --- a/src/webview-ui/diff/DiffContainer.svelte +++ b/src/webview-ui/diff/DiffContainer.svelte @@ -1,11 +1,11 @@
-
+
{#each diffComponents as [diffType, component, props]}
-
+
{/each}
-
+
{#each diffComponents as [diffType]} - {/each}
\ No newline at end of file + diff --git a/src/webview-ui/diff/Onion.svelte b/src/webview-ui/diff/Onion.svelte index 6cd9773..c931c20 100644 --- a/src/webview-ui/diff/Onion.svelte +++ b/src/webview-ui/diff/Onion.svelte @@ -1,5 +1,5 @@ -
+
Reference snaphsot Latest snapshot
-
+
Reference - Latest
- diff --git a/src/webview-ui/diff/Slide.svelte b/src/webview-ui/diff/Slide.svelte index c9a2afa..e39ef0b 100644 --- a/src/webview-ui/diff/Slide.svelte +++ b/src/webview-ui/diff/Slide.svelte @@ -1,5 +1,5 @@

{resource.locale} | {resource.formFactor}

{#if resource.diff.exists} {/if} -
- -
-
+ +
+
Reference snapshot @@ -52,29 +56,18 @@ Latest snapshot - +
\ No newline at end of file diff --git a/src/webview-ui/tailwind/Components.svelte b/src/webview-ui/tailwind/Components.svelte deleted file mode 100644 index 6dcad39..0000000 --- a/src/webview-ui/tailwind/Components.svelte +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/src/webview-ui/tailwind/Utilities.svelte b/src/webview-ui/tailwind/Utilities.svelte deleted file mode 100644 index c191b1d..0000000 --- a/src/webview-ui/tailwind/Utilities.svelte +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/tailwind.config.js b/tailwind.config.js index 3178af8..ecbe4a5 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,6 +1,7 @@ const colors = require('tailwindcss/colors'); module.exports = { + mode: 'jit', darkMode: 'class', theme: { extend: { @@ -9,15 +10,5 @@ module.exports = { }, }, }, - variants: { - extend: { - backgroundColor: ['active'], - borderWidth: ['last'], - margin: ['last'], - }, - }, - purge: { - content: ['./src/webview-ui/**/*.svelte'], - enabled: process.env.NODE_ENV !== 'development', - }, + purge: ['./src/webview-ui/**/*.svelte'] };