From 863c4f93da5b2400a82c0022c64d4026f865286b Mon Sep 17 00:00:00 2001 From: Ben Yorke Date: Mon, 6 Nov 2023 17:08:57 +0100 Subject: [PATCH] Customizable overrides --- package.json | 4 +- src/main/frontend/components/cmdk.cljs | 7 +- src/main/frontend/components/header.cljs | 71 -------- tailwind.config.js | 222 +++++++++-------------- yarn.lock | 208 ++++++++++++--------- 5 files changed, 218 insertions(+), 294 deletions(-) diff --git a/package.json b/package.json index 767fd251a5f..03218369c5c 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "shadow-cljs": "2.17.5", "stylelint": "^13.8.0", "stylelint-config-standard": "^20.0.0", - "tailwindcss": "3.1.8", + "tailwindcss": "3.3.5", "typescript": "^4.4.3" }, "scripts": { @@ -90,9 +90,9 @@ "@capacitor/splash-screen": "^5.0.0", "@capacitor/status-bar": "^5.0.0", "@capawesome/capacitor-background-task": "^5.0.0", + "@capgo/capacitor-navigation-bar": "^6.0.0", "@excalidraw/excalidraw": "0.15.3", "@highlightjs/cdn-assets": "10.4.1", - "@capgo/capacitor-navigation-bar": "^6.0.0", "@isomorphic-git/lightning-fs": "^4.6.0", "@logseq/capacitor-file-sync": "5.0.1", "@logseq/diff-merge": "0.2.2", diff --git a/src/main/frontend/components/cmdk.cljs b/src/main/frontend/components/cmdk.cljs index 608eaa2bf06..a60d7b9a3c0 100644 --- a/src/main/frontend/components/cmdk.cljs +++ b/src/main/frontend/components/cmdk.cljs @@ -235,7 +235,7 @@ :icon-theme :gray :text file :file-path file)) - files)] + files)] (swap! !results update group merge {:status :success :items items})))) (defmethod load-results :recents [group state] @@ -560,8 +560,9 @@ (rum/use-effect! (fn [] (js/setTimeout #(when (some-> input-ref deref) (.focus @input-ref)) 0)) []) - [:div {:style {:background "var(--lx-gray-02)" - :border-bottom "1px solid var(--lx-gray-07)"}} + ; [:div {:style {:background "var(--lx-gray-02)" + ; :border-bottom "1px solid var(--lx-gray-07)"}}] + [:div {:class "with-[bg-cmdk-input-row] bg-gray-02 border border-1 border-gray-07"} [:input#search {:class "text-xl bg-transparent border-none w-full outline-none px-3 py-3" :placeholder (input-placeholder false) diff --git a/src/main/frontend/components/header.cljs b/src/main/frontend/components/header.cljs index 5e5e12c4c74..0abea8ed600 100644 --- a/src/main/frontend/components/header.cljs +++ b/src/main/frontend/components/header.cljs @@ -79,77 +79,6 @@ "platform=" (js/encodeURIComponent platform)))) - #_(shui/dialog-v1 {:trigger (fn [{:keys [toggle-dialog! dialog]}] - [:div.relative - [:button.button.icon.toolbar-dots-btn - {:on-click toggle-dialog! - :title (t :header/more)} - (ui/icon "dots" {:size ui/icon-size})] - (dialog)]) - :groups [[:<> [:div.pl-3.pb-1.text-xxs.font-semibold.text-gray-11-alpha {:class "pt-0.5"} "General"] - (shui/list-item-v1 {:text (t :settings) - :compact true - :icon "settings" - :icon-theme :gray - ; :info "Open settings" - :shortcut "cmd+s" - :on-click state/open-settings!} - (make-shui-context nil nil)) - (shui/list-item-v1 {:text (t :plugins) - :compact true - :icon "apps" - :icon-theme :gray - :shortcut "g a" - :on-click #(plugin-handler/goto-plugins-dashboard!)} - (make-shui-context nil nil)) - (shui/list-item-v1 {:text (t :themes) - :compact true - :icon "palette" - :icon-theme :gray - :shortcut "g p" - :on-click #(plugins/open-select-theme!)} - (make-shui-context nil nil))] - [:<> [:div.pl-3.pb-1.pt-2.text-xxs.font-semibold.text-gray-11-alpha "Publishing"] - (shui/list-item-v1 {:text "Publishing settings" - :compact true - :icon-theme :gray - :icon "bulb"} - (make-shui-context nil nil)) - (shui/list-item-v1 {:text "Copy page URL" - :compact true - :icon-theme :gray - :icon "bulb"} - (make-shui-context nil nil)) - (shui/list-item-v1 {:text "Publish" - :compact true - :header "Last published: 2 days ago" - :icon-theme :gray - :icon "bulb"} - (make-shui-context nil nil))] - [:<> [:div.pl-3.pb-1.pt-2.text-xxs.font-semibold.text-gray-11-alpha "Graph management"] - (shui/list-item-v1 {:text (t :export-graph) - :compact true - :icon "database-export" - :icon-theme :color - :on-click #(state/set-modal! export/export)} - (make-shui-context nil nil)) - (shui/list-item-v1 {:text (t :import) - :compact true - :icon "file-upload" - :icon-theme :color - :on-click #(js/alert "set href")} - (make-shui-context nil nil))] - [:<> [:div.pl-3.pb-1.pt-2.text-xxs.font-semibold.text-gray-11-alpha "Account"] - (shui/list-item-v1 {:text "Logout" - :compact true - :icon "logout" - ; :shortcut "shift+cmd+x" - :icon-theme :gradient - :value "ben@logseq.com" - :on-click #(user-handler/logout)} - (make-shui-context nil nil))]]} - (make-shui-context nil nil)) - (rum/defc dropdown-menu < rum/reactive < {:key-fn #(identity "repos-dropdown-menu")} [{:keys [current-repo t]}] diff --git a/tailwind.config.js b/tailwind.config.js index 70602ced428..b764ac24320 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,56 +1,57 @@ const colors = require('tailwindcss/colors') +const plugin = require('tailwindcss/plugin') const radix = require('@radix-ui/colors') -const lx = { - 'accent-01': 'var(--lx-accent-01)', - 'accent-02': 'var(--lx-accent-02)', - 'accent-03': 'var(--lx-accent-03)', - 'accent-04': 'var(--lx-accent-04)', - 'accent-05': 'var(--lx-accent-05)', - 'accent-06': 'var(--lx-accent-06)', - 'accent-07': 'var(--lx-accent-07)', - 'accent-08': 'var(--lx-accent-08)', - 'accent-09': 'var(--lx-accent-09)', - 'accent-10': 'var(--lx-accent-10)', - 'accent-11': 'var(--lx-accent-11)', - 'accent-12': 'var(--lx-accent-12)', - 'accent-01-alpha': 'var(--lx-accent-01-alpha)', - 'accent-02-alpha': 'var(--lx-accent-02-alpha)', - 'accent-03-alpha': 'var(--lx-accent-03-alpha)', - 'accent-04-alpha': 'var(--lx-accent-04-alpha)', - 'accent-05-alpha': 'var(--lx-accent-05-alpha)', - 'accent-06-alpha': 'var(--lx-accent-06-alpha)', - 'accent-07-alpha': 'var(--lx-accent-07-alpha)', - 'accent-08-alpha': 'var(--lx-accent-08-alpha)', - 'accent-09-alpha': 'var(--lx-accent-09-alpha)', - 'accent-10-alpha': 'var(--lx-accent-10-alpha)', - 'accent-11-alpha': 'var(--lx-accent-11-alpha)', - 'accent-12-alpha': 'var(--lx-accent-12-alpha)', - 'gray-01': 'var(--lx-gray-01)', - 'gray-02': 'var(--lx-gray-02)', - 'gray-03': 'var(--lx-gray-03)', - 'gray-04': 'var(--lx-gray-04)', - 'gray-05': 'var(--lx-gray-05)', - 'gray-06': 'var(--lx-gray-06)', - 'gray-07': 'var(--lx-gray-07)', - 'gray-08': 'var(--lx-gray-08)', - 'gray-09': 'var(--lx-gray-09)', - 'gray-10': 'var(--lx-gray-10)', - 'gray-11': 'var(--lx-gray-11)', - 'gray-12': 'var(--lx-gray-12)', - 'gray-01-alpha': 'var(--lx-gray-01-alpha)', - 'gray-02-alpha': 'var(--lx-gray-02-alpha)', - 'gray-03-alpha': 'var(--lx-gray-03-alpha)', - 'gray-04-alpha': 'var(--lx-gray-04-alpha)', - 'gray-05-alpha': 'var(--lx-gray-05-alpha)', - 'gray-06-alpha': 'var(--lx-gray-06-alpha)', - 'gray-07-alpha': 'var(--lx-gray-07-alpha)', - 'gray-08-alpha': 'var(--lx-gray-08-alpha)', - 'gray-09-alpha': 'var(--lx-gray-09-alpha)', - 'gray-10-alpha': 'var(--lx-gray-10-alpha)', - 'gray-11-alpha': 'var(--lx-gray-11-alpha)', - 'gray-12-alpha': 'var(--lx-gray-12-alpha)', -} +const lx = override => ({ + 'accent-01': 'or(' + override + ', --lx-accent-01)', + 'accent-02': 'or(' + override + ', --lx-accent-02)', + 'accent-03': 'or(' + override + ', --lx-accent-03)', + 'accent-04': 'or(' + override + ', --lx-accent-04)', + 'accent-05': 'or(' + override + ', --lx-accent-05)', + 'accent-06': 'or(' + override + ', --lx-accent-06)', + 'accent-07': 'or(' + override + ', --lx-accent-07)', + 'accent-08': 'or(' + override + ', --lx-accent-08)', + 'accent-09': 'or(' + override + ', --lx-accent-09)', + 'accent-10': 'or(' + override + ', --lx-accent-10)', + 'accent-11': 'or(' + override + ', --lx-accent-11)', + 'accent-12': 'or(' + override + ', --lx-accent-12)', + 'accent-01-alpha': 'or(' + override + ', --lx-accent-01-alpha)', + 'accent-02-alpha': 'or(' + override + ', --lx-accent-02-alpha)', + 'accent-03-alpha': 'or(' + override + ', --lx-accent-03-alpha)', + 'accent-04-alpha': 'or(' + override + ', --lx-accent-04-alpha)', + 'accent-05-alpha': 'or(' + override + ', --lx-accent-05-alpha)', + 'accent-06-alpha': 'or(' + override + ', --lx-accent-06-alpha)', + 'accent-07-alpha': 'or(' + override + ', --lx-accent-07-alpha)', + 'accent-08-alpha': 'or(' + override + ', --lx-accent-08-alpha)', + 'accent-09-alpha': 'or(' + override + ', --lx-accent-09-alpha)', + 'accent-10-alpha': 'or(' + override + ', --lx-accent-10-alpha)', + 'accent-11-alpha': 'or(' + override + ', --lx-accent-11-alpha)', + 'accent-12-alpha': 'or(' + override + ', --lx-accent-12-alpha)', + 'gray-01': 'or(' + override + ', --lx-gray-01)', + 'gray-02': 'or(' + override + ', --lx-gray-02)', + 'gray-03': 'or(' + override + ', --lx-gray-03)', + 'gray-04': 'or(' + override + ', --lx-gray-04)', + 'gray-05': 'or(' + override + ', --lx-gray-05)', + 'gray-06': 'or(' + override + ', --lx-gray-06)', + 'gray-07': 'or(' + override + ', --lx-gray-07)', + 'gray-08': 'or(' + override + ', --lx-gray-08)', + 'gray-09': 'or(' + override + ', --lx-gray-09)', + 'gray-10': 'or(' + override + ', --lx-gray-10)', + 'gray-11': 'or(' + override + ', --lx-gray-11)', + 'gray-12': 'or(' + override + ', --lx-gray-12)', + 'gray-01-alpha': 'or(' + override + ', --lx-gray-01-alpha)', + 'gray-02-alpha': 'or(' + override + ', --lx-gray-02-alpha)', + 'gray-03-alpha': 'or(' + override + ', --lx-gray-03-alpha)', + 'gray-04-alpha': 'or(' + override + ', --lx-gray-04-alpha)', + 'gray-05-alpha': 'or(' + override + ', --lx-gray-05-alpha)', + 'gray-06-alpha': 'or(' + override + ', --lx-gray-06-alpha)', + 'gray-07-alpha': 'or(' + override + ', --lx-gray-07-alpha)', + 'gray-08-alpha': 'or(' + override + ', --lx-gray-08-alpha)', + 'gray-09-alpha': 'or(' + override + ', --lx-gray-09-alpha)', + 'gray-10-alpha': 'or(' + override + ', --lx-gray-10-alpha)', + 'gray-11-alpha': 'or(' + override + ', --lx-gray-11-alpha)', + 'gray-12-alpha': 'or(' + override + ', --lx-gray-12-alpha)', +}) const accent = { '01': 'var(--lx-accent-01)', @@ -126,6 +127,27 @@ function exposeColorsToCssVars ({ addBase, theme }) { }) } +const withOverride = plugin(function({ matchUtilities }) { + matchUtilities({ + 'or': (value, b) => { + // check if the value starts with "bg-" + if (value.startsWith('bg-')) { + return { [`--lx-bg-override`]: `var(--lx-${value})` } + } + // check if the value starts with "text-" + if (value.startsWith('text-')) { + return { [`--lx-text-override`]: `var(--lx-${value})` } + } + // check if the value starts with "border-" + if (value.startsWith('border-')) { + return { [`--lx-border-override`]: `var(--lx-${value})` } + } + } + }, { + values: {} + }) +}) + function buildColor(color, custom) { const base = custom || colors[color] || {} @@ -196,22 +218,11 @@ module.exports = { require('@tailwindcss/aspect-ratio'), require('@tailwindcss/line-clamp'), require('tailwind-capitalize-first-letter'), - exposeColorsToCssVars + exposeColorsToCssVars, + withOverride, ], theme: { extend: { - // backgroundColor: { - // ...lx, - // }, - // borderColor: { - // ...lx, - // }, - // outlineColor: { - // ...lx, - // }, - // textColor: { - // ...lx, - // }, backgroundImage: { 'gradient-conic': 'conic-gradient(var(--tw-gradient-stops))', 'gradient-conic-bounce': 'conic-gradient(var(--tw-gradient-from), var(--tw-gradient-via), var(--tw-gradient-to), var(--tw-gradient-via), var(--tw-gradient-from))', @@ -237,8 +248,17 @@ module.exports = { 'lsm': '600px', 'lmd': '728px', 'llg': '960px' - } - }, + }, + backgroundColor: { + ...lx('--lx-bg-override'), + }, + textColor: { + ...lx('--lx-text-override'), + }, + borderColor: { + ...lx('--lx-border-override'), + }, + }, colors: { // Tailwind colors gray: gray, @@ -257,78 +277,6 @@ module.exports = { current: 'currentColor', transparent: 'transparent', white: colors.white, - - // Radix colors - // amber: buildColor("amber"), - // blue: buildColor("blue"), - // bronze: buildColor("bronze"), - // brown: buildColor("brown"), - // crimson: buildColor("crimson"), - // cyan: buildColor("cyan"), - // gold: buildColor("gold"), - // grass: buildColor("grass"), - // green: buildColor("green"), - // lime: buildColor("lime"), - // mauve: buildColor("mauve"), - // mint: buildColor("mint"), - // olive: buildColor("olive"), - // orange: buildColor("orange"), - // pink: buildColor("pink"), - // plum: buildColor("plum"), - // purple: buildColor("purple"), - // red: buildColor("red"), - // sage: buildColor("sage"), - // sand: buildColor("sand"), - // sky: buildColor("sky"), - // slate: buildColor("slate"), - // teal: buildColor("teal"), - // tomato: buildColor("tomato"), - // violet: buildColor("violet"), - - // Custom colors - // gray: buildColor("gray", colors.neutral), - // yellow: buildColor("yellow", colors.amber), - // indigo: buildColor("indigo", { - // 50: '#f0f9ff', - // 100: '#e0f2fe', - // 200: '#bae6fd', - // 300: '#7dd3fc', - // 400: '#38bdf8', - // 500: '#0ea5e9', - // 600: '#0284c7', - // 700: '#005b8a', - // 800: '#075985', - // 900: '#0c4a6e', - // }), - - // tomatodark: buildColor("tomatoDark"), - // reddark: buildColor("redDark"), - // crimsondark: buildColor("crimsonDark"), - // pinkdark: buildColor("pinkDark"), - // plumdark: buildColor("plumDark"), - // purpledark: buildColor("purpleDark"), - // violetdark: buildColor("violetDark"), - // skydark: buildColor("skyDark"), - // indigodark: buildColor("indigoDark"), - // bluedark: buildColor("blueDark"), - // cyandark: buildColor("cyanDark"), - // mintdark: buildColor("mintDark"), - // tealdark: buildColor("tealDark"), - // greendark: buildColor("greenDark"), - // limedark: buildColor("limeDark"), - // grassdark: buildColor("grassDark"), - // yellowdark: buildColor("yellowDark"), - // amberdark: buildColor("amberDark"), - // orangedark: buildColor("orangeDark"), - // browndark: buildColor("brownDark"), - // graydark: buildColor("grayDark"), - // mauvedark: buildColor("mauveDark"), - // slatedark: buildColor("slateDark"), - // sagedark: buildColor("sageDark"), - // olivedark: buildColor("oliveDark"), - // sanddark: buildColor("sandDark"), - // golddark: buildColor("goldDark"), - // bronzedark: buildColor("bronzeDark"), } } } diff --git a/yarn.lock b/yarn.lock index 0a84476c266..cdd6d8bb549 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@alloc/quick-lru@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" + integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw== + "@ampproject/remapping@^2.2.0": version "2.2.1" resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" @@ -1069,25 +1074,6 @@ abbrev@1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -acorn-node@^1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" - integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== - dependencies: - acorn "^7.0.0" - acorn-walk "^7.0.0" - xtend "^4.0.2" - -acorn-walk@^7.0.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" - integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== - -acorn@^7.0.0: - version "7.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" - integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== - agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -1161,6 +1147,11 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0: resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" integrity sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw== +any-promise@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" + integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A== + anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -2011,7 +2002,7 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== -color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4: +color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== @@ -2046,6 +2037,11 @@ colord@^2.9.1: resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== +commander@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" + integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== + commander@^6.0.0: version "6.2.1" resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" @@ -2462,11 +2458,6 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" -defined@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.1.tgz#c0b9db27bfaffd95d6f61399419b893df0f91ebf" - integrity sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q== - del@^6.0.0: version "6.1.1" resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a" @@ -2514,15 +2505,6 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -detective@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.1.tgz#6af01eeda11015acb0e73f933242b70f24f91034" - integrity sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw== - dependencies: - acorn-node "^1.8.2" - defined "^1.0.0" - minimist "^1.2.6" - didyoumean@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" @@ -3006,7 +2988,7 @@ fast-deep-equal@^3.1.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.2.11, fast-glob@^3.2.4, fast-glob@^3.2.5, fast-glob@^3.2.9, fast-glob@^3.3.0: +fast-glob@^3.2.4, fast-glob@^3.2.5, fast-glob@^3.2.9, fast-glob@^3.3.0: version "3.3.1" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4" integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg== @@ -3435,6 +3417,18 @@ glob-watcher@^5.0.3: normalize-path "^3.0.0" object.defaults "^1.1.0" +glob@7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + glob@^7.0.0, glob@^7.1.1, glob@^7.1.3: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" @@ -4365,6 +4359,11 @@ isomorphic-textencoder@1.0.1: dependencies: fast-text-encoding "^1.0.0" +jiti@^1.19.1: + version "1.21.0" + resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d" + integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== + "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -4561,7 +4560,7 @@ liftoff@^3.1.0: rechoir "^0.6.2" resolve "^1.1.7" -lilconfig@^2.0.3, lilconfig@^2.0.5, lilconfig@^2.0.6: +lilconfig@^2.0.3, lilconfig@^2.0.5, lilconfig@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== @@ -4867,7 +4866,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.4: +micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -4951,7 +4950,7 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^1.2.5, minimist@^1.2.6: +minimist@^1.2.5: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -5026,6 +5025,15 @@ mute-stdout@^1.0.0: resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331" integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg== +mz@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== + dependencies: + any-promise "^1.0.0" + object-assign "^4.0.1" + thenify-all "^1.0.0" + nan@^2.12.1, nan@^2.17.0: version "2.18.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554" @@ -5231,7 +5239,7 @@ number-is-nan@^1.0.0: resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== -object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== @@ -5678,6 +5686,11 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg== +pirates@^4.0.1: + version "4.0.6" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" + integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== + pixi-graph-fork@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/pixi-graph-fork/-/pixi-graph-fork-0.2.0.tgz#e3a8149dbbb16037f87ce1f81ee2139c6b0464ef" @@ -5902,16 +5915,16 @@ postcss-import@15.0.0: read-cache "^1.0.0" resolve "^1.1.7" -postcss-import@^14.1.0: - version "14.1.0" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz#a7333ffe32f0b8795303ee9e40215dac922781f0" - integrity sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw== +postcss-import@^15.1.0: + version "15.1.0" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-15.1.0.tgz#41c64ed8cc0e23735a9698b3249ffdbf704adc70" + integrity sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew== dependencies: postcss-value-parser "^4.0.0" read-cache "^1.0.0" resolve "^1.1.7" -postcss-js@4.0.0, postcss-js@^4.0.0: +postcss-js@4.0.0, postcss-js@^4.0.1: version "4.0.0" resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.0.tgz#31db79889531b80dc7bc9b0ad283e418dce0ac00" integrity sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ== @@ -5925,15 +5938,7 @@ postcss-less@^3.1.4: dependencies: postcss "^7.0.14" -postcss-load-config@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855" - integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg== - dependencies: - lilconfig "^2.0.5" - yaml "^1.10.2" - -postcss-load-config@^4.0.0: +postcss-load-config@^4.0.0, postcss-load-config@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.1.tgz#152383f481c2758274404e4962743191d73875bd" integrity sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA== @@ -5996,13 +6001,6 @@ postcss-minify-selectors@^5.2.1: dependencies: postcss-selector-parser "^6.0.5" -postcss-nested@5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" - integrity sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA== - dependencies: - postcss-selector-parser "^6.0.6" - postcss-nested@6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.0.tgz#1572f1984736578f360cffc7eb7dca69e30d1735" @@ -6010,6 +6008,13 @@ postcss-nested@6.0.0: dependencies: postcss-selector-parser "^6.0.10" +postcss-nested@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.1.tgz#f83dc9846ca16d2f4fa864f16e9d9f7d0961662c" + integrity sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ== + dependencies: + postcss-selector-parser "^6.0.11" + postcss-normalize-charset@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed" @@ -6139,7 +6144,7 @@ postcss-selector-parser@6.0.10: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9: +postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: version "6.0.13" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== @@ -6172,7 +6177,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@8.4.17, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6, postcss@^8.2.1, postcss@^8.4.14: +postcss@8.4.17, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6, postcss@^8.2.1, postcss@^8.4.23: version "8.4.17" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.17.tgz#f87863ec7cd353f81f7ab2dec5d67d861bbb1be5" integrity sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q== @@ -6702,7 +6707,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.22.1, resolve@^1.4.0: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.4.0: version "1.22.6" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.6.tgz#dd209739eca3aef739c626fea1b4f3c506195362" integrity sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw== @@ -6711,6 +6716,15 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.22.1, resolve@^1.4.0 path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +resolve@^1.22.2: + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + responselike@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" @@ -7430,6 +7444,19 @@ stylelint@^13.8.0: v8-compile-cache "^2.3.0" write-file-atomic "^3.0.3" +sucrase@^3.32.0: + version "3.34.0" + resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.34.0.tgz#1e0e2d8fcf07f8b9c3569067d92fbd8690fb576f" + integrity sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw== + dependencies: + "@jridgewell/gen-mapping" "^0.3.2" + commander "^4.0.0" + glob "7.1.6" + lines-and-columns "^1.1.6" + mz "^2.7.0" + pirates "^4.0.1" + ts-interface-checker "^0.1.9" + sugarss@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz#ddd76e0124b297d40bf3cca31c8b22ecb43bc61d" @@ -7505,33 +7532,33 @@ tailwind-capitalize-first-letter@^1.0.4: resolved "https://registry.yarnpkg.com/tailwind-capitalize-first-letter/-/tailwind-capitalize-first-letter-1.0.4.tgz#d7a07c1dda4a7555f2240d57154df394b0ee8db6" integrity sha512-ZB8hBi68JI4aQ1cDUxuFWfMYTxgBvlzIdPPHSkFkMUlo7p2QlbMy0hVv/vAREAFmkUh9QfjuKQnOSbe4Gnqljg== -tailwindcss@3.1.8: - version "3.1.8" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.8.tgz#4f8520550d67a835d32f2f4021580f9fddb7b741" - integrity sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g== +tailwindcss@3.3.5: + version "3.3.5" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.5.tgz#22a59e2fbe0ecb6660809d9cc5f3976b077be3b8" + integrity sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA== dependencies: + "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" chokidar "^3.5.3" - color-name "^1.1.4" - detective "^5.2.1" didyoumean "^1.2.2" dlv "^1.1.3" - fast-glob "^3.2.11" + fast-glob "^3.3.0" glob-parent "^6.0.2" is-glob "^4.0.3" - lilconfig "^2.0.6" + jiti "^1.19.1" + lilconfig "^2.1.0" + micromatch "^4.0.5" normalize-path "^3.0.0" object-hash "^3.0.0" picocolors "^1.0.0" - postcss "^8.4.14" - postcss-import "^14.1.0" - postcss-js "^4.0.0" - postcss-load-config "^3.1.4" - postcss-nested "5.0.6" - postcss-selector-parser "^6.0.10" - postcss-value-parser "^4.2.0" - quick-lru "^5.1.1" - resolve "^1.22.1" + postcss "^8.4.23" + postcss-import "^15.1.0" + postcss-js "^4.0.1" + postcss-load-config "^4.0.1" + postcss-nested "^6.0.1" + postcss-selector-parser "^6.0.11" + resolve "^1.22.2" + sucrase "^3.32.0" tar@^6.1.11: version "6.2.0" @@ -7557,6 +7584,20 @@ thenby@^1.3.4: resolved "https://registry.yarnpkg.com/thenby/-/thenby-1.3.4.tgz#81581f6e1bb324c6dedeae9bfc28e59b1a2201cc" integrity sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ== +thenify-all@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" + integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA== + dependencies: + thenify ">= 3.1.0 < 4" + +"thenify@>= 3.1.0 < 4": + version "3.3.1" + resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" + integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== + dependencies: + any-promise "^1.0.0" + threads@1.6.5: version "1.6.5" resolved "https://registry.yarnpkg.com/threads/-/threads-1.6.5.tgz#5cee7f139e3e147c5a64f0134844ee92469932a5" @@ -7714,6 +7755,11 @@ truncate-utf8-bytes@^1.0.0: dependencies: utf8-byte-length "^1.0.1" +ts-interface-checker@^0.1.9: + version "0.1.13" + resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699" + integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA== + tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" @@ -8241,7 +8287,7 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== -xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: +xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==