diff --git a/gulpfile.js b/gulpfile.js index 1965afd193..be95531773 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -2,12 +2,14 @@ const path = require('path') const gulp = require('gulp') const postcss = require('gulp-postcss') const concat = require('gulp-concat') +const cached = require('gulp-cached') +const remember = require('gulp-remember') const cleanCSS = require('gulp-clean-css') const del = require('del') const outputPath = path.join(__dirname, 'static') const resourcesPath = path.join(__dirname, 'resources') -const sourcePath = path.join(__dirname, 'src') +const sourcePath = path.join(__dirname, 'src/main/frontend') const resourceFilePath = path.join(resourcesPath, '**') const tailwind = { @@ -17,22 +19,35 @@ const tailwind = { } const css = { - watchCSS() { - return gulp.watch(tailwind.paths, { ignoreInitial: false }, css._buildTailwind) + async watchCSS () { + // remove tailwind core css + await new Promise((resolve) => { + css._buildTailwind( + tailwind.paths.shift(), + 'tailwind.core.css' + ) + .on('end', resolve) + }) + + return gulp.watch( + tailwind.paths, { ignoreInitial: false }, + css._buildTailwind.bind(null, void 0, void 0)) }, - buildCSS(...params) { + buildCSS (...params) { return gulp.series(css._buildTailwind, css._optimizeCSSForRelease)(...params) }, - _buildTailwind() { - return gulp.src(tailwind.paths) + _buildTailwind (entry, output) { + return gulp.src(entry || tailwind.paths) + .pipe(cached('postcss-' + entry)) .pipe(postcss()) - .pipe(concat(tailwind.outputName)) + .pipe(remember('postcss-' + entry)) + .pipe(concat(output || tailwind.outputName)) .pipe(gulp.dest(tailwind.outputDir)) }, - _optimizeCSSForRelease() { + _optimizeCSSForRelease () { return gulp.src(path.join(outputPath, 'css', 'style.css')) .pipe(cleanCSS()) .pipe(gulp.dest(path.join(outputPath, 'css'))) @@ -40,15 +55,15 @@ const css = { } const common = { - clean() { + clean () { return del(outputPath) }, - syncResourceFile() { + syncResourceFile () { return gulp.src(resourceFilePath).pipe(gulp.dest(outputPath)) }, - keepSyncResourceFile() { + keepSyncResourceFile () { return gulp.watch(resourceFilePath, { ignoreInitial: false }, common.syncResourceFile) } } diff --git a/package.json b/package.json index 344f4ea2e4..3fae91bdd8 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "private": true, "devDependencies": { "@tailwindcss/ui": "0.7.2", + "@types/gulp": "^4.0.7", "cross-env": "^7.0.3", "cssnano": "^4.1.10", "del": "^6.0.0", @@ -11,6 +12,7 @@ "gulp-clean-css": "^4.3.0", "gulp-concat": "^2.6.1", "gulp-postcss": "^9.0.0", + "gulp-remember": "^1.0.1", "npm-run-all": "^4.1.5", "postcss": "8.2.1", "postcss-cli": "8.3.0", @@ -49,6 +51,7 @@ "codemirror": "^5.58.1", "diff": "^4.0.2", "fuzzysort": "^1.1.4", + "gulp-cached": "^1.1.1", "ignore": "^5.1.8", "jszip": "^3.5.0", "mousetrap": "^1.6.5", diff --git a/resources/css/common.css b/resources/css/common.css index 659c9b2381..7a28f3dbdd 100644 --- a/resources/css/common.css +++ b/resources/css/common.css @@ -124,7 +124,7 @@ html[data-theme=light] { --color-level-5: #bbdaf6; } -/* region reset top elements */ +/* region Reset top elements */ html { font-family: var(--ls-font-family), Inter, sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol !important; @@ -295,7 +295,7 @@ video { /* endregion */ -/** region utilities **/ +/** region Common utilities **/ .w10 { max-width: 10%; } @@ -376,7 +376,7 @@ video { /** endregion **/ -/** region app utilities **/ +/** region App utilities **/ .page { margin-top: 24px; } @@ -433,7 +433,7 @@ li p:last-child, } .loader { - -webkit-animation: lds-dual-ring 2s infinite linear; + -webkit-animation: spin 2s infinite linear; } .canceled, @@ -563,7 +563,7 @@ li p:last-child, /** endregion **/ -/* region override elements */ +/* region FIXME: override elements (?) */ a.block-control, a.block-control:hover { text-decoration: none; @@ -702,7 +702,7 @@ svg.tip { /* endregion */ -/* region code mirror */ +/* region FIXME: CodeMirror override (?) */ .CodeMirror pre.CodeMirror-line, .CodeMirror-scroll, .CodeMirror-sizer, diff --git a/resources/css/style.css b/resources/css/style.css index d62ce8cd68..e1d3a039fb 100644 --- a/resources/css/style.css +++ b/resources/css/style.css @@ -2,12 +2,13 @@ @import "./inter.css"; @import "./reveal.min.css"; @import "./reveal_black.min.css"; +@import "./excalidraw.min.css"; @import "./katex.min.css"; -@import "../../static/css/tailwind.build.css"; /* Build by gulp. Check `_buildTailwind` for more detail */ @import "./codemirror.min.css"; @import "./common.css"; @import "./animation.css"; +@import "./table.css"; @import "./datepicker.css"; @import "./highlight.css"; -@import "./table.css"; -@import "./excalidraw.min.css"; +@import "../../static/css/tailwind.core.css"; /* Build by gulp. Check `_buildTailwind` for more detail */ +@import "../../static/css/tailwind.build.css"; /* Build by gulp. Check `_buildTailwind` for more detail */ diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 97ed9fa506..1176077c2d 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -29,6 +29,7 @@ :after-load frontend.core/start :http-root "public" :http-port 3001 + :watch-path "static" :preloads [devtools.preload]}} :test diff --git a/src/main/frontend/components/block.css b/src/main/frontend/components/block.css index 750e0d02b6..4c9aafb4a6 100644 --- a/src/main/frontend/components/block.css +++ b/src/main/frontend/components/block.css @@ -65,11 +65,6 @@ } } -.ls-block, -.foldable-title { - max-width: var(--ls-main-content-max-width); -} - .ls-block, .editor-wrapper { margin-right: auto; diff --git a/src/main/frontend/components/theme.css b/src/main/frontend/components/theme.css index 51655167a5..31b80e9a26 100644 --- a/src/main/frontend/components/theme.css +++ b/src/main/frontend/components/theme.css @@ -7,8 +7,7 @@ html:not(.is-mac)[data-theme=dark] { &::-webkit-scrollbar, html::-webkit-scrollbar-track-piece { background-color: var(--ls-scrollbar-background-color); - border: 4px solid; - border-color: var(--ls-scrollbar-background-color); + border: 4px solid var(--ls-scrollbar-background-color); } &::-webkit-scrollbar-thumb { @@ -42,12 +41,16 @@ html[data-theme=dark] { } html[data-theme=light] { - .form-checkbox:focus { - border-color: var(--ls-page-checkbox-border-color); + .form-checkbox { + &:focus { + border-color: var(--ls-page-checkbox-border-color); + } } - .cp__header a { - color: var(--ls-primary-text-color); + .cp__header { + a { + color: var(--ls-primary-text-color); + } } a.right-sidebar-button { @@ -59,7 +62,6 @@ html[data-theme=light] { } } -/* Hide scrollbar for IE, Edge and Firefox */ .hide-scrollbar { -ms-overflow-style: none; /* IE and Edge */ scrollbar-width: none !important; /* Firefox */ diff --git a/src/main/frontend/extensions/code.css b/src/main/frontend/extensions/code.css index ff74fcdde6..16fde1f195 100644 --- a/src/main/frontend/extensions/code.css +++ b/src/main/frontend/extensions/code.css @@ -3,7 +3,7 @@ z-index: 0; &-lang { - @apply absolute top-0 right-0 p-1 text-sm text-gray-500; + @apply absolute top-0 right-0 p-1 text-sm; z-index: 1; background: white; } diff --git a/src/main/frontend/extensions/slide.css b/src/main/frontend/extensions/slide.css index 4c435885ae..b4e72c1213 100644 --- a/src/main/frontend/extensions/slide.css +++ b/src/main/frontend/extensions/slide.css @@ -1,5 +1,4 @@ .reveal { - //color: var(--ls-primary-text-color); color: #f7f7f7; background: var(--ls-slide-background-color); diff --git a/yarn.lock b/yarn.lock index 12442b480b..c21e44a346 100644 --- a/yarn.lock +++ b/yarn.lock @@ -251,6 +251,36 @@ hex-rgb "^4.1.0" postcss-selector-parser "^6.0.2" +"@types/expect@^1.20.4": + version "1.20.4" + resolved "https://registry.yarnpkg.com/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5" + integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg== + +"@types/glob-stream@*": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@types/glob-stream/-/glob-stream-6.1.0.tgz#7ede8a33e59140534f8d8adfb8ac9edfb31897bc" + integrity sha512-RHv6ZQjcTncXo3thYZrsbAVwoy4vSKosSWhuhuQxLOTv74OJuFQxXkmUuZCr3q9uNBEVCvIzmZL/FeRNbHZGUg== + dependencies: + "@types/glob" "*" + "@types/node" "*" + +"@types/glob@*": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" + integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== + dependencies: + "@types/minimatch" "*" + "@types/node" "*" + +"@types/gulp@^4.0.7": + version "4.0.7" + resolved "https://registry.yarnpkg.com/@types/gulp/-/gulp-4.0.7.tgz#cf3928fc4d351284453e876b560ed271bababad5" + integrity sha512-AjvRWEMr6pl9yQ5Yyg+2tiv/n6Ifowpi+NjhRqGwpHWSHH21uXPMHEqKVUT3HGVguACOuzgtk9jtWjChSREPFQ== + dependencies: + "@types/undertaker" "*" + "@types/vinyl-fs" "*" + chokidar "^3.3.1" + "@types/mdast@^3.0.0": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb" @@ -258,11 +288,21 @@ dependencies: "@types/unist" "*" +"@types/minimatch@*": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" + integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== + "@types/minimist@^1.2.0": version "1.2.1" resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256" integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg== +"@types/node@*": + version "14.14.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.13.tgz#9e425079799322113ae8477297ae6ef51b8e0cdf" + integrity sha512-vbxr0VZ8exFMMAjCW8rJwaya0dMCDyYW2ZRdTyjtrCvJoENMpdUHOT/eTzvgyA5ZnqRZ/sI0NwqAxNHKYokLJQ== + "@types/normalize-package-data@^2.4.0": version "2.4.0" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" @@ -278,11 +318,42 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== +"@types/undertaker-registry@*": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/undertaker-registry/-/undertaker-registry-1.0.1.tgz#4306d4a03d7acedb974b66530832b90729e1d1da" + integrity sha512-Z4TYuEKn9+RbNVk1Ll2SS4x1JeLHecolIbM/a8gveaHsW0Hr+RQMraZACwTO2VD7JvepgA6UO1A1VrbktQrIbQ== + +"@types/undertaker@*": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@types/undertaker/-/undertaker-1.2.5.tgz#05e92e464c3745c56451b25ee7d53a33393918b1" + integrity sha512-j0hCpPn9kdxdJX8eMTtFnlMrME0SK9T0PioDovo+6YaFWtkAZhvZlzMEKvOju2QRYM3bBCJQUzPbJ4bx/fxj2w== + dependencies: + "@types/node" "*" + "@types/undertaker-registry" "*" + async-done "~1.3.2" + "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e" integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ== +"@types/vinyl-fs@*": + version "2.4.11" + resolved "https://registry.yarnpkg.com/@types/vinyl-fs/-/vinyl-fs-2.4.11.tgz#b98119b8bb2494141eaf649b09fbfeb311161206" + integrity sha512-2OzQSfIr9CqqWMGqmcERE6Hnd2KY3eBVtFaulVo3sJghplUcaeMdL9ZjEiljcQQeHjheWY9RlNmumjIAvsBNaA== + dependencies: + "@types/glob-stream" "*" + "@types/node" "*" + "@types/vinyl" "*" + +"@types/vinyl@*": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.4.tgz#9a7a8071c8d14d3a95d41ebe7135babe4ad5995a" + integrity sha512-2o6a2ixaVI2EbwBPg1QYLGQoHK56p/8X/sGfKbFC8N6sY9lfjsMf/GprtkQkSya0D4uRiutRZ2BWj7k3JvLsAQ== + dependencies: + "@types/expect" "^1.20.4" + "@types/node" "*" + acorn-node@^1.6.1: version "1.8.2" resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" @@ -332,6 +403,13 @@ ansi-colors@^1.0.1: dependencies: ansi-wrap "^0.1.0" +ansi-cyan@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873" + integrity sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM= + dependencies: + ansi-wrap "0.1.0" + ansi-gray@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251" @@ -339,6 +417,13 @@ ansi-gray@^0.1.1: dependencies: ansi-wrap "0.1.0" +ansi-red@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c" + integrity sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw= + dependencies: + ansi-wrap "0.1.0" + ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -403,6 +488,14 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +arr-diff@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a" + integrity sha1-aHwydYFjWI/vfeezb6vklesaOZo= + dependencies: + arr-flatten "^1.0.1" + array-slice "^0.2.3" + arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" @@ -427,6 +520,11 @@ arr-map@^2.0.0, arr-map@^2.0.2: dependencies: make-iterator "^1.0.0" +arr-union@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d" + integrity sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0= + arr-union@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" @@ -452,6 +550,11 @@ array-last@^1.1.1: dependencies: is-number "^4.0.0" +array-slice@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5" + integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU= + array-slice@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4" @@ -509,7 +612,7 @@ astral-regex@^2.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== -async-done@^1.2.0, async-done@^1.2.2: +async-done@^1.2.0, async-done@^1.2.2, async-done@~1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/async-done/-/async-done-1.3.2.tgz#5e15aa729962a4b07414f528a88cdf18e0b290a2" integrity sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw== @@ -913,7 +1016,7 @@ chokidar@^2.0.0: optionalDependencies: fsevents "^1.2.7" -chokidar@^3.3.0: +chokidar@^3.3.0, chokidar@^3.3.1: version "3.4.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b" integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ== @@ -1808,6 +1911,13 @@ ext@^1.1.2: dependencies: type "^2.0.0" +extend-shallow@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071" + integrity sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE= + dependencies: + kind-of "^1.1.0" + extend-shallow@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" @@ -2225,6 +2335,14 @@ graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== +gulp-cached@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/gulp-cached/-/gulp-cached-1.1.1.tgz#fe7cd4f87f37601e6073cfedee5c2bdaf8b6acce" + integrity sha1-/nzU+H83YB5gc8/t7lwr2vi2rM4= + dependencies: + lodash.defaults "^4.2.0" + through2 "^2.0.1" + gulp-clean-css@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz#5b1e73f2fca46703eb636014cdd4553cea65146d" @@ -2278,6 +2396,15 @@ gulp-postcss@^9.0.0: postcss-load-config "^2.1.1" vinyl-sourcemaps-apply "^0.2.1" +gulp-remember@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gulp-remember/-/gulp-remember-1.0.1.tgz#cc3aab2a04a623614375571ca464d13e87502bfe" + integrity sha1-zDqrKgSmI2FDdVccpGTRPodQK/4= + dependencies: + fancy-log "^1.3.2" + plugin-error "^0.1.2" + through2 "^0.5.0" + gulp@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa" @@ -2879,6 +3006,11 @@ is-windows@^1.0.1, is-windows@^1.0.2: resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -2970,6 +3102,11 @@ just-debounce@^1.0.0: resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.0.0.tgz#87fccfaeffc0b68cd19d55f6722943f929ea35ea" integrity sha1-h/zPrv/AtozRnVX2cilD+SnqNeo= +kind-of@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44" + integrity sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ= + kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -3082,6 +3219,11 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash.defaults@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" + integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= + lodash.difference@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" @@ -3921,6 +4063,17 @@ plugin-error@1.0.1, plugin-error@^1.0.1: arr-union "^3.1.0" extend-shallow "^3.0.2" +plugin-error@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace" + integrity sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4= + dependencies: + ansi-cyan "^0.1.1" + ansi-red "^0.1.1" + arr-diff "^1.0.1" + arr-union "^2.0.1" + extend-shallow "^1.1.2" + posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -4590,6 +4743,16 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@~1.0.17: + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + readdirp@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" @@ -5177,6 +5340,11 @@ string_decoder@^1.0.0, string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -5408,7 +5576,15 @@ through2@3.0.1: dependencies: readable-stream "2 || 3" -through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: +through2@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/through2/-/through2-0.5.1.tgz#dfdd012eb9c700e2323fd334f38ac622ab372da7" + integrity sha1-390BLrnHAOIyP9M084rGIqs3Lac= + dependencies: + readable-stream "~1.0.17" + xtend "~3.0.0" + +through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -5916,6 +6092,11 @@ xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== +xtend@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a" + integrity sha1-XM50B7r2Qsunvs2laBEcST9ZZlo= + y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"