From 10952f9e12b5a6869d756e393772c8f14059914e Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Wed, 8 Feb 2023 17:39:43 +0100
Subject: [PATCH 01/84] Revert "Prepare for the `v3.2.6`"

This reverts commit 352677f0a9abbb80f67f0a4d32592a9976deeb7e.
---
 CHANGELOG.md                            |  11 +-
 src/corePlugins.js                      |  96 +++-
 src/css/preflight.css                   |   2 +
 src/util/dataTypes.js                   |   4 +
 src/util/pluginUtils.js                 |  12 +-
 stubs/defaultConfig.stub.js             |   2 +
 tests/any-type.test.js                  |   4 +-
 tests/arbitrary-values.oxide.test.css   |  16 +-
 tests/arbitrary-values.test.js          |  66 +++
 tests/basic-usage.oxide.test.css        |  18 +-
 tests/basic-usage.test.css              |   6 +
 tests/basic-usage.test.js               |   2 +
 tests/evaluateTailwindFunctions.test.js |  66 +++
 tests/getClassList.test.js              |  22 +
 tests/kitchen-sink.test.js              |  86 +++-
 tests/match-utilities.test.js           |   8 +-
 tests/oxide.test.js                     |   4 +-
 tests/plugins/divide.test.js            |   4 +-
 tests/plugins/fontFamily.test.js        |  40 ++
 tests/plugins/fontSize.test.js          |  74 +++
 tests/raw-content.oxide.test.css        |  18 +-
 tests/raw-content.test.css              |   6 +
 tests/raw-content.test.js               |   2 +
 tests/source-maps.test.js               | 569 ++++++++++++------------
 tests/variants.oxide.test.css           |   4 +-
 types/config.d.ts                       |   8 +-
 26 files changed, 825 insertions(+), 325 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24ac901cef2c..e6e46d3129ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-- Nothing yet!
+### Added
+
+- Add `line-height` modifier support to `font-size` utilities ([#9875](https://github.com/tailwindlabs/tailwindcss/pull/9875))
+- Support using variables as arbitrary values without `var(...)` ([#9880](https://github.com/tailwindlabs/tailwindcss/pull/9880), [#9962](https://github.com/tailwindlabs/tailwindcss/pull/9962))
+- Add `delay-0` and `duration-0` by default ([#10294](https://github.com/tailwindlabs/tailwindcss/pull/10294))
+- Add logical properties support for inline direction ([#10166](https://github.com/tailwindlabs/tailwindcss/pull/10166))
+- Add `hyphens` utilities ([#10071](https://github.com/tailwindlabs/tailwindcss/pull/10071))
+- [Oxide] Use `lightningcss` for nesting and vendor prefixes in PostCSS plugin ([#10399](https://github.com/tailwindlabs/tailwindcss/pull/10399))
+- Add support for configuring default `font-variation-settings` for a `font-family` ([#10034](https://github.com/tailwindlabs/tailwindcss/pull/10034), [#10515](https://github.com/tailwindlabs/tailwindcss/pull/10515))
+- Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
 
 ## [3.2.6] - 2023-02-08
 
diff --git a/src/corePlugins.js b/src/corePlugins.js
index 18c06eb08897..e440eff8eafe 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -1,6 +1,7 @@
 import fs from 'fs'
 import * as path from 'path'
 import postcss from 'postcss'
+import { env } from './lib/sharedState'
 import createUtilityPlugin from './util/createUtilityPlugin'
 import buildMediaQuery from './util/buildMediaQuery'
 import escapeClassName from './util/escapeClassName'
@@ -646,6 +647,8 @@ export let corePlugins = {
         ['inset-y', ['top', 'bottom']],
       ],
       [
+        ['start', ['inset-inline-start']],
+        ['end', ['inset-inline-end']],
         ['top', ['top']],
         ['right', ['right']],
         ['bottom', ['bottom']],
@@ -697,6 +700,8 @@ export let corePlugins = {
         ['my', ['margin-top', 'margin-bottom']],
       ],
       [
+        ['ms', ['margin-inline-start']],
+        ['me', ['margin-inline-end']],
         ['mt', ['margin-top']],
         ['mr', ['margin-right']],
         ['mb', ['margin-bottom']],
@@ -767,6 +772,13 @@ export let corePlugins = {
     })
   },
 
+  captionSide: ({ addUtilities }) => {
+    addUtilities({
+      '.caption-top': { 'caption-side': 'top' },
+      '.caption-bottom': { 'caption-side': 'bottom' },
+    })
+  },
+
   borderCollapse: ({ addUtilities }) => {
     addUtilities({
       '.border-collapse': { 'border-collapse': 'collapse' },
@@ -1045,6 +1057,8 @@ export let corePlugins = {
         ['scroll-my', ['scroll-margin-top', 'scroll-margin-bottom']],
       ],
       [
+        ['scroll-ms', ['scroll-margin-inline-start']],
+        ['scroll-me', ['scroll-margin-inline-end']],
         ['scroll-mt', ['scroll-margin-top']],
         ['scroll-mr', ['scroll-margin-right']],
         ['scroll-mb', ['scroll-margin-bottom']],
@@ -1061,6 +1075,8 @@ export let corePlugins = {
       ['scroll-py', ['scroll-padding-top', 'scroll-padding-bottom']],
     ],
     [
+      ['scroll-ps', ['scroll-padding-inline-start']],
+      ['scroll-pe', ['scroll-padding-inline-end']],
       ['scroll-pt', ['scroll-padding-top']],
       ['scroll-pr', ['scroll-padding-right']],
       ['scroll-pb', ['scroll-padding-bottom']],
@@ -1234,6 +1250,16 @@ export let corePlugins = {
         'space-x': (value) => {
           value = value === '0' ? '0px' : value
 
+          if (env.OXIDE) {
+            return {
+              '& > :not([hidden]) ~ :not([hidden])': {
+                '--tw-space-x-reverse': '0',
+                'margin-inline-end': `calc(${value} * var(--tw-space-x-reverse))`,
+                'margin-inline-start': `calc(${value} * calc(1 - var(--tw-space-x-reverse)))`,
+              },
+            }
+          }
+
           return {
             '& > :not([hidden]) ~ :not([hidden])': {
               '--tw-space-x-reverse': '0',
@@ -1269,6 +1295,17 @@ export let corePlugins = {
         'divide-x': (value) => {
           value = value === '0' ? '0px' : value
 
+          if (env.OXIDE) {
+            return {
+              '& > :not([hidden]) ~ :not([hidden])': {
+                '@defaults border-width': {},
+                '--tw-divide-x-reverse': '0',
+                'border-inline-end-width': `calc(${value} * var(--tw-divide-x-reverse))`,
+                'border-inline-start-width': `calc(${value} * calc(1 - var(--tw-divide-x-reverse)))`,
+              },
+            }
+          }
+
           return {
             '& > :not([hidden]) ~ :not([hidden])': {
               '@defaults border-width': {},
@@ -1436,6 +1473,14 @@ export let corePlugins = {
     })
   },
 
+  hyphens: ({ addUtilities }) => {
+    addUtilities({
+      '.hyphens-none': { hyphens: 'none' },
+      '.hyphens-manual': { hyphens: 'manual' },
+      '.hyphens-auto': { hyphens: 'auto' },
+    })
+  },
+
   whitespace: ({ addUtilities }) => {
     addUtilities({
       '.whitespace-normal': { 'white-space': 'normal' },
@@ -1458,12 +1503,18 @@ export let corePlugins = {
   borderRadius: createUtilityPlugin('borderRadius', [
     ['rounded', ['border-radius']],
     [
+      ['rounded-s', ['border-start-start-radius', 'border-end-start-radius']],
+      ['rounded-e', ['border-start-end-radius', 'border-end-end-radius']],
       ['rounded-t', ['border-top-left-radius', 'border-top-right-radius']],
       ['rounded-r', ['border-top-right-radius', 'border-bottom-right-radius']],
       ['rounded-b', ['border-bottom-right-radius', 'border-bottom-left-radius']],
       ['rounded-l', ['border-top-left-radius', 'border-bottom-left-radius']],
     ],
     [
+      ['rounded-ss', ['border-start-start-radius']],
+      ['rounded-se', ['border-start-end-radius']],
+      ['rounded-ee', ['border-end-end-radius']],
+      ['rounded-es', ['border-end-start-radius']],
       ['rounded-tl', ['border-top-left-radius']],
       ['rounded-tr', ['border-top-right-radius']],
       ['rounded-br', ['border-bottom-right-radius']],
@@ -1480,6 +1531,8 @@ export let corePlugins = {
         ['border-y', [['@defaults border-width', {}], 'border-top-width', 'border-bottom-width']],
       ],
       [
+        ['border-s', [['@defaults border-width', {}], 'border-inline-start-width']],
+        ['border-e', [['@defaults border-width', {}], 'border-inline-end-width']],
         ['border-t', [['@defaults border-width', {}], 'border-top-width']],
         ['border-r', [['@defaults border-width', {}], 'border-right-width']],
         ['border-b', [['@defaults border-width', {}], 'border-bottom-width']],
@@ -1562,6 +1615,32 @@ export let corePlugins = {
 
     matchUtilities(
       {
+        'border-s': (value) => {
+          if (!corePlugins('borderOpacity')) {
+            return {
+              'border-inline-start-color': toColorValue(value),
+            }
+          }
+
+          return withAlphaVariable({
+            color: value,
+            property: 'border-inline-start-color',
+            variable: '--tw-border-opacity',
+          })
+        },
+        'border-e': (value) => {
+          if (!corePlugins('borderOpacity')) {
+            return {
+              'border-inline-end-color': toColorValue(value),
+            }
+          }
+
+          return withAlphaVariable({
+            color: value,
+            property: 'border-inline-end-color',
+            variable: '--tw-border-opacity',
+          })
+        },
         'border-t': (value) => {
           if (!corePlugins('borderOpacity')) {
             return {
@@ -1798,6 +1877,8 @@ export let corePlugins = {
       ['py', ['padding-top', 'padding-bottom']],
     ],
     [
+      ['ps', ['padding-inline-start']],
+      ['pe', ['padding-inline-end']],
       ['pt', ['padding-top']],
       ['pr', ['padding-right']],
       ['pb', ['padding-bottom']],
@@ -1841,13 +1922,16 @@ export let corePlugins = {
         font: (value) => {
           let [families, options = {}] =
             Array.isArray(value) && isPlainObject(value[1]) ? value : [value]
-          let { fontFeatureSettings } = options
+          let { fontFeatureSettings, fontVariationSettings } = options
 
           return {
             'font-family': Array.isArray(families) ? families.join(', ') : families,
             ...(fontFeatureSettings === undefined
               ? {}
               : { 'font-feature-settings': fontFeatureSettings }),
+            ...(fontVariationSettings === undefined
+              ? {}
+              : { 'font-variation-settings': fontVariationSettings }),
           }
         },
       },
@@ -1861,9 +1945,16 @@ export let corePlugins = {
   fontSize: ({ matchUtilities, theme }) => {
     matchUtilities(
       {
-        text: (value) => {
+        text: (value, { modifier }) => {
           let [fontSize, options] = Array.isArray(value) ? value : [value]
 
+          if (modifier) {
+            return {
+              'font-size': fontSize,
+              'line-height': modifier,
+            }
+          }
+
           let { lineHeight, letterSpacing, fontWeight } = isPlainObject(options)
             ? options
             : { lineHeight: options }
@@ -1878,6 +1969,7 @@ export let corePlugins = {
       },
       {
         values: theme('fontSize'),
+        modifiers: theme('lineHeight'),
         type: ['absolute-size', 'relative-size', 'length', 'percentage'],
       }
     )
diff --git a/src/css/preflight.css b/src/css/preflight.css
index 3029044290d5..fab875d95904 100644
--- a/src/css/preflight.css
+++ b/src/css/preflight.css
@@ -23,6 +23,7 @@
 3. Use a more readable tab size.
 4. Use the user's configured `sans` font-family by default.
 5. Use the user's configured `sans` font-feature-settings by default.
+6. Use the user's configured `sans` font-variation-settings by default.
 */
 
 html {
@@ -32,6 +33,7 @@ html {
   tab-size: 4; /* 3 */
   font-family: theme('fontFamily.sans', ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"); /* 4 */
   font-feature-settings: theme('fontFamily.sans[1].fontFeatureSettings', normal); /* 5 */
+  font-variation-settings: theme('fontFamily.sans[1].fontVariationSettings', normal); /* 6 */
 }
 
 /*
diff --git a/src/util/dataTypes.js b/src/util/dataTypes.js
index 5005f5fe0083..55cc005799f6 100644
--- a/src/util/dataTypes.js
+++ b/src/util/dataTypes.js
@@ -16,6 +16,10 @@ const placeholderRe = new RegExp(placeholder, 'g')
 // This is not a data type, but rather a function that can normalize the
 // correct values.
 export function normalize(value, isRoot = true) {
+  if (value.startsWith('--')) {
+    return `var(${value})`
+  }
+
   // Keep raw strings if it starts with `url(`
   if (value.includes('url(')) {
     return value
diff --git a/src/util/pluginUtils.js b/src/util/pluginUtils.js
index 5c4821d3cbca..e347f404ba8a 100644
--- a/src/util/pluginUtils.js
+++ b/src/util/pluginUtils.js
@@ -133,6 +133,14 @@ export function parseColorFormat(value) {
   return value
 }
 
+function unwrapArbitraryModifier(modifier) {
+  modifier = modifier.slice(1, -1)
+  if (modifier.startsWith('--')) {
+    modifier = `var(${modifier})`
+  }
+  return modifier
+}
+
 export function asColor(modifier, options = {}, { tailwindConfig = {} } = {}) {
   if (options.values?.[modifier] !== undefined) {
     return parseColorFormat(options.values?.[modifier])
@@ -153,7 +161,7 @@ export function asColor(modifier, options = {}, { tailwindConfig = {} } = {}) {
     normalizedColor = parseColorFormat(normalizedColor)
 
     if (isArbitraryValue(alpha)) {
-      return withAlphaValue(normalizedColor, alpha.slice(1, -1))
+      return withAlphaValue(normalizedColor, unwrapArbitraryModifier(alpha))
     }
 
     if (tailwindConfig.theme?.opacity?.[alpha] === undefined) {
@@ -287,7 +295,7 @@ export function* getMatchingTypes(types, rawModifier, options, tailwindConfig) {
       if (configValue !== null) {
         utilityModifier = configValue
       } else if (isArbitraryValue(utilityModifier)) {
-        utilityModifier = utilityModifier.slice(1, -1)
+        utilityModifier = unwrapArbitraryModifier(utilityModifier)
       }
     }
   }
diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js
index 21a82cd4869b..8a3fac7a3fcc 100644
--- a/stubs/defaultConfig.stub.js
+++ b/stubs/defaultConfig.stub.js
@@ -853,6 +853,7 @@ module.exports = {
       'top-left': 'top left',
     },
     transitionDelay: {
+      0: '0s',
       75: '75ms',
       100: '100ms',
       150: '150ms',
@@ -864,6 +865,7 @@ module.exports = {
     },
     transitionDuration: {
       DEFAULT: '150ms',
+      0: '0s',
       75: '75ms',
       100: '100ms',
       150: '150ms',
diff --git a/tests/any-type.test.js b/tests/any-type.test.js
index 8593362aada6..add8a1795551 100644
--- a/tests/any-type.test.js
+++ b/tests/any-type.test.js
@@ -428,8 +428,8 @@ crosscheck(({ stable, oxide }) => {
         }
         .space-x-\[var\(--any-value\)\] > :not([hidden]) ~ :not([hidden]) {
           --tw-space-x-reverse: 0;
-          margin-right: calc(var(--any-value) * var(--tw-space-x-reverse));
-          margin-left: calc(var(--any-value) * calc(1 - var(--tw-space-x-reverse)));
+          margin-inline-start: calc(var(--any-value) * calc(1 - var(--tw-space-x-reverse)));
+          margin-inline-end: calc(var(--any-value) * var(--tw-space-x-reverse));
         }
         .space-y-\[var\(--any-value\)\] > :not([hidden]) ~ :not([hidden]) {
           --tw-space-y-reverse: 0;
diff --git a/tests/arbitrary-values.oxide.test.css b/tests/arbitrary-values.oxide.test.css
index e19212d7411c..acd68ee3386a 100644
--- a/tests/arbitrary-values.oxide.test.css
+++ b/tests/arbitrary-values.oxide.test.css
@@ -455,13 +455,13 @@
 }
 .space-x-\[20cm\] > :not([hidden]) ~ :not([hidden]) {
   --tw-space-x-reverse: 0;
-  margin-right: calc(20cm * var(--tw-space-x-reverse));
-  margin-left: calc(20cm * calc(1 - var(--tw-space-x-reverse)));
+  margin-inline-start: calc(20cm * calc(1 - var(--tw-space-x-reverse)));
+  margin-inline-end: calc(20cm * var(--tw-space-x-reverse));
 }
 .space-x-\[calc\(20\%-1cm\)\] > :not([hidden]) ~ :not([hidden]) {
   --tw-space-x-reverse: 0;
-  margin-right: calc(calc(20% - 1cm) * var(--tw-space-x-reverse));
-  margin-left: calc(calc(20% - 1cm) * calc(1 - var(--tw-space-x-reverse)));
+  margin-inline-start: calc(calc(20% - 1cm) * calc(1 - var(--tw-space-x-reverse)));
+  margin-inline-end: calc(calc(20% - 1cm) * var(--tw-space-x-reverse));
 }
 .space-y-\[20cm\] > :not([hidden]) ~ :not([hidden]) {
   --tw-space-y-reverse: 0;
@@ -475,13 +475,13 @@
 }
 .divide-x-\[20cm\] > :not([hidden]) ~ :not([hidden]) {
   --tw-divide-x-reverse: 0;
-  border-right-width: calc(20cm * var(--tw-divide-x-reverse));
-  border-left-width: calc(20cm * calc(1 - var(--tw-divide-x-reverse)));
+  border-inline-end-width: calc(20cm * var(--tw-divide-x-reverse));
+  border-inline-start-width: calc(20cm * calc(1 - var(--tw-divide-x-reverse)));
 }
 .divide-x-\[calc\(20\%-1cm\)\] > :not([hidden]) ~ :not([hidden]) {
   --tw-divide-x-reverse: 0;
-  border-right-width: calc(calc(20% - 1cm) * var(--tw-divide-x-reverse));
-  border-left-width: calc(calc(20% - 1cm) * calc(1 - var(--tw-divide-x-reverse)));
+  border-inline-end-width: calc(calc(20% - 1cm) * var(--tw-divide-x-reverse));
+  border-inline-start-width: calc(calc(20% - 1cm) * calc(1 - var(--tw-divide-x-reverse)));
 }
 .divide-y-\[20cm\] > :not([hidden]) ~ :not([hidden]) {
   --tw-divide-y-reverse: 0;
diff --git a/tests/arbitrary-values.test.js b/tests/arbitrary-values.test.js
index 57686114d6eb..183fcf57c3c9 100644
--- a/tests/arbitrary-values.test.js
+++ b/tests/arbitrary-values.test.js
@@ -545,4 +545,70 @@ crosscheck(({ stable, oxide }) => {
       `)
     })
   })
+
+  it('can use CSS variables as arbitrary values without `var()`', () => {
+    let config = {
+      content: [
+        {
+          raw: html`<div
+            class="w-[--width-var] bg-[--color-var] bg-[--color-var,#000] bg-[length:--size-var] text-[length:--size-var,12px]"
+          ></div>`,
+        },
+      ],
+      corePlugins: { preflight: false },
+      plugins: [],
+    }
+
+    let input = css`
+      @tailwind utilities;
+    `
+
+    return run(input, config).then((result) => {
+      expect(result.css).toMatchFormattedCss(css`
+        .w-\[--width-var\] {
+          width: var(--width-var);
+        }
+        .bg-\[--color-var\,\#000\] {
+          background-color: var(--color-var, #000);
+        }
+        .bg-\[--color-var\] {
+          background-color: var(--color-var);
+        }
+        .bg-\[length\:--size-var\] {
+          background-size: var(--size-var);
+        }
+        .text-\[length\:--size-var\,12px\] {
+          font-size: var(--size-var, 12px);
+        }
+      `)
+    })
+  })
+
+  it('can use CSS variables as arbitrary modifiers without `var()`', () => {
+    let config = {
+      content: [
+        {
+          raw: html`<div class="text-sm/[--line-height] bg-red-500/[--opacity]"></div>`,
+        },
+      ],
+      corePlugins: { preflight: false },
+      plugins: [],
+    }
+
+    let input = css`
+      @tailwind utilities;
+    `
+
+    return run(input, config).then((result) => {
+      expect(result.css).toMatchFormattedCss(css`
+        .bg-red-500\/\[--opacity\] {
+          background-color: rgb(239 68 68 / var(--opacity));
+        }
+        .text-sm\/\[--line-height\] {
+          font-size: 0.875rem;
+          line-height: var(--line-height);
+        }
+      `)
+    })
+  })
 })
diff --git a/tests/basic-usage.oxide.test.css b/tests/basic-usage.oxide.test.css
index 9484dfdd698b..5623fe79ee30 100644
--- a/tests/basic-usage.oxide.test.css
+++ b/tests/basic-usage.oxide.test.css
@@ -252,6 +252,12 @@
 .table-fixed {
   table-layout: fixed;
 }
+.caption-top {
+  caption-side: top;
+}
+.caption-bottom {
+  caption-side: bottom;
+}
 .border-collapse {
   border-collapse: collapse;
 }
@@ -470,8 +476,8 @@
 }
 .space-x-4 > :not([hidden]) ~ :not([hidden]) {
   --tw-space-x-reverse: 0;
-  margin-right: calc(1rem * var(--tw-space-x-reverse));
-  margin-left: calc(1rem * calc(1 - var(--tw-space-x-reverse)));
+  margin-inline-start: calc(1rem * calc(1 - var(--tw-space-x-reverse)));
+  margin-inline-end: calc(1rem * var(--tw-space-x-reverse));
 }
 .space-y-3 > :not([hidden]) ~ :not([hidden]) {
   --tw-space-y-reverse: 0;
@@ -486,13 +492,13 @@
 }
 .divide-x-0 > :not([hidden]) ~ :not([hidden]) {
   --tw-divide-x-reverse: 0;
-  border-right-width: calc(0px * var(--tw-divide-x-reverse));
-  border-left-width: calc(0px * calc(1 - var(--tw-divide-x-reverse)));
+  border-inline-end-width: calc(0px * var(--tw-divide-x-reverse));
+  border-inline-start-width: calc(0px * calc(1 - var(--tw-divide-x-reverse)));
 }
 .divide-x-2 > :not([hidden]) ~ :not([hidden]) {
   --tw-divide-x-reverse: 0;
-  border-right-width: calc(2px * var(--tw-divide-x-reverse));
-  border-left-width: calc(2px * calc(1 - var(--tw-divide-x-reverse)));
+  border-inline-end-width: calc(2px * var(--tw-divide-x-reverse));
+  border-inline-start-width: calc(2px * calc(1 - var(--tw-divide-x-reverse)));
 }
 .divide-y-0 > :not([hidden]) ~ :not([hidden]) {
   --tw-divide-y-reverse: 0;
diff --git a/tests/basic-usage.test.css b/tests/basic-usage.test.css
index 9484dfdd698b..184ada947ccf 100644
--- a/tests/basic-usage.test.css
+++ b/tests/basic-usage.test.css
@@ -252,6 +252,12 @@
 .table-fixed {
   table-layout: fixed;
 }
+.caption-top {
+  caption-side: top;
+}
+.caption-bottom {
+  caption-side: bottom;
+}
 .border-collapse {
   border-collapse: collapse;
 }
diff --git a/tests/basic-usage.test.js b/tests/basic-usage.test.js
index 9ec0e591714c..4b39eb68177d 100644
--- a/tests/basic-usage.test.js
+++ b/tests/basic-usage.test.js
@@ -161,6 +161,8 @@ crosscheck(({ stable, oxide }) => {
             <div class="stroke-current"></div>
             <div class="stroke-2"></div>
             <div class="table-fixed"></div>
+            <div class="caption-top"></div>
+            <div class="caption-bottom"></div>
             <div class="text-center"></div>
             <div class="indent-6 -indent-12"></div>
             <div class="text-indigo-500"></div>
diff --git a/tests/evaluateTailwindFunctions.test.js b/tests/evaluateTailwindFunctions.test.js
index 82aa9b7da21f..5b41a70307c7 100644
--- a/tests/evaluateTailwindFunctions.test.js
+++ b/tests/evaluateTailwindFunctions.test.js
@@ -591,6 +591,72 @@ crosscheck(({ stable, oxide }) => {
     })
   })
 
+  test('font-family values are retrieved without font-variation-settings', () => {
+    let input = css`
+      .heading-1 {
+        font-family: theme('fontFamily.sans');
+      }
+      .heading-2 {
+        font-family: theme('fontFamily.serif');
+      }
+      .heading-3 {
+        font-family: theme('fontFamily.mono');
+      }
+    `
+
+    let output = css`
+      .heading-1 {
+        font-family: Inter;
+      }
+      .heading-2 {
+        font-family: Times, serif;
+      }
+      .heading-3 {
+        font-family: Menlo, monospace;
+      }
+    `
+
+    return run(input, {
+      theme: {
+        fontFamily: {
+          sans: ['Inter', { fontVariationSettings: '"opsz" 32' }],
+          serif: [['Times', 'serif'], { fontVariationSettings: '"opsz" 32' }],
+          mono: ['Menlo, monospace', { fontVariationSettings: '"opsz" 32' }],
+        },
+      },
+    }).then((result) => {
+      expect(result.css).toMatchCss(output)
+      expect(result.warnings().length).toBe(0)
+    })
+  })
+
+  test('font-variation-settings values can be retrieved', () => {
+    let input = css`
+      .heading {
+        font-family: theme('fontFamily.sans');
+        font-variation-settings: theme('fontFamily.sans[1].fontVariationSettings');
+      }
+    `
+
+    let output = css`
+      .heading {
+        font-family: Inter;
+        font-variation-settings: 'opsz' 32;
+      }
+    `
+
+    return run(input, {
+      theme: {
+        fontFamily: {
+          sans: ['Inter', { fontVariationSettings: "'opsz' 32" }],
+        },
+      },
+    }).then((result) => {
+      expect(result.css).toMatchCss(output)
+      expect(result.warnings().length).toBe(0)
+    })
+  })
+
   test('font-family values are joined when an array', () => {
     let input = css`
       .element {
diff --git a/tests/getClassList.test.js b/tests/getClassList.test.js
index 5fd9b00b0f87..671a767ecfe5 100644
--- a/tests/getClassList.test.js
+++ b/tests/getClassList.test.js
@@ -88,6 +88,7 @@ crosscheck(() => {
     let classes = context.getClassList({ includeMetadata: true })
 
     expect(classes).not.toContain('bg-red-500')
+    expect(classes).not.toContain('text-2xl')
 
     expect(classes).toContainEqual([
       'bg-red-500',
@@ -111,6 +112,27 @@ crosscheck(() => {
         ],
       },
     ])
+    expect(classes).toContainEqual([
+      'text-2xl',
+      {
+        modifiers: [
+          '3',
+          '4',
+          '5',
+          '6',
+          '7',
+          '8',
+          '9',
+          '10',
+          'none',
+          'tight',
+          'snug',
+          'normal',
+          'relaxed',
+          'loose',
+        ],
+      },
+    ])
   })
 
   it('should generate plugin-defined utilities with modifier data when requested', () => {
diff --git a/tests/kitchen-sink.test.js b/tests/kitchen-sink.test.js
index fbe4fc9dfda9..976018cb05dc 100644
--- a/tests/kitchen-sink.test.js
+++ b/tests/kitchen-sink.test.js
@@ -13,7 +13,12 @@ crosscheck(() => {
             ></div>
             <div class="grid-cols-[200px,repeat(auto-fill,minmax(15%,100px)),300px]"></div>
             <div class="test-apply-font-variant"></div>
-            <div class="mt-6"></div>
+            <div class="mt-6 mx-1 ms-4 me-8"></div>
+            <div class="pt-6 px-1 ps-4 pe-8"></div>
+            <div class="inset-6 inset-x-1 start-4 end-8"></div>
+            <div class="border-2 border-s-0 border-e-4"></div>
+            <div class="border-black border-s-green-500 border-e-red-400"></div>
+            <div class="rounded-s rounded-e rounded-ss rounded-es"></div>
             <div class="bg-black"></div>
             <div class="md:hover:border-r-blue-500/30"></div>
             <div class="custom-util"></div>
@@ -204,7 +209,7 @@ crosscheck(() => {
         @apply font-bold group-hover:font-normal;
       }
       .list {
-        @apply space-x-4;
+        @apply space-y-4;
       }
       .nested {
         .example {
@@ -319,9 +324,9 @@ crosscheck(() => {
           font-weight: 400;
         }
         .list > :not([hidden]) ~ :not([hidden]) {
-          --tw-space-x-reverse: 0;
-          margin-right: calc(1rem * var(--tw-space-x-reverse));
-          margin-left: calc(1rem * calc(1 - var(--tw-space-x-reverse)));
+          --tw-space-y-reverse: 0;
+          margin-top: calc(1rem * calc(1 - var(--tw-space-y-reverse)));
+          margin-bottom: calc(1rem * var(--tw-space-y-reverse));
         }
         .nested .example {
           font-weight: 700;
@@ -401,6 +406,29 @@ crosscheck(() => {
         .foo .bg-black {
           appearance: none;
         }
+        .inset-6 {
+          inset: 1.5rem;
+        }
+        .inset-x-1 {
+          left: 0.25rem;
+          right: 0.25rem;
+        }
+        .end-8 {
+          inset-inline-end: 2rem;
+        }
+        .start-4 {
+          inset-inline-start: 1rem;
+        }
+        .mx-1 {
+          margin-left: 0.25rem;
+          margin-right: 0.25rem;
+        }
+        .me-8 {
+          margin-inline-end: 2rem;
+        }
+        .ms-4 {
+          margin-inline-start: 1rem;
+        }
         .mt-6 {
           margin-top: 1.5rem;
         }
@@ -419,6 +447,41 @@ crosscheck(() => {
         .grid-cols-\[200px\,repeat\(auto-fill\,minmax\(15\%\,100px\)\)\,300px\] {
           grid-template-columns: 200px repeat(auto-fill, minmax(15%, 100px)) 300px;
         }
+        .rounded-e {
+          border-start-end-radius: 0.25rem;
+          border-end-end-radius: 0.25rem;
+        }
+        .rounded-s {
+          border-start-start-radius: 0.25rem;
+          border-end-start-radius: 0.25rem;
+        }
+        .rounded-es {
+          border-end-start-radius: 0.25rem;
+        }
+        .rounded-ss {
+          border-start-start-radius: 0.25rem;
+        }
+        .border-2 {
+          border-width: 2px;
+        }
+        .border-e-4 {
+          border-inline-end-width: 4px;
+        }
+        .border-s-0 {
+          border-inline-start-width: 0;
+        }
+        .border-black {
+          --tw-border-opacity: 1;
+          border-color: rgb(0 0 0 / var(--tw-border-opacity));
+        }
+        .border-e-red-400 {
+          --tw-border-opacity: 1;
+          border-inline-end-color: rgb(248 113 113 / var(--tw-border-opacity));
+        }
+        .border-s-green-500 {
+          --tw-border-opacity: 1;
+          border-inline-start-color: rgb(34 197 94 / var(--tw-border-opacity));
+        }
         .bg-black {
           --tw-bg-opacity: 1;
           background-color: rgb(0 0 0 / var(--tw-bg-opacity));
@@ -441,6 +504,19 @@ crosscheck(() => {
           --tw-gradient-to: #bada5500;
           --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
         }
+        .px-1 {
+          padding-left: 0.25rem;
+          padding-right: 0.25rem;
+        }
+        .pe-8 {
+          padding-inline-end: 2rem;
+        }
+        .ps-4 {
+          padding-inline-start: 1rem;
+        }
+        .pt-6 {
+          padding-top: 1.5rem;
+        }
         .text-center {
           text-align: center;
         }
diff --git a/tests/match-utilities.test.js b/tests/match-utilities.test.js
index 9f4d1df09fb3..9b3cd4c56ec4 100644
--- a/tests/match-utilities.test.js
+++ b/tests/match-utilities.test.js
@@ -6,8 +6,8 @@ crosscheck(() => {
       content: [
         {
           raw: html`<div
-            class="test test/foo test-1/foo test-2/foo test/[foo] test-1/[foo]"
-          ></div>`,
+            class="test test/foo test-1/foo test-2/foo test/[foo] test-1/[foo] test-[8]/[9]"
+          ></div> `,
         },
       ],
       corePlugins: { preflight: false },
@@ -27,6 +27,7 @@ crosscheck(() => {
                 '1': 'one',
                 '2': 'two',
                 '1/foo': 'onefoo',
+                '[8]/[9]': 'eightnine',
               },
               modifiers: 'any',
             }
@@ -54,6 +55,9 @@ crosscheck(() => {
       .test-2\/foo {
         color: two_foo;
       }
+      .test-\[8\]\/\[9\] {
+        color: eightnine_null;
+      }
       .test\/\[foo\] {
         color: default_[foo];
       }
diff --git a/tests/oxide.test.js b/tests/oxide.test.js
index ee7d68697614..d2a697626021 100644
--- a/tests/oxide.test.js
+++ b/tests/oxide.test.js
@@ -13,8 +13,8 @@ crosscheck(({ stable, oxide }) => {
         ${defaults}
         .space-x-4 > :not([hidden]) ~ :not([hidden]) {
           --tw-space-x-reverse: 0;
-          margin-right: calc(1rem * var(--tw-space-x-reverse));
-          margin-left: calc(1rem * calc(1 - var(--tw-space-x-reverse)));
+          margin-inline-start: calc(1rem * calc(1 - var(--tw-space-x-reverse)));
+          margin-inline-end: calc(1rem * var(--tw-space-x-reverse));
         }
       `)
     })
diff --git a/tests/plugins/divide.test.js b/tests/plugins/divide.test.js
index fe63645dbf98..314233bea074 100644
--- a/tests/plugins/divide.test.js
+++ b/tests/plugins/divide.test.js
@@ -40,8 +40,8 @@ crosscheck(({ stable, oxide }) => {
         ${defaults}
         .divide-x > :not([hidden]) ~ :not([hidden]) {
           --tw-divide-x-reverse: 0;
-          border-right-width: calc(1px * var(--tw-divide-x-reverse));
-          border-left-width: calc(1px * calc(1 - var(--tw-divide-x-reverse)));
+          border-inline-end-width: calc(1px * var(--tw-divide-x-reverse));
+          border-inline-start-width: calc(1px * calc(1 - var(--tw-divide-x-reverse)));
         }
       `)
     })
diff --git a/tests/plugins/fontFamily.test.js b/tests/plugins/fontFamily.test.js
index fb025720a02b..1170dac8e9e6 100644
--- a/tests/plugins/fontFamily.test.js
+++ b/tests/plugins/fontFamily.test.js
@@ -98,3 +98,43 @@ crosscheck(() => {
     })
   })
 })
+
+test('font-variation-settings can be provided when families are defined as a string', () => {
+  let config = {
+    content: [{ raw: html`<div class="font-sans"></div>` }],
+    theme: {
+      fontFamily: {
+        sans: ['Inter, sans-serif', { fontVariationSettings: '"opsz" 32' }],
+      },
+    },
+  }
+
+  return run('@tailwind utilities', config).then((result) => {
+    expect(result.css).toMatchCss(`
+      .font-sans {
+        font-family: Inter, sans-serif;
+        font-variation-settings: "opsz" 32;
+      }
+    `)
+  })
+})
+
+test('font-variation-settings can be provided when families are defined as an array', () => {
+  let config = {
+    content: [{ raw: html`<div class="font-sans"></div>` }],
+    theme: {
+      fontFamily: {
+        sans: [['Inter', 'sans-serif'], { fontVariationSettings: '"opsz" 32' }],
+      },
+    },
+  }
+
+  return run('@tailwind utilities', config).then((result) => {
+    expect(result.css).toMatchCss(`
+      .font-sans {
+        font-family: Inter, sans-serif;
+        font-variation-settings: "opsz" 32;
+      }
+    `)
+  })
+})
diff --git a/tests/plugins/fontSize.test.js b/tests/plugins/fontSize.test.js
index c3a1159eb069..08e88bb76846 100644
--- a/tests/plugins/fontSize.test.js
+++ b/tests/plugins/fontSize.test.js
@@ -120,4 +120,78 @@ crosscheck(() => {
       `)
     })
   })
+
+  test('font-size utilities can include a line-height modifier', () => {
+    let config = {
+      content: [
+        {
+          raw: html`<div class="text-sm md:text-base">
+            <div class="text-sm/6 md:text-base/7"></div>
+            <div class="text-sm/[21px] md:text-base/[33px]"></div>
+            <div class="text-[13px]/6 md:text-[19px]/8"></div>
+            <div class="text-[17px]/[23px] md:text-[21px]/[29px]"></div>
+            <div class="text-sm/999 md:text-base/000"></div>
+          </div>`,
+        },
+      ],
+      theme: {
+        fontSize: {
+          sm: ['12px', '20px'],
+          base: ['16px', '24px'],
+        },
+        lineHeight: {
+          6: '24px',
+          7: '28px',
+          8: '32px',
+        },
+      },
+    }
+
+    return run('@tailwind utilities', config).then((result) => {
+      expect(result.css).toMatchCss(css`
+        .text-\[13px\]\/6 {
+          font-size: 13px;
+          line-height: 24px;
+        }
+        .text-\[17px\]\/\[23px\] {
+          font-size: 17px;
+          line-height: 23px;
+        }
+        .text-sm {
+          font-size: 12px;
+          line-height: 20px;
+        }
+        .text-sm\/6 {
+          font-size: 12px;
+          line-height: 24px;
+        }
+        .text-sm\/\[21px\] {
+          font-size: 12px;
+          line-height: 21px;
+        }
+        @media (min-width: 768px) {
+          .md\:text-\[19px\]\/8 {
+            font-size: 19px;
+            line-height: 32px;
+          }
+          .md\:text-\[21px\]\/\[29px\] {
+            font-size: 21px;
+            line-height: 29px;
+          }
+          .md\:text-base {
+            font-size: 16px;
+            line-height: 24px;
+          }
+          .md\:text-base\/7 {
+            font-size: 16px;
+            line-height: 28px;
+          }
+          .md\:text-base\/\[33px\] {
+            font-size: 16px;
+            line-height: 33px;
+          }
+        }
+      `)
+    })
+  })
 })
diff --git a/tests/raw-content.oxide.test.css b/tests/raw-content.oxide.test.css
index 402f90a345a4..b4fa9b8cc73c 100644
--- a/tests/raw-content.oxide.test.css
+++ b/tests/raw-content.oxide.test.css
@@ -179,6 +179,12 @@
 .table-fixed {
   table-layout: fixed;
 }
+.caption-top {
+  caption-side: top;
+}
+.caption-bottom {
+  caption-side: bottom;
+}
 .border-collapse {
   border-collapse: collapse;
 }
@@ -323,8 +329,8 @@
 }
 .space-x-4 > :not([hidden]) ~ :not([hidden]) {
   --tw-space-x-reverse: 0;
-  margin-right: calc(1rem * var(--tw-space-x-reverse));
-  margin-left: calc(1rem * calc(1 - var(--tw-space-x-reverse)));
+  margin-inline-start: calc(1rem * calc(1 - var(--tw-space-x-reverse)));
+  margin-inline-end: calc(1rem * var(--tw-space-x-reverse));
 }
 .space-y-3 > :not([hidden]) ~ :not([hidden]) {
   --tw-space-y-reverse: 0;
@@ -339,13 +345,13 @@
 }
 .divide-x-0 > :not([hidden]) ~ :not([hidden]) {
   --tw-divide-x-reverse: 0;
-  border-right-width: calc(0px * var(--tw-divide-x-reverse));
-  border-left-width: calc(0px * calc(1 - var(--tw-divide-x-reverse)));
+  border-inline-end-width: calc(0px * var(--tw-divide-x-reverse));
+  border-inline-start-width: calc(0px * calc(1 - var(--tw-divide-x-reverse)));
 }
 .divide-x-2 > :not([hidden]) ~ :not([hidden]) {
   --tw-divide-x-reverse: 0;
-  border-right-width: calc(2px * var(--tw-divide-x-reverse));
-  border-left-width: calc(2px * calc(1 - var(--tw-divide-x-reverse)));
+  border-inline-end-width: calc(2px * var(--tw-divide-x-reverse));
+  border-inline-start-width: calc(2px * calc(1 - var(--tw-divide-x-reverse)));
 }
 .divide-y-0 > :not([hidden]) ~ :not([hidden]) {
   --tw-divide-y-reverse: 0;
diff --git a/tests/raw-content.test.css b/tests/raw-content.test.css
index 402f90a345a4..2867d4b2a8fe 100644
--- a/tests/raw-content.test.css
+++ b/tests/raw-content.test.css
@@ -179,6 +179,12 @@
 .table-fixed {
   table-layout: fixed;
 }
+.caption-top {
+  caption-side: top;
+}
+.caption-bottom {
+  caption-side: bottom;
+}
 .border-collapse {
   border-collapse: collapse;
 }
diff --git a/tests/raw-content.test.js b/tests/raw-content.test.js
index 127a5d48a40e..417c37485555 100644
--- a/tests/raw-content.test.js
+++ b/tests/raw-content.test.js
@@ -123,6 +123,8 @@ crosscheck(({ stable, oxide }) => {
             <div class="stroke-current"></div>
             <div class="stroke-2"></div>
             <div class="table-fixed"></div>
+            <div class="caption-top"></div>
+            <div class="caption-bottom"></div>
             <div class="text-center"></div>
             <div class="text-indigo-500"></div>
             <div class="underline"></div>
diff --git a/tests/source-maps.test.js b/tests/source-maps.test.js
index cb7d5f1af6c6..4f6c522a1bb1 100644
--- a/tests/source-maps.test.js
+++ b/tests/source-maps.test.js
@@ -98,293 +98,294 @@ crosscheck(({ stable, oxide }) => {
       '2:6-20 -> 19:2-18',
       '2:20 -> 20:0',
       '2:6 -> 22:0',
-      '2:20 -> 28:1',
-      '2:6 -> 30:0',
-      '2:6-20 -> 31:2-26',
-      '2:6-20 -> 32:2-40',
-      '2:6-20 -> 33:2-26',
-      '2:6-20 -> 34:2-21',
-      '2:6-20 -> 35:2-230',
-      '2:6-20 -> 36:2-39',
-      '2:20 -> 37:0',
-      '2:6 -> 39:0',
-      '2:20 -> 42:1',
-      '2:6 -> 44:0',
-      '2:6-20 -> 45:2-19',
-      '2:6-20 -> 46:2-30',
-      '2:20 -> 47:0',
-      '2:6 -> 49:0',
-      '2:20 -> 53:1',
-      '2:6 -> 55:0',
-      '2:6-20 -> 56:2-19',
-      '2:6-20 -> 57:2-24',
-      '2:6-20 -> 58:2-31',
-      '2:20 -> 59:0',
-      '2:6 -> 61:0',
-      '2:20 -> 63:1',
-      '2:6 -> 65:0',
-      '2:6-20 -> 66:2-35',
-      '2:20 -> 67:0',
-      '2:6 -> 69:0',
-      '2:20 -> 71:1',
-      '2:6 -> 73:0',
-      '2:6-20 -> 79:2-20',
-      '2:6-20 -> 80:2-22',
-      '2:20 -> 81:0',
-      '2:6 -> 83:0',
-      '2:20 -> 85:1',
-      '2:6 -> 87:0',
-      '2:6-20 -> 88:2-16',
-      '2:6-20 -> 89:2-26',
-      '2:20 -> 90:0',
-      '2:6 -> 92:0',
-      '2:20 -> 94:1',
-      '2:6 -> 96:0',
-      '2:6-20 -> 98:2-21',
-      '2:20 -> 99:0',
-      '2:6 -> 101:0',
-      '2:20 -> 104:1',
-      '2:6 -> 106:0',
-      '2:6-20 -> 110:2-121',
-      '2:6-20 -> 111:2-24',
-      '2:20 -> 112:0',
-      '2:6 -> 114:0',
-      '2:20 -> 116:1',
-      '2:6 -> 118:0',
-      '2:6-20 -> 119:2-16',
-      '2:20 -> 120:0',
-      '2:6 -> 122:0',
-      '2:20 -> 124:1',
-      '2:6 -> 126:0',
-      '2:6-20 -> 128:2-16',
-      '2:6-20 -> 129:2-16',
-      '2:6-20 -> 130:2-20',
-      '2:6-20 -> 131:2-26',
-      '2:20 -> 132:0',
-      '2:6 -> 134:0',
-      '2:6-20 -> 135:2-17',
-      '2:20 -> 136:0',
-      '2:6 -> 138:0',
-      '2:6-20 -> 139:2-13',
-      '2:20 -> 140:0',
-      '2:6 -> 142:0',
-      '2:20 -> 146:1',
-      '2:6 -> 148:0',
-      '2:6-20 -> 149:2-24',
-      '2:6-20 -> 150:2-31',
-      '2:6-20 -> 151:2-35',
-      '2:20 -> 152:0',
-      '2:6 -> 154:0',
-      '2:20 -> 158:1',
-      '2:6 -> 160:0',
-      '2:6-20 -> 165:2-30',
-      '2:6-20 -> 166:2-25',
+      '2:20 -> 29:1',
+      '2:6 -> 31:0',
+      '2:6-20 -> 32:2-26',
+      '2:6-20 -> 33:2-40',
+      '2:6-20 -> 34:2-26',
+      '2:6-20 -> 35:2-21',
+      '2:6-20 -> 36:2-230',
+      '2:6-20 -> 37:2-39',
+      '2:6-20 -> 38:2-41',
+      '2:20 -> 39:0',
+      '2:6 -> 41:0',
+      '2:20 -> 44:1',
+      '2:6 -> 46:0',
+      '2:6-20 -> 47:2-19',
+      '2:6-20 -> 48:2-30',
+      '2:20 -> 49:0',
+      '2:6 -> 51:0',
+      '2:20 -> 55:1',
+      '2:6 -> 57:0',
+      '2:6-20 -> 58:2-19',
+      '2:6-20 -> 59:2-24',
+      '2:6-20 -> 60:2-31',
+      '2:20 -> 61:0',
+      '2:6 -> 63:0',
+      '2:20 -> 65:1',
+      '2:6 -> 67:0',
+      '2:6-20 -> 68:2-35',
+      '2:20 -> 69:0',
+      '2:6 -> 71:0',
+      '2:20 -> 73:1',
+      '2:6 -> 75:0',
+      '2:6-20 -> 81:2-20',
+      '2:6-20 -> 82:2-22',
+      '2:20 -> 83:0',
+      '2:6 -> 85:0',
+      '2:20 -> 87:1',
+      '2:6 -> 89:0',
+      '2:6-20 -> 90:2-16',
+      '2:6-20 -> 91:2-26',
+      '2:20 -> 92:0',
+      '2:6 -> 94:0',
+      '2:20 -> 96:1',
+      '2:6 -> 98:0',
+      '2:6-20 -> 100:2-21',
+      '2:20 -> 101:0',
+      '2:6 -> 103:0',
+      '2:20 -> 106:1',
+      '2:6 -> 108:0',
+      '2:6-20 -> 112:2-121',
+      '2:6-20 -> 113:2-24',
+      '2:20 -> 114:0',
+      '2:6 -> 116:0',
+      '2:20 -> 118:1',
+      '2:6 -> 120:0',
+      '2:6-20 -> 121:2-16',
+      '2:20 -> 122:0',
+      '2:6 -> 124:0',
+      '2:20 -> 126:1',
+      '2:6 -> 128:0',
+      '2:6-20 -> 130:2-16',
+      '2:6-20 -> 131:2-16',
+      '2:6-20 -> 132:2-20',
+      '2:6-20 -> 133:2-26',
+      '2:20 -> 134:0',
+      '2:6 -> 136:0',
+      '2:6-20 -> 137:2-17',
+      '2:20 -> 138:0',
+      '2:6 -> 140:0',
+      '2:6-20 -> 141:2-13',
+      '2:20 -> 142:0',
+      '2:6 -> 144:0',
+      '2:20 -> 148:1',
+      '2:6 -> 150:0',
+      '2:6-20 -> 151:2-24',
+      '2:6-20 -> 152:2-31',
+      '2:6-20 -> 153:2-35',
+      '2:20 -> 154:0',
+      '2:6 -> 156:0',
+      '2:20 -> 160:1',
+      '2:6 -> 162:0',
       '2:6-20 -> 167:2-30',
-      '2:6-20 -> 168:2-30',
-      '2:6-20 -> 169:2-24',
-      '2:6-20 -> 170:2-19',
-      '2:6-20 -> 171:2-20',
-      '2:20 -> 172:0',
-      '2:6 -> 174:0',
-      '2:20 -> 176:1',
-      '2:6 -> 178:0',
-      '2:6-20 -> 180:2-22',
-      '2:20 -> 181:0',
-      '2:6 -> 183:0',
-      '2:20 -> 186:1',
-      '2:6 -> 188:0',
-      '2:6-20 -> 192:2-36',
-      '2:6-20 -> 193:2-39',
-      '2:6-20 -> 194:2-32',
-      '2:20 -> 195:0',
-      '2:6 -> 197:0',
-      '2:20 -> 199:1',
-      '2:6 -> 201:0',
-      '2:6-20 -> 202:2-15',
-      '2:20 -> 203:0',
-      '2:6 -> 205:0',
-      '2:20 -> 207:1',
-      '2:6 -> 209:0',
-      '2:6-20 -> 210:2-18',
-      '2:20 -> 211:0',
-      '2:6 -> 213:0',
-      '2:20 -> 215:1',
-      '2:6 -> 217:0',
-      '2:6-20 -> 218:2-26',
-      '2:20 -> 219:0',
-      '2:6 -> 221:0',
-      '2:20 -> 223:1',
-      '2:6 -> 225:0',
-      '2:6-20 -> 227:2-14',
-      '2:20 -> 228:0',
-      '2:6 -> 230:0',
-      '2:20 -> 233:1',
-      '2:6 -> 235:0',
-      '2:6-20 -> 236:2-39',
-      '2:6-20 -> 237:2-30',
-      '2:20 -> 238:0',
-      '2:6 -> 240:0',
-      '2:20 -> 242:1',
-      '2:6 -> 244:0',
-      '2:6-20 -> 245:2-26',
-      '2:20 -> 246:0',
-      '2:6 -> 248:0',
-      '2:20 -> 251:1',
-      '2:6 -> 253:0',
-      '2:6-20 -> 254:2-36',
-      '2:6-20 -> 255:2-23',
-      '2:20 -> 256:0',
-      '2:6 -> 258:0',
-      '2:20 -> 260:1',
-      '2:6 -> 262:0',
-      '2:6-20 -> 263:2-20',
-      '2:20 -> 264:0',
-      '2:6 -> 266:0',
-      '2:20 -> 268:1',
-      '2:6 -> 270:0',
-      '2:6-20 -> 283:2-11',
-      '2:20 -> 284:0',
-      '2:6 -> 286:0',
-      '2:6-20 -> 287:2-11',
-      '2:6-20 -> 288:2-12',
-      '2:20 -> 289:0',
-      '2:6 -> 291:0',
-      '2:6-20 -> 292:2-12',
-      '2:20 -> 293:0',
-      '2:6 -> 295:0',
-      '2:6-20 -> 298:2-18',
-      '2:6-20 -> 299:2-11',
-      '2:6-20 -> 300:2-12',
-      '2:20 -> 301:0',
-      '2:6 -> 303:0',
-      '2:20 -> 305:1',
-      '2:6 -> 307:0',
-      '2:6-20 -> 308:2-18',
-      '2:20 -> 309:0',
-      '2:6 -> 311:0',
-      '2:20 -> 314:1',
-      '2:6 -> 316:0',
-      '2:6-20 -> 318:2-20',
-      '2:6-20 -> 319:2-24',
-      '2:20 -> 320:0',
-      '2:6 -> 322:0',
-      '2:20 -> 324:1',
-      '2:6 -> 326:0',
-      '2:6-20 -> 328:2-17',
-      '2:20 -> 329:0',
-      '2:6 -> 331:0',
-      '2:20 -> 333:1',
-      '2:6 -> 334:0',
-      '2:6-20 -> 335:2-17',
-      '2:20 -> 336:0',
-      '2:6 -> 338:0',
-      '2:20 -> 342:1',
-      '2:6 -> 344:0',
-      '2:6-20 -> 352:2-24',
-      '2:6-20 -> 353:2-32',
-      '2:20 -> 354:0',
-      '2:6 -> 356:0',
-      '2:20 -> 358:1',
-      '2:6 -> 360:0',
-      '2:6-20 -> 362:2-17',
-      '2:6-20 -> 363:2-14',
-      '2:20 -> 364:0',
-      '2:6-20 -> 366:0-72',
-      '2:6 -> 367:0',
-      '2:6-20 -> 368:2-15',
-      '2:20 -> 369:0',
-      '2:6 -> 371:0',
-      '2:6-20 -> 372:2-26',
-      '2:6-20 -> 373:2-26',
-      '2:6-20 -> 374:2-21',
-      '2:6-20 -> 375:2-21',
-      '2:6-20 -> 376:2-16',
-      '2:6-20 -> 377:2-16',
+      '2:6-20 -> 168:2-25',
+      '2:6-20 -> 169:2-30',
+      '2:6-20 -> 170:2-30',
+      '2:6-20 -> 171:2-24',
+      '2:6-20 -> 172:2-19',
+      '2:6-20 -> 173:2-20',
+      '2:20 -> 174:0',
+      '2:6 -> 176:0',
+      '2:20 -> 178:1',
+      '2:6 -> 180:0',
+      '2:6-20 -> 182:2-22',
+      '2:20 -> 183:0',
+      '2:6 -> 185:0',
+      '2:20 -> 188:1',
+      '2:6 -> 190:0',
+      '2:6-20 -> 194:2-36',
+      '2:6-20 -> 195:2-39',
+      '2:6-20 -> 196:2-32',
+      '2:20 -> 197:0',
+      '2:6 -> 199:0',
+      '2:20 -> 201:1',
+      '2:6 -> 203:0',
+      '2:6-20 -> 204:2-15',
+      '2:20 -> 205:0',
+      '2:6 -> 207:0',
+      '2:20 -> 209:1',
+      '2:6 -> 211:0',
+      '2:6-20 -> 212:2-18',
+      '2:20 -> 213:0',
+      '2:6 -> 215:0',
+      '2:20 -> 217:1',
+      '2:6 -> 219:0',
+      '2:6-20 -> 220:2-26',
+      '2:20 -> 221:0',
+      '2:6 -> 223:0',
+      '2:20 -> 225:1',
+      '2:6 -> 227:0',
+      '2:6-20 -> 229:2-14',
+      '2:20 -> 230:0',
+      '2:6 -> 232:0',
+      '2:20 -> 235:1',
+      '2:6 -> 237:0',
+      '2:6-20 -> 238:2-39',
+      '2:6-20 -> 239:2-30',
+      '2:20 -> 240:0',
+      '2:6 -> 242:0',
+      '2:20 -> 244:1',
+      '2:6 -> 246:0',
+      '2:6-20 -> 247:2-26',
+      '2:20 -> 248:0',
+      '2:6 -> 250:0',
+      '2:20 -> 253:1',
+      '2:6 -> 255:0',
+      '2:6-20 -> 256:2-36',
+      '2:6-20 -> 257:2-23',
+      '2:20 -> 258:0',
+      '2:6 -> 260:0',
+      '2:20 -> 262:1',
+      '2:6 -> 264:0',
+      '2:6-20 -> 265:2-20',
+      '2:20 -> 266:0',
+      '2:6 -> 268:0',
+      '2:20 -> 270:1',
+      '2:6 -> 272:0',
+      '2:6-20 -> 285:2-11',
+      '2:20 -> 286:0',
+      '2:6 -> 288:0',
+      '2:6-20 -> 289:2-11',
+      '2:6-20 -> 290:2-12',
+      '2:20 -> 291:0',
+      '2:6 -> 293:0',
+      '2:6-20 -> 294:2-12',
+      '2:20 -> 295:0',
+      '2:6 -> 297:0',
+      '2:6-20 -> 300:2-18',
+      '2:6-20 -> 301:2-11',
+      '2:6-20 -> 302:2-12',
+      '2:20 -> 303:0',
+      '2:6 -> 305:0',
+      '2:20 -> 307:1',
+      '2:6 -> 309:0',
+      '2:6-20 -> 310:2-18',
+      '2:20 -> 311:0',
+      '2:6 -> 313:0',
+      '2:20 -> 316:1',
+      '2:6 -> 318:0',
+      '2:6-20 -> 320:2-20',
+      '2:6-20 -> 321:2-24',
+      '2:20 -> 322:0',
+      '2:6 -> 324:0',
+      '2:20 -> 326:1',
+      '2:6 -> 328:0',
+      '2:6-20 -> 330:2-17',
+      '2:20 -> 331:0',
+      '2:6 -> 333:0',
+      '2:20 -> 335:1',
+      '2:6 -> 336:0',
+      '2:6-20 -> 337:2-17',
+      '2:20 -> 338:0',
+      '2:6 -> 340:0',
+      '2:20 -> 344:1',
+      '2:6 -> 346:0',
+      '2:6-20 -> 354:2-24',
+      '2:6-20 -> 355:2-32',
+      '2:20 -> 356:0',
+      '2:6 -> 358:0',
+      '2:20 -> 360:1',
+      '2:6 -> 362:0',
+      '2:6-20 -> 364:2-17',
+      '2:6-20 -> 365:2-14',
+      '2:20 -> 366:0',
+      '2:6-20 -> 368:0-72',
+      '2:6 -> 369:0',
+      '2:6-20 -> 370:2-15',
+      '2:20 -> 371:0',
+      '2:6 -> 373:0',
+      '2:6-20 -> 374:2-26',
+      '2:6-20 -> 375:2-26',
+      '2:6-20 -> 376:2-21',
+      '2:6-20 -> 377:2-21',
       '2:6-20 -> 378:2-16',
-      '2:6-20 -> 379:2-17',
-      '2:6-20 -> 380:2-17',
-      '2:6-20 -> 381:2-15',
-      '2:6-20 -> 382:2-15',
-      '2:6-20 -> 383:2-20',
-      '2:6-20 -> 384:2-40',
-      '2:6-20 -> 385:2-17',
-      '2:6-20 -> 386:2-22',
-      '2:6-20 -> 387:2-24',
-      '2:6-20 -> 388:2-25',
-      '2:6-20 -> 389:2-26',
-      '2:6-20 -> 390:2-20',
-      '2:6-20 -> 391:2-29',
-      '2:6-20 -> 392:2-30',
-      '2:6-20 -> 393:2-40',
-      '2:6-20 -> 394:2-36',
-      '2:6-20 -> 395:2-29',
-      '2:6-20 -> 396:2-24',
-      '2:6-20 -> 397:2-32',
-      '2:6-20 -> 398:2-14',
-      '2:6-20 -> 399:2-20',
-      '2:6-20 -> 400:2-18',
-      '2:6-20 -> 401:2-19',
-      '2:6-20 -> 402:2-20',
-      '2:6-20 -> 403:2-16',
-      '2:6-20 -> 404:2-18',
-      '2:6-20 -> 405:2-15',
-      '2:6-20 -> 406:2-21',
-      '2:6-20 -> 407:2-23',
-      '2:6-20 -> 408:2-29',
-      '2:6-20 -> 409:2-27',
-      '2:6-20 -> 410:2-28',
-      '2:6-20 -> 411:2-29',
-      '2:6-20 -> 412:2-25',
-      '2:6-20 -> 413:2-26',
-      '2:6-20 -> 414:2-27',
-      '2:6 -> 415:2',
-      '2:20 -> 416:0',
-      '2:6 -> 418:0',
-      '2:6-20 -> 419:2-26',
-      '2:6-20 -> 420:2-26',
-      '2:6-20 -> 421:2-21',
-      '2:6-20 -> 422:2-21',
-      '2:6-20 -> 423:2-16',
-      '2:6-20 -> 424:2-16',
+      '2:6-20 -> 379:2-16',
+      '2:6-20 -> 380:2-16',
+      '2:6-20 -> 381:2-17',
+      '2:6-20 -> 382:2-17',
+      '2:6-20 -> 383:2-15',
+      '2:6-20 -> 384:2-15',
+      '2:6-20 -> 385:2-20',
+      '2:6-20 -> 386:2-40',
+      '2:6-20 -> 387:2-17',
+      '2:6-20 -> 388:2-22',
+      '2:6-20 -> 389:2-24',
+      '2:6-20 -> 390:2-25',
+      '2:6-20 -> 391:2-26',
+      '2:6-20 -> 392:2-20',
+      '2:6-20 -> 393:2-29',
+      '2:6-20 -> 394:2-30',
+      '2:6-20 -> 395:2-40',
+      '2:6-20 -> 396:2-36',
+      '2:6-20 -> 397:2-29',
+      '2:6-20 -> 398:2-24',
+      '2:6-20 -> 399:2-32',
+      '2:6-20 -> 400:2-14',
+      '2:6-20 -> 401:2-20',
+      '2:6-20 -> 402:2-18',
+      '2:6-20 -> 403:2-19',
+      '2:6-20 -> 404:2-20',
+      '2:6-20 -> 405:2-16',
+      '2:6-20 -> 406:2-18',
+      '2:6-20 -> 407:2-15',
+      '2:6-20 -> 408:2-21',
+      '2:6-20 -> 409:2-23',
+      '2:6-20 -> 410:2-29',
+      '2:6-20 -> 411:2-27',
+      '2:6-20 -> 412:2-28',
+      '2:6-20 -> 413:2-29',
+      '2:6-20 -> 414:2-25',
+      '2:6-20 -> 415:2-26',
+      '2:6-20 -> 416:2-27',
+      '2:6 -> 417:2',
+      '2:20 -> 418:0',
+      '2:6 -> 420:0',
+      '2:6-20 -> 421:2-26',
+      '2:6-20 -> 422:2-26',
+      '2:6-20 -> 423:2-21',
+      '2:6-20 -> 424:2-21',
       '2:6-20 -> 425:2-16',
-      '2:6-20 -> 426:2-17',
-      '2:6-20 -> 427:2-17',
-      '2:6-20 -> 428:2-15',
-      '2:6-20 -> 429:2-15',
-      '2:6-20 -> 430:2-20',
-      '2:6-20 -> 431:2-40',
-      '2:6-20 -> 432:2-17',
-      '2:6-20 -> 433:2-22',
-      '2:6-20 -> 434:2-24',
-      '2:6-20 -> 435:2-25',
-      '2:6-20 -> 436:2-26',
-      '2:6-20 -> 437:2-20',
-      '2:6-20 -> 438:2-29',
-      '2:6-20 -> 439:2-30',
-      '2:6-20 -> 440:2-40',
-      '2:6-20 -> 441:2-36',
-      '2:6-20 -> 442:2-29',
-      '2:6-20 -> 443:2-24',
-      '2:6-20 -> 444:2-32',
-      '2:6-20 -> 445:2-14',
-      '2:6-20 -> 446:2-20',
-      '2:6-20 -> 447:2-18',
-      '2:6-20 -> 448:2-19',
-      '2:6-20 -> 449:2-20',
-      '2:6-20 -> 450:2-16',
-      '2:6-20 -> 451:2-18',
-      '2:6-20 -> 452:2-15',
-      '2:6-20 -> 453:2-21',
-      '2:6-20 -> 454:2-23',
-      '2:6-20 -> 455:2-29',
-      '2:6-20 -> 456:2-27',
-      '2:6-20 -> 457:2-28',
-      '2:6-20 -> 458:2-29',
-      '2:6-20 -> 459:2-25',
-      '2:6-20 -> 460:2-26',
-      '2:6-20 -> 461:2-27',
-      '2:6 -> 462:2',
-      '2:20 -> 463:0',
+      '2:6-20 -> 426:2-16',
+      '2:6-20 -> 427:2-16',
+      '2:6-20 -> 428:2-17',
+      '2:6-20 -> 429:2-17',
+      '2:6-20 -> 430:2-15',
+      '2:6-20 -> 431:2-15',
+      '2:6-20 -> 432:2-20',
+      '2:6-20 -> 433:2-40',
+      '2:6-20 -> 434:2-17',
+      '2:6-20 -> 435:2-22',
+      '2:6-20 -> 436:2-24',
+      '2:6-20 -> 437:2-25',
+      '2:6-20 -> 438:2-26',
+      '2:6-20 -> 439:2-20',
+      '2:6-20 -> 440:2-29',
+      '2:6-20 -> 441:2-30',
+      '2:6-20 -> 442:2-40',
+      '2:6-20 -> 443:2-36',
+      '2:6-20 -> 444:2-29',
+      '2:6-20 -> 445:2-24',
+      '2:6-20 -> 446:2-32',
+      '2:6-20 -> 447:2-14',
+      '2:6-20 -> 448:2-20',
+      '2:6-20 -> 449:2-18',
+      '2:6-20 -> 450:2-19',
+      '2:6-20 -> 451:2-20',
+      '2:6-20 -> 452:2-16',
+      '2:6-20 -> 453:2-18',
+      '2:6-20 -> 454:2-15',
+      '2:6-20 -> 455:2-21',
+      '2:6-20 -> 456:2-23',
+      '2:6-20 -> 457:2-29',
+      '2:6-20 -> 458:2-27',
+      '2:6-20 -> 459:2-28',
+      '2:6-20 -> 460:2-29',
+      '2:6-20 -> 461:2-25',
+      '2:6-20 -> 462:2-26',
+      '2:6-20 -> 463:2-27',
+      '2:6 -> 464:2',
+      '2:20 -> 465:0',
     ])
   })
 
diff --git a/tests/variants.oxide.test.css b/tests/variants.oxide.test.css
index 7d0120d127a6..a00e42f2f0bf 100644
--- a/tests/variants.oxide.test.css
+++ b/tests/variants.oxide.test.css
@@ -237,8 +237,8 @@
 }
 .group[open]:hover .group-open\:group-hover\:space-x-2 > :not([hidden]) ~ :not([hidden]) {
   --tw-space-x-reverse: 0;
-  margin-right: calc(0.5rem * var(--tw-space-x-reverse));
-  margin-left: calc(0.5rem * calc(1 - var(--tw-space-x-reverse)));
+  margin-inline-start: calc(0.5rem * calc(1 - var(--tw-space-x-reverse)));
+  margin-inline-end: calc(0.5rem * var(--tw-space-x-reverse));
 }
 .group:focus .group-focus\:shadow-md {
   --tw-shadow: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
diff --git a/types/config.d.ts b/types/config.d.ts
index 7b2a3eebcf60..81e3c342db16 100644
--- a/types/config.d.ts
+++ b/types/config.d.ts
@@ -168,7 +168,13 @@ interface ThemeConfig {
       string,
       | string
       | string[]
-      | [fontFamily: string | string[], configuration: Partial<{ fontFeatureSettings: string }>]
+      | [
+          fontFamily: string | string[],
+          configuration: Partial<{
+            fontFeatureSettings: string
+            fontVariationSettings: string
+          }>
+        ]
     >
   >
   fontSize: ResolvableTo<

From 6c77544b994549da3c6b1973887b3d437bc0c008 Mon Sep 17 00:00:00 2001
From: Justin Wong <11310624+wongjn@users.noreply.github.com>
Date: Wed, 8 Feb 2023 16:57:15 +0000
Subject: [PATCH 02/84] Fix spelling errors in CHANGELOG.md (#10533)

---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6e46d3129ec..210a6bd67077 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,7 +64,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Alphabetize `theme` keys in default config ([#9953](https://github.com/tailwindlabs/tailwindcss/pull/9953))
 - Update esbuild to v17 ([#10368](https://github.com/tailwindlabs/tailwindcss/pull/10368))
-- Include `outline-color` in `transition` and `transition-colors` utilitires ([#10385](https://github.com/tailwindlabs/tailwindcss/pull/10385))
+- Include `outline-color` in `transition` and `transition-colors` utilities ([#10385](https://github.com/tailwindlabs/tailwindcss/pull/10385))
 
 ## [3.2.4] - 2022-11-11
 
@@ -297,7 +297,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Split box shadows on top-level commas only ([#7479](https://github.com/tailwindlabs/tailwindcss/pull/7479))
 - Use local user CSS cache for `@apply` ([#7524](https://github.com/tailwindlabs/tailwindcss/pull/7524))
 - Invalidate context when main CSS changes ([#7626](https://github.com/tailwindlabs/tailwindcss/pull/7626))
-- Only add `!` to selector class matching template candidate when using important modifier with mutli-class selectors ([#7664](https://github.com/tailwindlabs/tailwindcss/pull/7664))
+- Only add `!` to selector class matching template candidate when using important modifier with multi-class selectors ([#7664](https://github.com/tailwindlabs/tailwindcss/pull/7664))
 - Correctly parse and prefix animation names with dots ([#7163](https://github.com/tailwindlabs/tailwindcss/pull/7163))
 - Fix extraction from template literal/function with array ([#7481](https://github.com/tailwindlabs/tailwindcss/pull/7481))
 - Don't output unparsable arbitrary values ([#7789](https://github.com/tailwindlabs/tailwindcss/pull/7789))
@@ -741,7 +741,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Remove outdated focus style fix in Preflight ([#4780](https://github.com/tailwindlabs/tailwindcss/pull/4780))
 - Enable `purge` if provided on the CLI ([#4772](https://github.com/tailwindlabs/tailwindcss/pull/4772))
 - JIT: Fix error when not using a config file with postcss-cli ([#4773](https://github.com/tailwindlabs/tailwindcss/pull/4773))
-- Fix issue with `resolveConfig` not being importable in Next.js pags ([#4725](https://github.com/tailwindlabs/tailwindcss/pull/4725))
+- Fix issue with `resolveConfig` not being importable in Next.js pages ([#4725](https://github.com/tailwindlabs/tailwindcss/pull/4725))
 
 ## [2.2.2] - 2021-06-18
 
@@ -876,7 +876,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fix issue with `@apply` not working as expected with `!important` inside an atrule ([#2824](https://github.com/tailwindlabs/tailwindcss/pull/2824))
+- Fix issue with `@apply` not working as expected with `!important` inside an at-rule ([#2824](https://github.com/tailwindlabs/tailwindcss/pull/2824))
 - Fix issue with `@apply` not working as expected with defined classes ([#2832](https://github.com/tailwindlabs/tailwindcss/pull/2832))
 - Fix memory leak, and broken `@apply` when splitting up files ([#3032](https://github.com/tailwindlabs/tailwindcss/pull/3032))
 

From bcf983a34efb65c459202cc5889d39005998714b Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Fri, 10 Feb 2023 02:42:08 +0000
Subject: [PATCH 03/84] Update vite to version 4.1.1

---
 integrations/vite/package.json |  2 +-
 package-lock.json              | 82 ++++++++++------------------------
 2 files changed, 25 insertions(+), 59 deletions(-)

diff --git a/integrations/vite/package.json b/integrations/vite/package.json
index 05575d21437e..46b0146d3595 100644
--- a/integrations/vite/package.json
+++ b/integrations/vite/package.json
@@ -17,6 +17,6 @@
   },
   "devDependencies": {
     "isomorphic-fetch": "^3.0.0",
-    "vite": "^4.0.4"
+    "vite": "^4.1.1"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index c9706c573602..62af0f1de89e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -107,7 +107,7 @@
       "devDependencies": {
         "rollup": "^3.10.0",
         "rollup-plugin-postcss": "^4.0.2",
-        "sass": "1.58.0"
+        "sass": "^1.58.0"
       }
     },
     "integrations/tailwindcss-cli": {
@@ -122,7 +122,7 @@
       "version": "0.0.0",
       "devDependencies": {
         "isomorphic-fetch": "^3.0.0",
-        "vite": "^4.0.4"
+        "vite": "4.1.1"
       }
     },
     "integrations/webpack-4": {
@@ -14289,15 +14289,15 @@
       "dev": true
     },
     "node_modules/vite": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.0.4.tgz",
-      "integrity": "sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.1.1.tgz",
+      "integrity": "sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==",
       "dev": true,
       "dependencies": {
-        "esbuild": "^0.16.3",
-        "postcss": "^8.4.20",
+        "esbuild": "^0.16.14",
+        "postcss": "^8.4.21",
         "resolve": "^1.22.1",
-        "rollup": "^3.7.0"
+        "rollup": "^3.10.0"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -14726,22 +14726,6 @@
         "@esbuild/win32-x64": "0.16.17"
       }
     },
-    "node_modules/vite/node_modules/rollup": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.10.0.tgz",
-      "integrity": "sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA==",
-      "dev": true,
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=14.18.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "node_modules/vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
@@ -17807,7 +17791,7 @@
       "requires": {
         "rollup": "^3.10.0",
         "rollup-plugin-postcss": "^4.0.2",
-        "sass": "1.58.0"
+        "sass": "^1.58.0"
       }
     },
     "@tailwindcss/integrations-tailwindcss-cli": {
@@ -17820,7 +17804,7 @@
       "version": "file:integrations/vite",
       "requires": {
         "isomorphic-fetch": "^3.0.0",
-        "vite": "^4.0.4"
+        "vite": "4.1.1"
       }
     },
     "@tailwindcss/integrations-webpack-4": {
@@ -27507,7 +27491,7 @@
           "requires": {
             "rollup": "^3.10.0",
             "rollup-plugin-postcss": "^4.0.2",
-            "sass": "1.58.0"
+            "sass": "^1.58.0"
           }
         },
         "@tailwindcss/integrations-tailwindcss-cli": {
@@ -27520,7 +27504,7 @@
           "version": "file:integrations/vite",
           "requires": {
             "isomorphic-fetch": "^3.0.0",
-            "vite": "^4.0.4"
+            "vite": "4.1.1"
           }
         },
         "@tailwindcss/integrations-webpack-4": {
@@ -35384,16 +35368,16 @@
           }
         },
         "vite": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/vite/-/vite-4.0.4.tgz",
-          "integrity": "sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/vite/-/vite-4.1.1.tgz",
+          "integrity": "sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==",
           "dev": true,
           "requires": {
-            "esbuild": "^0.16.3",
+            "esbuild": "^0.16.14",
             "fsevents": "~2.3.2",
-            "postcss": "^8.4.20",
+            "postcss": "^8.4.21",
             "resolve": "^1.22.1",
-            "rollup": "^3.7.0"
+            "rollup": "^3.10.0"
           },
           "dependencies": {
             "@esbuild/android-arm": {
@@ -35579,15 +35563,6 @@
                 "@esbuild/win32-ia32": "0.16.17",
                 "@esbuild/win32-x64": "0.16.17"
               }
-            },
-            "rollup": {
-              "version": "3.10.0",
-              "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.10.0.tgz",
-              "integrity": "sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA==",
-              "dev": true,
-              "requires": {
-                "fsevents": "~2.3.2"
-              }
             }
           }
         },
@@ -36702,16 +36677,16 @@
       }
     },
     "vite": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.0.4.tgz",
-      "integrity": "sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.1.1.tgz",
+      "integrity": "sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==",
       "dev": true,
       "requires": {
-        "esbuild": "^0.16.3",
+        "esbuild": "^0.16.14",
         "fsevents": "~2.3.2",
-        "postcss": "^8.4.20",
+        "postcss": "^8.4.21",
         "resolve": "^1.22.1",
-        "rollup": "^3.7.0"
+        "rollup": "^3.10.0"
       },
       "dependencies": {
         "@esbuild/android-arm": {
@@ -36897,15 +36872,6 @@
             "@esbuild/win32-ia32": "0.16.17",
             "@esbuild/win32-x64": "0.16.17"
           }
-        },
-        "rollup": {
-          "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.10.0.tgz",
-          "integrity": "sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA==",
-          "dev": true,
-          "requires": {
-            "fsevents": "~2.3.2"
-          }
         }
       }
     },

From fa693e50c5e8631c21ab54affda0a48446763052 Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Tue, 14 Feb 2023 09:14:54 -0500
Subject: [PATCH 04/84] Update CHANGELOG.md

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 210a6bd67077..97cbfeaa0851 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- drop oxide api shim ([add16364b4b1100e1af23ad1ca6900a0b53cbba0](https://github.com/tailwindlabs/tailwindcss/commit/add16364b4b1100e1af23ad1ca6900a0b53cbba0))
+- Fix installation failing with yarn and pnpm by dropping `oxide-api-shim` ([add1636](https://github.com/tailwindlabs/tailwindcss/commit/add16364b4b1100e1af23ad1ca6900a0b53cbba0))
 
 ## [3.2.5] - 2023-02-08
 
@@ -35,7 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Cleanup unused `variantOrder` ([#9829](https://github.com/tailwindlabs/tailwindcss/pull/9829))
 - Fix `foo-[abc]/[def]` not being handled correctly ([#9866](https://github.com/tailwindlabs/tailwindcss/pull/9866))
 - Add container queries plugin to standalone CLI ([#9865](https://github.com/tailwindlabs/tailwindcss/pull/9865))
-- Support renaming of output files by `PostCSS` plugin. ([#9944](https://github.com/tailwindlabs/tailwindcss/pull/9944))
+- Support renaming of output files by PostCSS plugins in CLI ([#9944](https://github.com/tailwindlabs/tailwindcss/pull/9944))
 - Improve return value of `resolveConfig`, unwrap `ResolvableTo` ([#9972](https://github.com/tailwindlabs/tailwindcss/pull/9972))
 - Clip unbalanced brackets in arbitrary values ([#9973](https://github.com/tailwindlabs/tailwindcss/pull/9973))
 - Don’t reorder webkit scrollbar pseudo elements ([#9991](https://github.com/tailwindlabs/tailwindcss/pull/9991))
@@ -106,7 +106,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix missing `supports` in types ([#9616](https://github.com/tailwindlabs/tailwindcss/pull/9616))
 - Fix missing PostCSS dependencies in the CLI ([#9617](https://github.com/tailwindlabs/tailwindcss/pull/9617))
 - Ensure `micromatch` is a proper CLI dependency ([#9620](https://github.com/tailwindlabs/tailwindcss/pull/9620))
-- Ensure modifier values exist when using a `modifiers` object for `matchVariant` ([ba6551db0f2726461371b4f3c6cd4c7090888504](https://github.com/tailwindlabs/tailwindcss/commit/ba6551db0f2726461371b4f3c6cd4c7090888504))
+- Ensure modifier values exist when using a `modifiers` object for `matchVariant` ([ba6551d](https://github.com/tailwindlabs/tailwindcss/commit/ba6551db0f2726461371b4f3c6cd4c7090888504))
 
 ## [3.2.0] - 2022-10-19
 

From 1c9b2d116d088bb735e193a037a68312091c7ede Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Wed, 15 Feb 2023 00:25:39 +0000
Subject: [PATCH 05/84] Update turbo to version 1.7.4

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 62af0f1de89e..d010af1ffa47 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -122,7 +122,7 @@
       "version": "0.0.0",
       "devDependencies": {
         "isomorphic-fetch": "^3.0.0",
-        "vite": "4.1.1"
+        "vite": "^4.1.1"
       }
     },
     "integrations/webpack-4": {
@@ -17804,7 +17804,7 @@
       "version": "file:integrations/vite",
       "requires": {
         "isomorphic-fetch": "^3.0.0",
-        "vite": "4.1.1"
+        "vite": "^4.1.1"
       }
     },
     "@tailwindcss/integrations-webpack-4": {
@@ -27504,7 +27504,7 @@
           "version": "file:integrations/vite",
           "requires": {
             "isomorphic-fetch": "^3.0.0",
-            "vite": "4.1.1"
+            "vite": "^4.1.1"
           }
         },
         "@tailwindcss/integrations-webpack-4": {
diff --git a/package.json b/package.json
index 23702274d009..b9e09db0bee3 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "prettier": "^2.8.3",
     "rimraf": "^3.0.0",
     "source-map-js": "^1.0.2",
-    "turbo": "^1.7.0"
+    "turbo": "^1.7.4"
   },
   "peerDependencies": {
     "postcss": "^8.0.9"

From 48c35b7d4722e6bd982e33aa95ff55ae04a3c622 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Wed, 15 Feb 2023 03:43:31 +0000
Subject: [PATCH 06/84] Update prettier to version 2.8.4

---
 package-lock.json | 166 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d010af1ffa47..eadbcd1f6202 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -61,7 +61,7 @@
         "prettier": "^2.8.3",
         "rimraf": "^3.0.0",
         "source-map-js": "^1.0.2",
-        "turbo": "^1.7.0"
+        "turbo": "^1.7.4"
       },
       "engines": {
         "node": ">=16.0.0"
@@ -13939,27 +13939,27 @@
       "dev": true
     },
     "node_modules/turbo": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.7.0.tgz",
-      "integrity": "sha512-cwympNwQNnQZ/TffBd8yT0i0O10Cf/hlxccCYgUcwhcGEb9rDjE5thDbHoHw1hlJQUF/5ua7ERJe7Zr0lNE/ww==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.7.4.tgz",
+      "integrity": "sha512-8RLedDoUL0kkVKWEZ/RMM70BvKLyDFen06QuKKhYC2XNOfNKqFDqzIdcY/vGick869bNIWalChoy4O07k0HLsA==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
         "turbo": "bin/turbo"
       },
       "optionalDependencies": {
-        "turbo-darwin-64": "1.7.0",
-        "turbo-darwin-arm64": "1.7.0",
-        "turbo-linux-64": "1.7.0",
-        "turbo-linux-arm64": "1.7.0",
-        "turbo-windows-64": "1.7.0",
-        "turbo-windows-arm64": "1.7.0"
+        "turbo-darwin-64": "1.7.4",
+        "turbo-darwin-arm64": "1.7.4",
+        "turbo-linux-64": "1.7.4",
+        "turbo-linux-arm64": "1.7.4",
+        "turbo-windows-64": "1.7.4",
+        "turbo-windows-arm64": "1.7.4"
       }
     },
     "node_modules/turbo-darwin-64": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.7.0.tgz",
-      "integrity": "sha512-hSGAueSf5Ko8J67mpqjpt9FsP6ePn1nMcl7IVPoJq5dHsgX3anCP/BPlexJ502bNK+87DDyhQhJ/LPSJXKrSYQ==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.7.4.tgz",
+      "integrity": "sha512-ZyYrQlUl8K/mYN1e6R7bEhPPYjMakz0DYMaexkyD7TAijQtWmTSd4a+I7VknOYNEssnUZ/v41GU3gPV1JAzxxQ==",
       "cpu": [
         "x64"
       ],
@@ -13970,9 +13970,9 @@
       ]
     },
     "node_modules/turbo-darwin-arm64": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.7.0.tgz",
-      "integrity": "sha512-BLLOW5W6VZxk5+0ZOj5AO1qjM0P5isIgjbEuyAl8lHZ4s9antUbY4CtFrspT32XxPTYoDl4UjviPMcSsbcl3WQ==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.7.4.tgz",
+      "integrity": "sha512-CKIXg9uqp1a+Yeq/c4U0alPOqvwLUq5SBZf1PGYhGqJsfG0fRBtJfkUjHuBsuJIOGXg8rCmcGSWGIsIF6fqYuw==",
       "cpu": [
         "arm64"
       ],
@@ -13983,9 +13983,9 @@
       ]
     },
     "node_modules/turbo-linux-64": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.7.0.tgz",
-      "integrity": "sha512-aw2qxmfZa+kT87SB3GNUoFimqEPzTlzlRqhPgHuAAT6Uf0JHnmebPt4K+ZPtDNl5yfVmtB05bhHPqw+5QV97Yg==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.7.4.tgz",
+      "integrity": "sha512-RIUl4RUFFyzD2T024vL7509Ygwcw+SEa8NOwPfaN6TtJHK7RZV/SBP3fLNVOptG9WRLnOWX3OvsLMbiOqDLLyA==",
       "cpu": [
         "x64"
       ],
@@ -13996,9 +13996,9 @@
       ]
     },
     "node_modules/turbo-linux-arm64": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.7.0.tgz",
-      "integrity": "sha512-AJEx2jX+zO5fQtJpO3r6uhTabj4oSA5ZhB7zTs/rwu/XqoydsvStA4X8NDW4poTbOjF7DcSHizqwi04tSMzpJw==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.7.4.tgz",
+      "integrity": "sha512-Bg65F0AjYYYxqE6RPf2H5TIGuA/EyWMeGOATHVSZOWAbYcnG3Ly03GZii8AHnUi7ntWBdjwvXf/QbOS1ayNB6A==",
       "cpu": [
         "arm64"
       ],
@@ -14009,9 +14009,9 @@
       ]
     },
     "node_modules/turbo-windows-64": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.7.0.tgz",
-      "integrity": "sha512-ewj7PPv2uxqv0r31hgnBa3E5qwUu7eyVRP5M1gB/TJXfSHduU79gbxpKCyxIZv2fL/N2/3U7EPOQPSZxBAoljA==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.7.4.tgz",
+      "integrity": "sha512-rTaV50XZ2BRxRHOHqt1UsWfeDmYLbn8UKE6g2D2ED+uW+kmnTvR9s01nmlGWd2sAuWcRYQyQ2V+O09VfKPKcQw==",
       "cpu": [
         "x64"
       ],
@@ -14022,9 +14022,9 @@
       ]
     },
     "node_modules/turbo-windows-arm64": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.7.0.tgz",
-      "integrity": "sha512-LzjOUzveWkvTD0jP8DBMYiAnYemmydsvqxdSmsUapHHJkl6wKZIOQNSO7pxsy+9XM/1/+0f9Y9F9ZNl5lePTEA==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.7.4.tgz",
+      "integrity": "sha512-h8sxdKPvHTnWUPtwnYszFMmSO0P/iUUwmYY9n7iYThA71zSao28UeZ0H0Gw75cY3MPjvkjn2C4EBAUGPjuZJLw==",
       "cpu": [
         "arm64"
       ],
@@ -25217,7 +25217,7 @@
         "resolve": "^1.22.1",
         "rimraf": "^3.0.0",
         "source-map-js": "^1.0.2",
-        "turbo": "^1.7.0"
+        "turbo": "^1.7.4"
       },
       "dependencies": {
         "@ampproject/remapping": {
@@ -35110,58 +35110,58 @@
           "dev": true
         },
         "turbo": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.7.0.tgz",
-          "integrity": "sha512-cwympNwQNnQZ/TffBd8yT0i0O10Cf/hlxccCYgUcwhcGEb9rDjE5thDbHoHw1hlJQUF/5ua7ERJe7Zr0lNE/ww==",
+          "version": "1.7.4",
+          "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.7.4.tgz",
+          "integrity": "sha512-8RLedDoUL0kkVKWEZ/RMM70BvKLyDFen06QuKKhYC2XNOfNKqFDqzIdcY/vGick869bNIWalChoy4O07k0HLsA==",
           "dev": true,
           "requires": {
-            "turbo-darwin-64": "1.7.0",
-            "turbo-darwin-arm64": "1.7.0",
-            "turbo-linux-64": "1.7.0",
-            "turbo-linux-arm64": "1.7.0",
-            "turbo-windows-64": "1.7.0",
-            "turbo-windows-arm64": "1.7.0"
+            "turbo-darwin-64": "1.7.4",
+            "turbo-darwin-arm64": "1.7.4",
+            "turbo-linux-64": "1.7.4",
+            "turbo-linux-arm64": "1.7.4",
+            "turbo-windows-64": "1.7.4",
+            "turbo-windows-arm64": "1.7.4"
           }
         },
         "turbo-darwin-64": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.7.0.tgz",
-          "integrity": "sha512-hSGAueSf5Ko8J67mpqjpt9FsP6ePn1nMcl7IVPoJq5dHsgX3anCP/BPlexJ502bNK+87DDyhQhJ/LPSJXKrSYQ==",
+          "version": "1.7.4",
+          "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.7.4.tgz",
+          "integrity": "sha512-ZyYrQlUl8K/mYN1e6R7bEhPPYjMakz0DYMaexkyD7TAijQtWmTSd4a+I7VknOYNEssnUZ/v41GU3gPV1JAzxxQ==",
           "dev": true,
           "optional": true
         },
         "turbo-darwin-arm64": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.7.0.tgz",
-          "integrity": "sha512-BLLOW5W6VZxk5+0ZOj5AO1qjM0P5isIgjbEuyAl8lHZ4s9antUbY4CtFrspT32XxPTYoDl4UjviPMcSsbcl3WQ==",
+          "version": "1.7.4",
+          "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.7.4.tgz",
+          "integrity": "sha512-CKIXg9uqp1a+Yeq/c4U0alPOqvwLUq5SBZf1PGYhGqJsfG0fRBtJfkUjHuBsuJIOGXg8rCmcGSWGIsIF6fqYuw==",
           "dev": true,
           "optional": true
         },
         "turbo-linux-64": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.7.0.tgz",
-          "integrity": "sha512-aw2qxmfZa+kT87SB3GNUoFimqEPzTlzlRqhPgHuAAT6Uf0JHnmebPt4K+ZPtDNl5yfVmtB05bhHPqw+5QV97Yg==",
+          "version": "1.7.4",
+          "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.7.4.tgz",
+          "integrity": "sha512-RIUl4RUFFyzD2T024vL7509Ygwcw+SEa8NOwPfaN6TtJHK7RZV/SBP3fLNVOptG9WRLnOWX3OvsLMbiOqDLLyA==",
           "dev": true,
           "optional": true
         },
         "turbo-linux-arm64": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.7.0.tgz",
-          "integrity": "sha512-AJEx2jX+zO5fQtJpO3r6uhTabj4oSA5ZhB7zTs/rwu/XqoydsvStA4X8NDW4poTbOjF7DcSHizqwi04tSMzpJw==",
+          "version": "1.7.4",
+          "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.7.4.tgz",
+          "integrity": "sha512-Bg65F0AjYYYxqE6RPf2H5TIGuA/EyWMeGOATHVSZOWAbYcnG3Ly03GZii8AHnUi7ntWBdjwvXf/QbOS1ayNB6A==",
           "dev": true,
           "optional": true
         },
         "turbo-windows-64": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.7.0.tgz",
-          "integrity": "sha512-ewj7PPv2uxqv0r31hgnBa3E5qwUu7eyVRP5M1gB/TJXfSHduU79gbxpKCyxIZv2fL/N2/3U7EPOQPSZxBAoljA==",
+          "version": "1.7.4",
+          "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.7.4.tgz",
+          "integrity": "sha512-rTaV50XZ2BRxRHOHqt1UsWfeDmYLbn8UKE6g2D2ED+uW+kmnTvR9s01nmlGWd2sAuWcRYQyQ2V+O09VfKPKcQw==",
           "dev": true,
           "optional": true
         },
         "turbo-windows-arm64": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.7.0.tgz",
-          "integrity": "sha512-LzjOUzveWkvTD0jP8DBMYiAnYemmydsvqxdSmsUapHHJkl6wKZIOQNSO7pxsy+9XM/1/+0f9Y9F9ZNl5lePTEA==",
+          "version": "1.7.4",
+          "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.7.4.tgz",
+          "integrity": "sha512-h8sxdKPvHTnWUPtwnYszFMmSO0P/iUUwmYY9n7iYThA71zSao28UeZ0H0Gw75cY3MPjvkjn2C4EBAUGPjuZJLw==",
           "dev": true,
           "optional": true
         },
@@ -36419,58 +36419,58 @@
       "dev": true
     },
     "turbo": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.7.0.tgz",
-      "integrity": "sha512-cwympNwQNnQZ/TffBd8yT0i0O10Cf/hlxccCYgUcwhcGEb9rDjE5thDbHoHw1hlJQUF/5ua7ERJe7Zr0lNE/ww==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.7.4.tgz",
+      "integrity": "sha512-8RLedDoUL0kkVKWEZ/RMM70BvKLyDFen06QuKKhYC2XNOfNKqFDqzIdcY/vGick869bNIWalChoy4O07k0HLsA==",
       "dev": true,
       "requires": {
-        "turbo-darwin-64": "1.7.0",
-        "turbo-darwin-arm64": "1.7.0",
-        "turbo-linux-64": "1.7.0",
-        "turbo-linux-arm64": "1.7.0",
-        "turbo-windows-64": "1.7.0",
-        "turbo-windows-arm64": "1.7.0"
+        "turbo-darwin-64": "1.7.4",
+        "turbo-darwin-arm64": "1.7.4",
+        "turbo-linux-64": "1.7.4",
+        "turbo-linux-arm64": "1.7.4",
+        "turbo-windows-64": "1.7.4",
+        "turbo-windows-arm64": "1.7.4"
       }
     },
     "turbo-darwin-64": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.7.0.tgz",
-      "integrity": "sha512-hSGAueSf5Ko8J67mpqjpt9FsP6ePn1nMcl7IVPoJq5dHsgX3anCP/BPlexJ502bNK+87DDyhQhJ/LPSJXKrSYQ==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.7.4.tgz",
+      "integrity": "sha512-ZyYrQlUl8K/mYN1e6R7bEhPPYjMakz0DYMaexkyD7TAijQtWmTSd4a+I7VknOYNEssnUZ/v41GU3gPV1JAzxxQ==",
       "dev": true,
       "optional": true
     },
     "turbo-darwin-arm64": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.7.0.tgz",
-      "integrity": "sha512-BLLOW5W6VZxk5+0ZOj5AO1qjM0P5isIgjbEuyAl8lHZ4s9antUbY4CtFrspT32XxPTYoDl4UjviPMcSsbcl3WQ==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.7.4.tgz",
+      "integrity": "sha512-CKIXg9uqp1a+Yeq/c4U0alPOqvwLUq5SBZf1PGYhGqJsfG0fRBtJfkUjHuBsuJIOGXg8rCmcGSWGIsIF6fqYuw==",
       "dev": true,
       "optional": true
     },
     "turbo-linux-64": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.7.0.tgz",
-      "integrity": "sha512-aw2qxmfZa+kT87SB3GNUoFimqEPzTlzlRqhPgHuAAT6Uf0JHnmebPt4K+ZPtDNl5yfVmtB05bhHPqw+5QV97Yg==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.7.4.tgz",
+      "integrity": "sha512-RIUl4RUFFyzD2T024vL7509Ygwcw+SEa8NOwPfaN6TtJHK7RZV/SBP3fLNVOptG9WRLnOWX3OvsLMbiOqDLLyA==",
       "dev": true,
       "optional": true
     },
     "turbo-linux-arm64": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.7.0.tgz",
-      "integrity": "sha512-AJEx2jX+zO5fQtJpO3r6uhTabj4oSA5ZhB7zTs/rwu/XqoydsvStA4X8NDW4poTbOjF7DcSHizqwi04tSMzpJw==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.7.4.tgz",
+      "integrity": "sha512-Bg65F0AjYYYxqE6RPf2H5TIGuA/EyWMeGOATHVSZOWAbYcnG3Ly03GZii8AHnUi7ntWBdjwvXf/QbOS1ayNB6A==",
       "dev": true,
       "optional": true
     },
     "turbo-windows-64": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.7.0.tgz",
-      "integrity": "sha512-ewj7PPv2uxqv0r31hgnBa3E5qwUu7eyVRP5M1gB/TJXfSHduU79gbxpKCyxIZv2fL/N2/3U7EPOQPSZxBAoljA==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.7.4.tgz",
+      "integrity": "sha512-rTaV50XZ2BRxRHOHqt1UsWfeDmYLbn8UKE6g2D2ED+uW+kmnTvR9s01nmlGWd2sAuWcRYQyQ2V+O09VfKPKcQw==",
       "dev": true,
       "optional": true
     },
     "turbo-windows-arm64": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.7.0.tgz",
-      "integrity": "sha512-LzjOUzveWkvTD0jP8DBMYiAnYemmydsvqxdSmsUapHHJkl6wKZIOQNSO7pxsy+9XM/1/+0f9Y9F9ZNl5lePTEA==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.7.4.tgz",
+      "integrity": "sha512-h8sxdKPvHTnWUPtwnYszFMmSO0P/iUUwmYY9n7iYThA71zSao28UeZ0H0Gw75cY3MPjvkjn2C4EBAUGPjuZJLw==",
       "dev": true,
       "optional": true
     },
diff --git a/package.json b/package.json
index b9e09db0bee3..06079b9e9af3 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^29.4.1",
     "jest-diff": "^29.4.1",
-    "prettier": "^2.8.3",
+    "prettier": "^2.8.4",
     "rimraf": "^3.0.0",
     "source-map-js": "^1.0.2",
     "turbo": "^1.7.4"

From 6cf5ab43a454d4c28d7eff72010d06f51e37864f Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Wed, 15 Feb 2023 10:00:56 +0000
Subject: [PATCH 07/84] Update @napi-rs/cli to version 2.14.7

---
 oxide/crates/node/package.json |  2 +-
 package-lock.json              | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/oxide/crates/node/package.json b/oxide/crates/node/package.json
index edf08ec85e77..c97f3864e21d 100644
--- a/oxide/crates/node/package.json
+++ b/oxide/crates/node/package.json
@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@napi-rs/cli": "^2.14.3"
+    "@napi-rs/cli": "^2.14.7"
   },
   "engines": {
     "node": ">= 10"
diff --git a/package-lock.json b/package-lock.json
index eadbcd1f6202..81a8d6093746 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -58,7 +58,7 @@
         "eslint-plugin-prettier": "^4.2.1",
         "jest": "^29.4.1",
         "jest-diff": "^29.4.1",
-        "prettier": "^2.8.3",
+        "prettier": "^2.8.4",
         "rimraf": "^3.0.0",
         "source-map-js": "^1.0.2",
         "turbo": "^1.7.4"
@@ -12135,9 +12135,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz",
-      "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
+      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
       "dev": true,
       "bin": {
         "prettier": "bin-prettier.js"
@@ -24056,9 +24056,9 @@
       }
     },
     "prettier": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz",
-      "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
+      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
       "dev": true
     },
     "prettier-linter-helpers": {
@@ -25212,7 +25212,7 @@
         "postcss-nested": "6.0.0",
         "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
-        "prettier": "^2.8.3",
+        "prettier": "^2.8.4",
         "quick-lru": "^5.1.1",
         "resolve": "^1.22.1",
         "rimraf": "^3.0.0",
@@ -33756,9 +33756,9 @@
           }
         },
         "prettier": {
-          "version": "2.8.3",
-          "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz",
-          "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==",
+          "version": "2.8.4",
+          "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
+          "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
           "dev": true
         },
         "prettier-linter-helpers": {

From 59b7e7085919fadc16193819303bb745addb792d Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Wed, 15 Feb 2023 15:55:43 +0000
Subject: [PATCH 08/84] Update postcss-js to version 4.0.1

---
 package-lock.json | 24 ++++++++++++------------
 package.json      |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 81a8d6093746..75c6ce20de5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2403,9 +2403,9 @@
       ]
     },
     "node_modules/@napi-rs/cli": {
-      "version": "2.14.3",
-      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.3.tgz",
-      "integrity": "sha512-yPc3dXHwynwR815s/7NczYx61wwmkZS1zlzgoVV+KaYJ9qAcd7pRiCZ7n/lBYL9lqUPWFZ7D9QYDn7b6teIsow==",
+      "version": "2.14.7",
+      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.7.tgz",
+      "integrity": "sha512-H+YCgdbBNMWn8c878C3RsRYcMxamWI7rB0H+1TqOy9n6u31isikcRyW1VDyoNHp7ApfmzV0+tpPopVi0W7WHAA==",
       "dev": true,
       "bin": {
         "napi": "scripts/index.js"
@@ -15501,7 +15501,7 @@
       "version": "0.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@napi-rs/cli": "^2.14.3"
+        "@napi-rs/cli": "^2.14.7"
       },
       "engines": {
         "node": ">= 10"
@@ -16807,9 +16807,9 @@
       "optional": true
     },
     "@napi-rs/cli": {
-      "version": "2.14.3",
-      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.3.tgz",
-      "integrity": "sha512-yPc3dXHwynwR815s/7NczYx61wwmkZS1zlzgoVV+KaYJ9qAcd7pRiCZ7n/lBYL9lqUPWFZ7D9QYDn7b6teIsow==",
+      "version": "2.14.7",
+      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.7.tgz",
+      "integrity": "sha512-H+YCgdbBNMWn8c878C3RsRYcMxamWI7rB0H+1TqOy9n6u31isikcRyW1VDyoNHp7ApfmzV0+tpPopVi0W7WHAA==",
       "dev": true
     },
     "@nodelib/fs.scandir": {
@@ -18086,7 +18086,7 @@
     "@tailwindcss/oxide": {
       "version": "file:oxide/crates/node",
       "requires": {
-        "@napi-rs/cli": "^2.14.3",
+        "@napi-rs/cli": "^2.14.7",
         "@tailwindcss/oxide-darwin-arm64": "0.0.0",
         "@tailwindcss/oxide-darwin-x64": "0.0.0",
         "@tailwindcss/oxide-freebsd-x64": "0.0.0",
@@ -26507,9 +26507,9 @@
           "optional": true
         },
         "@napi-rs/cli": {
-          "version": "2.14.3",
-          "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.3.tgz",
-          "integrity": "sha512-yPc3dXHwynwR815s/7NczYx61wwmkZS1zlzgoVV+KaYJ9qAcd7pRiCZ7n/lBYL9lqUPWFZ7D9QYDn7b6teIsow==",
+          "version": "2.14.7",
+          "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.7.tgz",
+          "integrity": "sha512-H+YCgdbBNMWn8c878C3RsRYcMxamWI7rB0H+1TqOy9n6u31isikcRyW1VDyoNHp7ApfmzV0+tpPopVi0W7WHAA==",
           "dev": true
         },
         "@nodelib/fs.scandir": {
@@ -27786,7 +27786,7 @@
         "@tailwindcss/oxide": {
           "version": "file:oxide/crates/node",
           "requires": {
-            "@napi-rs/cli": "^2.14.3",
+            "@napi-rs/cli": "^2.14.7",
             "@tailwindcss/oxide-darwin-arm64": "0.0.0",
             "@tailwindcss/oxide-darwin-x64": "0.0.0",
             "@tailwindcss/oxide-freebsd-x64": "0.0.0",
diff --git a/package.json b/package.json
index 06079b9e9af3..4811431bc91b 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "picocolors": "^1.0.0",
     "postcss": "^8.4.21",
     "postcss-import": "^14.1.0",
-    "postcss-js": "^4.0.0",
+    "postcss-js": "^4.0.1",
     "postcss-load-config": "^3.1.4",
     "postcss-nested": "6.0.0",
     "postcss-selector-parser": "^6.0.11",

From c0670ccb354bd20d84a1aab63f438d1233c8da32 Mon Sep 17 00:00:00 2001
From: Davy <davy@prepr.io>
Date: Wed, 15 Feb 2023 17:44:23 +0100
Subject: [PATCH 09/84] Add `justify-normal` and `justify-stretch` classes
 (#10560)

* Added justify-normal class

* Update corePlugins.js

* Add `justify-normal` utility

---------

Co-authored-by: Jonathan Reinink <jonathan@reinink.ca>
---
 src/corePlugins.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/corePlugins.js b/src/corePlugins.js
index e440eff8eafe..48f215cbd8b5 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -1218,12 +1218,14 @@ export let corePlugins = {
 
   justifyContent: ({ addUtilities }) => {
     addUtilities({
+      '.justify-normal': { 'justify-content': 'normal' },
       '.justify-start': { 'justify-content': 'flex-start' },
       '.justify-end': { 'justify-content': 'flex-end' },
       '.justify-center': { 'justify-content': 'center' },
       '.justify-between': { 'justify-content': 'space-between' },
       '.justify-around': { 'justify-content': 'space-around' },
       '.justify-evenly': { 'justify-content': 'space-evenly' },
+      '.justify-stretch': { 'justify-content': 'stretch' },
     })
   },
 

From e3f9ea413aa17e70eff10d02717cccb283ba9729 Mon Sep 17 00:00:00 2001
From: Jonathan Reinink <jonathan@reinink.ca>
Date: Wed, 15 Feb 2023 11:45:53 -0500
Subject: [PATCH 10/84] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97cbfeaa0851..fce9d9761b92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Oxide] Use `lightningcss` for nesting and vendor prefixes in PostCSS plugin ([#10399](https://github.com/tailwindlabs/tailwindcss/pull/10399))
 - Add support for configuring default `font-variation-settings` for a `font-family` ([#10034](https://github.com/tailwindlabs/tailwindcss/pull/10034), [#10515](https://github.com/tailwindlabs/tailwindcss/pull/10515))
 - Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
+- Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
 
 ## [3.2.6] - 2023-02-08
 

From 66c640b73599e36c6087644d3b2c231cc17b37ff Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Thu, 16 Feb 2023 00:52:36 +0100
Subject: [PATCH 11/84] =?UTF-8?q?Upgrade=20rimraf:=203.0.2=20=E2=86=92=204?=
 =?UTF-8?q?.1.2=20(major)=20(#10596)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update rimraf to version 4.1.2

* use rimraf sync API

Our `oxide` engine uses rimraf v4, our `stable` engine uses rimraf v3
and the API is different in both. However the tests are currently shared
for both engines so we have to use the correct API for the correct
version.

However, we can also just use the `sync` API.

More info: https://github.com/isaacs/rimraf#major-changes-from-v3-to-v4

---------

Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
---
 jest/runInTempDirectory.js |  4 +-
 package-lock.json          | 91 +++++++++++++++++++++++++++-----------
 package.json               |  2 +-
 3 files changed, 70 insertions(+), 27 deletions(-)

diff --git a/jest/runInTempDirectory.js b/jest/runInTempDirectory.js
index f111cc603c75..8524dd6ee118 100644
--- a/jest/runInTempDirectory.js
+++ b/jest/runInTempDirectory.js
@@ -17,7 +17,9 @@ export default function (callback) {
 
     callback().then(() => {
       process.chdir(currentPath)
-      rimraf(tmpPath, resolve)
+
+      rimraf.sync(tmpPath)
+      resolve()
     })
   })
 }
diff --git a/package-lock.json b/package-lock.json
index 75c6ce20de5f..f1686741f76f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "picocolors": "^1.0.0",
         "postcss": "^8.4.21",
         "postcss-import": "^14.1.0",
-        "postcss-js": "^4.0.0",
+        "postcss-js": "^4.0.1",
         "postcss-load-config": "^3.1.4",
         "postcss-nested": "6.0.0",
         "postcss-selector-parser": "^6.0.11",
@@ -59,7 +59,7 @@
         "jest": "^29.4.1",
         "jest-diff": "^29.4.1",
         "prettier": "^2.8.4",
-        "rimraf": "^3.0.0",
+        "rimraf": "^4.1.2",
         "source-map-js": "^1.0.2",
         "turbo": "^1.7.4"
       },
@@ -7828,6 +7828,21 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
+    "node_modules/flat-cache/node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/flatted": {
       "version": "3.1.1",
       "dev": true,
@@ -11565,8 +11580,9 @@
       }
     },
     "node_modules/postcss-js": {
-      "version": "4.0.0",
-      "license": "MIT",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
       "dependencies": {
         "camelcase-css": "^2.0.1"
       },
@@ -11578,7 +11594,7 @@
         "url": "https://opencollective.com/postcss/"
       },
       "peerDependencies": {
-        "postcss": "^8.3.3"
+        "postcss": "^8.4.21"
       }
     },
     "node_modules/postcss-load-config": {
@@ -12625,14 +12641,15 @@
       }
     },
     "node_modules/rimraf": {
-      "version": "3.0.2",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.1.2.tgz",
+      "integrity": "sha512-BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
       "bin": {
-        "rimraf": "bin.js"
+        "rimraf": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=14"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -21032,6 +21049,17 @@
       "requires": {
         "flatted": "^3.1.0",
         "rimraf": "^3.0.2"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "flatted": {
@@ -23740,7 +23768,9 @@
       }
     },
     "postcss-js": {
-      "version": "4.0.0",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
       "requires": {
         "camelcase-css": "^2.0.1"
       }
@@ -24410,11 +24440,10 @@
       "version": "1.0.4"
     },
     "rimraf": {
-      "version": "3.0.2",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.1.2.tgz",
+      "integrity": "sha512-BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ==",
+      "dev": true
     },
     "ripemd160": {
       "version": "2.0.2",
@@ -25207,7 +25236,7 @@
         "picocolors": "^1.0.0",
         "postcss": "^8.4.21",
         "postcss-import": "^14.1.0",
-        "postcss-js": "^4.0.0",
+        "postcss-js": "^4.0.1",
         "postcss-load-config": "^3.1.4",
         "postcss-nested": "6.0.0",
         "postcss-selector-parser": "^6.0.11",
@@ -25215,7 +25244,7 @@
         "prettier": "^2.8.4",
         "quick-lru": "^5.1.1",
         "resolve": "^1.22.1",
-        "rimraf": "^3.0.0",
+        "rimraf": "^4.1.2",
         "source-map-js": "^1.0.2",
         "turbo": "^1.7.4"
       },
@@ -30732,6 +30761,17 @@
           "requires": {
             "flatted": "^3.1.0",
             "rimraf": "^3.0.2"
+          },
+          "dependencies": {
+            "rimraf": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+              "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+              "dev": true,
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            }
           }
         },
         "flatted": {
@@ -33440,7 +33480,9 @@
           }
         },
         "postcss-js": {
-          "version": "4.0.0",
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+          "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
           "requires": {
             "camelcase-css": "^2.0.1"
           }
@@ -34110,11 +34152,10 @@
           "version": "1.0.4"
         },
         "rimraf": {
-          "version": "3.0.2",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.1.2.tgz",
+          "integrity": "sha512-BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ==",
+          "dev": true
         },
         "ripemd160": {
           "version": "2.0.2",
diff --git a/package.json b/package.json
index 4811431bc91b..fe2e35cbe8fb 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "jest": "^29.4.1",
     "jest-diff": "^29.4.1",
     "prettier": "^2.8.4",
-    "rimraf": "^3.0.0",
+    "rimraf": "^4.1.2",
     "source-map-js": "^1.0.2",
     "turbo": "^1.7.4"
   },

From 89fe09bfe1dc1c5044412989437e0f5d2a6d606d Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Thu, 16 Feb 2023 10:13:42 -0500
Subject: [PATCH 12/84] Fix use of `:where(.btn)` when matching `!btn` (#10601)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Cleanup code

This makes it more explicit that we’re parsing a string selector, modifying it, and turning it back into a string

* Fix important modifier when :where is involved

* Only parse selector list once when handling the important modifier

* Fix import

* Fix lint errors
---
 src/lib/generateRules.js          | 30 ++++++++++++++--------
 src/util/formatVariantSelector.js |  2 +-
 src/util/pluginUtils.js           | 39 ++++++++--------------------
 tests/important-modifier.test.js  | 42 +++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 40 deletions(-)

diff --git a/src/lib/generateRules.js b/src/lib/generateRules.js
index 0533a9e86c51..f7096e556602 100644
--- a/src/lib/generateRules.js
+++ b/src/lib/generateRules.js
@@ -3,10 +3,14 @@ import selectorParser from 'postcss-selector-parser'
 import parseObjectStyles from '../util/parseObjectStyles'
 import isPlainObject from '../util/isPlainObject'
 import prefixSelector from '../util/prefixSelector'
-import { updateAllClasses, filterSelectorsForClass, getMatchingTypes } from '../util/pluginUtils'
+import { updateAllClasses, getMatchingTypes } from '../util/pluginUtils'
 import log from '../util/log'
 import * as sharedState from './sharedState'
-import { formatVariantSelector, finalizeSelector } from '../util/formatVariantSelector'
+import {
+  formatVariantSelector,
+  finalizeSelector,
+  eliminateIrrelevantSelectors,
+} from '../util/formatVariantSelector'
 import { asClass } from '../util/nameClass'
 import { normalize } from '../util/dataTypes'
 import { isValidVariantFormatString, parseVariant } from './setupContextUtils'
@@ -111,22 +115,28 @@ function applyImportant(matches, classCandidate) {
   if (matches.length === 0) {
     return matches
   }
+
   let result = []
 
   for (let [meta, rule] of matches) {
     let container = postcss.root({ nodes: [rule.clone()] })
+
     container.walkRules((r) => {
-      r.selector = updateAllClasses(
-        filterSelectorsForClass(r.selector, classCandidate),
-        (className) => {
-          if (className === classCandidate) {
-            return `!${className}`
-          }
-          return className
-        }
+      let ast = selectorParser().astSync(r.selector)
+
+      // Remove extraneous selectors that do not include the base candidate
+      ast.each((sel) => eliminateIrrelevantSelectors(sel, classCandidate))
+
+      // Update all instances of the base candidate to include the important marker
+      updateAllClasses(ast, (className) =>
+        className === classCandidate ? `!${className}` : className
       )
+
+      r.selector = ast.toString()
+
       r.walkDecls((d) => (d.important = true))
     })
+
     result.push([{ ...meta, important: true }, container.nodes[0]])
   }
 
diff --git a/src/util/formatVariantSelector.js b/src/util/formatVariantSelector.js
index ee6350b8ef33..da5e2c78dfbc 100644
--- a/src/util/formatVariantSelector.js
+++ b/src/util/formatVariantSelector.js
@@ -120,7 +120,7 @@ function resortSelector(sel) {
  * @param {Selector} ast
  * @param {string} base
  */
-function eliminateIrrelevantSelectors(sel, base) {
+export function eliminateIrrelevantSelectors(sel, base) {
   let hasClassesMatchingCandidate = false
 
   sel.walk((child) => {
diff --git a/src/util/pluginUtils.js b/src/util/pluginUtils.js
index e347f404ba8a..407019c905a6 100644
--- a/src/util/pluginUtils.js
+++ b/src/util/pluginUtils.js
@@ -1,4 +1,3 @@
-import selectorParser from 'postcss-selector-parser'
 import escapeCommas from './escapeCommas'
 import { withAlphaValue } from './withAlphaVariable'
 import {
@@ -21,37 +20,19 @@ import negateValue from './negateValue'
 import { backgroundSize } from './validateFormalSyntax'
 import { flagEnabled } from '../featureFlags.js'
 
+/**
+ * @param {import('postcss-selector-parser').Container} selectors
+ * @param {(className: string) => string} updateClass
+ * @returns {string}
+ */
 export function updateAllClasses(selectors, updateClass) {
-  let parser = selectorParser((selectors) => {
-    selectors.walkClasses((sel) => {
-      let updatedClass = updateClass(sel.value)
-      sel.value = updatedClass
-      if (sel.raws && sel.raws.value) {
-        sel.raws.value = escapeCommas(sel.raws.value)
-      }
-    })
-  })
-
-  let result = parser.processSync(selectors)
+  selectors.walkClasses((sel) => {
+    sel.value = updateClass(sel.value)
 
-  return result
-}
-
-export function filterSelectorsForClass(selectors, classCandidate) {
-  let parser = selectorParser((selectors) => {
-    selectors.each((sel) => {
-      const containsClass = sel.nodes.some(
-        (node) => node.type === 'class' && node.value === classCandidate
-      )
-      if (!containsClass) {
-        sel.remove()
-      }
-    })
+    if (sel.raws && sel.raws.value) {
+      sel.raws.value = escapeCommas(sel.raws.value)
+    }
   })
-
-  let result = parser.processSync(selectors)
-
-  return result
 }
 
 function resolveArbitraryValue(modifier, validate) {
diff --git a/tests/important-modifier.test.js b/tests/important-modifier.test.js
index bde7eee2ea84..6d30fd0bceb3 100644
--- a/tests/important-modifier.test.js
+++ b/tests/important-modifier.test.js
@@ -108,4 +108,46 @@ crosscheck(() => {
       `)
     })
   })
+
+  test('the important modifier works on utilities using :where()', () => {
+    let config = {
+      content: [
+        {
+          raw: html` <div class="btn hover:btn !btn hover:focus:disabled:!btn"></div> `,
+        },
+      ],
+      corePlugins: { preflight: false },
+      plugins: [
+        function ({ addComponents }) {
+          addComponents({
+            ':where(.btn)': {
+              backgroundColor: '#00f',
+            },
+          })
+        },
+      ],
+    }
+
+    let input = css`
+      @tailwind components;
+      @tailwind utilities;
+    `
+
+    return run(input, config).then((result) => {
+      expect(result.css).toMatchFormattedCss(css`
+        :where(.\!btn) {
+          background-color: #00f !important;
+        }
+        :where(.btn) {
+          background-color: #00f;
+        }
+        :where(.hover\:btn:hover) {
+          background-color: #00f;
+        }
+        :where(.hover\:focus\:disabled\:\!btn:disabled:focus:hover) {
+          background-color: #00f !important;
+        }
+      `)
+    })
+  })
 })

From 17159ff6c28b2d9700fa489dddf4d6f8d8d6f376 Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Thu, 16 Feb 2023 10:16:36 -0500
Subject: [PATCH 13/84] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fce9d9761b92..27c559021d9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
 - Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
 
+### Fixed
+
+- Fix use of `:where(.btn)` when matching `!btn` ([#10601](https://github.com/tailwindlabs/tailwindcss/pull/10601))
+
 ## [3.2.6] - 2023-02-08
 
 ### Fixed

From 6e92dfa4ea20d097a1be4e22ebf559f82b4dcb5e Mon Sep 17 00:00:00 2001
From: Jonathan Reinink <jonathan@reinink.ca>
Date: Thu, 16 Feb 2023 13:46:43 -0500
Subject: [PATCH 14/84] Revert including `outline-color` in `transition` and
 `transition-colors` by default (#10604)

* Remove `outline-color` from default color properties to transition (Reverts #10385)

* Update changelog
---
 CHANGELOG.md                     |  1 +
 stubs/defaultConfig.stub.js      |  4 ++--
 tests/basic-usage.oxide.test.css |  4 ++--
 tests/basic-usage.test.css       |  4 ++--
 tests/kitchen-sink.test.js       | 15 ++++++---------
 tests/raw-content.oxide.test.css |  4 ++--
 tests/raw-content.test.css       |  4 ++--
 7 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27c559021d9d..eec465550b41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fix use of `:where(.btn)` when matching `!btn` ([#10601](https://github.com/tailwindlabs/tailwindcss/pull/10601))
+- Revert including `outline-color` in `transition` and `transition-colors` by default ([#10604](https://github.com/tailwindlabs/tailwindcss/pull/10604))
 
 ## [3.2.6] - 2023-02-08
 
diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js
index 8a3fac7a3fcc..75ebb7c01cfb 100644
--- a/stubs/defaultConfig.stub.js
+++ b/stubs/defaultConfig.stub.js
@@ -879,8 +879,8 @@ module.exports = {
       none: 'none',
       all: 'all',
       DEFAULT:
-        'color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter',
-      colors: 'color, background-color, border-color, outline-color, text-decoration-color, fill, stroke',
+        'color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter',
+      colors: 'color, background-color, border-color, text-decoration-color, fill, stroke',
       opacity: 'opacity',
       shadow: 'box-shadow',
       transform: 'transform',
diff --git a/tests/basic-usage.oxide.test.css b/tests/basic-usage.oxide.test.css
index 5623fe79ee30..de40c07498a0 100644
--- a/tests/basic-usage.oxide.test.css
+++ b/tests/basic-usage.oxide.test.css
@@ -1020,8 +1020,8 @@
   backdrop-filter: none;
 }
 .transition {
-  transition-property: color, background-color, border-color, outline-color, text-decoration-color,
-    fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke,
+    opacity, box-shadow, transform, filter, backdrop-filter;
   transition-duration: 0.15s;
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 }
diff --git a/tests/basic-usage.test.css b/tests/basic-usage.test.css
index 184ada947ccf..0e39ff9e01ac 100644
--- a/tests/basic-usage.test.css
+++ b/tests/basic-usage.test.css
@@ -1020,8 +1020,8 @@
   backdrop-filter: none;
 }
 .transition {
-  transition-property: color, background-color, border-color, outline-color, text-decoration-color,
-    fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke,
+    opacity, box-shadow, transform, filter, backdrop-filter;
   transition-duration: 0.15s;
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 }
diff --git a/tests/kitchen-sink.test.js b/tests/kitchen-sink.test.js
index 976018cb05dc..a750ff6566d7 100644
--- a/tests/kitchen-sink.test.js
+++ b/tests/kitchen-sink.test.js
@@ -698,9 +698,8 @@ crosscheck(() => {
         }
         @media (prefers-reduced-motion: no-preference) {
           .motion-safe\:transition {
-            transition-property: color, background-color, border-color, outline-color,
-              text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter,
-              backdrop-filter;
+            transition-property: color, background-color, border-color, text-decoration-color, fill,
+              stroke, opacity, box-shadow, transform, filter, backdrop-filter;
             transition-duration: 0.15s;
             transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
           }
@@ -710,9 +709,8 @@ crosscheck(() => {
         }
         @media (prefers-reduced-motion: reduce) {
           .motion-reduce\:transition {
-            transition-property: color, background-color, border-color, outline-color,
-              text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter,
-              backdrop-filter;
+            transition-property: color, background-color, border-color, text-decoration-color, fill,
+              stroke, opacity, box-shadow, transform, filter, backdrop-filter;
             transition-duration: 0.15s;
             transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
           }
@@ -759,9 +757,8 @@ crosscheck(() => {
           }
           @media (prefers-reduced-motion: no-preference) {
             .md\:motion-safe\:hover\:transition:hover {
-              transition-property: color, background-color, border-color, outline-color,
-                text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter,
-                backdrop-filter;
+              transition-property: color, background-color, border-color, text-decoration-color,
+                fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
               transition-duration: 0.15s;
               transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
             }
diff --git a/tests/raw-content.oxide.test.css b/tests/raw-content.oxide.test.css
index b4fa9b8cc73c..6f59c98b4f4f 100644
--- a/tests/raw-content.oxide.test.css
+++ b/tests/raw-content.oxide.test.css
@@ -761,8 +761,8 @@
   backdrop-filter: none;
 }
 .transition {
-  transition-property: color, background-color, border-color, outline-color, text-decoration-color,
-    fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke,
+    opacity, box-shadow, transform, filter, backdrop-filter;
   transition-duration: 0.15s;
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 }
diff --git a/tests/raw-content.test.css b/tests/raw-content.test.css
index 2867d4b2a8fe..2978955898d8 100644
--- a/tests/raw-content.test.css
+++ b/tests/raw-content.test.css
@@ -761,8 +761,8 @@
   backdrop-filter: none;
 }
 .transition {
-  transition-property: color, background-color, border-color, outline-color, text-decoration-color,
-    fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke,
+    opacity, box-shadow, transform, filter, backdrop-filter;
   transition-duration: 0.15s;
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 }

From e7ae7f19318d12fd4800dde63cbc4f7291b2996e Mon Sep 17 00:00:00 2001
From: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
Date: Thu, 16 Feb 2023 14:28:15 -0500
Subject: [PATCH 15/84] Update version and changelog

---
 CHANGELOG.md        | 29 +++++++++++------------------
 package.json        |  2 +-
 package.stable.json |  2 +-
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eec465550b41..4d7497ca17de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,17 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
+- Nothing yet!
 
-- Add `line-height` modifier support to `font-size` utilities ([#9875](https://github.com/tailwindlabs/tailwindcss/pull/9875))
-- Support using variables as arbitrary values without `var(...)` ([#9880](https://github.com/tailwindlabs/tailwindcss/pull/9880), [#9962](https://github.com/tailwindlabs/tailwindcss/pull/9962))
-- Add `delay-0` and `duration-0` by default ([#10294](https://github.com/tailwindlabs/tailwindcss/pull/10294))
-- Add logical properties support for inline direction ([#10166](https://github.com/tailwindlabs/tailwindcss/pull/10166))
-- Add `hyphens` utilities ([#10071](https://github.com/tailwindlabs/tailwindcss/pull/10071))
-- [Oxide] Use `lightningcss` for nesting and vendor prefixes in PostCSS plugin ([#10399](https://github.com/tailwindlabs/tailwindcss/pull/10399))
-- Add support for configuring default `font-variation-settings` for a `font-family` ([#10034](https://github.com/tailwindlabs/tailwindcss/pull/10034), [#10515](https://github.com/tailwindlabs/tailwindcss/pull/10515))
-- Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
-- Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
+## [3.2.7] - 2023-02-16
 
 ### Fixed
 
@@ -28,7 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fix installation failing with yarn and pnpm by dropping `oxide-api-shim` ([add1636](https://github.com/tailwindlabs/tailwindcss/commit/add16364b4b1100e1af23ad1ca6900a0b53cbba0))
+- drop oxide api shim ([add16364b4b1100e1af23ad1ca6900a0b53cbba0](https://github.com/tailwindlabs/tailwindcss/commit/add16364b4b1100e1af23ad1ca6900a0b53cbba0))
 
 ## [3.2.5] - 2023-02-08
 
@@ -41,7 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Cleanup unused `variantOrder` ([#9829](https://github.com/tailwindlabs/tailwindcss/pull/9829))
 - Fix `foo-[abc]/[def]` not being handled correctly ([#9866](https://github.com/tailwindlabs/tailwindcss/pull/9866))
 - Add container queries plugin to standalone CLI ([#9865](https://github.com/tailwindlabs/tailwindcss/pull/9865))
-- Support renaming of output files by PostCSS plugins in CLI ([#9944](https://github.com/tailwindlabs/tailwindcss/pull/9944))
+- Support renaming of output files by `PostCSS` plugin. ([#9944](https://github.com/tailwindlabs/tailwindcss/pull/9944))
 - Improve return value of `resolveConfig`, unwrap `ResolvableTo` ([#9972](https://github.com/tailwindlabs/tailwindcss/pull/9972))
 - Clip unbalanced brackets in arbitrary values ([#9973](https://github.com/tailwindlabs/tailwindcss/pull/9973))
 - Don’t reorder webkit scrollbar pseudo elements ([#9991](https://github.com/tailwindlabs/tailwindcss/pull/9991))
@@ -70,7 +62,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Alphabetize `theme` keys in default config ([#9953](https://github.com/tailwindlabs/tailwindcss/pull/9953))
 - Update esbuild to v17 ([#10368](https://github.com/tailwindlabs/tailwindcss/pull/10368))
-- Include `outline-color` in `transition` and `transition-colors` utilities ([#10385](https://github.com/tailwindlabs/tailwindcss/pull/10385))
+- Include `outline-color` in `transition` and `transition-colors` utilitires ([#10385](https://github.com/tailwindlabs/tailwindcss/pull/10385))
 
 ## [3.2.4] - 2022-11-11
 
@@ -112,7 +104,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix missing `supports` in types ([#9616](https://github.com/tailwindlabs/tailwindcss/pull/9616))
 - Fix missing PostCSS dependencies in the CLI ([#9617](https://github.com/tailwindlabs/tailwindcss/pull/9617))
 - Ensure `micromatch` is a proper CLI dependency ([#9620](https://github.com/tailwindlabs/tailwindcss/pull/9620))
-- Ensure modifier values exist when using a `modifiers` object for `matchVariant` ([ba6551d](https://github.com/tailwindlabs/tailwindcss/commit/ba6551db0f2726461371b4f3c6cd4c7090888504))
+- Ensure modifier values exist when using a `modifiers` object for `matchVariant` ([ba6551db0f2726461371b4f3c6cd4c7090888504](https://github.com/tailwindlabs/tailwindcss/commit/ba6551db0f2726461371b4f3c6cd4c7090888504))
 
 ## [3.2.0] - 2022-10-19
 
@@ -303,7 +295,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Split box shadows on top-level commas only ([#7479](https://github.com/tailwindlabs/tailwindcss/pull/7479))
 - Use local user CSS cache for `@apply` ([#7524](https://github.com/tailwindlabs/tailwindcss/pull/7524))
 - Invalidate context when main CSS changes ([#7626](https://github.com/tailwindlabs/tailwindcss/pull/7626))
-- Only add `!` to selector class matching template candidate when using important modifier with multi-class selectors ([#7664](https://github.com/tailwindlabs/tailwindcss/pull/7664))
+- Only add `!` to selector class matching template candidate when using important modifier with mutli-class selectors ([#7664](https://github.com/tailwindlabs/tailwindcss/pull/7664))
 - Correctly parse and prefix animation names with dots ([#7163](https://github.com/tailwindlabs/tailwindcss/pull/7163))
 - Fix extraction from template literal/function with array ([#7481](https://github.com/tailwindlabs/tailwindcss/pull/7481))
 - Don't output unparsable arbitrary values ([#7789](https://github.com/tailwindlabs/tailwindcss/pull/7789))
@@ -747,7 +739,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Remove outdated focus style fix in Preflight ([#4780](https://github.com/tailwindlabs/tailwindcss/pull/4780))
 - Enable `purge` if provided on the CLI ([#4772](https://github.com/tailwindlabs/tailwindcss/pull/4772))
 - JIT: Fix error when not using a config file with postcss-cli ([#4773](https://github.com/tailwindlabs/tailwindcss/pull/4773))
-- Fix issue with `resolveConfig` not being importable in Next.js pages ([#4725](https://github.com/tailwindlabs/tailwindcss/pull/4725))
+- Fix issue with `resolveConfig` not being importable in Next.js pags ([#4725](https://github.com/tailwindlabs/tailwindcss/pull/4725))
 
 ## [2.2.2] - 2021-06-18
 
@@ -882,7 +874,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fix issue with `@apply` not working as expected with `!important` inside an at-rule ([#2824](https://github.com/tailwindlabs/tailwindcss/pull/2824))
+- Fix issue with `@apply` not working as expected with `!important` inside an atrule ([#2824](https://github.com/tailwindlabs/tailwindcss/pull/2824))
 - Fix issue with `@apply` not working as expected with defined classes ([#2832](https://github.com/tailwindlabs/tailwindcss/pull/2832))
 - Fix memory leak, and broken `@apply` when splitting up files ([#3032](https://github.com/tailwindlabs/tailwindcss/pull/3032))
 
@@ -2184,7 +2176,8 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.6...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.7...HEAD
+[3.2.7]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.6...v3.2.7
 [3.2.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.5...v3.2.6
 [3.2.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.4...v3.2.5
 [3.2.4]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.3...v3.2.4
diff --git a/package.json b/package.json
index fe2e35cbe8fb..f5d3615c7e96 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.2.6",
+  "version": "3.2.7",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
diff --git a/package.stable.json b/package.stable.json
index 1ff633751777..3c2efc25fd19 100644
--- a/package.stable.json
+++ b/package.stable.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.2.6",
+  "version": "3.2.7",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",

From 509a5e091a7ffc4353b522d2893e0726bb59f6d0 Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Thu, 16 Feb 2023 23:16:04 +0100
Subject: [PATCH 16/84] update changelog

---
 CHANGELOG.md | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d7497ca17de..de9618db4016 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-- Nothing yet!
+### Added
+
+- Add `line-height` modifier support to `font-size` utilities ([#9875](https://github.com/tailwindlabs/tailwindcss/pull/9875))
+- Support using variables as arbitrary values without `var(...)` ([#9880](https://github.com/tailwindlabs/tailwindcss/pull/9880), [#9962](https://github.com/tailwindlabs/tailwindcss/pull/9962))
+- Add `delay-0` and `duration-0` by default ([#10294](https://github.com/tailwindlabs/tailwindcss/pull/10294))
+- Add logical properties support for inline direction ([#10166](https://github.com/tailwindlabs/tailwindcss/pull/10166))
+- Add `hyphens` utilities ([#10071](https://github.com/tailwindlabs/tailwindcss/pull/10071))
+- [Oxide] Use `lightningcss` for nesting and vendor prefixes in PostCSS plugin ([#10399](https://github.com/tailwindlabs/tailwindcss/pull/10399))
+- Add support for configuring default `font-variation-settings` for a `font-family` ([#10034](https://github.com/tailwindlabs/tailwindcss/pull/10034), [#10515](https://github.com/tailwindlabs/tailwindcss/pull/10515))
+- Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
+- Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
 
 ## [3.2.7] - 2023-02-16
 
@@ -20,7 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- drop oxide api shim ([add16364b4b1100e1af23ad1ca6900a0b53cbba0](https://github.com/tailwindlabs/tailwindcss/commit/add16364b4b1100e1af23ad1ca6900a0b53cbba0))
+- Fix installation failing with yarn and pnpm by dropping `oxide-api-shim` ([add1636](https://github.com/tailwindlabs/tailwindcss/commit/add16364b4b1100e1af23ad1ca6900a0b53cbba0))
 
 ## [3.2.5] - 2023-02-08
 
@@ -33,7 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Cleanup unused `variantOrder` ([#9829](https://github.com/tailwindlabs/tailwindcss/pull/9829))
 - Fix `foo-[abc]/[def]` not being handled correctly ([#9866](https://github.com/tailwindlabs/tailwindcss/pull/9866))
 - Add container queries plugin to standalone CLI ([#9865](https://github.com/tailwindlabs/tailwindcss/pull/9865))
-- Support renaming of output files by `PostCSS` plugin. ([#9944](https://github.com/tailwindlabs/tailwindcss/pull/9944))
+- Support renaming of output files by PostCSS plugins in CLI ([#9944](https://github.com/tailwindlabs/tailwindcss/pull/9944))
 - Improve return value of `resolveConfig`, unwrap `ResolvableTo` ([#9972](https://github.com/tailwindlabs/tailwindcss/pull/9972))
 - Clip unbalanced brackets in arbitrary values ([#9973](https://github.com/tailwindlabs/tailwindcss/pull/9973))
 - Don’t reorder webkit scrollbar pseudo elements ([#9991](https://github.com/tailwindlabs/tailwindcss/pull/9991))
@@ -62,7 +72,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Alphabetize `theme` keys in default config ([#9953](https://github.com/tailwindlabs/tailwindcss/pull/9953))
 - Update esbuild to v17 ([#10368](https://github.com/tailwindlabs/tailwindcss/pull/10368))
-- Include `outline-color` in `transition` and `transition-colors` utilitires ([#10385](https://github.com/tailwindlabs/tailwindcss/pull/10385))
+- Include `outline-color` in `transition` and `transition-colors` utilities ([#10385](https://github.com/tailwindlabs/tailwindcss/pull/10385))
 
 ## [3.2.4] - 2022-11-11
 
@@ -104,7 +114,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix missing `supports` in types ([#9616](https://github.com/tailwindlabs/tailwindcss/pull/9616))
 - Fix missing PostCSS dependencies in the CLI ([#9617](https://github.com/tailwindlabs/tailwindcss/pull/9617))
 - Ensure `micromatch` is a proper CLI dependency ([#9620](https://github.com/tailwindlabs/tailwindcss/pull/9620))
-- Ensure modifier values exist when using a `modifiers` object for `matchVariant` ([ba6551db0f2726461371b4f3c6cd4c7090888504](https://github.com/tailwindlabs/tailwindcss/commit/ba6551db0f2726461371b4f3c6cd4c7090888504))
+- Ensure modifier values exist when using a `modifiers` object for `matchVariant` ([ba6551d](https://github.com/tailwindlabs/tailwindcss/commit/ba6551db0f2726461371b4f3c6cd4c7090888504))
 
 ## [3.2.0] - 2022-10-19
 
@@ -295,7 +305,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Split box shadows on top-level commas only ([#7479](https://github.com/tailwindlabs/tailwindcss/pull/7479))
 - Use local user CSS cache for `@apply` ([#7524](https://github.com/tailwindlabs/tailwindcss/pull/7524))
 - Invalidate context when main CSS changes ([#7626](https://github.com/tailwindlabs/tailwindcss/pull/7626))
-- Only add `!` to selector class matching template candidate when using important modifier with mutli-class selectors ([#7664](https://github.com/tailwindlabs/tailwindcss/pull/7664))
+- Only add `!` to selector class matching template candidate when using important modifier with multi-class selectors ([#7664](https://github.com/tailwindlabs/tailwindcss/pull/7664))
 - Correctly parse and prefix animation names with dots ([#7163](https://github.com/tailwindlabs/tailwindcss/pull/7163))
 - Fix extraction from template literal/function with array ([#7481](https://github.com/tailwindlabs/tailwindcss/pull/7481))
 - Don't output unparsable arbitrary values ([#7789](https://github.com/tailwindlabs/tailwindcss/pull/7789))
@@ -739,7 +749,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Remove outdated focus style fix in Preflight ([#4780](https://github.com/tailwindlabs/tailwindcss/pull/4780))
 - Enable `purge` if provided on the CLI ([#4772](https://github.com/tailwindlabs/tailwindcss/pull/4772))
 - JIT: Fix error when not using a config file with postcss-cli ([#4773](https://github.com/tailwindlabs/tailwindcss/pull/4773))
-- Fix issue with `resolveConfig` not being importable in Next.js pags ([#4725](https://github.com/tailwindlabs/tailwindcss/pull/4725))
+- Fix issue with `resolveConfig` not being importable in Next.js pages ([#4725](https://github.com/tailwindlabs/tailwindcss/pull/4725))
 
 ## [2.2.2] - 2021-06-18
 
@@ -874,7 +884,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fix issue with `@apply` not working as expected with `!important` inside an atrule ([#2824](https://github.com/tailwindlabs/tailwindcss/pull/2824))
+- Fix issue with `@apply` not working as expected with `!important` inside an at-rule ([#2824](https://github.com/tailwindlabs/tailwindcss/pull/2824))
 - Fix issue with `@apply` not working as expected with defined classes ([#2832](https://github.com/tailwindlabs/tailwindcss/pull/2832))
 - Fix memory leak, and broken `@apply` when splitting up files ([#3032](https://github.com/tailwindlabs/tailwindcss/pull/3032))
 

From 77f2f5d3d18f998fd26df4c0d77c29578033b42d Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Fri, 17 Feb 2023 05:56:00 +0000
Subject: [PATCH 17/84] Update rollup to version 3.15.0

---
 integrations/rollup-sass/package.json |  2 +-
 integrations/rollup/package.json      |  2 +-
 package-lock.json                     | 34 +++++++++++++--------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/integrations/rollup-sass/package.json b/integrations/rollup-sass/package.json
index a3108a8cd8de..5f2875f21c83 100644
--- a/integrations/rollup-sass/package.json
+++ b/integrations/rollup-sass/package.json
@@ -14,7 +14,7 @@
     ]
   },
   "devDependencies": {
-    "rollup": "^3.10.0",
+    "rollup": "^3.15.0",
     "rollup-plugin-postcss": "^4.0.2",
     "sass": "^1.58.0"
   }
diff --git a/integrations/rollup/package.json b/integrations/rollup/package.json
index 151861e7c1f3..03eff7ec3642 100644
--- a/integrations/rollup/package.json
+++ b/integrations/rollup/package.json
@@ -14,7 +14,7 @@
     ]
   },
   "devDependencies": {
-    "rollup": "^3.10.0",
+    "rollup": "^3.15.0",
     "rollup-plugin-postcss": "^4.0.2"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index f1686741f76f..2cc14ea39de4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "tailwindcss",
-  "version": "3.2.6",
+  "version": "3.2.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tailwindcss",
-      "version": "3.2.6",
+      "version": "3.2.7",
       "license": "MIT",
       "workspaces": [
         "integrations/*",
@@ -97,7 +97,7 @@
       "name": "@tailwindcss/integrations-rollup",
       "version": "0.0.0",
       "devDependencies": {
-        "rollup": "^3.10.0",
+        "rollup": "3.15.0",
         "rollup-plugin-postcss": "^4.0.2"
       }
     },
@@ -105,7 +105,7 @@
       "name": "@tailwindcss/integrations-rollup-sass",
       "version": "0.0.0",
       "devDependencies": {
-        "rollup": "^3.10.0",
+        "rollup": "3.15.0",
         "rollup-plugin-postcss": "^4.0.2",
         "sass": "^1.58.0"
       }
@@ -12666,9 +12666,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.10.0.tgz",
-      "integrity": "sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA==",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.15.0.tgz",
+      "integrity": "sha512-F9hrCAhnp5/zx/7HYmftvsNBkMfLfk/dXUh73hPSM2E3CRgap65orDNJbLetoiUFwSAk6iHPLvBrZ5iHYvzqsg==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -17799,14 +17799,14 @@
     "@tailwindcss/integrations-rollup": {
       "version": "file:integrations/rollup",
       "requires": {
-        "rollup": "^3.10.0",
+        "rollup": "3.15.0",
         "rollup-plugin-postcss": "^4.0.2"
       }
     },
     "@tailwindcss/integrations-rollup-sass": {
       "version": "file:integrations/rollup-sass",
       "requires": {
-        "rollup": "^3.10.0",
+        "rollup": "3.15.0",
         "rollup-plugin-postcss": "^4.0.2",
         "sass": "^1.58.0"
       }
@@ -24456,9 +24456,9 @@
       }
     },
     "rollup": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.10.0.tgz",
-      "integrity": "sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA==",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.15.0.tgz",
+      "integrity": "sha512-F9hrCAhnp5/zx/7HYmftvsNBkMfLfk/dXUh73hPSM2E3CRgap65orDNJbLetoiUFwSAk6iHPLvBrZ5iHYvzqsg==",
       "dev": true,
       "requires": {
         "fsevents": "~2.3.2"
@@ -27511,14 +27511,14 @@
         "@tailwindcss/integrations-rollup": {
           "version": "file:integrations/rollup",
           "requires": {
-            "rollup": "^3.10.0",
+            "rollup": "3.15.0",
             "rollup-plugin-postcss": "^4.0.2"
           }
         },
         "@tailwindcss/integrations-rollup-sass": {
           "version": "file:integrations/rollup-sass",
           "requires": {
-            "rollup": "^3.10.0",
+            "rollup": "3.15.0",
             "rollup-plugin-postcss": "^4.0.2",
             "sass": "^1.58.0"
           }
@@ -34168,9 +34168,9 @@
           }
         },
         "rollup": {
-          "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.10.0.tgz",
-          "integrity": "sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA==",
+          "version": "3.15.0",
+          "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.15.0.tgz",
+          "integrity": "sha512-F9hrCAhnp5/zx/7HYmftvsNBkMfLfk/dXUh73hPSM2E3CRgap65orDNJbLetoiUFwSAk6iHPLvBrZ5iHYvzqsg==",
           "dev": true,
           "requires": {
             "fsevents": "~2.3.2"

From 316282d719d141b184a71349021ad51d8aee1950 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Fri, 17 Feb 2023 07:25:42 +0000
Subject: [PATCH 18/84] Update @swc/core to version 1.3.35

---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2cc14ea39de4..719cdcbd06af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -97,7 +97,7 @@
       "name": "@tailwindcss/integrations-rollup",
       "version": "0.0.0",
       "devDependencies": {
-        "rollup": "3.15.0",
+        "rollup": "^3.15.0",
         "rollup-plugin-postcss": "^4.0.2"
       }
     },
@@ -105,7 +105,7 @@
       "name": "@tailwindcss/integrations-rollup-sass",
       "version": "0.0.0",
       "devDependencies": {
-        "rollup": "3.15.0",
+        "rollup": "^3.15.0",
         "rollup-plugin-postcss": "^4.0.2",
         "sass": "^1.58.0"
       }
@@ -17799,14 +17799,14 @@
     "@tailwindcss/integrations-rollup": {
       "version": "file:integrations/rollup",
       "requires": {
-        "rollup": "3.15.0",
+        "rollup": "^3.15.0",
         "rollup-plugin-postcss": "^4.0.2"
       }
     },
     "@tailwindcss/integrations-rollup-sass": {
       "version": "file:integrations/rollup-sass",
       "requires": {
-        "rollup": "3.15.0",
+        "rollup": "^3.15.0",
         "rollup-plugin-postcss": "^4.0.2",
         "sass": "^1.58.0"
       }
@@ -27511,14 +27511,14 @@
         "@tailwindcss/integrations-rollup": {
           "version": "file:integrations/rollup",
           "requires": {
-            "rollup": "3.15.0",
+            "rollup": "^3.15.0",
             "rollup-plugin-postcss": "^4.0.2"
           }
         },
         "@tailwindcss/integrations-rollup-sass": {
           "version": "file:integrations/rollup-sass",
           "requires": {
-            "rollup": "3.15.0",
+            "rollup": "^3.15.0",
             "rollup-plugin-postcss": "^4.0.2",
             "sass": "^1.58.0"
           }
diff --git a/package.json b/package.json
index f5d3615c7e96..33f63856ffad 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
   ],
   "devDependencies": {
     "@swc/cli": "0.1.61",
-    "@swc/core": "1.3.27",
+    "@swc/core": "1.3.35",
     "@swc/jest": "0.2.24",
     "@swc/register": "0.1.10",
     "autoprefixer": "^10.4.13",

From c8bf2d49b619e454722e7c72bce34b284b2d7529 Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Fri, 17 Feb 2023 20:21:22 +0100
Subject: [PATCH 19/84] Disable color opacity plugins by default in the `oxide`
 engine (#10618)

* disable color opacity plugins by default for the `oxide` engine

* update tests to reflect this change in the `oxide` engine

* update changelog

* reflect changes in integration tests
---
 CHANGELOG.md                                  |   4 +
 integrations/parcel/tests/integration.test.js | 137 +++--
 .../postcss-cli/tests/integration.test.js     | 143 +++--
 .../rollup-sass/tests/integration.test.js     | 185 ++++--
 integrations/rollup/tests/integration.test.js | 142 +++--
 .../tailwindcss-cli/tests/cli.test.js         | 101 +++-
 .../tailwindcss-cli/tests/integration.test.js | 363 ++++++++----
 integrations/vite/tests/integration.test.js   | 145 +++--
 .../webpack-4/tests/integration.test.js       | 142 +++--
 .../webpack-5/tests/integration.test.js       | 192 +++++--
 src/featureFlags.js                           |   4 +
 tests/any-type.test.js                        |  21 -
 tests/apply.test.js                           | 392 ++++++++++++-
 tests/arbitrary-values.oxide.test.css         |  97 +---
 tests/arbitrary-values.test.js                |  28 +-
 tests/arbitrary-variants.test.js              |  26 +-
 tests/basic-usage.oxide.test.css              |  59 +-
 tests/basic-usage.test.js                     |  38 +-
 tests/blocklist.test.js                       |  27 +-
 tests/collapse-adjacent-rules.test.js         |  80 ++-
 tests/color-opacity-modifiers.test.js         |  34 +-
 tests/import-syntax.test.js                   |  49 +-
 tests/kitchen-sink.test.js                    | 539 +++++++++++++++++-
 tests/match-variants.test.js                  |  40 +-
 tests/opacity.test.js                         | 112 +++-
 tests/plugins/gradientColorStops.test.js      |  36 +-
 tests/prefers-contrast.test.js                |  35 +-
 tests/raw-content.oxide.test.css              |  36 +-
 tests/safelist.test.js                        | 173 +++++-
 tests/syntax-lit-html.test.js                 |  29 +-
 tests/variants.oxide.test.css                 |  68 +--
 tests/variants.test.js                        |  41 +-
 32 files changed, 2746 insertions(+), 772 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de9618db4016..3931d5f91a47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
 - Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
 
+### Changed
+
+- [Oxide] Disable color opacity plugins by default in the `oxide` engine ([#10618](https://github.com/tailwindlabs/tailwindcss/pull/10618))
+
 ## [3.2.7] - 2023-02-16
 
 ### Fixed
diff --git a/integrations/parcel/tests/integration.test.js b/integrations/parcel/tests/integration.test.js
index 646ca051ae5c..0fc539f37eec 100644
--- a/integrations/parcel/tests/integration.test.js
+++ b/integrations/parcel/tests/integration.test.js
@@ -1,5 +1,6 @@
 let $ = require('../../execute')
 let { css, html, javascript } = require('../../syntax')
+let { env } = require('../../../lib/lib/sharedState')
 
 let {
   readOutputFile,
@@ -74,20 +75,38 @@ describe('watcher', () => {
       await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
     })
 
-    expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -128,20 +147,38 @@ describe('watcher', () => {
       await appendToInputFile('glob/index.html', html`<div class="bg-red-500"></div>`)
     })
 
-    expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -281,20 +318,36 @@ describe('watcher', () => {
       )
     })
 
-    expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
-      css`
-        /* prettier-ignore */
-        .btn {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-          border-radius: .25rem;
-          padding: .25rem .5rem;
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
+        css`
+          .btn {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+            border-radius: 0.25rem;
+            padding: 0.25rem 0.5rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
+        css`
+          .btn {
+            background-color: #ef4444;
+            border-radius: 0.25rem;
+            padding: 0.25rem 0.5rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
diff --git a/integrations/postcss-cli/tests/integration.test.js b/integrations/postcss-cli/tests/integration.test.js
index 964c57b82e39..36cfe7f4c4f5 100644
--- a/integrations/postcss-cli/tests/integration.test.js
+++ b/integrations/postcss-cli/tests/integration.test.js
@@ -1,5 +1,6 @@
 let $ = require('../../execute')
 let { css, html, javascript } = require('../../syntax')
+let { env } = require('../../../lib/lib/sharedState')
 
 let { readOutputFile, appendToInputFile, writeInputFile } = require('../../io')({
   output: 'dist',
@@ -60,20 +61,38 @@ describe('watcher', () => {
     await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -109,20 +128,38 @@ describe('watcher', () => {
     await appendToInputFile('glob/index.html', html`<div class="bg-red-500"></div>`)
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -247,22 +284,40 @@ describe('watcher', () => {
     )
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .btn {
-          border-radius: 0.25rem;
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-          padding-left: 0.5rem;
-          padding-right: 0.5rem;
-          padding-top: 0.25rem;
-          padding-bottom: 0.25rem;
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .btn {
+            border-radius: 0.25rem;
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+            padding-left: 0.5rem;
+            padding-right: 0.5rem;
+            padding-top: 0.25rem;
+            padding-bottom: 0.25rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          /* prettier-ignore */
+          .btn {
+            border-radius: 0.25rem;
+            background-color: #ef4444;
+            padding: 0.25rem 0.5rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
diff --git a/integrations/rollup-sass/tests/integration.test.js b/integrations/rollup-sass/tests/integration.test.js
index cdf9a11fb2cc..7d359577eea1 100644
--- a/integrations/rollup-sass/tests/integration.test.js
+++ b/integrations/rollup-sass/tests/integration.test.js
@@ -1,5 +1,6 @@
 let $ = require('../../execute')
 let { css, html, javascript } = require('../../syntax')
+let { env } = require('../../../lib/lib/sharedState')
 
 let { readOutputFile, appendToInputFile, writeInputFile } = require('../../io')({
   output: 'dist',
@@ -60,20 +61,38 @@ describe('watcher', () => {
     await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('index.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('index.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('index.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -109,20 +128,38 @@ describe('watcher', () => {
     await appendToInputFile('glob/index.html', html`<div class="bg-red-500"></div>`)
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('index.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('index.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('index.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -245,22 +282,36 @@ describe('watcher', () => {
     )
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('index.css')).toIncludeCss(
-      css`
-        .btn {
-          border-radius: 0.25rem;
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-          padding-left: 0.5rem;
-          padding-right: 0.5rem;
-          padding-top: 0.25rem;
-          padding-bottom: 0.25rem;
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('index.css')).toIncludeCss(
+        css`
+          .btn {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+            border-radius: 0.25rem;
+            padding: 0.25rem 0.5rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('index.css')).toIncludeCss(
+        css`
+          .btn {
+            background-color: #ef4444;
+            border-radius: 0.25rem;
+            padding: 0.25rem 0.5rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -326,22 +377,36 @@ describe('watcher', () => {
     )
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('index.css')).toIncludeCss(
-      css`
-        .btn {
-          border-radius: 0.25rem;
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-          padding-left: 0.5rem;
-          padding-right: 0.5rem;
-          padding-top: 0.25rem;
-          padding-bottom: 0.25rem;
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('index.css')).toIncludeCss(
+        css`
+          .btn {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+            border-radius: 0.25rem;
+            padding: 0.25rem 0.5rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('index.css')).toIncludeCss(
+        css`
+          .btn {
+            background-color: #ef4444;
+            border-radius: 0.25rem;
+            padding: 0.25rem 0.5rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
diff --git a/integrations/rollup/tests/integration.test.js b/integrations/rollup/tests/integration.test.js
index 63a28bcb54c4..1daea888a875 100644
--- a/integrations/rollup/tests/integration.test.js
+++ b/integrations/rollup/tests/integration.test.js
@@ -1,5 +1,6 @@
 let $ = require('../../execute')
 let { css, html, javascript } = require('../../syntax')
+let { env } = require('../../../lib/lib/sharedState')
 
 let { readOutputFile, appendToInputFile, writeInputFile } = require('../../io')({
   output: 'dist',
@@ -60,20 +61,38 @@ describe('watcher', () => {
     await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('index.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('index.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('index.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -109,20 +128,38 @@ describe('watcher', () => {
     await appendToInputFile('glob/index.html', html`<div class="bg-red-500"></div>`)
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('index.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('index.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('index.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -245,22 +282,39 @@ describe('watcher', () => {
     )
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('index.css')).toIncludeCss(
-      css`
-        .btn {
-          border-radius: 0.25rem;
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-          padding-left: 0.5rem;
-          padding-right: 0.5rem;
-          padding-top: 0.25rem;
-          padding-bottom: 0.25rem;
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('index.css')).toIncludeCss(
+        css`
+          .btn {
+            border-radius: 0.25rem;
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+            padding-left: 0.5rem;
+            padding-right: 0.5rem;
+            padding-top: 0.25rem;
+            padding-bottom: 0.25rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('index.css')).toIncludeCss(
+        css`
+          .btn {
+            border-radius: 0.25rem;
+            background-color: #ef4444;
+            padding: 0.25rem 0.5rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
diff --git a/integrations/tailwindcss-cli/tests/cli.test.js b/integrations/tailwindcss-cli/tests/cli.test.js
index b43f2975aa1f..def432cab4e5 100644
--- a/integrations/tailwindcss-cli/tests/cli.test.js
+++ b/integrations/tailwindcss-cli/tests/cli.test.js
@@ -2,6 +2,7 @@ let path = require('path')
 let $ = require('../../execute')
 let { css, html, javascript } = require('../../syntax')
 let resolveToolRoot = require('../../resolve-tool-root')
+let { env } = require('../../../lib/lib/sharedState')
 
 let version = require('../../../package.json').version
 
@@ -215,22 +216,42 @@ describe('Build command', () => {
 
     await $(`${EXECUTABLE} --output ./dist/main.css --postcss`)
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .font-bold-after {
-          font-weight: 700;
-        }
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .font-bold-after {
+            font-weight: 700;
+          }
 
-        .btn-after {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-          padding-left: 0.5rem;
-          padding-right: 0.5rem;
-          padding-top: 0.25rem;
-          padding-bottom: 0.25rem;
-        }
-      `
-    )
+          .btn-after {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+            padding-left: 0.5rem;
+            padding-right: 0.5rem;
+            padding-top: 0.25rem;
+            padding-bottom: 0.25rem;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .font-bold-after {
+            font-weight: 700;
+          }
+
+          .btn-after {
+            background-color: #ef4444;
+            padding-left: 0.5rem;
+            padding-right: 0.5rem;
+            padding-top: 0.25rem;
+            padding-bottom: 0.25rem;
+          }
+        `
+      )
+    }
   })
 
   test('--postcss (custom.postcss.config.js)', async () => {
@@ -266,22 +287,42 @@ describe('Build command', () => {
 
     await $(`${EXECUTABLE} --output ./dist/main.css --postcss ./custom.postcss.config.js`)
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .font-bold-after {
-          font-weight: 700;
-        }
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .font-bold-after {
+            font-weight: 700;
+          }
 
-        .btn-after {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-          padding-left: 0.5rem;
-          padding-right: 0.5rem;
-          padding-top: 0.25rem;
-          padding-bottom: 0.25rem;
-        }
-      `
-    )
+          .btn-after {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+            padding-left: 0.5rem;
+            padding-right: 0.5rem;
+            padding-top: 0.25rem;
+            padding-bottom: 0.25rem;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .font-bold-after {
+            font-weight: 700;
+          }
+
+          .btn-after {
+            background-color: #ef4444;
+            padding-left: 0.5rem;
+            padding-right: 0.5rem;
+            padding-top: 0.25rem;
+            padding-bottom: 0.25rem;
+          }
+        `
+      )
+    }
   })
 
   test('--postcss supports process options', async () => {
diff --git a/integrations/tailwindcss-cli/tests/integration.test.js b/integrations/tailwindcss-cli/tests/integration.test.js
index 42e35a895218..ff8db20b8a2d 100644
--- a/integrations/tailwindcss-cli/tests/integration.test.js
+++ b/integrations/tailwindcss-cli/tests/integration.test.js
@@ -1,6 +1,7 @@
 let fs = require('fs')
 let $ = require('../../execute')
 let { css, html, javascript } = require('../../syntax')
+let { env } = require('../../../lib/lib/sharedState')
 
 let { readOutputFile, appendToInputFile, writeInputFile } = require('../../io')({
   output: 'dist',
@@ -71,23 +72,43 @@ describe('static build', () => {
       env: { NODE_ENV: 'production' },
     })
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
 
-        .bg-red-600 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(220 38 38 / var(--tw-bg-opacity));
-        }
+          .bg-red-600 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(220 38 38 / var(--tw-bg-opacity));
+          }
 
-        .font-bold {
-          font-weight: 700;
-        }
-      `
-    )
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+
+          .bg-red-600 {
+            background-color: #dc2626;
+          }
+
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
   })
 
   it('can read from a config file from an @config directive', async () => {
@@ -127,14 +148,26 @@ describe('static build', () => {
       env: { NODE_ENV: 'production' },
     })
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-yellow {
-          --tw-bg-opacity: 1;
-          background-color: rgb(255 255 0 / var(--tw-bg-opacity));
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-yellow {
+            --tw-bg-opacity: 1;
+            background-color: rgb(255 255 0 / var(--tw-bg-opacity));
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-yellow {
+            background-color: #ff0;
+          }
+        `
+      )
+    }
   })
 
   it('can read from a config file from an @config directive inside an @import from postcss-import', async () => {
@@ -182,14 +215,26 @@ describe('static build', () => {
       env: { NODE_ENV: 'production' },
     })
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-yellow {
-          --tw-bg-opacity: 1;
-          background-color: rgb(255 255 0 / var(--tw-bg-opacity));
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-yellow {
+            --tw-bg-opacity: 1;
+            background-color: rgb(255 255 0 / var(--tw-bg-opacity));
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-yellow {
+            background-color: #ff0;
+          }
+        `
+      )
+    }
   })
 
   it('should work with raw content', async () => {
@@ -216,14 +261,26 @@ describe('static build', () => {
       env: { NODE_ENV: 'production' },
     })
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+        `
+      )
+    }
   })
 })
 
@@ -259,20 +316,38 @@ describe('watcher', () => {
     await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -308,20 +383,38 @@ describe('watcher', () => {
     await appendToInputFile('glob/index.html', html`<div class="bg-red-500"></div>`)
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -496,22 +589,42 @@ describe('watcher', () => {
     )
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .btn {
-          border-radius: 0.25rem;
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-          padding-left: 0.5rem;
-          padding-right: 0.5rem;
-          padding-top: 0.25rem;
-          padding-bottom: 0.25rem;
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .btn {
+            border-radius: 0.25rem;
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+            padding-left: 0.5rem;
+            padding-right: 0.5rem;
+            padding-top: 0.25rem;
+            padding-bottom: 0.25rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .btn {
+            border-radius: 0.25rem;
+            background-color: #ef4444;
+            padding-left: 0.5rem;
+            padding-right: 0.5rem;
+            padding-top: 0.25rem;
+            padding-bottom: 0.25rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -573,14 +686,26 @@ describe('watcher', () => {
     let runningProcess = $('node ../../lib/cli.js -i ./src/index.css -o ./dist/main.css -w')
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-yellow {
-          --tw-bg-opacity: 1;
-          background-color: rgb(255 255 0 / var(--tw-bg-opacity));
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-yellow {
+            --tw-bg-opacity: 1;
+            background-color: rgb(255 255 0 / var(--tw-bg-opacity));
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-yellow {
+            background-color: #ff0;
+          }
+        `
+      )
+    }
 
     await writeInputFile(
       'index.css',
@@ -593,14 +718,26 @@ describe('watcher', () => {
     )
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-yellow {
-          --tw-bg-opacity: 1;
-          background-color: rgb(255 255 119 / var(--tw-bg-opacity));
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-yellow {
+            --tw-bg-opacity: 1;
+            background-color: rgb(255 255 119 / var(--tw-bg-opacity));
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-yellow {
+            background-color: #ff7;
+          }
+        `
+      )
+    }
 
     await writeInputFile(
       'tailwind.2.config.js',
@@ -625,14 +762,26 @@ describe('watcher', () => {
     )
     await runningProcess.onStderr(ready)
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-yellow {
-          --tw-bg-opacity: 1;
-          background-color: rgb(255 255 255 / var(--tw-bg-opacity));
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-yellow {
+            --tw-bg-opacity: 1;
+            background-color: rgb(255 255 255 / var(--tw-bg-opacity));
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-yellow {
+            background-color: #fff;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
diff --git a/integrations/vite/tests/integration.test.js b/integrations/vite/tests/integration.test.js
index b2d08bc27d01..1e5cd2d3345e 100644
--- a/integrations/vite/tests/integration.test.js
+++ b/integrations/vite/tests/integration.test.js
@@ -2,6 +2,7 @@ require('isomorphic-fetch')
 
 let $ = require('../../execute')
 let { css, html, javascript } = require('../../syntax')
+let { env } = require('../../../lib/lib/sharedState')
 
 let { readOutputFile, appendToInputFile, writeInputFile } = require('../../io')({
   output: 'dist',
@@ -83,20 +84,38 @@ describe('watcher', () => {
     await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
     await runningProcess.onStdout((message) => message.includes('page reload'))
 
-    expect(await fetchCSS()).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await fetchCSS()).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await fetchCSS()).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -136,20 +155,38 @@ describe('watcher', () => {
     await appendToInputFile('glob/index.html', html`<div class="bg-red-500"></div>`)
     await runningProcess.onStdout((message) => message.includes('page reload'))
 
-    expect(await fetchCSS()).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await fetchCSS()).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await fetchCSS()).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -288,22 +325,42 @@ describe('watcher', () => {
     )
     await runningProcess.onStdout((message) => message.includes('hmr update /index.css'))
 
-    expect(await fetchCSS()).toIncludeCss(
-      css`
-        .btn {
-          border-radius: 0.25rem;
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-          padding-left: 0.5rem;
-          padding-right: 0.5rem;
-          padding-top: 0.25rem;
-          padding-bottom: 0.25rem;
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await fetchCSS()).toIncludeCss(
+        css`
+          .btn {
+            border-radius: 0.25rem;
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+            padding-left: 0.5rem;
+            padding-right: 0.5rem;
+            padding-top: 0.25rem;
+            padding-bottom: 0.25rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await fetchCSS()).toIncludeCss(
+        css`
+          .btn {
+            border-radius: 0.25rem;
+            background-color: #ef4444;
+            padding-left: 0.5rem;
+            padding-right: 0.5rem;
+            padding-top: 0.25rem;
+            padding-bottom: 0.25rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
diff --git a/integrations/webpack-4/tests/integration.test.js b/integrations/webpack-4/tests/integration.test.js
index 63ab3cbbf130..6bbf3f879fcd 100644
--- a/integrations/webpack-4/tests/integration.test.js
+++ b/integrations/webpack-4/tests/integration.test.js
@@ -1,5 +1,6 @@
 let $ = require('../../execute')
 let { css, html, javascript } = require('../../syntax')
+let { env } = require('../../../lib/lib/sharedState')
 
 let {
   readOutputFile,
@@ -60,20 +61,38 @@ describe('watcher', () => {
       await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
     })
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -112,20 +131,38 @@ describe('watcher', () => {
       await appendToInputFile('glob/index.html', html`<div class="bg-red-500"></div>`)
     })
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -253,22 +290,39 @@ describe('watcher', () => {
       )
     })
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .btn {
-          border-radius: 0.25rem;
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-          padding-left: 0.5rem;
-          padding-right: 0.5rem;
-          padding-top: 0.25rem;
-          padding-bottom: 0.25rem;
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .btn {
+            border-radius: 0.25rem;
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+            padding-left: 0.5rem;
+            padding-right: 0.5rem;
+            padding-top: 0.25rem;
+            padding-bottom: 0.25rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .btn {
+            background-color: #ef4444;
+            border-radius: 0.25rem;
+            padding: 0.25rem 0.5rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
diff --git a/integrations/webpack-5/tests/integration.test.js b/integrations/webpack-5/tests/integration.test.js
index 95f3d5f5f890..fde0d60c5364 100644
--- a/integrations/webpack-5/tests/integration.test.js
+++ b/integrations/webpack-5/tests/integration.test.js
@@ -1,5 +1,6 @@
 let $ = require('../../execute')
 let { css, html, javascript } = require('../../syntax')
+let { env } = require('../../../lib/lib/sharedState')
 
 let {
   readOutputFile,
@@ -60,20 +61,38 @@ describe('watcher', () => {
       await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
     })
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -112,20 +131,38 @@ describe('watcher', () => {
       await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
     })
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-        .font-normal {
-          font-weight: 400;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+          .font-normal {
+            font-weight: 400;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -253,22 +290,39 @@ describe('watcher', () => {
       )
     })
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .btn {
-          border-radius: 0.25rem;
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-          padding-left: 0.5rem;
-          padding-right: 0.5rem;
-          padding-top: 0.25rem;
-          padding-bottom: 0.25rem;
-        }
-        .font-bold {
-          font-weight: 700;
-        }
-      `
-    )
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .btn {
+            border-radius: 0.25rem;
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+            padding-left: 0.5rem;
+            padding-right: 0.5rem;
+            padding-top: 0.25rem;
+            padding-bottom: 0.25rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .btn {
+            background-color: #ef4444;
+            border-radius: 0.25rem;
+            padding: 0.25rem 0.5rem;
+          }
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
@@ -299,23 +353,43 @@ describe('watcher', () => {
 
     await waitForOutputFileCreation('main.css')
 
-    expect(await readOutputFile('main.css')).toIncludeCss(
-      css`
-        .bg-red-500 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-        }
+    if (!env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+          }
 
-        .bg-red-600 {
-          --tw-bg-opacity: 1;
-          background-color: rgb(220 38 38 / var(--tw-bg-opacity));
-        }
+          .bg-red-600 {
+            --tw-bg-opacity: 1;
+            background-color: rgb(220 38 38 / var(--tw-bg-opacity));
+          }
 
-        .font-bold {
-          font-weight: 700;
-        }
-      `
-    )
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
+
+    if (env.OXIDE) {
+      expect(await readOutputFile('main.css')).toIncludeCss(
+        css`
+          .bg-red-500 {
+            background-color: #ef4444;
+          }
+
+          .bg-red-600 {
+            background-color: #dc2626;
+          }
+
+          .font-bold {
+            font-weight: 700;
+          }
+        `
+      )
+    }
 
     return runningProcess.stop()
   })
diff --git a/src/featureFlags.js b/src/featureFlags.js
index f07229d492e1..7013c7534ffd 100644
--- a/src/featureFlags.js
+++ b/src/featureFlags.js
@@ -1,9 +1,13 @@
 import colors from 'picocolors'
 import log from './util/log'
+import { env } from './lib/sharedState'
 
 let defaults = {
   optimizeUniversalDefaults: false,
   generalizedModifiers: true,
+  get disableColorOpacityUtilitiesByDefault() {
+    return env.OXIDE
+  },
 }
 
 let featureFlags = {
diff --git a/tests/any-type.test.js b/tests/any-type.test.js
index add8a1795551..a7e266176828 100644
--- a/tests/any-type.test.js
+++ b/tests/any-type.test.js
@@ -444,9 +444,6 @@ crosscheck(({ stable, oxide }) => {
         .divide-\[var\(--any-value\)\] > :not([hidden]) ~ :not([hidden]) {
           border-color: var(--any-value);
         }
-        .divide-opacity-\[var\(--any-value\)\] > :not([hidden]) ~ :not([hidden]) {
-          --tw-divide-opacity: var(--any-value);
-        }
         .rounded-\[var\(--any-value\)\] {
           border-radius: var(--any-value);
         }
@@ -501,15 +498,9 @@ crosscheck(({ stable, oxide }) => {
         .border-t-\[var\(--any-value\)\] {
           border-top-color: var(--any-value);
         }
-        .border-opacity-\[var\(--any-value\)\] {
-          --tw-border-opacity: var(--any-value);
-        }
         .bg-\[var\(--any-value\)\] {
           background-color: var(--any-value);
         }
-        .bg-opacity-\[var\(--any-value\)\] {
-          --tw-bg-opacity: var(--any-value);
-        }
         .from-\[var\(--any-value\)\] {
           --tw-gradient-from: var(--any-value);
           --tw-gradient-to: #fff0;
@@ -572,9 +563,6 @@ crosscheck(({ stable, oxide }) => {
         .text-\[var\(--any-value\)\] {
           color: var(--any-value);
         }
-        .text-opacity-\[var\(--any-value\)\] {
-          --tw-text-opacity: var(--any-value);
-        }
         .decoration-\[var\(--any-value\)\] {
           text-decoration-color: var(--any-value);
         }
@@ -584,9 +572,6 @@ crosscheck(({ stable, oxide }) => {
         .placeholder-\[var\(--any-value\)\]::placeholder {
           color: var(--any-value);
         }
-        .placeholder-opacity-\[var\(--any-value\)\]::placeholder {
-          --tw-placeholder-opacity: var(--any-value);
-        }
         .caret-\[var\(--any-value\)\] {
           caret-color: var(--any-value);
         }
@@ -609,9 +594,6 @@ crosscheck(({ stable, oxide }) => {
         .ring-\[var\(--any-value\)\] {
           --tw-ring-color: var(--any-value);
         }
-        .ring-opacity-\[var\(--any-value\)\] {
-          --tw-ring-opacity: var(--any-value);
-        }
         .ring-offset-\[var\(--any-value\)\] {
           --tw-ring-offset-color: var(--any-value);
         }
@@ -743,15 +725,12 @@ crosscheck(({ stable, oxide }) => {
         .duration-\[var\(--any-value\)\] {
           transition-duration: var(--any-value);
         }
-
         .ease-\[var\(--any-value\)\] {
           transition-timing-function: var(--any-value);
         }
-
         .will-change-\[var\(--any-value\)\] {
           will-change: var(--any-value);
         }
-
         .content-\[var\(--any-value\)\] {
           --tw-content: var(--any-value);
           content: var(--tw-content);
diff --git a/tests/apply.test.js b/tests/apply.test.js
index a90bdf23cec1..cb5c6be068a6 100644
--- a/tests/apply.test.js
+++ b/tests/apply.test.js
@@ -1,6 +1,6 @@
 import { crosscheck, run, html, css, defaults } from './util/run'
 
-crosscheck(() => {
+crosscheck(({ stable, oxide }) => {
   let sharedHtml = html`
     <div class="basic-example"></div>
     <div class="class-order"></div>
@@ -159,7 +159,7 @@ crosscheck(() => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .basic-example {
           --tw-bg-opacity: 1;
           background-color: rgb(59 130 246 / var(--tw-bg-opacity));
@@ -457,6 +457,299 @@ crosscheck(() => {
           animation: 2s cubic-bezier(0.4, 0, 0.6, 1) infinite pulse !important;
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .basic-example {
+          background-color: #3b82f6;
+          border-radius: 0.375rem;
+          padding: 0.5rem 1rem;
+        }
+        .class-order {
+          padding: 1rem 0.25rem 1.75rem 0.75rem;
+        }
+        .with-additional-properties {
+          text-align: right;
+          font-weight: 500;
+        }
+        .variants {
+          font-weight: 600;
+        }
+        .variants:hover {
+          font-weight: 700;
+        }
+        .variants:focus {
+          font-weight: 500;
+        }
+        @media (min-width: 1024px) {
+          .variants {
+            font-weight: 300;
+          }
+        }
+        @media (min-width: 1280px) {
+          .variants:focus {
+            font-weight: 900;
+          }
+        }
+        .only-variants:hover {
+          font-weight: 700;
+        }
+        .only-variants:focus {
+          font-weight: 500;
+        }
+        @media (min-width: 1024px) {
+          .only-variants {
+            font-weight: 300;
+          }
+        }
+        @media (min-width: 1280px) {
+          .only-variants:focus {
+            font-weight: 900;
+          }
+        }
+        .group:hover .apply-group-variant {
+          text-align: center;
+        }
+        @media (min-width: 1024px) {
+          .group:hover .apply-group-variant {
+            text-align: left;
+          }
+        }
+        .dark .apply-dark-variant {
+          text-align: center;
+        }
+        .dark .apply-dark-variant:hover {
+          text-align: right;
+        }
+        @media (min-width: 1024px) {
+          .dark .apply-dark-variant {
+            text-align: left;
+          }
+        }
+        .apply-custom-utility,
+        .apply-custom-utility:hover {
+          custom: stuff;
+        }
+        @media (min-width: 1024px) {
+          .apply-custom-utility {
+            custom: stuff;
+          }
+        }
+        @media (min-width: 1280px) {
+          .apply-custom-utility:focus {
+            custom: stuff;
+          }
+        }
+        .multiple,
+        .selectors {
+          background-color: #3b82f6;
+          border-radius: 0.375rem;
+          padding: 0.5rem 1rem;
+        }
+        .multiple-variants:hover,
+        .selectors-variants:hover {
+          text-align: center;
+        }
+        .multiple-variants:active,
+        .selectors-variants:active {
+          text-align: right;
+        }
+        @media (min-width: 1024px) {
+          .multiple-variants:focus,
+          .selectors-variants:focus {
+            text-align: left;
+          }
+        }
+        .group:hover .multiple-group,
+        .group:hover .selectors-group {
+          text-align: center;
+        }
+        @media (min-width: 1024px) {
+          .group:hover .multiple-group,
+          .group:hover .selectors-group {
+            text-align: left;
+          }
+        }
+        .complex-utilities {
+          --tw-ordinal: ordinal;
+          --tw-numeric-spacing: tabular-nums;
+          font-variant-numeric: var(--tw-ordinal) var(--tw-slashed-zero) var(--tw-numeric-figure)
+            var(--tw-numeric-spacing) var(--tw-numeric-fraction);
+          --tw-shadow: 0 10px 15px -3px #0000001a, 0 4px 6px -4px #0000001a;
+          --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color),
+            0 4px 6px -4px var(--tw-shadow-color);
+          box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
+            var(--tw-shadow);
+        }
+        .complex-utilities:hover {
+          --tw-shadow: 0 20px 25px -5px #0000001a, 0 8px 10px -6px #0000001a;
+          --tw-shadow-colored: 0 20px 25px -5px var(--tw-shadow-color),
+            0 8px 10px -6px var(--tw-shadow-color);
+          box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
+            var(--tw-shadow);
+        }
+        .complex-utilities:focus {
+          --tw-numeric-fraction: diagonal-fractions;
+          font-variant-numeric: var(--tw-ordinal) var(--tw-slashed-zero) var(--tw-numeric-figure)
+            var(--tw-numeric-spacing) var(--tw-numeric-fraction);
+        }
+        .use-base-only-a {
+          font-weight: 700;
+        }
+        .use-dependant-only-b {
+          font-weight: 400;
+        }
+        .btn {
+          border-radius: 0.25rem;
+          padding: 0.5rem 1rem;
+          font-weight: 700;
+        }
+        .btn-blue {
+          color: #fff;
+          background-color: #3b82f6;
+          border-radius: 0.25rem;
+          padding: 0.5rem 1rem;
+          font-weight: 700;
+        }
+        .btn-blue:hover {
+          background-color: #1d4ed8;
+        }
+        .recursive-apply-a {
+          font-weight: 900;
+        }
+        @media (min-width: 640px) {
+          .recursive-apply-a {
+            font-weight: 100;
+          }
+        }
+        .recursive-apply-b {
+          font-weight: 900;
+        }
+        @media (min-width: 640px) {
+          .recursive-apply-b {
+            font-weight: 100;
+          }
+        }
+        .recursive-apply-b {
+          font-weight: 600;
+        }
+        @media (min-width: 768px) {
+          .recursive-apply-b {
+            font-weight: 200;
+          }
+        }
+        .recursive-apply-c {
+          font-weight: 900;
+        }
+        @media (min-width: 640px) {
+          .recursive-apply-c {
+            font-weight: 100;
+          }
+        }
+        .recursive-apply-c {
+          font-weight: 600;
+        }
+        @media (min-width: 768px) {
+          .recursive-apply-c {
+            font-weight: 200;
+          }
+        }
+        .recursive-apply-c {
+          font-weight: 700;
+        }
+        @media (min-width: 1024px) {
+          .recursive-apply-c {
+            font-weight: 300;
+          }
+        }
+        .use-with-other-properties-base,
+        .use-with-other-properties-component {
+          color: green;
+          font-weight: 700;
+        }
+        .add-sibling-properties {
+          padding: 2rem 1rem;
+        }
+        .add-sibling-properties:hover {
+          padding-left: 0.5rem;
+          padding-right: 0.5rem;
+        }
+        @media (min-width: 1024px) {
+          .add-sibling-properties {
+            padding-left: 2.5rem;
+            padding-right: 2.5rem;
+          }
+        }
+        @media (min-width: 1280px) {
+          .add-sibling-properties:focus {
+            padding-left: 0.25rem;
+            padding-right: 0.25rem;
+          }
+        }
+        .add-sibling-properties {
+          color: green;
+          padding-top: 3px;
+          font-weight: 700;
+        }
+        h1 {
+          font-size: 1.5rem;
+          line-height: 2rem;
+        }
+        @media (min-width: 640px) {
+          h1 {
+            font-size: 1.875rem;
+            line-height: 2.25rem;
+          }
+        }
+        @media (min-width: 1024px) {
+          h1 {
+            font-size: 1.5rem;
+            line-height: 2rem;
+          }
+        }
+        h2 {
+          font-size: 1.5rem;
+          line-height: 2rem;
+        }
+        @media (min-width: 1024px) {
+          h2 {
+            font-size: 1.5rem;
+            line-height: 2rem;
+          }
+        }
+        @media (min-width: 640px) {
+          h2 {
+            font-size: 1.5rem;
+            line-height: 2rem;
+          }
+        }
+        .important-modifier {
+          padding-left: 1rem;
+          padding-right: 1rem;
+          border-radius: 0.375rem !important;
+        }
+        .important-modifier-variant {
+          padding-left: 1rem;
+          padding-right: 1rem;
+        }
+        .important-modifier-variant:hover {
+          border-radius: 0.375rem !important;
+        }
+        @keyframes spin {
+          to {
+            transform: rotate(360deg);
+          }
+        }
+        .foo {
+          animation: 1s linear infinite spin;
+        }
+        @keyframes pulse {
+          50% {
+            opacity: 0.5;
+          }
+        }
+        .bar {
+          animation: 2s cubic-bezier(0.4, 0, 0.6, 1) infinite pulse !important;
+        }
+      `)
     })
   })
 
@@ -645,7 +938,7 @@ crosscheck(() => {
     `
 
     await run(input, config).then((result) => {
-      return expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .font-bold,
         .foo {
           font-weight: 700;
@@ -673,6 +966,30 @@ crosscheck(() => {
           color: green;
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .font-bold,
+        .foo {
+          font-weight: 700;
+        }
+        .bar {
+          color: #ef4444;
+          font-weight: 700;
+        }
+        .bar:hover {
+          color: #22c55e;
+        }
+        .baz {
+          color: #ef4444;
+          font-weight: 700;
+          text-decoration-line: underline;
+        }
+        .baz:hover {
+          color: #22c55e;
+        }
+        .keep-me-even-though-I-am-not-used-in-content {
+          color: green;
+        }
+      `)
     })
   })
 
@@ -888,13 +1205,19 @@ crosscheck(() => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .bg-gray-500,
         .focus\:bg-gray-500 {
           --tw-bg-opacity: 1;
           background-color: rgb(107 114 128 / var(--tw-bg-opacity));
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .bg-gray-500,
+        .focus\:bg-gray-500 {
+          background-color: #6b7280;
+        }
+      `)
     })
   })
 
@@ -1441,7 +1764,7 @@ crosscheck(() => {
       `
 
       return run(input, config).then((result) => {
-        return expect(result.css).toMatchFormattedCss(css`
+        stable.expect(result.css).toMatchFormattedCss(css`
           .a {
             color: red;
             --tw-text-opacity: 1;
@@ -1455,6 +1778,18 @@ crosscheck(() => {
             text-decoration: underline;
           }
         `)
+        oxide.expect(result.css).toMatchFormattedCss(css`
+          .a {
+            color: red;
+            color: #22c55e;
+            color: #00f;
+            text-decoration: underline;
+          }
+          .b {
+            color: #22c55e;
+            text-decoration: underline;
+          }
+        `)
       })
     })
 
@@ -1565,23 +1900,33 @@ crosscheck(() => {
     let result
     result = await run(input, config)
 
-    expect(result.css).toMatchFormattedCss(css`
+    stable.expect(result.css).toMatchFormattedCss(css`
       .input-text {
         --tw-bg-opacity: 1;
         background-color: rgb(255 255 255 / var(--tw-bg-opacity));
         background-color: red;
       }
     `)
+    oxide.expect(result.css).toMatchFormattedCss(css`
+      .input-text {
+        background-color: red;
+      }
+    `)
 
     result = await run(input, config)
 
-    expect(result.css).toMatchFormattedCss(css`
+    stable.expect(result.css).toMatchFormattedCss(css`
       .input-text {
         --tw-bg-opacity: 1;
         background-color: rgb(255 255 255 / var(--tw-bg-opacity));
         background-color: red;
       }
     `)
+    oxide.expect(result.css).toMatchFormattedCss(css`
+      .input-text {
+        background-color: red;
+      }
+    `)
   })
 
   it('should work in layer', async () => {
@@ -1603,13 +1948,18 @@ crosscheck(() => {
     await run(input, config)
     const result = await run(input, config)
 
-    expect(result.css).toMatchFormattedCss(css`
+    stable.expect(result.css).toMatchFormattedCss(css`
       .input-text {
         --tw-bg-opacity: 1;
         background-color: rgb(255 255 255 / var(--tw-bg-opacity));
         background-color: red;
       }
     `)
+    oxide.expect(result.css).toMatchFormattedCss(css`
+      .input-text {
+        background-color: red;
+      }
+    `)
   })
 
   it('apply partitioning works with media queries', async () => {
@@ -1640,7 +1990,7 @@ crosscheck(() => {
     await run(input, config)
     const result = await run(input, config)
 
-    expect(result.css).toMatchFormattedCss(css`
+    stable.expect(result.css).toMatchFormattedCss(css`
       html,
       body {
         --tw-text-opacity: 1;
@@ -1657,6 +2007,21 @@ crosscheck(() => {
       }
       ${defaults}
     `)
+    oxide.expect(result.css).toMatchFormattedCss(css`
+      html,
+      body {
+        color: #16a34a;
+        font-size: 1rem;
+      }
+      @media print {
+        html,
+        body {
+          color: #dc2626;
+          font-size: 2rem;
+        }
+      }
+      ${defaults}
+    `)
   })
 
   it('should be possible to use apply in plugins', async () => {
@@ -1975,7 +2340,7 @@ crosscheck(() => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .foo:hover.bar .baz,
         .foo:hover.bar > .baz {
           --tw-bg-opacity: 1;
@@ -1983,6 +2348,13 @@ crosscheck(() => {
           color: red;
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .foo:hover.bar .baz,
+        .foo:hover.bar > .baz {
+          color: red;
+          background-color: #000;
+        }
+      `)
     })
   })
 })
diff --git a/tests/arbitrary-values.oxide.test.css b/tests/arbitrary-values.oxide.test.css
index acd68ee3386a..c8dfb24a7007 100644
--- a/tests/arbitrary-values.oxide.test.css
+++ b/tests/arbitrary-values.oxide.test.css
@@ -137,13 +137,13 @@
   min-height: var(--height);
 }
 .w-\[\'\)\(\)\'\] {
-  width: ')()';
+  width: ")()";
 }
 .w-\[\'\]\[\]\'\] {
-  width: '][]';
+  width: "][]";
 }
 .w-\[\'\}\{\}\'\] {
-  width: '}{}';
+  width: "}{}";
 }
 .w-\[\(\(\)\)\] {
   width: (());
@@ -348,10 +348,10 @@
   cursor: pointer;
 }
 .cursor-\[url\(\'\.\/path_to_hand\.cur\'\)_2_2\,pointer\] {
-  cursor: url('./path_to_hand.cur') 2 2, pointer;
+  cursor: url("./path_to_hand.cur") 2 2, pointer;
 }
 .cursor-\[url\(hand\.cur\)_2_2\,pointer\] {
-  cursor: url('hand.cur') 2 2, pointer;
+  cursor: url("hand.cur") 2 2, pointer;
 }
 .cursor-\[var\(--value\)\] {
   cursor: var(--value);
@@ -409,7 +409,7 @@
   scroll-padding-top: var(--scroll-padding);
 }
 .list-\[\'\\1f44d\'\] {
-  list-style-type: '👍';
+  list-style-type: "👍";
 }
 .list-\[var\(--value\)\] {
   list-style-type: var(--value);
@@ -494,18 +494,11 @@
   border-bottom-width: calc(calc(20% - 1cm) * var(--tw-divide-y-reverse));
 }
 .divide-\[black\] > :not([hidden]) ~ :not([hidden]) {
-  --tw-divide-opacity: 1;
-  border-color: rgb(0 0 0 / var(--tw-divide-opacity));
+  border-color: #000;
 }
 .divide-\[var\(--value\)\] > :not([hidden]) ~ :not([hidden]) {
   border-color: var(--value);
 }
-.divide-opacity-\[0\.8\] > :not([hidden]) ~ :not([hidden]) {
-  --tw-divide-opacity: 0.8;
-}
-.divide-opacity-\[var\(--value\)\] > :not([hidden]) ~ :not([hidden]) {
-  --tw-divide-opacity: var(--value);
-}
 .rounded-\[11px\] {
   border-radius: 11px;
 }
@@ -568,8 +561,7 @@
   border-top-width: var(--value);
 }
 .border-\[\#f00\] {
-  --tw-border-opacity: 1;
-  border-color: rgb(255 0 0 / var(--tw-border-opacity));
+  border-color: red;
 }
 .border-\[color\:var\(--value\)\] {
   border-color: var(--value);
@@ -578,75 +570,60 @@
   border-color: red #000;
 }
 .border-b-\[\#f00\] {
-  --tw-border-opacity: 1;
-  border-bottom-color: rgb(255 0 0 / var(--tw-border-opacity));
+  border-bottom-color: red;
 }
 .border-b-\[color\:var\(--value\)\] {
   border-bottom-color: var(--value);
 }
 .border-l-\[\#f00\] {
-  --tw-border-opacity: 1;
-  border-left-color: rgb(255 0 0 / var(--tw-border-opacity));
+  border-left-color: red;
 }
 .border-l-\[color\:var\(--value\)\] {
   border-left-color: var(--value);
 }
 .border-r-\[\#f00\] {
-  --tw-border-opacity: 1;
-  border-right-color: rgb(255 0 0 / var(--tw-border-opacity));
+  border-right-color: red;
 }
 .border-r-\[color\:var\(--value\)\] {
   border-right-color: var(--value);
 }
 .border-t-\[\#f00\] {
-  --tw-border-opacity: 1;
-  border-top-color: rgb(255 0 0 / var(--tw-border-opacity));
+  border-top-color: red;
 }
 .border-t-\[color\:var\(--value\)\] {
   border-top-color: var(--value);
 }
-.border-opacity-\[0\.8\] {
-  --tw-border-opacity: 0.8;
-}
-.border-opacity-\[var\(--value\)\] {
-  --tw-border-opacity: var(--value);
-}
 .bg-\[\#0000ffcc\] {
   background-color: #00fc;
 }
 .bg-\[\#0f0\] {
-  --tw-bg-opacity: 1;
-  background-color: rgb(0 255 0 / var(--tw-bg-opacity));
+  background-color: #0f0;
 }
 .bg-\[\#0f0_var\(--value\)\] {
   background-color: #0f0 var(--value);
 }
 .bg-\[\#ff0000\] {
-  --tw-bg-opacity: 1;
-  background-color: rgb(255 0 0 / var(--tw-bg-opacity));
+  background-color: red;
 }
 .bg-\[color\:var\(--value1\)_var\(--value2\)\] {
   background-color: var(--value1) var(--value2);
 }
 .bg-\[hsl\(0\,100\%\,50\%\)\],
 .bg-\[hsl\(0rad\,100\%\,50\%\)\] {
-  --tw-bg-opacity: 1;
-  background-color: hsl(0 100% 50% / var(--tw-bg-opacity));
+  background-color: red;
 }
 .bg-\[hsla\(0\,100\%\,50\%\,0\.3\)\],
 .bg-\[hsla\(0turn\,100\%\,50\%\,0\.3\)\] {
   background-color: #ff00004d;
 }
 .bg-\[rgb\(123\,123\,123\)\] {
-  --tw-bg-opacity: 1;
-  background-color: rgb(123 123 123 / var(--tw-bg-opacity));
+  background-color: #7b7b7b;
 }
 .bg-\[rgb\(123\,_456\,_123\)_black\] {
   background-color: #7bff7b black;
 }
 .bg-\[rgb\(123_456_789\)\] {
-  --tw-bg-opacity: 1;
-  background-color: rgb(123 255 255 / var(--tw-bg-opacity));
+  background-color: #7bffff;
 }
 .bg-\[rgba\(123\,123\,123\,0\.5\)\] {
   background-color: #7b7b7b80;
@@ -657,12 +634,6 @@
 .bg-\[var\(--value1\)_var\(--value2\)\] {
   background-color: var(--value1) var(--value2);
 }
-.bg-opacity-\[0\.11\] {
-  --tw-bg-opacity: 0.11;
-}
-.bg-opacity-\[var\(--value\)\] {
-  --tw-bg-opacity: var(--value);
-}
 .bg-\[image\(\)\,var\(--value\)\] {
   background-image: image(), var(--value);
 }
@@ -679,7 +650,7 @@
   background-image: linear-gradient(to left, rgb(var(--green)), blue);
 }
 .bg-\[url\(\'\/path-to-image\.png\'\)\] {
-  background-image: url('/path-to-image.png');
+  background-image: url("/path-to-image.png");
 }
 .bg-\[url\:var\(--url\)\] {
   background-image: var(--url);
@@ -727,7 +698,7 @@
   fill: #da5b66;
 }
 .fill-\[url\(\#icon-gradient\)\] {
-  fill: url('#icon-gradient');
+  fill: url("#icon-gradient");
 }
 .fill-\[var\(--value\)\] {
   fill: var(--value);
@@ -739,7 +710,7 @@
   stroke: var(--value);
 }
 .stroke-\[url\(\#icon-gradient\)\] {
-  stroke: url('#icon-gradient');
+  stroke: url("#icon-gradient");
 }
 .stroke-\[20px\] {
   stroke-width: 20px;
@@ -801,7 +772,7 @@
   font-family: Some Font, sans-serif;
 }
 .font-\[\'Some_Font\'\,var\(--other-font\)\] {
-  font-family: 'Some Font', var(--other-font);
+  font-family: "Some Font", var(--other-font);
 }
 .font-\[Georgia\,serif\] {
   font-family: Georgia, serif;
@@ -846,8 +817,7 @@
   letter-spacing: var(--tracking);
 }
 .text-\[black\] {
-  --tw-text-opacity: 1;
-  color: rgb(0 0 0 / var(--tw-text-opacity));
+  color: #000;
 }
 .text-\[color\:var\(--color\)\] {
   color: var(--color);
@@ -855,14 +825,7 @@
 .text-\[rgb\(123\,123\,123\)\],
 .text-\[rgb\(123\,_123\,_123\)\],
 .text-\[rgb\(123_123_123\)\] {
-  --tw-text-opacity: 1;
-  color: rgb(123 123 123 / var(--tw-text-opacity));
-}
-.text-opacity-\[0\.8\] {
-  --tw-text-opacity: 0.8;
-}
-.text-opacity-\[var\(--value\)\] {
-  --tw-text-opacity: var(--value);
+  color: #7b7b7b;
 }
 .decoration-\[black\] {
   text-decoration-color: #000;
@@ -884,9 +847,6 @@
 .placeholder-\[var\(--placeholder\)\]::placeholder {
   color: var(--placeholder);
 }
-.placeholder-opacity-\[var\(--placeholder-opacity\)\]::placeholder {
-  --tw-placeholder-opacity: var(--placeholder-opacity);
-}
 .caret-\[black\] {
   caret-color: #000;
 }
@@ -947,15 +907,11 @@
   box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
 }
 .ring-\[\#76ad65\] {
-  --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(118 173 101 / var(--tw-ring-opacity));
+  --tw-ring-color: #76ad65;
 }
 .ring-\[color\:var\(--value\)\] {
   --tw-ring-color: var(--value);
 }
-.ring-opacity-\[var\(--ring-opacity\)\] {
-  --tw-ring-opacity: var(--ring-opacity);
-}
 .ring-offset-\[19rem\] {
   --tw-ring-offset-width: 19rem;
 }
@@ -1091,11 +1047,11 @@
   will-change: var(--will-change);
 }
 .content-\[\'\>\'\] {
-  --tw-content: '>';
+  --tw-content: ">";
   content: var(--tw-content);
 }
 .content-\[\'hello\'\] {
-  --tw-content: 'hello';
+  --tw-content: "hello";
   content: var(--tw-content);
 }
 .content-\[attr\(content-before\)\] {
@@ -1107,3 +1063,4 @@
     grid-template-columns: 200px repeat(auto-fill, minmax(15%, 100px)) 300px;
   }
 }
+
diff --git a/tests/arbitrary-values.test.js b/tests/arbitrary-values.test.js
index 183fcf57c3c9..df7cca3398e8 100644
--- a/tests/arbitrary-values.test.js
+++ b/tests/arbitrary-values.test.js
@@ -105,7 +105,7 @@ crosscheck(({ stable, oxide }) => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .bg-\[\#ff0000\] {
           --tw-bg-opacity: 1;
           background-color: rgb(255 0 0 / var(--tw-bg-opacity));
@@ -133,6 +133,32 @@ crosscheck(({ stable, oxide }) => {
           background-image: linear-gradient(to right, var(--tw-gradient-stops));
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .bg-\[\#ff0000\] {
+          background-color: red;
+        }
+        .bg-\[color\:var\(--bg-color\)\] {
+          background-color: var(--bg-color);
+        }
+        .bg-\[hsl\(var\(--bg-color\)\)\] {
+          background-color: hsl(var(--bg-color));
+        }
+        .bg-\[rgb\(var\(--bg-color\)\)\] {
+          background-color: rgb(var(--bg-color));
+        }
+        .bg-red-500 {
+          background-color: #ef4444;
+        }
+        .bg-\[url\(\'\/image-1-0\.png\'\)\] {
+          background-image: url('/image-1-0.png');
+        }
+        .bg-\[url\:var\(--image-url\)\] {
+          background-image: var(--image-url);
+        }
+        .bg-gradient-to-r {
+          background-image: linear-gradient(to right, var(--tw-gradient-stops));
+        }
+      `)
     })
   })
 
diff --git a/tests/arbitrary-variants.test.js b/tests/arbitrary-variants.test.js
index 8bc02a582783..46da5cdf2027 100644
--- a/tests/arbitrary-variants.test.js
+++ b/tests/arbitrary-variants.test.js
@@ -540,7 +540,7 @@ crosscheck(({ stable, oxide }) => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .\[\&_\.foo\]\:tw-text-red-400 .foo,
         .\[\&_\.foo\]\:hover\:tw-text-red-400:hover .foo,
         .hover\:\[\&_\.foo\]\:tw-text-red-400 .foo:hover,
@@ -549,6 +549,14 @@ crosscheck(({ stable, oxide }) => {
           color: rgb(248 113 113 / var(--tw-text-opacity));
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .\[\&_\.foo\]\:tw-text-red-400 .foo,
+        .\[\&_\.foo\]\:hover\:tw-text-red-400:hover .foo,
+        .hover\:\[\&_\.foo\]\:tw-text-red-400 .foo:hover,
+        .foo .\[\.foo_\&\]\:tw-text-red-400 {
+          color: #f87171;
+        }
+      `)
     })
   })
 
@@ -577,7 +585,7 @@ crosscheck(({ stable, oxide }) => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .\[\&_\.foo\]\:tw-bg-white .foo {
           --tw-bg-opacity: 1;
           background-color: rgb(255 255 255 / var(--tw-bg-opacity));
@@ -595,6 +603,20 @@ crosscheck(({ stable, oxide }) => {
           color: rgb(248 113 113 / var(--tw-text-opacity));
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .\[\&_\.foo\]\:tw-bg-white .foo {
+          background-color: #fff;
+        }
+        .\[\&_\.foo\]\:tw-text-red-400 .foo {
+          color: #f87171;
+        }
+        .foo .\[\.foo_\&\]\:tw-bg-white {
+          background-color: #fff;
+        }
+        .foo .\[\.foo_\&\]\:tw-text-red-400 {
+          color: #f87171;
+        }
+      `)
     })
   })
 
diff --git a/tests/basic-usage.oxide.test.css b/tests/basic-usage.oxide.test.css
index de40c07498a0..ac91e67e81f9 100644
--- a/tests/basic-usage.oxide.test.css
+++ b/tests/basic-usage.oxide.test.css
@@ -514,11 +514,7 @@
   border-style: dotted;
 }
 .divide-gray-200 > :not([hidden]) ~ :not([hidden]) {
-  --tw-divide-opacity: 1;
-  border-color: rgb(229 231 235 / var(--tw-divide-opacity));
-}
-.divide-opacity-50 > :not([hidden]) ~ :not([hidden]) {
-  --tw-divide-opacity: 0.5;
+  border-color: #e5e7eb;
 }
 .place-self-center {
   place-self: center;
@@ -579,44 +575,30 @@
   border-style: hidden;
 }
 .border-black {
-  --tw-border-opacity: 1;
-  border-color: rgb(0 0 0 / var(--tw-border-opacity));
+  border-color: #000;
 }
 .border-x-black {
-  --tw-border-opacity: 1;
-  border-left-color: rgb(0 0 0 / var(--tw-border-opacity));
-  border-right-color: rgb(0 0 0 / var(--tw-border-opacity));
+  border-left-color: #000;
+  border-right-color: #000;
 }
 .border-y-black {
-  --tw-border-opacity: 1;
-  border-top-color: rgb(0 0 0 / var(--tw-border-opacity));
-  border-bottom-color: rgb(0 0 0 / var(--tw-border-opacity));
+  border-top-color: #000;
+  border-bottom-color: #000;
 }
 .border-b-black {
-  --tw-border-opacity: 1;
-  border-bottom-color: rgb(0 0 0 / var(--tw-border-opacity));
+  border-bottom-color: #000;
 }
 .border-l-black {
-  --tw-border-opacity: 1;
-  border-left-color: rgb(0 0 0 / var(--tw-border-opacity));
+  border-left-color: #000;
 }
 .border-r-black {
-  --tw-border-opacity: 1;
-  border-right-color: rgb(0 0 0 / var(--tw-border-opacity));
+  border-right-color: #000;
 }
 .border-t-black {
-  --tw-border-opacity: 1;
-  border-top-color: rgb(0 0 0 / var(--tw-border-opacity));
-}
-.border-opacity-10 {
-  --tw-border-opacity: 0.1;
+  border-top-color: #000;
 }
 .bg-green-500 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(34 197 94 / var(--tw-bg-opacity));
-}
-.bg-opacity-20 {
-  --tw-bg-opacity: 0.2;
+  background-color: #22c55e;
 }
 .bg-gradient-to-r {
   background-image: linear-gradient(to right, var(--tw-gradient-stops));
@@ -766,11 +748,7 @@
   letter-spacing: -0.025em;
 }
 .text-indigo-500 {
-  --tw-text-opacity: 1;
-  color: rgb(99 102 241 / var(--tw-text-opacity));
-}
-.text-opacity-10 {
-  --tw-text-opacity: 0.1;
+  color: #6366f1;
 }
 .underline {
   text-decoration-line: underline;
@@ -798,11 +776,7 @@
   -moz-osx-font-smoothing: grayscale;
 }
 .placeholder-green-300::placeholder {
-  --tw-placeholder-opacity: 1;
-  color: rgb(134 239 172 / var(--tw-placeholder-opacity));
-}
-.placeholder-opacity-60::placeholder {
-  --tw-placeholder-opacity: 0.6;
+  color: #86efac;
 }
 .caret-red-600 {
   caret-color: #dc2626;
@@ -893,11 +867,7 @@
   box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
 }
 .ring-white {
-  --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(255 255 255 / var(--tw-ring-opacity));
-}
-.ring-opacity-40 {
-  --tw-ring-opacity: 0.4;
+  --tw-ring-color: #fff;
 }
 .ring-offset-2 {
   --tw-ring-offset-width: 2px;
@@ -1049,3 +1019,4 @@
   --tw-content: none;
   content: var(--tw-content);
 }
+
diff --git a/tests/basic-usage.test.js b/tests/basic-usage.test.js
index 4b39eb68177d..90d480380fce 100644
--- a/tests/basic-usage.test.js
+++ b/tests/basic-usage.test.js
@@ -245,12 +245,17 @@ crosscheck(({ stable, oxide }) => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .bg-green-light {
           --tw-bg-opacity: 1;
           background-color: rgb(0 128 0 / var(--tw-bg-opacity));
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .bg-green-light {
+          background-color: green;
+        }
+      `)
     })
   })
 
@@ -293,7 +298,7 @@ crosscheck(({ stable, oxide }) => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .bg-theme {
           --tw-bg-opacity: 1;
           background-color: rgb(255 0 0 / var(--tw-bg-opacity));
@@ -303,6 +308,14 @@ crosscheck(({ stable, oxide }) => {
           color: rgb(0 128 0 / var(--tw-text-opacity));
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .bg-theme {
+          background-color: red;
+        }
+        .text-theme {
+          color: green;
+        }
+      `)
     })
   })
 
@@ -825,7 +838,7 @@ crosscheck(({ stable, oxide }) => {
     })
   })
 
-  it('A bare ring-opacity utility is supported when using respectDefaultRingColorOpacity', () => {
+  test('A bare ring-opacity utility is supported when using respectDefaultRingColorOpacity', () => {
     let config = {
       future: { respectDefaultRingColorOpacity: true },
       content: [{ raw: html`<div class="ring-opacity"></div>` }],
@@ -842,11 +855,13 @@ crosscheck(({ stable, oxide }) => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .ring-opacity {
           --tw-ring-opacity: 0.33;
         }
       `)
+      // The opacity plugins are disabled by default in the `oxide` engine
+      oxide.expect(result.css).toMatchFormattedCss(css``)
     })
   })
 
@@ -862,7 +877,7 @@ crosscheck(({ stable, oxide }) => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .ring {
           --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width)
             var(--tw-ring-offset-color);
@@ -876,6 +891,19 @@ crosscheck(({ stable, oxide }) => {
           --tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity));
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .ring {
+          --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width)
+            var(--tw-ring-offset-color);
+          --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(3px + var(--tw-ring-offset-width))
+            var(--tw-ring-color);
+          box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow),
+            var(--tw-shadow, 0 0 #0000);
+        }
+        .ring-blue-500 {
+          --tw-ring-color: #3b82f6;
+        }
+      `)
     })
   })
 
diff --git a/tests/blocklist.test.js b/tests/blocklist.test.js
index b9667101cd19..f5627d20c932 100644
--- a/tests/blocklist.test.js
+++ b/tests/blocklist.test.js
@@ -1,7 +1,7 @@
 import log from '../src/util/log'
 import { crosscheck, run, html, css } from './util/run'
 
-crosscheck(() => {
+crosscheck(({ stable, oxide }) => {
   let warn
 
   beforeEach(() => {
@@ -30,7 +30,7 @@ crosscheck(() => {
     `
 
     return run(input, config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      return expect(result.css).toMatchFormattedCss(css`
         .font-bold {
           font-weight: 700;
         }
@@ -67,7 +67,7 @@ crosscheck(() => {
     `
 
     return run(input, config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      return expect(result.css).toMatchFormattedCss(css`
         .font-bold {
           font-weight: 700;
         }
@@ -83,7 +83,7 @@ crosscheck(() => {
 
     let result = await run('@tailwind utilities', config)
 
-    expect(result.css).toMatchCss(css`
+    stable.expect(result.css).toMatchFormattedCss(css`
       .bg-\[\#f00d1e\] {
         --tw-bg-opacity: 1;
         background-color: rgb(240 13 30 / var(--tw-bg-opacity));
@@ -93,6 +93,15 @@ crosscheck(() => {
       }
     `)
 
+    oxide.expect(result.css).toMatchFormattedCss(css`
+      .bg-\[\#f00d1e\] {
+        background-color: #f00d1e;
+      }
+      .font-bold {
+        font-weight: 700;
+      }
+    `)
+
     expect(warn).toHaveBeenCalledTimes(1)
     expect(warn.mock.calls.map((x) => x[0])).toEqual(['blocklist-invalid'])
   })
@@ -105,7 +114,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .bg-red-400 {
           --tw-bg-opacity: 1;
           background-color: rgb(248 113 113 / var(--tw-bg-opacity));
@@ -114,6 +123,14 @@ crosscheck(() => {
           font-weight: 700;
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .bg-red-400 {
+          background-color: #f87171;
+        }
+        .font-bold {
+          font-weight: 700;
+        }
+      `)
     })
   })
 })
diff --git a/tests/collapse-adjacent-rules.test.js b/tests/collapse-adjacent-rules.test.js
index 5033d27a35e2..4dbaab769ed4 100644
--- a/tests/collapse-adjacent-rules.test.js
+++ b/tests/collapse-adjacent-rules.test.js
@@ -1,6 +1,6 @@
 import { crosscheck, run, html, css, defaults } from './util/run'
 
-crosscheck(() => {
+crosscheck(({ stable, oxide }) => {
   test('collapse adjacent rules', () => {
     let config = {
       content: [
@@ -71,7 +71,7 @@ crosscheck(() => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         @font-face {
           font-family: Poppins;
           src: url('/fonts/Poppins.woff2') format('woff2'),
@@ -150,6 +150,82 @@ crosscheck(() => {
           }
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        @font-face {
+          font-family: Poppins;
+          src: url('/fonts/Poppins.woff2') format('woff2'),
+            url('/fonts/Poppins.woff') format('woff');
+        }
+        @font-face {
+          font-family: Proxima Nova;
+          src: url('/fonts/ProximaNova.woff2') format('woff2'),
+            url('/fonts/ProximaNova.woff') format('woff');
+        }
+        ${defaults}
+        @font-face {
+          font-family: Inter;
+          src: url('/fonts/Inter.woff2') format('woff2'), url('/fonts/Inter.woff') format('woff');
+        }
+        @font-face {
+          font-family: Gilroy;
+          src: url('/fonts/Gilroy.woff2') format('woff2'), url('/fonts/Gilroy.woff') format('woff');
+        }
+        @page {
+          margin: 1cm;
+        }
+        .font-bold {
+          font-weight: 700;
+        }
+        .foo,
+        .bar {
+          color: #000;
+          font-weight: 700;
+        }
+        @supports (foo: bar) {
+          .some-apply-thing {
+            color: #000;
+            font-weight: 700;
+          }
+        }
+        @media (min-width: 768px) {
+          .some-apply-thing {
+            color: #000;
+            font-weight: 700;
+          }
+        }
+        @supports (foo: bar) {
+          @media (min-width: 768px) {
+            .some-apply-thing {
+              color: #000;
+              font-weight: 700;
+            }
+          }
+        }
+        @media (min-width: 640px) {
+          .sm\:text-center {
+            text-align: center;
+          }
+          .sm\:font-bold {
+            font-weight: 700;
+          }
+        }
+        @media (min-width: 768px) {
+          .md\:text-center {
+            text-align: center;
+          }
+          .md\:font-bold {
+            font-weight: 700;
+          }
+        }
+        @media (min-width: 1024px) {
+          .lg\:text-center {
+            text-align: center;
+          }
+          .lg\:font-bold {
+            font-weight: 700;
+          }
+        }
+      `)
     })
   })
 
diff --git a/tests/color-opacity-modifiers.test.js b/tests/color-opacity-modifiers.test.js
index 435511affcbb..e7d285740714 100644
--- a/tests/color-opacity-modifiers.test.js
+++ b/tests/color-opacity-modifiers.test.js
@@ -1,6 +1,6 @@
 import { crosscheck, run, html, css } from './util/run'
 
-crosscheck(() => {
+crosscheck(({ stable, oxide }) => {
   test('basic color opacity modifier', async () => {
     let config = {
       content: [{ raw: html`<div class="bg-red-500/50"></div>` }],
@@ -28,12 +28,17 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .bg-red-500\/50 {
           --tw-bg-opacity: 1;
           background-color: rgb(255 0 0 / var(--tw-bg-opacity));
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .bg-red-500\/50 {
+          background-color: red;
+        }
+      `)
     })
   })
 
@@ -205,7 +210,7 @@ crosscheck(() => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .bg-\[hsl\(123\,50\%\,var\(--foo\)\)\] {
           --tw-bg-opacity: 1;
           background-color: hsl(123 50% var(--foo) / var(--tw-bg-opacity));
@@ -231,6 +236,29 @@ crosscheck(() => {
           background-color: hsl(var(--foo) var(--bar) var(--baz) / 0.5);
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .bg-\[hsl\(123\,50\%\,var\(--foo\)\)\] {
+          background-color: hsl(123, 50%, var(--foo));
+        }
+        .bg-\[hsl\(123\,50\%\,var\(--foo\)\)\]\/50 {
+          background-color: hsl(123 50% var(--foo) / 0.5);
+        }
+        .bg-\[hsl\(123\,var\(--foo\)\,50\%\)\] {
+          background-color: hsl(123, var(--foo), 50%);
+        }
+        .bg-\[hsl\(123\,var\(--foo\)\,50\%\)\]\/50 {
+          background-color: hsl(123 var(--foo) 50% / 0.5);
+        }
+        .bg-\[hsl\(var\(--foo\)\,50\%\,50\%\)\] {
+          background-color: hsl(var(--foo), 50%, 50%);
+        }
+        .bg-\[hsl\(var\(--foo\)\,50\%\,50\%\)\]\/50 {
+          background-color: hsl(var(--foo) 50% 50% / 0.5);
+        }
+        .bg-\[hsl\(var\(--foo\)\,var\(--bar\)\,var\(--baz\)\)\]\/50 {
+          background-color: hsl(var(--foo) var(--bar) var(--baz) / 0.5);
+        }
+      `)
     })
   })
 })
diff --git a/tests/import-syntax.test.js b/tests/import-syntax.test.js
index c10d8b1427a8..992ef81d5f51 100644
--- a/tests/import-syntax.test.js
+++ b/tests/import-syntax.test.js
@@ -1,6 +1,6 @@
 import { crosscheck, run, html, css, defaults } from './util/run'
 
-crosscheck(() => {
+crosscheck(({ stable, oxide }) => {
   test('using @import instead of @tailwind', () => {
     let config = {
       content: [
@@ -33,7 +33,7 @@ crosscheck(() => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         h1 {
           font-size: 32px;
         }
@@ -79,6 +79,51 @@ crosscheck(() => {
           }
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        h1 {
+          font-size: 32px;
+        }
+        ${defaults}
+        .container {
+          width: 100%;
+        }
+        @media (min-width: 640px) {
+          .container {
+            max-width: 640px;
+          }
+        }
+        @media (min-width: 768px) {
+          .container {
+            max-width: 768px;
+          }
+        }
+        @media (min-width: 1024px) {
+          .container {
+            max-width: 1024px;
+          }
+        }
+        @media (min-width: 1280px) {
+          .container {
+            max-width: 1280px;
+          }
+        }
+        @media (min-width: 1536px) {
+          .container {
+            max-width: 1536px;
+          }
+        }
+        .mt-6 {
+          margin-top: 1.5rem;
+        }
+        .bg-black {
+          background-color: #000;
+        }
+        @media (min-width: 768px) {
+          .md\:hover\:text-center:hover {
+            text-align: center;
+          }
+        }
+      `)
     })
   })
 })
diff --git a/tests/kitchen-sink.test.js b/tests/kitchen-sink.test.js
index a750ff6566d7..d6d74225d293 100644
--- a/tests/kitchen-sink.test.js
+++ b/tests/kitchen-sink.test.js
@@ -1,6 +1,6 @@
 import { crosscheck, run, html, css, defaults } from './util/run'
 
-crosscheck(() => {
+crosscheck(({ stable, oxide }) => {
   test('it works', () => {
     let config = {
       darkMode: 'class',
@@ -234,7 +234,7 @@ crosscheck(() => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .theme-test {
           color: #3b82f6;
           font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
@@ -783,6 +783,541 @@ crosscheck(() => {
           }
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .theme-test {
+          color: #3b82f6;
+          font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
+            Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji,
+            Segoe UI Symbol, Noto Color Emoji;
+        }
+        @media (min-width: 1024px) {
+          .screen-test {
+            color: purple;
+          }
+        }
+        .apply-1,
+        .apply-2 {
+          margin-top: 1.5rem;
+        }
+        .apply-test {
+          background-color: #ec4899;
+          margin-top: 1.5rem;
+        }
+        .apply-test:hover,
+        .apply-test:hover:focus {
+          font-weight: 700;
+        }
+        @media (min-width: 640px) {
+          .apply-test {
+            background-color: #22c55e;
+          }
+          .apply-test:nth-child(2n):focus {
+            background-color: #fbcfe8;
+          }
+        }
+        .apply-components {
+          width: 100%;
+        }
+        @media (min-width: 640px) {
+          .apply-components {
+            max-width: 640px;
+          }
+        }
+        @media (min-width: 768px) {
+          .apply-components {
+            max-width: 768px;
+          }
+        }
+        @media (min-width: 1024px) {
+          .apply-components {
+            max-width: 1024px;
+          }
+        }
+        @media (min-width: 1280px) {
+          .apply-components {
+            max-width: 1280px;
+          }
+        }
+        @media (min-width: 1536px) {
+          .apply-components {
+            max-width: 1536px;
+          }
+        }
+        .apply-components {
+          margin-left: auto;
+          margin-right: auto;
+        }
+        .drop-empty-rules:hover,
+        .group:hover .apply-group,
+        .dark .apply-dark-mode {
+          font-weight: 700;
+        }
+        .apply-with-existing:hover {
+          font-weight: 400;
+        }
+        @media (min-width: 640px) {
+          .apply-with-existing:hover {
+            background-color: #22c55e;
+          }
+        }
+        .multiple,
+        .selectors {
+          font-weight: 700;
+        }
+        .group:hover .multiple,
+        .group:hover .selectors {
+          font-weight: 400;
+        }
+        .list > :not([hidden]) ~ :not([hidden]) {
+          --tw-space-y-reverse: 0;
+          margin-top: calc(1rem * calc(1 - var(--tw-space-y-reverse)));
+          margin-bottom: calc(1rem * var(--tw-space-y-reverse));
+        }
+        .nested .example {
+          font-weight: 700;
+        }
+        .nested .example:hover {
+          font-weight: 400;
+        }
+        .apply-order-a,
+        .apply-order-b {
+          margin: 1.5rem 1.25rem 1.25rem;
+        }
+        .dark .group:hover .apply-dark-group-example-a {
+          background-color: #22c55e;
+        }
+        @media (min-width: 640px) {
+          @media (prefers-reduced-motion: no-preference) {
+            .group:active .crazy-example:focus {
+              opacity: 0.1;
+            }
+          }
+        }
+        h1 {
+          font-size: 1.5rem;
+          font-weight: 700;
+        }
+        h1:first-child {
+          margin-top: 0;
+        }
+        div {
+          background: #654321;
+        }
+        ${defaults}
+        .container {
+          width: 100%;
+        }
+        @media (min-width: 640px) {
+          .container {
+            max-width: 640px;
+          }
+        }
+        @media (min-width: 768px) {
+          .container {
+            max-width: 768px;
+          }
+        }
+        @media (min-width: 1024px) {
+          .container {
+            max-width: 1024px;
+          }
+        }
+        @media (min-width: 1280px) {
+          .container {
+            max-width: 1280px;
+          }
+        }
+        @media (min-width: 1536px) {
+          .container {
+            max-width: 1536px;
+          }
+        }
+        .test-apply-font-variant {
+          --tw-ordinal: ordinal;
+          --tw-numeric-spacing: tabular-nums;
+          font-variant-numeric: var(--tw-ordinal) var(--tw-slashed-zero) var(--tw-numeric-figure)
+            var(--tw-numeric-spacing) var(--tw-numeric-fraction);
+        }
+        .custom-component {
+          background: #123456;
+        }
+        *,
+        :before,
+        :after,
+        ::backdrop {
+          padding: 5px;
+        }
+        .foo .bg-black {
+          appearance: none;
+        }
+        .inset-6 {
+          inset: 1.5rem;
+        }
+        .inset-x-1 {
+          left: 0.25rem;
+          right: 0.25rem;
+        }
+        .end-8 {
+          inset-inline-end: 2rem;
+        }
+        .start-4 {
+          inset-inline-start: 1rem;
+        }
+        .mx-1 {
+          margin-left: 0.25rem;
+          margin-right: 0.25rem;
+        }
+        .me-8 {
+          margin-inline-end: 2rem;
+        }
+        .ms-4 {
+          margin-inline-start: 1rem;
+        }
+        .mt-6 {
+          margin-top: 1.5rem;
+        }
+        .scale-50 {
+          --tw-scale-x: 0.5;
+          --tw-scale-y: 0.5;
+          transform: translate(var(--tw-translate-x), var(--tw-translate-y))
+            rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y))
+            scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+        }
+        .transform {
+          transform: translate(var(--tw-translate-x), var(--tw-translate-y))
+            rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y))
+            scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+        }
+        .grid-cols-\[200px\,repeat\(auto-fill\,minmax\(15\%\,100px\)\)\,300px\] {
+          grid-template-columns: 200px repeat(auto-fill, minmax(15%, 100px)) 300px;
+        }
+        .rounded-e {
+          border-start-end-radius: 0.25rem;
+          border-end-end-radius: 0.25rem;
+        }
+        .rounded-s {
+          border-start-start-radius: 0.25rem;
+          border-end-start-radius: 0.25rem;
+        }
+        .rounded-es {
+          border-end-start-radius: 0.25rem;
+        }
+        .rounded-ss {
+          border-start-start-radius: 0.25rem;
+        }
+        .border-2 {
+          border-width: 2px;
+        }
+        .border-e-4 {
+          border-inline-end-width: 4px;
+        }
+        .border-s-0 {
+          border-inline-start-width: 0;
+        }
+        .border-black {
+          border-color: #000;
+        }
+        .border-e-red-400 {
+          border-inline-end-color: #f87171;
+        }
+        .border-s-green-500 {
+          border-inline-start-color: #22c55e;
+        }
+        .bg-black {
+          background-color: #000;
+        }
+        .bg-green-500 {
+          background-color: #22c55e;
+        }
+        .bg-gradient-to-r {
+          background-image: linear-gradient(to right, var(--tw-gradient-stops));
+        }
+        .bg-hero--home-1 {
+          background-image: url('/images/homepage-1.jpg');
+        }
+        .from-foo {
+          --tw-gradient-from: #bada55;
+          --tw-gradient-to: #bada5500;
+          --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
+        }
+        .px-1 {
+          padding-left: 0.25rem;
+          padding-right: 0.25rem;
+        }
+        .pe-8 {
+          padding-inline-end: 2rem;
+        }
+        .ps-4 {
+          padding-inline-start: 1rem;
+        }
+        .pt-6 {
+          padding-top: 1.5rem;
+        }
+        .text-center {
+          text-align: center;
+        }
+        .font-medium {
+          font-weight: 500;
+        }
+        .shadow-md {
+          --tw-shadow: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
+          --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color),
+            0 2px 4px -2px var(--tw-shadow-color);
+          box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
+            var(--tw-shadow);
+        }
+        .shadow-sm {
+          --tw-shadow: 0 1px 2px 0 #0000000d;
+          --tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color);
+          box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
+            var(--tw-shadow);
+        }
+        .magic-none {
+          magic: none;
+        }
+        .magic-tons {
+          magic: tons;
+        }
+        .custom-util {
+          background: #abcdef;
+        }
+        *,
+        :before,
+        :after,
+        ::backdrop {
+          margin: 10px;
+        }
+        .hover\:container:hover {
+          width: 100%;
+        }
+        @media (min-width: 640px) {
+          .hover\:container:hover {
+            max-width: 640px;
+          }
+        }
+        @media (min-width: 768px) {
+          .hover\:container:hover {
+            max-width: 768px;
+          }
+        }
+        @media (min-width: 1024px) {
+          .hover\:container:hover {
+            max-width: 1024px;
+          }
+        }
+        @media (min-width: 1280px) {
+          .hover\:container:hover {
+            max-width: 1280px;
+          }
+        }
+        @media (min-width: 1536px) {
+          .hover\:container:hover {
+            max-width: 1536px;
+          }
+        }
+        @media (min-width: 640px) {
+          .sm\:container {
+            width: 100%;
+          }
+          @media (min-width: 640px) {
+            .sm\:container {
+              max-width: 640px;
+            }
+          }
+          @media (min-width: 768px) {
+            .sm\:container {
+              max-width: 768px;
+            }
+          }
+          @media (min-width: 1024px) {
+            .sm\:container {
+              max-width: 1024px;
+            }
+          }
+          @media (min-width: 1280px) {
+            .sm\:container {
+              max-width: 1280px;
+            }
+          }
+          @media (min-width: 1536px) {
+            .sm\:container {
+              max-width: 1536px;
+            }
+          }
+        }
+        @media (min-width: 768px) {
+          .md\:container {
+            width: 100%;
+          }
+          @media (min-width: 640px) {
+            .md\:container {
+              max-width: 640px;
+            }
+          }
+          @media (min-width: 768px) {
+            .md\:container {
+              max-width: 768px;
+            }
+          }
+          @media (min-width: 1024px) {
+            .md\:container {
+              max-width: 1024px;
+            }
+          }
+          @media (min-width: 1280px) {
+            .md\:container {
+              max-width: 1280px;
+            }
+          }
+          @media (min-width: 1536px) {
+            .md\:container {
+              max-width: 1536px;
+            }
+          }
+        }
+        .first\:pt-0:first-child {
+          padding-top: 0;
+        }
+        .hover\:scale-75:hover {
+          --tw-scale-x: 0.75;
+          --tw-scale-y: 0.75;
+          transform: translate(var(--tw-translate-x), var(--tw-translate-y))
+            rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y))
+            scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+        }
+        .hover\:font-bold:hover {
+          font-weight: 700;
+        }
+        .hover\:shadow-lg:hover {
+          --tw-shadow: 0 10px 15px -3px #0000001a, 0 4px 6px -4px #0000001a;
+          --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color),
+            0 4px 6px -4px var(--tw-shadow-color);
+          box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
+            var(--tw-shadow);
+        }
+        .hover\:custom-util:hover {
+          background: #abcdef;
+        }
+        .focus\:font-normal:focus {
+          font-weight: 400;
+        }
+        .focus\:ring-2:focus {
+          --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width)
+            var(--tw-ring-offset-color);
+          --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width))
+            var(--tw-ring-color);
+          box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow),
+            var(--tw-shadow, 0 0 #0000);
+        }
+        .focus\:ring-blue-500:focus {
+          --tw-ring-color: #3b82f6;
+        }
+        .focus\:hover\:font-light:hover:focus {
+          font-weight: 300;
+        }
+        .disabled\:font-bold:disabled {
+          font-weight: 700;
+        }
+        .group:hover .group-hover\:opacity-100 {
+          opacity: 1;
+        }
+        .group:hover .group-hover\:custom-util {
+          background: #abcdef;
+        }
+        .group:active .group-active\:opacity-10 {
+          opacity: 0.1;
+        }
+        .foo\:custom-util,
+        .foo\:hover\:custom-util:hover {
+          background: #abcdef !important;
+        }
+        @media (prefers-reduced-motion: no-preference) {
+          .motion-safe\:transition {
+            transition-property: color, background-color, border-color, text-decoration-color, fill,
+              stroke, opacity, box-shadow, transform, filter, backdrop-filter;
+            transition-duration: 0.15s;
+            transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+          }
+          .motion-safe\:custom-util {
+            background: #abcdef;
+          }
+        }
+        @media (prefers-reduced-motion: reduce) {
+          .motion-reduce\:transition {
+            transition-property: color, background-color, border-color, text-decoration-color, fill,
+              stroke, opacity, box-shadow, transform, filter, backdrop-filter;
+            transition-duration: 0.15s;
+            transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+          }
+        }
+        .dark .dark\:custom-util {
+          background: #abcdef;
+        }
+        @media (min-width: 640px) {
+          .sm\:text-center {
+            text-align: center;
+          }
+          .sm\:tabular-nums {
+            --tw-numeric-spacing: tabular-nums;
+            font-variant-numeric: var(--tw-ordinal) var(--tw-slashed-zero) var(--tw-numeric-figure)
+              var(--tw-numeric-spacing) var(--tw-numeric-fraction);
+          }
+          .sm\:custom-util {
+            background: #abcdef;
+          }
+          @media (prefers-reduced-motion: no-preference) {
+            .group:active .sm\:motion-safe\:group-active\:focus\:opacity-10:focus {
+              opacity: 0.1;
+            }
+          }
+        }
+        @media (min-width: 768px) {
+          .md\:text-center {
+            text-align: center;
+          }
+          .md\:opacity-50 {
+            opacity: 0.5;
+          }
+          .md\:shadow-sm {
+            --tw-shadow: 0 1px 2px 0 #0000000d;
+            --tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color);
+            box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
+              var(--tw-shadow);
+          }
+          .md\:hover\:border-r-blue-500\/30:hover {
+            border-right-color: #3b82f64d;
+          }
+          .md\:hover\:opacity-20:hover {
+            opacity: 0.2;
+          }
+          @media (prefers-reduced-motion: no-preference) {
+            .md\:motion-safe\:hover\:transition:hover {
+              transition-property: color, background-color, border-color, text-decoration-color,
+                fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
+              transition-duration: 0.15s;
+              transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+            }
+            .dark .md\:dark\:motion-safe\:foo\:active\:custom-util:active {
+              background: #abcdef !important;
+            }
+          }
+          @media (min-width: 640px) {
+            .md\:sm\:text-center {
+              text-align: center;
+            }
+          }
+        }
+        @media (min-width: 1280px) and (max-width: 1535px) {
+          .range\:text-right {
+            text-align: right;
+          }
+        }
+        @media (min-width: 640px) and (max-width: 767px), (max-width: 868px) {
+          .multi\:text-left {
+            text-align: left;
+          }
+        }
+      `)
     })
   })
 })
diff --git a/tests/match-variants.test.js b/tests/match-variants.test.js
index 8b1f95429048..e4330f7a92cc 100644
--- a/tests/match-variants.test.js
+++ b/tests/match-variants.test.js
@@ -3,7 +3,7 @@ import { createContext } from '../src/lib/setupContextUtils'
 
 import { crosscheck, run, html, css } from './util/run'
 
-crosscheck(() => {
+crosscheck(({ stable, oxide }) => {
   test('partial arbitrary variants', () => {
     let config = {
       content: [
@@ -24,7 +24,7 @@ crosscheck(() => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .potato-baked .potato-\[baked\]\:w-3 {
           width: 0.75rem;
         }
@@ -33,6 +33,14 @@ crosscheck(() => {
           background-color: rgb(254 240 138 / var(--tw-bg-opacity));
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .potato-baked .potato-\[baked\]\:w-3 {
+          width: 0.75rem;
+        }
+        .potato-yellow .potato-\[yellow\]\:bg-yellow-200 {
+          background-color: #fef08a;
+        }
+      `)
     })
   })
 
@@ -56,7 +64,7 @@ crosscheck(() => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         @media (potato: baked) {
           .potato-\[baked\]\:w-3 {
             width: 0.75rem;
@@ -69,6 +77,18 @@ crosscheck(() => {
           }
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        @media (potato: baked) {
+          .potato-\[baked\]\:w-3 {
+            width: 0.75rem;
+          }
+        }
+        @media (potato: yellow) {
+          .potato-\[yellow\]\:bg-yellow-200 {
+            background-color: #fef08a;
+          }
+        }
+      `)
     })
   })
 
@@ -92,7 +112,7 @@ crosscheck(() => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         @media (potato: baked) {
           .potato-\[baked\]\:w-3:potato {
             width: 0.75rem;
@@ -105,6 +125,18 @@ crosscheck(() => {
           }
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        @media (potato: baked) {
+          .potato-\[baked\]\:w-3:potato {
+            width: 0.75rem;
+          }
+        }
+        @media (potato: yellow) {
+          .potato-\[yellow\]\:bg-yellow-200:potato {
+            background-color: #fef08a;
+          }
+        }
+      `)
     })
   })
 
diff --git a/tests/opacity.test.js b/tests/opacity.test.js
index c435676dd5ae..82b437ce8b0d 100644
--- a/tests/opacity.test.js
+++ b/tests/opacity.test.js
@@ -1,6 +1,6 @@
 import { crosscheck, run, html, css } from './util/run'
 
-crosscheck(() => {
+crosscheck(({ stable, oxide }) => {
   test('opacity', () => {
     let config = {
       darkMode: 'class',
@@ -25,7 +25,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchCss(css`
+      expect(result.css).toMatchFormattedCss(css`
         .divide-black > :not([hidden]) ~ :not([hidden]),
         .border-black {
           border-color: #000;
@@ -73,7 +73,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchCss(css`
+      expect(result.css).toMatchFormattedCss(css`
         .divide-primary > :not([hidden]) ~ :not([hidden]),
         .border-primary {
           border-color: rgb(var(--color-primary));
@@ -117,7 +117,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .divide-primary > :not([hidden]) ~ :not([hidden]) {
           --tw-divide-opacity: 1;
           border-color: rgb(var(--color-primary) / var(--tw-divide-opacity));
@@ -161,6 +161,22 @@ crosscheck(() => {
           --tw-ring-opacity: 0.5;
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .divide-primary > :not([hidden]) ~ :not([hidden]),
+        .border-primary {
+          border-color: rgb(var(--color-primary) / 1);
+        }
+        .bg-primary {
+          background-color: rgb(var(--color-primary) / 1);
+        }
+        .text-primary,
+        .placeholder-primary::placeholder {
+          color: rgb(var(--color-primary) / 1);
+        }
+        .ring-primary {
+          --tw-ring-color: rgb(var(--color-primary) / 1);
+        }
+      `)
     })
   })
 
@@ -269,7 +285,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .divide-primary > :not([hidden]) ~ :not([hidden]) {
           --tw-divide-opacity: 1;
           border-color: hsl(var(--color-primary) / var(--tw-divide-opacity));
@@ -313,6 +329,22 @@ crosscheck(() => {
           --tw-ring-opacity: 0.5;
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .divide-primary > :not([hidden]) ~ :not([hidden]),
+        .border-primary {
+          border-color: hsl(var(--color-primary) / 1);
+        }
+        .bg-primary {
+          background-color: hsl(var(--color-primary) / 1);
+        }
+        .text-primary,
+        .placeholder-primary::placeholder {
+          color: hsl(var(--color-primary) / 1);
+        }
+        .ring-primary {
+          --tw-ring-color: hsl(var(--color-primary) / 1);
+        }
+      `)
     })
   })
 
@@ -352,7 +384,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchCss(css`
+      expect(result.css).toMatchFormattedCss(css`
         .divide-primary > :not([hidden]) ~ :not([hidden]) {
           border-color: hsl(var(--color-primary) / 1);
         }
@@ -416,7 +448,7 @@ crosscheck(() => {
         },
       },
     }).then((result) => {
-      expect(result.css).toMatchCss(output)
+      expect(result.css).toMatchFormattedCss(output)
       expect(result.warnings().length).toBe(0)
     })
   })
@@ -444,7 +476,7 @@ crosscheck(() => {
         },
       },
     }).then((result) => {
-      expect(result.css).toMatchCss(output)
+      expect(result.css).toMatchFormattedCss(output)
       expect(result.warnings().length).toBe(0)
     })
   })
@@ -472,7 +504,7 @@ crosscheck(() => {
         },
       },
     }).then((result) => {
-      expect(result.css).toMatchCss(output)
+      expect(result.css).toMatchFormattedCss(output)
       expect(result.warnings().length).toBe(0)
     })
   })
@@ -500,7 +532,7 @@ crosscheck(() => {
         },
       },
     }).then((result) => {
-      expect(result.css).toMatchCss(output)
+      expect(result.css).toMatchFormattedCss(output)
       expect(result.warnings().length).toBe(0)
     })
   })
@@ -528,7 +560,7 @@ crosscheck(() => {
         },
       },
     }).then((result) => {
-      expect(result.css).toMatchCss(output)
+      expect(result.css).toMatchFormattedCss(output)
       expect(result.warnings().length).toBe(0)
     })
   })
@@ -556,7 +588,7 @@ crosscheck(() => {
         },
       },
     }).then((result) => {
-      expect(result.css).toMatchCss(output)
+      expect(result.css).toMatchFormattedCss(output)
       expect(result.warnings().length).toBe(0)
     })
   })
@@ -588,7 +620,7 @@ crosscheck(() => {
         },
       },
     }).then((result) => {
-      expect(result.css).toMatchCss(output)
+      expect(result.css).toMatchFormattedCss(output)
       expect(result.warnings().length).toBe(0)
     })
   })
@@ -620,7 +652,7 @@ crosscheck(() => {
         },
       },
     }).then((result) => {
-      expect(result.css).toMatchCss(output)
+      expect(result.css).toMatchFormattedCss(output)
       expect(result.warnings().length).toBe(0)
     })
   })
@@ -641,7 +673,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchCss(css`
+      expect(result.css).toMatchFormattedCss(css`
         .bg-primary {
           --tw-bg-opacity: 1;
           background-color: rgb(var(--color-primary) / var(--tw-bg-opacity));
@@ -666,7 +698,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchCss(css`
+      expect(result.css).toMatchFormattedCss(css`
         .bg-primary\/50 {
           background-color: rgb(var(--color-primary) / 0.5);
         }
@@ -690,7 +722,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchCss(css`
+      expect(result.css).toMatchFormattedCss(css`
         .bg-primary {
           background-color: rgb(var(--color-primary) / 1);
         }
@@ -714,7 +746,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchCss(css`
+      expect(result.css).toMatchFormattedCss(css`
         .bg-\[rgb\(var\(--color-primary\)\/\<alpha-value\>\)\]\/50 {
           background-color: rgb(var(--color-primary) / 0.5);
         }
@@ -743,7 +775,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .bg-foo1 {
           --tw-bg-opacity: 1;
           background-color: rgb(0 0 0 / var(--tw-bg-opacity));
@@ -752,6 +784,14 @@ crosscheck(() => {
           background-color: #00000080;
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .bg-foo1 {
+          background-color: #000;
+        }
+        .bg-foo2 {
+          background-color: #00000080;
+        }
+      `)
     })
   })
 
@@ -791,7 +831,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .bg-foo10 {
           background-color: #ff6400;
         }
@@ -819,6 +859,32 @@ crosscheck(() => {
           background-color: #ff640080;
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .bg-foo10 {
+          background-color: #ff6400;
+        }
+        .bg-foo11 {
+          background-color: #ff640080;
+        }
+        .bg-foo20 {
+          background-color: #ff6400;
+        }
+        .bg-foo21 {
+          background-color: #ff640080;
+        }
+        .bg-foo30 {
+          background-color: #ff6400;
+        }
+        .bg-foo31 {
+          background-color: #ff640080;
+        }
+        .bg-foo40 {
+          background-color: #ff6400;
+        }
+        .bg-foo41 {
+          background-color: #ff640080;
+        }
+      `)
     })
   })
 
@@ -848,7 +914,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchCss(css`
+      expect(result.css).toMatchFormattedCss(css`
         .divide-blue-300 > :not([hidden]) ~ :not([hidden]) {
           border-color: #93c5fd;
         }
@@ -941,7 +1007,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchCss(css`
+      expect(result.css).toMatchFormattedCss(css`
         .divide-blue-300 > :not([hidden]) ~ :not([hidden]) {
           --tw-divide-opacity: 1;
           border-color: rgb(147 197 253 / var(--tw-divide-opacity));
@@ -1037,7 +1103,7 @@ crosscheck(() => {
 
     let result = await run('@tailwind utilities', config)
 
-    expect(result.css).toMatchCss(css`
+    expect(result.css).toMatchFormattedCss(css`
       .text-primary-hsla\/50 {
         color: hsla(var(--color), 0.5);
       }
diff --git a/tests/plugins/gradientColorStops.test.js b/tests/plugins/gradientColorStops.test.js
index cf9fbd6e4cbb..6a26e2e33901 100644
--- a/tests/plugins/gradientColorStops.test.js
+++ b/tests/plugins/gradientColorStops.test.js
@@ -1,6 +1,6 @@
 import { crosscheck, run, html, css } from '../util/run'
 
-crosscheck(() => {
+crosscheck(({ stable, oxide }) => {
   test('opacity variables are given to colors defined as closures', () => {
     let config = {
       content: [
@@ -32,7 +32,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .from-primary {
           --tw-gradient-from: #1f1f1f;
           --tw-gradient-to: #1f1f1f00;
@@ -69,6 +69,38 @@ crosscheck(() => {
           --tw-text-opacity: 0.5;
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .from-primary {
+          --tw-gradient-from: #1f1f1f;
+          --tw-gradient-to: #1f1f1f00;
+          --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
+        }
+        .from-secondary {
+          --tw-gradient-from: #bf5540;
+          --tw-gradient-to: #bf554000;
+          --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
+        }
+        .via-primary {
+          --tw-gradient-to: #1f1f1f00;
+          --tw-gradient-stops: var(--tw-gradient-from), #1f1f1f, var(--tw-gradient-to);
+        }
+        .via-secondary {
+          --tw-gradient-to: #bf554000;
+          --tw-gradient-stops: var(--tw-gradient-from), #bf5540, var(--tw-gradient-to);
+        }
+        .to-primary {
+          --tw-gradient-to: #1f1f1f;
+        }
+        .to-secondary {
+          --tw-gradient-to: #bf5540;
+        }
+        .text-primary {
+          color: #1f1f1f;
+        }
+        .text-secondary {
+          color: #bf5540;
+        }
+      `)
     })
   })
 })
diff --git a/tests/prefers-contrast.test.js b/tests/prefers-contrast.test.js
index 1d658437ee9b..e3b940da858c 100644
--- a/tests/prefers-contrast.test.js
+++ b/tests/prefers-contrast.test.js
@@ -1,6 +1,6 @@
 import { crosscheck, run, html, css, defaults } from './util/run'
 
-crosscheck(() => {
+crosscheck(({ stable, oxide }) => {
   it('should be possible to use contrast-more and contrast-less variants', () => {
     let config = {
       content: [
@@ -18,7 +18,7 @@ crosscheck(() => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         ${defaults}
         .bg-white {
           --tw-bg-opacity: 1;
@@ -37,6 +37,22 @@ crosscheck(() => {
           }
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        ${defaults}
+        .bg-white {
+          background-color: #fff;
+        }
+        @media (prefers-contrast: more) {
+          .contrast-more\:bg-pink-500 {
+            background-color: #ec4899;
+          }
+        }
+        @media (prefers-contrast: less) {
+          .contrast-less\:bg-black {
+            background-color: #000;
+          }
+        }
+      `)
     })
   })
 
@@ -53,7 +69,7 @@ crosscheck(() => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         ${defaults}
         @media (prefers-contrast: more) {
           .contrast-more\:bg-black {
@@ -68,6 +84,19 @@ crosscheck(() => {
           }
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        ${defaults}
+        @media (prefers-contrast: more) {
+          .contrast-more\:bg-black {
+            background-color: #000;
+          }
+        }
+        @media (prefers-color-scheme: dark) {
+          .dark\:bg-white {
+            background-color: #fff;
+          }
+        }
+      `)
     })
   })
 })
diff --git a/tests/raw-content.oxide.test.css b/tests/raw-content.oxide.test.css
index 6f59c98b4f4f..f50f95e878cb 100644
--- a/tests/raw-content.oxide.test.css
+++ b/tests/raw-content.oxide.test.css
@@ -367,11 +367,7 @@
   border-style: dotted;
 }
 .divide-gray-200 > :not([hidden]) ~ :not([hidden]) {
-  --tw-divide-opacity: 1;
-  border-color: rgb(229 231 235 / var(--tw-divide-opacity));
-}
-.divide-opacity-50 > :not([hidden]) ~ :not([hidden]) {
-  --tw-divide-opacity: 0.5;
+  border-color: #e5e7eb;
 }
 .place-self-center {
   place-self: center;
@@ -418,18 +414,10 @@
   border-style: solid;
 }
 .border-black {
-  --tw-border-opacity: 1;
-  border-color: rgb(0 0 0 / var(--tw-border-opacity));
-}
-.border-opacity-10 {
-  --tw-border-opacity: 0.1;
+  border-color: #000;
 }
 .bg-green-500 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(34 197 94 / var(--tw-bg-opacity));
-}
-.bg-opacity-20 {
-  --tw-bg-opacity: 0.2;
+  background-color: #22c55e;
 }
 .bg-gradient-to-r {
   background-image: linear-gradient(to right, var(--tw-gradient-stops));
@@ -565,11 +553,7 @@
   letter-spacing: -0.025em;
 }
 .text-indigo-500 {
-  --tw-text-opacity: 1;
-  color: rgb(99 102 241 / var(--tw-text-opacity));
-}
-.text-opacity-10 {
-  --tw-text-opacity: 0.1;
+  color: #6366f1;
 }
 .underline {
   text-decoration-line: underline;
@@ -579,11 +563,7 @@
   -moz-osx-font-smoothing: grayscale;
 }
 .placeholder-green-300::placeholder {
-  --tw-placeholder-opacity: 1;
-  color: rgb(134 239 172 / var(--tw-placeholder-opacity));
-}
-.placeholder-opacity-60::placeholder {
-  --tw-placeholder-opacity: 0.6;
+  color: #86efac;
 }
 .opacity-90 {
   opacity: 0.9;
@@ -634,11 +614,7 @@
   box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
 }
 .ring-white {
-  --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(255 255 255 / var(--tw-ring-opacity));
-}
-.ring-opacity-40 {
-  --tw-ring-opacity: 0.4;
+  --tw-ring-color: #fff;
 }
 .ring-offset-2 {
   --tw-ring-offset-width: 2px;
diff --git a/tests/safelist.test.js b/tests/safelist.test.js
index 07e9fe4061b0..cbbd1e245821 100644
--- a/tests/safelist.test.js
+++ b/tests/safelist.test.js
@@ -1,13 +1,13 @@
 import { crosscheck, run, html, css } from './util/run'
 
-crosscheck(() => {
+crosscheck(({ stable, oxide }) => {
   it('should not safelist anything', () => {
     let config = {
       content: [{ raw: html`<div class="uppercase"></div>` }],
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      return expect(result.css).toMatchFormattedCss(css`
         .uppercase {
           text-transform: uppercase;
         }
@@ -22,7 +22,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .mt-\[20px\] {
           margin-top: 20px;
         }
@@ -40,6 +40,23 @@ crosscheck(() => {
           text-decoration-line: underline;
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .mt-\[20px\] {
+          margin-top: 20px;
+        }
+        .font-bold {
+          font-weight: 700;
+        }
+        .uppercase {
+          text-transform: uppercase;
+        }
+        .text-gray-200 {
+          color: #e5e7eb;
+        }
+        .hover\:underline:hover {
+          text-decoration-line: underline;
+        }
+      `)
     })
   })
 
@@ -55,7 +72,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .bg-red-100 {
           --tw-bg-opacity: 1;
           background-color: rgb(254 226 226 / var(--tw-bg-opacity));
@@ -76,6 +93,23 @@ crosscheck(() => {
           background-color: rgb(254 202 202 / var(--tw-bg-opacity));
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .bg-red-100 {
+          background-color: #fee2e2;
+        }
+        .bg-red-200 {
+          background-color: #fecaca;
+        }
+        .uppercase {
+          text-transform: uppercase;
+        }
+        .hover\:bg-red-100:hover {
+          background-color: #fee2e2;
+        }
+        .hover\:bg-red-200:hover {
+          background-color: #fecaca;
+        }
+      `)
     })
   })
 
@@ -100,7 +134,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .bg-red-100 {
           --tw-bg-opacity: 1;
           background-color: rgb(254 226 226 / var(--tw-bg-opacity));
@@ -121,6 +155,23 @@ crosscheck(() => {
           background-color: rgb(254 202 202 / var(--tw-bg-opacity));
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .bg-red-100 {
+          background-color: #fee2e2;
+        }
+        .bg-red-200 {
+          background-color: #fecaca;
+        }
+        .uppercase {
+          text-transform: uppercase;
+        }
+        .hover\:bg-red-100:hover {
+          background-color: #fee2e2;
+        }
+        .hover\:bg-red-200:hover {
+          background-color: #fecaca;
+        }
+      `)
     })
   })
 
@@ -136,7 +187,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .tw-bg-red-100 {
           --tw-bg-opacity: 1;
           background-color: rgb(254 226 226 / var(--tw-bg-opacity));
@@ -149,6 +200,17 @@ crosscheck(() => {
           text-transform: uppercase;
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .tw-bg-red-100 {
+          background-color: #fee2e2;
+        }
+        .tw-bg-red-200 {
+          background-color: #fecaca;
+        }
+        .tw-uppercase {
+          text-transform: uppercase;
+        }
+      `)
     })
   })
 
@@ -159,7 +221,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      return expect(result.css).toMatchFormattedCss(css`
         .uppercase {
           text-transform: uppercase;
         }
@@ -174,7 +236,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      return expect(result.css).toMatchFormattedCss(css`
         .uppercase {
           text-transform: uppercase;
         }
@@ -194,7 +256,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .bg-red-100 {
           --tw-bg-opacity: 1;
           background-color: rgb(254 226 226 / var(--tw-bg-opacity));
@@ -207,6 +269,17 @@ crosscheck(() => {
           text-transform: uppercase;
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .bg-red-100 {
+          background-color: #fee2e2;
+        }
+        .bg-red-200 {
+          background-color: #fecaca;
+        }
+        .uppercase {
+          text-transform: uppercase;
+        }
+      `)
     })
   })
 
@@ -222,7 +295,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      return expect(result.css).toMatchFormattedCss(css`
         .-top-1 {
           top: -0.25rem;
         }
@@ -252,7 +325,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .bg-red-400 {
           --tw-bg-opacity: 1;
           background-color: rgb(248 113 113 / var(--tw-bg-opacity));
@@ -325,7 +398,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      return expect(result.css).toMatchFormattedCss(css`
         .\!grid-cols-4 {
           grid-template-columns: repeat(4, minmax(0, 1fr)) !important;
         }
@@ -350,7 +423,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      return expect(result.css).toMatchFormattedCss(css`
         .\!tw-grid-cols-4 {
           grid-template-columns: repeat(4, minmax(0, 1fr)) !important;
         }
@@ -379,7 +452,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .\!bg-gray-500 {
           --tw-bg-opacity: 1 !important;
           background-color: rgb(107 114 128 / var(--tw-bg-opacity)) !important;
@@ -416,6 +489,35 @@ crosscheck(() => {
           background-color: rgb(31 41 55 / var(--tw-bg-opacity)) !important;
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .\!bg-gray-500 {
+          background-color: #6b7280 !important;
+        }
+        .\!bg-gray-600 {
+          background-color: #4b5563 !important;
+        }
+        .\!bg-gray-700 {
+          background-color: #374151 !important;
+        }
+        .\!bg-gray-800 {
+          background-color: #1f2937 !important;
+        }
+        .uppercase {
+          text-transform: uppercase;
+        }
+        .hover\:\!bg-gray-500:hover {
+          background-color: #6b7280 !important;
+        }
+        .hover\:\!bg-gray-600:hover {
+          background-color: #4b5563 !important;
+        }
+        .hover\:\!bg-gray-700:hover {
+          background-color: #374151 !important;
+        }
+        .hover\:\!bg-gray-800:hover {
+          background-color: #1f2937 !important;
+        }
+      `)
     })
   })
 
@@ -435,7 +537,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .\!bg-gray-200 {
           --tw-bg-opacity: 1 !important;
           background-color: rgb(229 231 235 / var(--tw-bg-opacity)) !important;
@@ -488,6 +590,47 @@ crosscheck(() => {
           color: rgb(17 24 39 / var(--tw-text-opacity)) !important;
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .\!bg-gray-200 {
+          background-color: #e5e7eb !important;
+        }
+        .\!bg-gray-300 {
+          background-color: #d1d5db !important;
+        }
+        .\!bg-gray-400 {
+          background-color: #9ca3af !important;
+        }
+        .uppercase {
+          text-transform: uppercase;
+        }
+        .\!text-gray-700 {
+          color: #374151 !important;
+        }
+        .\!text-gray-800 {
+          color: #1f2937 !important;
+        }
+        .\!text-gray-900 {
+          color: #111827 !important;
+        }
+        .hover\:\!bg-gray-200:hover {
+          background-color: #e5e7eb !important;
+        }
+        .hover\:\!bg-gray-300:hover {
+          background-color: #d1d5db !important;
+        }
+        .hover\:\!bg-gray-400:hover {
+          background-color: #9ca3af !important;
+        }
+        .hover\:\!text-gray-700:hover {
+          color: #374151 !important;
+        }
+        .hover\:\!text-gray-800:hover {
+          color: #1f2937 !important;
+        }
+        .hover\:\!text-gray-900:hover {
+          color: #111827 !important;
+        }
+      `)
     })
   })
 })
diff --git a/tests/syntax-lit-html.test.js b/tests/syntax-lit-html.test.js
index 3e00ebf5469e..952a9b969cdc 100644
--- a/tests/syntax-lit-html.test.js
+++ b/tests/syntax-lit-html.test.js
@@ -1,6 +1,6 @@
 import { crosscheck, run, css } from './util/run'
 
-crosscheck(() => {
+crosscheck(({ stable, oxide }) => {
   test('it detects classes in lit-html templates', () => {
     let config = {
       content: [
@@ -14,7 +14,7 @@ crosscheck(() => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .rounded {
           border-radius: 0.25rem;
         }
@@ -42,6 +42,31 @@ crosscheck(() => {
           background-color: rgb(37 99 235 / var(--tw-bg-opacity));
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .rounded {
+          border-radius: 0.25rem;
+        }
+        .bg-blue-400 {
+          background-color: #60a5fa;
+        }
+        .px-4 {
+          padding-left: 1rem;
+          padding-right: 1rem;
+        }
+        .py-2 {
+          padding-top: 0.5rem;
+          padding-bottom: 0.5rem;
+        }
+        .font-bold {
+          font-weight: 700;
+        }
+        .text-white {
+          color: #fff;
+        }
+        .hover\:bg-blue-600:hover {
+          background-color: #2563eb;
+        }
+      `)
     })
   })
 })
diff --git a/tests/variants.oxide.test.css b/tests/variants.oxide.test.css
index a00e42f2f0bf..db3a5283f1a1 100644
--- a/tests/variants.oxide.test.css
+++ b/tests/variants.oxide.test.css
@@ -52,12 +52,10 @@
   line-height: 2rem;
 }
 .first-letter\:text-red-500:first-letter {
-  --tw-text-opacity: 1;
-  color: rgb(239 68 68 / var(--tw-text-opacity));
+  color: #ef4444;
 }
 .first-line\:bg-yellow-300:first-line {
-  --tw-bg-opacity: 1;
-  background-color: rgb(253 224 71 / var(--tw-bg-opacity));
+  background-color: #fde047;
 }
 .first-line\:underline:first-line {
   text-decoration-line: underline;
@@ -77,35 +75,28 @@
   color: #ef4444;
 }
 .selection\:bg-blue-500 ::selection {
-  --tw-bg-opacity: 1;
-  background-color: rgb(59 130 246 / var(--tw-bg-opacity));
+  background-color: #3b82f6;
 }
 .selection\:text-white ::selection {
-  --tw-text-opacity: 1;
-  color: rgb(255 255 255 / var(--tw-text-opacity));
+  color: #fff;
 }
 .selection\:bg-blue-500::selection {
-  --tw-bg-opacity: 1;
-  background-color: rgb(59 130 246 / var(--tw-bg-opacity));
+  background-color: #3b82f6;
 }
 .selection\:text-white::selection {
-  --tw-text-opacity: 1;
-  color: rgb(255 255 255 / var(--tw-text-opacity));
+  color: #fff;
 }
 .file\:bg-blue-500::file-selector-button {
-  --tw-bg-opacity: 1;
-  background-color: rgb(59 130 246 / var(--tw-bg-opacity));
+  background-color: #3b82f6;
 }
 .file\:text-white::file-selector-button {
-  --tw-text-opacity: 1;
-  color: rgb(255 255 255 / var(--tw-text-opacity));
+  color: #fff;
 }
 .placeholder\:font-bold::placeholder {
   font-weight: 700;
 }
 .placeholder\:text-red-500::placeholder {
-  --tw-text-opacity: 1;
-  color: rgb(239 68 68 / var(--tw-text-opacity));
+  color: #ef4444;
 }
 .backdrop\:shadow-md::backdrop {
   --tw-shadow: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
@@ -119,8 +110,7 @@
 }
 .before\:bg-red-500:before {
   content: var(--tw-content);
-  --tw-bg-opacity: 1;
-  background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+  background-color: #ef4444;
 }
 .after\:flex:after {
   content: var(--tw-content);
@@ -146,8 +136,7 @@
     var(--tw-shadow);
 }
 .open\:bg-red-200[open] {
-  --tw-bg-opacity: 1;
-  background-color: rgb(254 202 202 / var(--tw-bg-opacity));
+  background-color: #fecaca;
 }
 .default\:shadow-md:default,
 .checked\:shadow-md:checked,
@@ -183,12 +172,10 @@
     var(--tw-shadow);
 }
 .file\:hover\:bg-blue-600:hover::file-selector-button {
-  --tw-bg-opacity: 1;
-  background-color: rgb(37 99 235 / var(--tw-bg-opacity));
+  background-color: #2563eb;
 }
 .open\:hover\:bg-red-200:hover[open] {
-  --tw-bg-opacity: 1;
-  background-color: rgb(254 202 202 / var(--tw-bg-opacity));
+  background-color: #fecaca;
 }
 .focus\:shadow-md:focus,
 .focus\:hover\:shadow-md:hover:focus,
@@ -212,8 +199,7 @@
     var(--tw-shadow);
 }
 .group[open] .group-open\:bg-red-200 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(254 202 202 / var(--tw-bg-opacity));
+  background-color: #fecaca;
 }
 .group:default .group-default\:shadow-md,
 .group:checked .group-checked\:shadow-md,
@@ -247,8 +233,7 @@
     var(--tw-shadow);
 }
 .group[open]:focus .group-open\:group-focus\:bg-red-200 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(254 202 202 / var(--tw-bg-opacity));
+  background-color: #fecaca;
 }
 .group:focus:hover .group-focus\:group-hover\:shadow-md,
 .group:focus-visible .group-focus-visible\:shadow-md,
@@ -273,8 +258,7 @@
     var(--tw-shadow);
 }
 .peer[open] ~ .peer-open\:bg-red-200 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(254 202 202 / var(--tw-bg-opacity));
+  background-color: #fecaca;
 }
 .peer:default ~ .peer-default\:shadow-md,
 .peer:checked ~ .peer-checked\:shadow-md,
@@ -299,8 +283,8 @@
 .peer:disabled ~ .peer-disabled\:shadow-md,
 .peer:disabled:focus:hover ~ .peer-disabled\:peer-focus\:peer-hover\:shadow-md,
 .peer:disabled:focus:hover ~ .peer-disabled\:peer-focus\:peer-hover\:first\:shadow-md:first-child,
-[dir='ltr'] .ltr\:shadow-md,
-[dir='rtl'] .rtl\:shadow-md {
+[dir="ltr"] .ltr\:shadow-md,
+[dir="rtl"] .rtl\:shadow-md {
   --tw-shadow: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
   --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color);
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
@@ -326,14 +310,12 @@
 }
 @media (prefers-contrast: more) {
   .contrast-more\:bg-yellow-300 {
-    --tw-bg-opacity: 1;
-    background-color: rgb(253 224 71 / var(--tw-bg-opacity));
+    background-color: #fde047;
   }
 }
 @media (prefers-contrast: less) {
   .contrast-less\:bg-yellow-300 {
-    --tw-bg-opacity: 1;
-    background-color: rgb(253 224 71 / var(--tw-bg-opacity));
+    background-color: #fde047;
   }
 }
 .dark .dark\:shadow-md,
@@ -346,8 +328,7 @@
 }
 @media print {
   .print\:bg-yellow-300 {
-    --tw-bg-opacity: 1;
-    background-color: rgb(253 224 71 / var(--tw-bg-opacity));
+    background-color: #fde047;
   }
 }
 @media (min-width: 640px) {
@@ -418,13 +399,12 @@
 }
 @media (orientation: portrait) {
   .portrait\:bg-yellow-300 {
-    --tw-bg-opacity: 1;
-    background-color: rgb(253 224 71 / var(--tw-bg-opacity));
+    background-color: #fde047;
   }
 }
 @media (orientation: landscape) {
   .landscape\:bg-yellow-300 {
-    --tw-bg-opacity: 1;
-    background-color: rgb(253 224 71 / var(--tw-bg-opacity));
+    background-color: #fde047;
   }
 }
+
diff --git a/tests/variants.test.js b/tests/variants.test.js
index f37897d804f3..a762745f082f 100644
--- a/tests/variants.test.js
+++ b/tests/variants.test.js
@@ -44,7 +44,7 @@ crosscheck(({ stable, oxide }) => {
     }
 
     return run('@tailwind utilities', config).then((result) => {
-      return expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         .file\:hover\:bg-pink-600:hover::file-selector-button {
           --tw-bg-opacity: 1;
           background-color: rgb(219 39 119 / var(--tw-bg-opacity));
@@ -54,6 +54,14 @@ crosscheck(({ stable, oxide }) => {
           background-color: rgb(219 39 119 / var(--tw-bg-opacity));
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        .file\:hover\:bg-pink-600:hover::file-selector-button {
+          background-color: #db2777;
+        }
+        .hover\:file\:bg-pink-600::file-selector-button:hover {
+          background-color: #db2777;
+        }
+      `)
     })
   })
 
@@ -254,15 +262,18 @@ crosscheck(({ stable, oxide }) => {
       @tailwind utilities;
     `
 
-    let expected = css`
+    let result = await run(input, config)
+    stable.expect(result.css).toIncludeCss(css`
       .peer:disabled:focus:hover ~ .peer-disabled\:peer-focus\:peer-hover\:border-blue-500 {
         --tw-border-opacity: 1;
         border-color: rgb(59 130 246 / var(--tw-border-opacity));
       }
-    `
-
-    let result = await run(input, config)
-    expect(result.css).toIncludeCss(expected)
+    `)
+    oxide.expect(result.css).toIncludeCss(css`
+      .peer:disabled:focus:hover ~ .peer-disabled\:peer-focus\:peer-hover\:border-blue-500 {
+        border-color: #3b82f6;
+      }
+    `)
   })
 
   it('should properly handle keyframes with multiple variants', async () => {
@@ -1007,7 +1018,7 @@ crosscheck(({ stable, oxide }) => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         @media (min-aspect-ratio: 1 / 10) {
           .ar-1\/10\:text-red-500 {
             --tw-text-opacity: 1;
@@ -1015,6 +1026,13 @@ crosscheck(({ stable, oxide }) => {
           }
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        @media (min-aspect-ratio: 1 / 10) {
+          .ar-1\/10\:text-red-500 {
+            color: #ef4444;
+          }
+        }
+      `)
     })
   })
 
@@ -1044,7 +1062,7 @@ crosscheck(({ stable, oxide }) => {
     `
 
     return run(input, config).then((result) => {
-      expect(result.css).toMatchFormattedCss(css`
+      stable.expect(result.css).toMatchFormattedCss(css`
         @media (min-aspect-ratio: 1 / 10) and (foo: 20) {
           .ar-1\/10\/20\:text-red-500 {
             --tw-text-opacity: 1;
@@ -1052,6 +1070,13 @@ crosscheck(({ stable, oxide }) => {
           }
         }
       `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        @media (min-aspect-ratio: 1 / 10) and (foo: 20) {
+          .ar-1\/10\/20\:text-red-500 {
+            color: #ef4444;
+          }
+        }
+      `)
     })
   })
 

From 962eb52ec6d73e503c30718b03bbbe75249b8697 Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Fri, 17 Feb 2023 21:42:10 +0100
Subject: [PATCH 20/84] Enable relative content paths for the `oxide` engine
 (#10621)

* enable `relativeContentPathsByDefault` for the `oxide` engine

* update tests to reflect `relative` change in the `oxide` engine

* update changelog
---
 CHANGELOG.md                   |  1 +
 src/featureFlags.js            |  3 ++
 src/util/normalizeConfig.js    |  3 +-
 tests/normalize-config.test.js | 50 ++++++++++++++++++++++++----------
 4 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3931d5f91a47..e76da292e3f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - [Oxide] Disable color opacity plugins by default in the `oxide` engine ([#10618](https://github.com/tailwindlabs/tailwindcss/pull/10618))
+- [Oxide] Enable relative content paths for the `oxide` engine ([#10621](https://github.com/tailwindlabs/tailwindcss/pull/10621))
 
 ## [3.2.7] - 2023-02-16
 
diff --git a/src/featureFlags.js b/src/featureFlags.js
index 7013c7534ffd..bc5f167a0ff7 100644
--- a/src/featureFlags.js
+++ b/src/featureFlags.js
@@ -8,6 +8,9 @@ let defaults = {
   get disableColorOpacityUtilitiesByDefault() {
     return env.OXIDE
   },
+  get relativeContentPathsByDefault() {
+    return env.OXIDE
+  },
 }
 
 let featureFlags = {
diff --git a/src/util/normalizeConfig.js b/src/util/normalizeConfig.js
index 95f63a39eeee..7e1a592decda 100644
--- a/src/util/normalizeConfig.js
+++ b/src/util/normalizeConfig.js
@@ -1,3 +1,4 @@
+import { flagEnabled } from '../featureFlags'
 import log, { dim } from './log'
 
 export function normalizeConfig(config) {
@@ -189,7 +190,7 @@ export function normalizeConfig(config) {
         return content.relative
       }
 
-      return config.future?.relativeContentPathsByDefault ?? false
+      return flagEnabled(config, 'relativeContentPathsByDefault')
     })(),
 
     files: (() => {
diff --git a/tests/normalize-config.test.js b/tests/normalize-config.test.js
index ac9892c8cc5a..dff357a81977 100644
--- a/tests/normalize-config.test.js
+++ b/tests/normalize-config.test.js
@@ -36,19 +36,21 @@ crosscheck(({ stable, oxide }) => {
 
   oxide.test.todo('should normalize extractors')
   stable.test.each`
-  config
-  ${{ content: [{ raw: 'text-center' }], purge: { extract: () => ['font-bold'] } }}
-  ${{ content: [{ raw: 'text-center' }], purge: { extract: { DEFAULT: () => ['font-bold'] } } }}
-  ${{
-    content: [{ raw: 'text-center' }],
-    purge: { options: { defaultExtractor: () => ['font-bold'] } },
-  }}
-  ${{
-    content: [{ raw: 'text-center' }],
-    purge: { options: { extractors: [{ extractor: () => ['font-bold'], extensions: ['html'] }] } },
-  }}
-  ${{ content: [{ raw: 'text-center' }], purge: { extract: { html: () => ['font-bold'] } } }}
-`('should normalize extractors $config', ({ config }) => {
+    config
+    ${{ content: [{ raw: 'text-center' }], purge: { extract: () => ['font-bold'] } }}
+    ${{ content: [{ raw: 'text-center' }], purge: { extract: { DEFAULT: () => ['font-bold'] } } }}
+    ${{
+      content: [{ raw: 'text-center' }],
+      purge: { options: { defaultExtractor: () => ['font-bold'] } },
+    }}
+    ${{
+      content: [{ raw: 'text-center' }],
+      purge: {
+        options: { extractors: [{ extractor: () => ['font-bold'], extensions: ['html'] }] },
+      },
+    }}
+    ${{ content: [{ raw: 'text-center' }], purge: { extract: { html: () => ['font-bold'] } } }}
+  `('should normalize extractors $config', ({ config }) => {
     return run('@tailwind utilities', config).then((result) => {
       return expect(result.css).toMatchFormattedCss(css`
         .font-bold {
@@ -111,12 +113,18 @@ crosscheck(({ stable, oxide }) => {
       content: ['./example-folder/**/*.{html,js}'],
     }
 
-    expect(normalizeConfig(resolveConfig(config)).content).toEqual({
+    stable.expect(normalizeConfig(resolveConfig(config)).content).toEqual({
       files: ['./example-folder/**/*.{html,js}'],
       relative: false,
       extract: {},
       transform: {},
     })
+    oxide.expect(normalizeConfig(resolveConfig(config)).content).toEqual({
+      files: ['./example-folder/**/*.{html,js}'],
+      relative: true,
+      extract: {},
+      transform: {},
+    })
   })
 
   it('should warn when we detect invalid globs with incorrect brace expansion', () => {
@@ -130,8 +138,10 @@ crosscheck(({ stable, oxide }) => {
       ],
     }
 
+    let normalizedConfig = normalizeConfig(resolveConfig(config)).content
+
     // No rewrite happens
-    expect(normalizeConfig(resolveConfig(config)).content).toEqual({
+    stable.expect(normalizedConfig).toEqual({
       files: [
         './{example-folder}/**/*.{html,js}',
         './{example-folder}/**/*.{html}',
@@ -141,6 +151,16 @@ crosscheck(({ stable, oxide }) => {
       extract: {},
       transform: {},
     })
+    oxide.expect(normalizedConfig).toEqual({
+      files: [
+        './{example-folder}/**/*.{html,js}',
+        './{example-folder}/**/*.{html}',
+        './example-folder/**/*.{html}',
+      ],
+      relative: true,
+      extract: {},
+      transform: {},
+    })
 
     // But a warning should happen
     expect(spy).toHaveBeenCalledTimes(2)

From d6121f0ede5f767029bdab9f28b141ed85d543d2 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Fri, 17 Feb 2023 20:43:25 +0000
Subject: [PATCH 21/84] Update eslint to version 8.34.0

---
 package-lock.json | 262 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 719cdcbd06af..f1d60f5df227 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46,7 +46,7 @@
       },
       "devDependencies": {
         "@swc/cli": "0.1.61",
-        "@swc/core": "1.3.27",
+        "@swc/core": "1.3.35",
         "@swc/jest": "0.2.24",
         "@swc/register": "0.1.10",
         "autoprefixer": "^10.4.13",
@@ -3688,9 +3688,9 @@
       }
     },
     "node_modules/@swc/core": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.27.tgz",
-      "integrity": "sha512-praRNgpeYGvwDIm/Cl6JU+yHMvwVraL0U6ejMgGyzvpcm1FVsZd1/EYXGqzbBJ0ALv7Gx4eK56h4GnwV6d4L0w==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.35.tgz",
+      "integrity": "sha512-KmiBin0XSVzJhzX19zTiCqmLslZ40Cl7zqskJcTDeIrRhfgKdiAsxzYUanJgMJIRjYtl9Kcg1V/Ip2o2wL8v3w==",
       "dev": true,
       "hasInstallScript": true,
       "engines": {
@@ -3701,22 +3701,22 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.3.27",
-        "@swc/core-darwin-x64": "1.3.27",
-        "@swc/core-linux-arm-gnueabihf": "1.3.27",
-        "@swc/core-linux-arm64-gnu": "1.3.27",
-        "@swc/core-linux-arm64-musl": "1.3.27",
-        "@swc/core-linux-x64-gnu": "1.3.27",
-        "@swc/core-linux-x64-musl": "1.3.27",
-        "@swc/core-win32-arm64-msvc": "1.3.27",
-        "@swc/core-win32-ia32-msvc": "1.3.27",
-        "@swc/core-win32-x64-msvc": "1.3.27"
+        "@swc/core-darwin-arm64": "1.3.35",
+        "@swc/core-darwin-x64": "1.3.35",
+        "@swc/core-linux-arm-gnueabihf": "1.3.35",
+        "@swc/core-linux-arm64-gnu": "1.3.35",
+        "@swc/core-linux-arm64-musl": "1.3.35",
+        "@swc/core-linux-x64-gnu": "1.3.35",
+        "@swc/core-linux-x64-musl": "1.3.35",
+        "@swc/core-win32-arm64-msvc": "1.3.35",
+        "@swc/core-win32-ia32-msvc": "1.3.35",
+        "@swc/core-win32-x64-msvc": "1.3.35"
       }
     },
     "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.27.tgz",
-      "integrity": "sha512-IKlxkhEy99CnP9nduaf5IJWIFcr6D5cZCjYmCs7nWkjMV+aAieyDO9AX4LT8AcHy6CF7ByOX7SKoqk+gVMAaKw==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.35.tgz",
+      "integrity": "sha512-zQUFkHx4gZpu0uo2IspvPnKsz8bsdXd5bC33xwjtoAI1cpLerDyqo4v2zIahEp+FdKZjyVsLHtfJiQiA1Qka3A==",
       "cpu": [
         "arm64"
       ],
@@ -3730,9 +3730,9 @@
       }
     },
     "node_modules/@swc/core-darwin-x64": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.27.tgz",
-      "integrity": "sha512-MtabZIhFf/dL3vs6UMbd+vJsjIkm2NaFqulGV0Jofy2bfVZPTj/b5pXeOlUsTWy7JcH1uixjdx4RvJRyvqJxQA==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.35.tgz",
+      "integrity": "sha512-oOSkSGWtALovaw22lNevKD434OQTPf8X+dVPvPMrJXJpJ34dWDlFWpLntoc+arvKLNZ7LQmTuk8rR1hkrAY7cw==",
       "cpu": [
         "x64"
       ],
@@ -3746,9 +3746,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.27.tgz",
-      "integrity": "sha512-XELMoGcUTAkk+G4buwIIhu6AIr1U418Odt22HUW8+ZvV+Wty2ICgR/myOIhM3xMb6U2L8ay+evMqoVNMQ0RRTg==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.35.tgz",
+      "integrity": "sha512-Yie8k00O6O8BCATS/xeKStquV4OYSskUGRDXBQVDw1FrE23PHaSeHCgg4q6iNZjJzXCOJbaTCKnYoIDn9DMf7A==",
       "cpu": [
         "arm"
       ],
@@ -3762,9 +3762,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.27.tgz",
-      "integrity": "sha512-O6vtT6bnrVR9PzEIuA5U7tIfYo7bv97H9K9Vqy2oyHNeGN0H36DKwS4UqPreHtziXNF5+7ubdUYUkrG/j8UnUQ==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.35.tgz",
+      "integrity": "sha512-Zlv3WHa/4x2p51HSvjUWXHfSe1Gl2prqImUZJc8NZOlj75BFzVuR0auhQ+LbwvIQ3gaA1LODX9lyS9wXL3yjxA==",
       "cpu": [
         "arm64"
       ],
@@ -3778,9 +3778,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.27.tgz",
-      "integrity": "sha512-Oa0E1i7dOTWpaEZumKoNbTE/Ap+da6nlhqKVUdYrFDrOBi25tz76SdxZIyvAszzmgY89b5yd1naourKmkPXpww==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.35.tgz",
+      "integrity": "sha512-u6tCYsrSyZ8U+4jLMA/O82veBfLy2aUpn51WxQaeH7wqZGy9TGSJXoO8vWxARQ6b72vjsnKDJHP4MD8hFwcctg==",
       "cpu": [
         "arm64"
       ],
@@ -3794,9 +3794,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.27.tgz",
-      "integrity": "sha512-S3v9H8oL2a8Ur6AjQyhkC6HfBVPOxKMdBhcZmdNuVgEUHbHdbf/Lka85F9IOYXEarMn0FtQw3ywowS22O9L5Uw==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.35.tgz",
+      "integrity": "sha512-Dtxf2IbeH7XlNhP1Qt2/MvUPkpEbn7hhGfpSRs4ot8D3Vf5QEX4S/QtC1OsFWuciiYgHAT1Ybjt4xZic9DSkmA==",
       "cpu": [
         "x64"
       ],
@@ -3810,9 +3810,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.27.tgz",
-      "integrity": "sha512-6DDkdXlOADpwICFZTRphCR+cIeS8aEYh4NlyzBito0mOWwIIdfCgALzhkTQOzTOkcD42bP97CIoZ97hqV/puOg==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.35.tgz",
+      "integrity": "sha512-4XavNJ60GprjpTiESCu5daJUnmErixPAqDitJSMu4TV32LNIE8G00S9pDLXinDTW1rgcGtQdq1NLkNRmwwovtg==",
       "cpu": [
         "x64"
       ],
@@ -3826,9 +3826,9 @@
       }
     },
     "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.27.tgz",
-      "integrity": "sha512-baxfH4AbEcaTNo08wxV0W6hiMXwVCxPS4qc0amHpXPti92unvSqeDR1W3C9GjHqzXlWtmCRsq8Ww1pal6ZVLrw==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.35.tgz",
+      "integrity": "sha512-dNGfKCUSX2M4qVyaS80Lyos0FkXyHRCvrdQ2Y4Hrg3FVokiuw3yY6fLohpUfQ5ws3n2A39dh7jGDeh34+l0sGA==",
       "cpu": [
         "arm64"
       ],
@@ -3842,9 +3842,9 @@
       }
     },
     "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.27.tgz",
-      "integrity": "sha512-7iLJnH71k5qCwxv9NcM/P7nIEzTsC7r1sIiQW6bu+CpC8qZvwl0PS+XvQRlLly2gCZM+Le98tksYG14MEh+Hrw==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.35.tgz",
+      "integrity": "sha512-ChuPSrDR+JBf7S7dEKPicnG8A3bM0uWPsW2vG+V2wH4iNfNxKVemESHosmYVeEZXqMpomNMvLyeHep1rjRsc0Q==",
       "cpu": [
         "ia32"
       ],
@@ -3858,9 +3858,9 @@
       }
     },
     "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.27.tgz",
-      "integrity": "sha512-mFM907PDw/jrQ44+TRjIVGEOy2Mu06mMMz0HPMFuRsBzl5t0Kajp3vmn8FkkpS9wH5982VPi6hPYVTb7QJo5Qg==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.35.tgz",
+      "integrity": "sha512-/RvphT4WfuGfIK84Ha0dovdPrKB1bW/mc+dtdmhv2E3EGkNc5FoueNwYmXWRimxnU7X0X7IkcRhyKB4G5DeAmg==",
       "cpu": [
         "x64"
       ],
@@ -17650,90 +17650,90 @@
       }
     },
     "@swc/core": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.27.tgz",
-      "integrity": "sha512-praRNgpeYGvwDIm/Cl6JU+yHMvwVraL0U6ejMgGyzvpcm1FVsZd1/EYXGqzbBJ0ALv7Gx4eK56h4GnwV6d4L0w==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.35.tgz",
+      "integrity": "sha512-KmiBin0XSVzJhzX19zTiCqmLslZ40Cl7zqskJcTDeIrRhfgKdiAsxzYUanJgMJIRjYtl9Kcg1V/Ip2o2wL8v3w==",
       "dev": true,
       "requires": {
-        "@swc/core-darwin-arm64": "1.3.27",
-        "@swc/core-darwin-x64": "1.3.27",
-        "@swc/core-linux-arm-gnueabihf": "1.3.27",
-        "@swc/core-linux-arm64-gnu": "1.3.27",
-        "@swc/core-linux-arm64-musl": "1.3.27",
-        "@swc/core-linux-x64-gnu": "1.3.27",
-        "@swc/core-linux-x64-musl": "1.3.27",
-        "@swc/core-win32-arm64-msvc": "1.3.27",
-        "@swc/core-win32-ia32-msvc": "1.3.27",
-        "@swc/core-win32-x64-msvc": "1.3.27"
+        "@swc/core-darwin-arm64": "1.3.35",
+        "@swc/core-darwin-x64": "1.3.35",
+        "@swc/core-linux-arm-gnueabihf": "1.3.35",
+        "@swc/core-linux-arm64-gnu": "1.3.35",
+        "@swc/core-linux-arm64-musl": "1.3.35",
+        "@swc/core-linux-x64-gnu": "1.3.35",
+        "@swc/core-linux-x64-musl": "1.3.35",
+        "@swc/core-win32-arm64-msvc": "1.3.35",
+        "@swc/core-win32-ia32-msvc": "1.3.35",
+        "@swc/core-win32-x64-msvc": "1.3.35"
       }
     },
     "@swc/core-darwin-arm64": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.27.tgz",
-      "integrity": "sha512-IKlxkhEy99CnP9nduaf5IJWIFcr6D5cZCjYmCs7nWkjMV+aAieyDO9AX4LT8AcHy6CF7ByOX7SKoqk+gVMAaKw==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.35.tgz",
+      "integrity": "sha512-zQUFkHx4gZpu0uo2IspvPnKsz8bsdXd5bC33xwjtoAI1cpLerDyqo4v2zIahEp+FdKZjyVsLHtfJiQiA1Qka3A==",
       "dev": true,
       "optional": true
     },
     "@swc/core-darwin-x64": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.27.tgz",
-      "integrity": "sha512-MtabZIhFf/dL3vs6UMbd+vJsjIkm2NaFqulGV0Jofy2bfVZPTj/b5pXeOlUsTWy7JcH1uixjdx4RvJRyvqJxQA==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.35.tgz",
+      "integrity": "sha512-oOSkSGWtALovaw22lNevKD434OQTPf8X+dVPvPMrJXJpJ34dWDlFWpLntoc+arvKLNZ7LQmTuk8rR1hkrAY7cw==",
       "dev": true,
       "optional": true
     },
     "@swc/core-linux-arm-gnueabihf": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.27.tgz",
-      "integrity": "sha512-XELMoGcUTAkk+G4buwIIhu6AIr1U418Odt22HUW8+ZvV+Wty2ICgR/myOIhM3xMb6U2L8ay+evMqoVNMQ0RRTg==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.35.tgz",
+      "integrity": "sha512-Yie8k00O6O8BCATS/xeKStquV4OYSskUGRDXBQVDw1FrE23PHaSeHCgg4q6iNZjJzXCOJbaTCKnYoIDn9DMf7A==",
       "dev": true,
       "optional": true
     },
     "@swc/core-linux-arm64-gnu": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.27.tgz",
-      "integrity": "sha512-O6vtT6bnrVR9PzEIuA5U7tIfYo7bv97H9K9Vqy2oyHNeGN0H36DKwS4UqPreHtziXNF5+7ubdUYUkrG/j8UnUQ==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.35.tgz",
+      "integrity": "sha512-Zlv3WHa/4x2p51HSvjUWXHfSe1Gl2prqImUZJc8NZOlj75BFzVuR0auhQ+LbwvIQ3gaA1LODX9lyS9wXL3yjxA==",
       "dev": true,
       "optional": true
     },
     "@swc/core-linux-arm64-musl": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.27.tgz",
-      "integrity": "sha512-Oa0E1i7dOTWpaEZumKoNbTE/Ap+da6nlhqKVUdYrFDrOBi25tz76SdxZIyvAszzmgY89b5yd1naourKmkPXpww==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.35.tgz",
+      "integrity": "sha512-u6tCYsrSyZ8U+4jLMA/O82veBfLy2aUpn51WxQaeH7wqZGy9TGSJXoO8vWxARQ6b72vjsnKDJHP4MD8hFwcctg==",
       "dev": true,
       "optional": true
     },
     "@swc/core-linux-x64-gnu": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.27.tgz",
-      "integrity": "sha512-S3v9H8oL2a8Ur6AjQyhkC6HfBVPOxKMdBhcZmdNuVgEUHbHdbf/Lka85F9IOYXEarMn0FtQw3ywowS22O9L5Uw==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.35.tgz",
+      "integrity": "sha512-Dtxf2IbeH7XlNhP1Qt2/MvUPkpEbn7hhGfpSRs4ot8D3Vf5QEX4S/QtC1OsFWuciiYgHAT1Ybjt4xZic9DSkmA==",
       "dev": true,
       "optional": true
     },
     "@swc/core-linux-x64-musl": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.27.tgz",
-      "integrity": "sha512-6DDkdXlOADpwICFZTRphCR+cIeS8aEYh4NlyzBito0mOWwIIdfCgALzhkTQOzTOkcD42bP97CIoZ97hqV/puOg==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.35.tgz",
+      "integrity": "sha512-4XavNJ60GprjpTiESCu5daJUnmErixPAqDitJSMu4TV32LNIE8G00S9pDLXinDTW1rgcGtQdq1NLkNRmwwovtg==",
       "dev": true,
       "optional": true
     },
     "@swc/core-win32-arm64-msvc": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.27.tgz",
-      "integrity": "sha512-baxfH4AbEcaTNo08wxV0W6hiMXwVCxPS4qc0amHpXPti92unvSqeDR1W3C9GjHqzXlWtmCRsq8Ww1pal6ZVLrw==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.35.tgz",
+      "integrity": "sha512-dNGfKCUSX2M4qVyaS80Lyos0FkXyHRCvrdQ2Y4Hrg3FVokiuw3yY6fLohpUfQ5ws3n2A39dh7jGDeh34+l0sGA==",
       "dev": true,
       "optional": true
     },
     "@swc/core-win32-ia32-msvc": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.27.tgz",
-      "integrity": "sha512-7iLJnH71k5qCwxv9NcM/P7nIEzTsC7r1sIiQW6bu+CpC8qZvwl0PS+XvQRlLly2gCZM+Le98tksYG14MEh+Hrw==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.35.tgz",
+      "integrity": "sha512-ChuPSrDR+JBf7S7dEKPicnG8A3bM0uWPsW2vG+V2wH4iNfNxKVemESHosmYVeEZXqMpomNMvLyeHep1rjRsc0Q==",
       "dev": true,
       "optional": true
     },
     "@swc/core-win32-x64-msvc": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.27.tgz",
-      "integrity": "sha512-mFM907PDw/jrQ44+TRjIVGEOy2Mu06mMMz0HPMFuRsBzl5t0Kajp3vmn8FkkpS9wH5982VPi6hPYVTb7QJo5Qg==",
+      "version": "1.3.35",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.35.tgz",
+      "integrity": "sha512-/RvphT4WfuGfIK84Ha0dovdPrKB1bW/mc+dtdmhv2E3EGkNc5FoueNwYmXWRimxnU7X0X7IkcRhyKB4G5DeAmg==",
       "dev": true,
       "optional": true
     },
@@ -25196,7 +25196,7 @@
       "version": "file:",
       "requires": {
         "@swc/cli": "0.1.61",
-        "@swc/core": "1.3.27",
+        "@swc/core": "1.3.35",
         "@swc/jest": "0.2.24",
         "@swc/register": "0.1.10",
         "@tailwindcss/integrations-content-resolution": "file:integrations/content-resolution",
@@ -27362,90 +27362,90 @@
           }
         },
         "@swc/core": {
-          "version": "1.3.27",
-          "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.27.tgz",
-          "integrity": "sha512-praRNgpeYGvwDIm/Cl6JU+yHMvwVraL0U6ejMgGyzvpcm1FVsZd1/EYXGqzbBJ0ALv7Gx4eK56h4GnwV6d4L0w==",
+          "version": "1.3.35",
+          "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.35.tgz",
+          "integrity": "sha512-KmiBin0XSVzJhzX19zTiCqmLslZ40Cl7zqskJcTDeIrRhfgKdiAsxzYUanJgMJIRjYtl9Kcg1V/Ip2o2wL8v3w==",
           "dev": true,
           "requires": {
-            "@swc/core-darwin-arm64": "1.3.27",
-            "@swc/core-darwin-x64": "1.3.27",
-            "@swc/core-linux-arm-gnueabihf": "1.3.27",
-            "@swc/core-linux-arm64-gnu": "1.3.27",
-            "@swc/core-linux-arm64-musl": "1.3.27",
-            "@swc/core-linux-x64-gnu": "1.3.27",
-            "@swc/core-linux-x64-musl": "1.3.27",
-            "@swc/core-win32-arm64-msvc": "1.3.27",
-            "@swc/core-win32-ia32-msvc": "1.3.27",
-            "@swc/core-win32-x64-msvc": "1.3.27"
+            "@swc/core-darwin-arm64": "1.3.35",
+            "@swc/core-darwin-x64": "1.3.35",
+            "@swc/core-linux-arm-gnueabihf": "1.3.35",
+            "@swc/core-linux-arm64-gnu": "1.3.35",
+            "@swc/core-linux-arm64-musl": "1.3.35",
+            "@swc/core-linux-x64-gnu": "1.3.35",
+            "@swc/core-linux-x64-musl": "1.3.35",
+            "@swc/core-win32-arm64-msvc": "1.3.35",
+            "@swc/core-win32-ia32-msvc": "1.3.35",
+            "@swc/core-win32-x64-msvc": "1.3.35"
           }
         },
         "@swc/core-darwin-arm64": {
-          "version": "1.3.27",
-          "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.27.tgz",
-          "integrity": "sha512-IKlxkhEy99CnP9nduaf5IJWIFcr6D5cZCjYmCs7nWkjMV+aAieyDO9AX4LT8AcHy6CF7ByOX7SKoqk+gVMAaKw==",
+          "version": "1.3.35",
+          "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.35.tgz",
+          "integrity": "sha512-zQUFkHx4gZpu0uo2IspvPnKsz8bsdXd5bC33xwjtoAI1cpLerDyqo4v2zIahEp+FdKZjyVsLHtfJiQiA1Qka3A==",
           "dev": true,
           "optional": true
         },
         "@swc/core-darwin-x64": {
-          "version": "1.3.27",
-          "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.27.tgz",
-          "integrity": "sha512-MtabZIhFf/dL3vs6UMbd+vJsjIkm2NaFqulGV0Jofy2bfVZPTj/b5pXeOlUsTWy7JcH1uixjdx4RvJRyvqJxQA==",
+          "version": "1.3.35",
+          "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.35.tgz",
+          "integrity": "sha512-oOSkSGWtALovaw22lNevKD434OQTPf8X+dVPvPMrJXJpJ34dWDlFWpLntoc+arvKLNZ7LQmTuk8rR1hkrAY7cw==",
           "dev": true,
           "optional": true
         },
         "@swc/core-linux-arm-gnueabihf": {
-          "version": "1.3.27",
-          "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.27.tgz",
-          "integrity": "sha512-XELMoGcUTAkk+G4buwIIhu6AIr1U418Odt22HUW8+ZvV+Wty2ICgR/myOIhM3xMb6U2L8ay+evMqoVNMQ0RRTg==",
+          "version": "1.3.35",
+          "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.35.tgz",
+          "integrity": "sha512-Yie8k00O6O8BCATS/xeKStquV4OYSskUGRDXBQVDw1FrE23PHaSeHCgg4q6iNZjJzXCOJbaTCKnYoIDn9DMf7A==",
           "dev": true,
           "optional": true
         },
         "@swc/core-linux-arm64-gnu": {
-          "version": "1.3.27",
-          "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.27.tgz",
-          "integrity": "sha512-O6vtT6bnrVR9PzEIuA5U7tIfYo7bv97H9K9Vqy2oyHNeGN0H36DKwS4UqPreHtziXNF5+7ubdUYUkrG/j8UnUQ==",
+          "version": "1.3.35",
+          "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.35.tgz",
+          "integrity": "sha512-Zlv3WHa/4x2p51HSvjUWXHfSe1Gl2prqImUZJc8NZOlj75BFzVuR0auhQ+LbwvIQ3gaA1LODX9lyS9wXL3yjxA==",
           "dev": true,
           "optional": true
         },
         "@swc/core-linux-arm64-musl": {
-          "version": "1.3.27",
-          "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.27.tgz",
-          "integrity": "sha512-Oa0E1i7dOTWpaEZumKoNbTE/Ap+da6nlhqKVUdYrFDrOBi25tz76SdxZIyvAszzmgY89b5yd1naourKmkPXpww==",
+          "version": "1.3.35",
+          "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.35.tgz",
+          "integrity": "sha512-u6tCYsrSyZ8U+4jLMA/O82veBfLy2aUpn51WxQaeH7wqZGy9TGSJXoO8vWxARQ6b72vjsnKDJHP4MD8hFwcctg==",
           "dev": true,
           "optional": true
         },
         "@swc/core-linux-x64-gnu": {
-          "version": "1.3.27",
-          "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.27.tgz",
-          "integrity": "sha512-S3v9H8oL2a8Ur6AjQyhkC6HfBVPOxKMdBhcZmdNuVgEUHbHdbf/Lka85F9IOYXEarMn0FtQw3ywowS22O9L5Uw==",
+          "version": "1.3.35",
+          "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.35.tgz",
+          "integrity": "sha512-Dtxf2IbeH7XlNhP1Qt2/MvUPkpEbn7hhGfpSRs4ot8D3Vf5QEX4S/QtC1OsFWuciiYgHAT1Ybjt4xZic9DSkmA==",
           "dev": true,
           "optional": true
         },
         "@swc/core-linux-x64-musl": {
-          "version": "1.3.27",
-          "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.27.tgz",
-          "integrity": "sha512-6DDkdXlOADpwICFZTRphCR+cIeS8aEYh4NlyzBito0mOWwIIdfCgALzhkTQOzTOkcD42bP97CIoZ97hqV/puOg==",
+          "version": "1.3.35",
+          "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.35.tgz",
+          "integrity": "sha512-4XavNJ60GprjpTiESCu5daJUnmErixPAqDitJSMu4TV32LNIE8G00S9pDLXinDTW1rgcGtQdq1NLkNRmwwovtg==",
           "dev": true,
           "optional": true
         },
         "@swc/core-win32-arm64-msvc": {
-          "version": "1.3.27",
-          "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.27.tgz",
-          "integrity": "sha512-baxfH4AbEcaTNo08wxV0W6hiMXwVCxPS4qc0amHpXPti92unvSqeDR1W3C9GjHqzXlWtmCRsq8Ww1pal6ZVLrw==",
+          "version": "1.3.35",
+          "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.35.tgz",
+          "integrity": "sha512-dNGfKCUSX2M4qVyaS80Lyos0FkXyHRCvrdQ2Y4Hrg3FVokiuw3yY6fLohpUfQ5ws3n2A39dh7jGDeh34+l0sGA==",
           "dev": true,
           "optional": true
         },
         "@swc/core-win32-ia32-msvc": {
-          "version": "1.3.27",
-          "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.27.tgz",
-          "integrity": "sha512-7iLJnH71k5qCwxv9NcM/P7nIEzTsC7r1sIiQW6bu+CpC8qZvwl0PS+XvQRlLly2gCZM+Le98tksYG14MEh+Hrw==",
+          "version": "1.3.35",
+          "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.35.tgz",
+          "integrity": "sha512-ChuPSrDR+JBf7S7dEKPicnG8A3bM0uWPsW2vG+V2wH4iNfNxKVemESHosmYVeEZXqMpomNMvLyeHep1rjRsc0Q==",
           "dev": true,
           "optional": true
         },
         "@swc/core-win32-x64-msvc": {
-          "version": "1.3.27",
-          "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.27.tgz",
-          "integrity": "sha512-mFM907PDw/jrQ44+TRjIVGEOy2Mu06mMMz0HPMFuRsBzl5t0Kajp3vmn8FkkpS9wH5982VPi6hPYVTb7QJo5Qg==",
+          "version": "1.3.35",
+          "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.35.tgz",
+          "integrity": "sha512-/RvphT4WfuGfIK84Ha0dovdPrKB1bW/mc+dtdmhv2E3EGkNc5FoueNwYmXWRimxnU7X0X7IkcRhyKB4G5DeAmg==",
           "dev": true,
           "optional": true
         },
diff --git a/package.json b/package.json
index 33f63856ffad..42ebdc615dc8 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "concurrently": "^7.5.0",
     "cssnano": "^5.1.14",
     "esbuild": "^0.17.4",
-    "eslint": "^8.31.0",
+    "eslint": "^8.34.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^29.4.1",

From 9bbdd9b10dea9693c4df8beebbdfe39694c7a2f5 Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Wed, 22 Feb 2023 14:44:54 -0500
Subject: [PATCH 22/84] Disallow multi-selector arbitrary variants (#10655)

* Allow escaping in `splitAtTopLevelOnly`

* Correctly parse arbitrary variants that have multiple selectors

* Explicitly disallow multiple selector arbitrary variants

Now that we parse them correctly we can restrict them to explicitly supporting only a single selector

* Add test to verify that multiple selector arbitrary variants are dropped

* Add test

* Make prettier happy

* Fix CS

* Update changelog
---
 CHANGELOG.md                     |  4 +++
 src/lib/generateRules.js         | 17 +++++++++---
 src/util/splitAtTopLevelOnly.js  |  9 +++++-
 tests/arbitrary-variants.test.js | 47 ++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e76da292e3f4..c4d96da84e49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
 - Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
 
+### Fixed
+
+- Disallow multiple selectors in arbitrary variants ([#10655](https://github.com/tailwindlabs/tailwindcss/pull/10655))
+
 ### Changed
 
 - [Oxide] Disable color opacity plugins by default in the `oxide` engine ([#10618](https://github.com/tailwindlabs/tailwindcss/pull/10618))
diff --git a/src/lib/generateRules.js b/src/lib/generateRules.js
index f7096e556602..0306893ad3ef 100644
--- a/src/lib/generateRules.js
+++ b/src/lib/generateRules.js
@@ -205,17 +205,26 @@ function applyVariant(variant, matches, context) {
 
   // Register arbitrary variants
   if (isArbitraryValue(variant) && !context.variantMap.has(variant)) {
+    let sort = context.offsets.recordVariant(variant)
+
     let selector = normalize(variant.slice(1, -1))
+    let selectors = splitAtTopLevelOnly(selector, ',')
 
-    if (!isValidVariantFormatString(selector)) {
+    // We do not support multiple selectors for arbitrary variants
+    if (selectors.length > 1) {
       return []
     }
 
-    let fn = parseVariant(selector)
+    if (!selectors.every(isValidVariantFormatString)) {
+      return []
+    }
 
-    let sort = context.offsets.recordVariant(variant)
+    let records = selectors.map((sel, idx) => [
+      context.offsets.applyParallelOffset(sort, idx),
+      parseVariant(sel.trim()),
+    ])
 
-    context.variantMap.set(variant, [[sort, fn]])
+    context.variantMap.set(variant, records)
   }
 
   if (context.variantMap.has(variant)) {
diff --git a/src/util/splitAtTopLevelOnly.js b/src/util/splitAtTopLevelOnly.js
index 63fd767403ce..a749c7932ed9 100644
--- a/src/util/splitAtTopLevelOnly.js
+++ b/src/util/splitAtTopLevelOnly.js
@@ -17,17 +17,24 @@ export function splitAtTopLevelOnly(input, separator) {
   let stack = []
   let parts = []
   let lastPos = 0
+  let isEscaped = false
 
   for (let idx = 0; idx < input.length; idx++) {
     let char = input[idx]
 
-    if (stack.length === 0 && char === separator[0]) {
+    if (stack.length === 0 && char === separator[0] && !isEscaped) {
       if (separator.length === 1 || input.slice(idx, idx + separator.length) === separator) {
         parts.push(input.slice(lastPos, idx))
         lastPos = idx + separator.length
       }
     }
 
+    if (isEscaped) {
+      isEscaped = false
+    } else if (char === '\\') {
+      isEscaped = true
+    }
+
     if (char === '(' || char === '[' || char === '{') {
       stack.push(char)
     } else if (
diff --git a/tests/arbitrary-variants.test.js b/tests/arbitrary-variants.test.js
index 46da5cdf2027..b210bdc77ecb 100644
--- a/tests/arbitrary-variants.test.js
+++ b/tests/arbitrary-variants.test.js
@@ -1116,6 +1116,53 @@ crosscheck(({ stable, oxide }) => {
     })
   })
 
+  it('it should discard arbitrary variants with multiple selectors', () => {
+    let config = {
+      content: [
+        {
+          raw: html`
+            <div class="p-1"></div>
+            <div class="[div]:p-1"></div>
+            <div class="[div_&]:p-1"></div>
+            <div class="[div,span]:p-1"></div>
+            <div class="[div_&,span]:p-1"></div>
+            <div class="[div,span_&]:p-1"></div>
+            <div class="[div_&,span_&]:p-1"></div>
+            <div class="hover:[div]:p-1"></div>
+            <div class="hover:[div_&]:p-1"></div>
+            <div class="hover:[div,span]:p-1"></div>
+            <div class="hover:[div_&,span]:p-1"></div>
+            <div class="hover:[div,span_&]:p-1"></div>
+            <div class="hover:[div_&,span_&]:p-1"></div>
+            <div class="hover:[:is(span,div)_&]:p-1"></div>
+          `,
+        },
+        {
+          // escaped commas are a-ok
+          // This is separate because prettier complains about `\,` in the template string
+          raw: '<div class="hover:[.span\\,div_&]:p-1"></div>',
+        },
+      ],
+      corePlugins: { preflight: false },
+    }
+
+    let input = css`
+      @tailwind utilities;
+    `
+
+    return run(input, config).then((result) => {
+      expect(result.css).toMatchFormattedCss(css`
+        .p-1,
+        .span\,div .hover\:\[\.span\\\,div_\&\]\:p-1:hover,
+        :is(span, div) .hover\:\[\:is\(span\,div\)_\&\]\:p-1:hover,
+        div .\[div_\&\]\:p-1,
+        div .hover\:\[div_\&\]\:p-1:hover {
+          padding: 0.25rem;
+        }
+      `)
+    })
+  })
+
   it('should sort multiple variant fns with normal variants between them', () => {
     /** @type {string[]} */
     let lines = []

From 0439d44ce07aaeceaad693f437ce6c4aba05e22b Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Wed, 22 Feb 2023 22:26:06 +0000
Subject: [PATCH 23/84] Update cssnano to version 5.1.15

---
 package-lock.json | 22 +++++++++++-----------
 package.json      |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f1d60f5df227..2044475a8a93 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -53,7 +53,7 @@
         "concurrently": "^7.5.0",
         "cssnano": "^5.1.14",
         "esbuild": "^0.17.4",
-        "eslint": "^8.31.0",
+        "eslint": "^8.34.0",
         "eslint-config-prettier": "^8.6.0",
         "eslint-plugin-prettier": "^4.2.1",
         "jest": "^29.4.1",
@@ -6891,9 +6891,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz",
-      "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==",
+      "version": "8.34.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz",
+      "integrity": "sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==",
       "dev": true,
       "dependencies": {
         "@eslint/eslintrc": "^1.4.1",
@@ -20374,9 +20374,9 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz",
-      "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==",
+      "version": "8.34.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz",
+      "integrity": "sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==",
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.4.1",
@@ -25220,7 +25220,7 @@
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
         "esbuild": "^0.17.4",
-        "eslint": "^8.31.0",
+        "eslint": "^8.34.0",
         "eslint-config-prettier": "^8.6.0",
         "eslint-plugin-prettier": "^4.2.1",
         "fast-glob": "^3.2.12",
@@ -30086,9 +30086,9 @@
           "dev": true
         },
         "eslint": {
-          "version": "8.32.0",
-          "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz",
-          "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==",
+          "version": "8.34.0",
+          "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz",
+          "integrity": "sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==",
           "dev": true,
           "requires": {
             "@eslint/eslintrc": "^1.4.1",
diff --git a/package.json b/package.json
index 42ebdc615dc8..350e1923dea8 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "@swc/register": "0.1.10",
     "autoprefixer": "^10.4.13",
     "concurrently": "^7.5.0",
-    "cssnano": "^5.1.14",
+    "cssnano": "^5.1.15",
     "esbuild": "^0.17.4",
     "eslint": "^8.34.0",
     "eslint-config-prettier": "^8.6.0",

From 261a8b42cbd14c6173e499a307c25e14cbaa29b5 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Thu, 23 Feb 2023 16:43:57 +0000
Subject: [PATCH 24/84] Update all of jest to version 29.4.3

---
 package-lock.json | 322 ++++++++++++++++++++++++++++++++++++----------
 package.json      |   4 +-
 2 files changed, 253 insertions(+), 73 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2044475a8a93..82ed662bbcc0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -51,7 +51,7 @@
         "@swc/register": "0.1.10",
         "autoprefixer": "^10.4.13",
         "concurrently": "^7.5.0",
-        "cssnano": "^5.1.14",
+        "cssnano": "^5.1.15",
         "esbuild": "^0.17.4",
         "eslint": "^8.34.0",
         "eslint-config-prettier": "^8.6.0",
@@ -5561,8 +5561,9 @@
     },
     "node_modules/caniuse-api": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.0.0",
         "caniuse-lite": "^1.0.0",
@@ -5916,8 +5917,9 @@
     },
     "node_modules/colord": {
       "version": "2.9.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+      "dev": true
     },
     "node_modules/colorette": {
       "version": "2.0.19",
@@ -6200,8 +6202,9 @@
     },
     "node_modules/css-declaration-sorter": {
       "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
+      "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >=14"
       },
@@ -6319,11 +6322,12 @@
       }
     },
     "node_modules/cssnano": {
-      "version": "5.1.14",
+      "version": "5.1.15",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
+      "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "cssnano-preset-default": "^5.2.13",
+        "cssnano-preset-default": "^5.2.14",
         "lilconfig": "^2.0.3",
         "yaml": "^1.10.2"
       },
@@ -6339,21 +6343,22 @@
       }
     },
     "node_modules/cssnano-preset-default": {
-      "version": "5.2.13",
+      "version": "5.2.14",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
+      "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "css-declaration-sorter": "^6.3.1",
         "cssnano-utils": "^3.1.0",
         "postcss-calc": "^8.2.3",
-        "postcss-colormin": "^5.3.0",
+        "postcss-colormin": "^5.3.1",
         "postcss-convert-values": "^5.1.3",
         "postcss-discard-comments": "^5.1.2",
         "postcss-discard-duplicates": "^5.1.0",
         "postcss-discard-empty": "^5.1.1",
         "postcss-discard-overridden": "^5.1.0",
         "postcss-merge-longhand": "^5.1.7",
-        "postcss-merge-rules": "^5.1.3",
+        "postcss-merge-rules": "^5.1.4",
         "postcss-minify-font-values": "^5.1.0",
         "postcss-minify-gradients": "^5.1.1",
         "postcss-minify-params": "^5.1.4",
@@ -6368,7 +6373,7 @@
         "postcss-normalize-url": "^5.1.0",
         "postcss-normalize-whitespace": "^5.1.1",
         "postcss-ordered-values": "^5.1.3",
-        "postcss-reduce-initial": "^5.1.1",
+        "postcss-reduce-initial": "^5.1.2",
         "postcss-reduce-transforms": "^5.1.0",
         "postcss-svgo": "^5.1.0",
         "postcss-unique-selectors": "^5.1.1"
@@ -6382,8 +6387,9 @@
     },
     "node_modules/cssnano-utils": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
+      "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -10270,8 +10276,9 @@
     },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
@@ -10280,8 +10287,9 @@
     },
     "node_modules/lodash.uniq": {
       "version": "4.5.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+      "dev": true
     },
     "node_modules/lowercase-keys": {
       "version": "2.0.0",
@@ -11437,8 +11445,9 @@
     },
     "node_modules/postcss-calc": {
       "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
+      "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.9",
         "postcss-value-parser": "^4.2.0"
@@ -11489,11 +11498,12 @@
       }
     },
     "node_modules/postcss-colormin": {
-      "version": "5.3.0",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
+      "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0",
         "colord": "^2.9.1",
         "postcss-value-parser": "^4.2.0"
@@ -11507,8 +11517,9 @@
     },
     "node_modules/postcss-convert-values": {
       "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
+      "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.21.4",
         "postcss-value-parser": "^4.2.0"
@@ -11522,8 +11533,9 @@
     },
     "node_modules/postcss-discard-comments": {
       "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
+      "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -11533,8 +11545,9 @@
     },
     "node_modules/postcss-discard-duplicates": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
+      "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -11544,8 +11557,9 @@
     },
     "node_modules/postcss-discard-empty": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
+      "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -11555,8 +11569,9 @@
     },
     "node_modules/postcss-discard-overridden": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
+      "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -11683,8 +11698,9 @@
     },
     "node_modules/postcss-merge-longhand": {
       "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
+      "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0",
         "stylehacks": "^5.1.1"
@@ -11697,9 +11713,10 @@
       }
     },
     "node_modules/postcss-merge-rules": {
-      "version": "5.1.3",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
+      "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0",
@@ -11715,8 +11732,9 @@
     },
     "node_modules/postcss-minify-font-values": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
+      "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11729,8 +11747,9 @@
     },
     "node_modules/postcss-minify-gradients": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
+      "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "colord": "^2.9.1",
         "cssnano-utils": "^3.1.0",
@@ -11745,8 +11764,9 @@
     },
     "node_modules/postcss-minify-params": {
       "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
+      "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.21.4",
         "cssnano-utils": "^3.1.0",
@@ -11761,8 +11781,9 @@
     },
     "node_modules/postcss-minify-selectors": {
       "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
+      "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.5"
       },
@@ -11870,8 +11891,9 @@
     },
     "node_modules/postcss-normalize-charset": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
+      "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -11881,8 +11903,9 @@
     },
     "node_modules/postcss-normalize-display-values": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
+      "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11895,8 +11918,9 @@
     },
     "node_modules/postcss-normalize-positions": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
+      "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11909,8 +11933,9 @@
     },
     "node_modules/postcss-normalize-repeat-style": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
+      "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11923,8 +11948,9 @@
     },
     "node_modules/postcss-normalize-string": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
+      "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11937,8 +11963,9 @@
     },
     "node_modules/postcss-normalize-timing-functions": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
+      "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11951,8 +11978,9 @@
     },
     "node_modules/postcss-normalize-unicode": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
+      "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.21.4",
         "postcss-value-parser": "^4.2.0"
@@ -11966,8 +11994,9 @@
     },
     "node_modules/postcss-normalize-url": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
+      "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "normalize-url": "^6.0.1",
         "postcss-value-parser": "^4.2.0"
@@ -11981,8 +12010,9 @@
     },
     "node_modules/postcss-normalize-whitespace": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
+      "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11995,8 +12025,9 @@
     },
     "node_modules/postcss-ordered-values": {
       "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
+      "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cssnano-utils": "^3.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -12009,9 +12040,10 @@
       }
     },
     "node_modules/postcss-reduce-initial": {
-      "version": "5.1.1",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
+      "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0"
@@ -12025,8 +12057,9 @@
     },
     "node_modules/postcss-reduce-transforms": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
+      "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12070,8 +12103,9 @@
     },
     "node_modules/postcss-svgo": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
+      "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0",
         "svgo": "^2.7.0"
@@ -12085,8 +12119,9 @@
     },
     "node_modules/postcss-unique-selectors": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
+      "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.5"
       },
@@ -13583,8 +13618,9 @@
     },
     "node_modules/stylehacks": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
+      "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.21.4",
         "postcss-selector-parser": "^6.0.4"
@@ -19421,6 +19457,8 @@
     },
     "caniuse-api": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -19673,6 +19711,8 @@
     },
     "colord": {
       "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
       "dev": true
     },
     "colorette": {
@@ -19904,6 +19944,8 @@
     },
     "css-declaration-sorter": {
       "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
+      "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
       "dev": true,
       "requires": {}
     },
@@ -19974,29 +20016,33 @@
       "version": "3.0.0"
     },
     "cssnano": {
-      "version": "5.1.14",
+      "version": "5.1.15",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
+      "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
       "dev": true,
       "requires": {
-        "cssnano-preset-default": "^5.2.13",
+        "cssnano-preset-default": "^5.2.14",
         "lilconfig": "^2.0.3",
         "yaml": "^1.10.2"
       }
     },
     "cssnano-preset-default": {
-      "version": "5.2.13",
+      "version": "5.2.14",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
+      "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
       "dev": true,
       "requires": {
         "css-declaration-sorter": "^6.3.1",
         "cssnano-utils": "^3.1.0",
         "postcss-calc": "^8.2.3",
-        "postcss-colormin": "^5.3.0",
+        "postcss-colormin": "^5.3.1",
         "postcss-convert-values": "^5.1.3",
         "postcss-discard-comments": "^5.1.2",
         "postcss-discard-duplicates": "^5.1.0",
         "postcss-discard-empty": "^5.1.1",
         "postcss-discard-overridden": "^5.1.0",
         "postcss-merge-longhand": "^5.1.7",
-        "postcss-merge-rules": "^5.1.3",
+        "postcss-merge-rules": "^5.1.4",
         "postcss-minify-font-values": "^5.1.0",
         "postcss-minify-gradients": "^5.1.1",
         "postcss-minify-params": "^5.1.4",
@@ -20011,7 +20057,7 @@
         "postcss-normalize-url": "^5.1.0",
         "postcss-normalize-whitespace": "^5.1.1",
         "postcss-ordered-values": "^5.1.3",
-        "postcss-reduce-initial": "^5.1.1",
+        "postcss-reduce-initial": "^5.1.2",
         "postcss-reduce-transforms": "^5.1.0",
         "postcss-svgo": "^5.1.0",
         "postcss-unique-selectors": "^5.1.1"
@@ -20019,6 +20065,8 @@
     },
     "cssnano-utils": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
+      "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
       "dev": true,
       "requires": {}
     },
@@ -22840,6 +22888,8 @@
     },
     "lodash.memoize": {
       "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
       "dev": true
     },
     "lodash.merge": {
@@ -22848,6 +22898,8 @@
     },
     "lodash.uniq": {
       "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
       "dev": true
     },
     "lowercase-keys": {
@@ -23687,6 +23739,8 @@
     },
     "postcss-calc": {
       "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
+      "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
       "dev": true,
       "requires": {
         "postcss-selector-parser": "^6.0.9",
@@ -23722,10 +23776,12 @@
       }
     },
     "postcss-colormin": {
-      "version": "5.3.0",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
+      "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0",
         "colord": "^2.9.1",
         "postcss-value-parser": "^4.2.0"
@@ -23733,6 +23789,8 @@
     },
     "postcss-convert-values": {
       "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
+      "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
       "dev": true,
       "requires": {
         "browserslist": "^4.21.4",
@@ -23741,21 +23799,29 @@
     },
     "postcss-discard-comments": {
       "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
+      "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
       "dev": true,
       "requires": {}
     },
     "postcss-discard-duplicates": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
+      "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
       "dev": true,
       "requires": {}
     },
     "postcss-discard-empty": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
+      "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
       "dev": true,
       "requires": {}
     },
     "postcss-discard-overridden": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
+      "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
       "dev": true,
       "requires": {}
     },
@@ -23819,6 +23885,8 @@
     },
     "postcss-merge-longhand": {
       "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
+      "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
       "dev": true,
       "requires": {
         "postcss-value-parser": "^4.2.0",
@@ -23826,7 +23894,9 @@
       }
     },
     "postcss-merge-rules": {
-      "version": "5.1.3",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
+      "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
       "dev": true,
       "requires": {
         "browserslist": "^4.21.4",
@@ -23837,6 +23907,8 @@
     },
     "postcss-minify-font-values": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
+      "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
       "dev": true,
       "requires": {
         "postcss-value-parser": "^4.2.0"
@@ -23844,6 +23916,8 @@
     },
     "postcss-minify-gradients": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
+      "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
       "dev": true,
       "requires": {
         "colord": "^2.9.1",
@@ -23853,6 +23927,8 @@
     },
     "postcss-minify-params": {
       "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
+      "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
       "dev": true,
       "requires": {
         "browserslist": "^4.21.4",
@@ -23862,6 +23938,8 @@
     },
     "postcss-minify-selectors": {
       "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
+      "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
       "dev": true,
       "requires": {
         "postcss-selector-parser": "^6.0.5"
@@ -23927,11 +24005,15 @@
     },
     "postcss-normalize-charset": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
+      "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
       "dev": true,
       "requires": {}
     },
     "postcss-normalize-display-values": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
+      "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
       "dev": true,
       "requires": {
         "postcss-value-parser": "^4.2.0"
@@ -23939,6 +24021,8 @@
     },
     "postcss-normalize-positions": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
+      "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
       "dev": true,
       "requires": {
         "postcss-value-parser": "^4.2.0"
@@ -23946,6 +24030,8 @@
     },
     "postcss-normalize-repeat-style": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
+      "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
       "dev": true,
       "requires": {
         "postcss-value-parser": "^4.2.0"
@@ -23953,6 +24039,8 @@
     },
     "postcss-normalize-string": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
+      "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
       "dev": true,
       "requires": {
         "postcss-value-parser": "^4.2.0"
@@ -23960,6 +24048,8 @@
     },
     "postcss-normalize-timing-functions": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
+      "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
       "dev": true,
       "requires": {
         "postcss-value-parser": "^4.2.0"
@@ -23967,6 +24057,8 @@
     },
     "postcss-normalize-unicode": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
+      "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
       "dev": true,
       "requires": {
         "browserslist": "^4.21.4",
@@ -23975,6 +24067,8 @@
     },
     "postcss-normalize-url": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
+      "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
       "dev": true,
       "requires": {
         "normalize-url": "^6.0.1",
@@ -23983,6 +24077,8 @@
     },
     "postcss-normalize-whitespace": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
+      "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
       "dev": true,
       "requires": {
         "postcss-value-parser": "^4.2.0"
@@ -23990,6 +24086,8 @@
     },
     "postcss-ordered-values": {
       "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
+      "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
       "dev": true,
       "requires": {
         "cssnano-utils": "^3.1.0",
@@ -23997,7 +24095,9 @@
       }
     },
     "postcss-reduce-initial": {
-      "version": "5.1.1",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
+      "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
       "dev": true,
       "requires": {
         "browserslist": "^4.21.4",
@@ -24006,6 +24106,8 @@
     },
     "postcss-reduce-transforms": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
+      "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
       "dev": true,
       "requires": {
         "postcss-value-parser": "^4.2.0"
@@ -24030,6 +24132,8 @@
     },
     "postcss-svgo": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
+      "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
       "dev": true,
       "requires": {
         "postcss-value-parser": "^4.2.0",
@@ -24038,6 +24142,8 @@
     },
     "postcss-unique-selectors": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
+      "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
       "dev": true,
       "requires": {
         "postcss-selector-parser": "^6.0.5"
@@ -25163,6 +25269,8 @@
     },
     "stylehacks": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
+      "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
       "dev": true,
       "requires": {
         "browserslist": "^4.21.4",
@@ -25215,7 +25323,7 @@
         "chokidar": "^3.5.3",
         "color-name": "^1.1.4",
         "concurrently": "^7.5.0",
-        "cssnano": "^5.1.14",
+        "cssnano": "^5.1.15",
         "detective": "^5.2.1",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
@@ -29133,6 +29241,8 @@
         },
         "caniuse-api": {
           "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+          "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
           "dev": true,
           "requires": {
             "browserslist": "^4.0.0",
@@ -29385,6 +29495,8 @@
         },
         "colord": {
           "version": "2.9.3",
+          "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+          "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
           "dev": true
         },
         "colorette": {
@@ -29616,6 +29728,8 @@
         },
         "css-declaration-sorter": {
           "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
+          "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
           "dev": true,
           "requires": {}
         },
@@ -29686,29 +29800,33 @@
           "version": "3.0.0"
         },
         "cssnano": {
-          "version": "5.1.14",
+          "version": "5.1.15",
+          "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
+          "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
           "dev": true,
           "requires": {
-            "cssnano-preset-default": "^5.2.13",
+            "cssnano-preset-default": "^5.2.14",
             "lilconfig": "^2.0.3",
             "yaml": "^1.10.2"
           }
         },
         "cssnano-preset-default": {
-          "version": "5.2.13",
+          "version": "5.2.14",
+          "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
+          "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
           "dev": true,
           "requires": {
             "css-declaration-sorter": "^6.3.1",
             "cssnano-utils": "^3.1.0",
             "postcss-calc": "^8.2.3",
-            "postcss-colormin": "^5.3.0",
+            "postcss-colormin": "^5.3.1",
             "postcss-convert-values": "^5.1.3",
             "postcss-discard-comments": "^5.1.2",
             "postcss-discard-duplicates": "^5.1.0",
             "postcss-discard-empty": "^5.1.1",
             "postcss-discard-overridden": "^5.1.0",
             "postcss-merge-longhand": "^5.1.7",
-            "postcss-merge-rules": "^5.1.3",
+            "postcss-merge-rules": "^5.1.4",
             "postcss-minify-font-values": "^5.1.0",
             "postcss-minify-gradients": "^5.1.1",
             "postcss-minify-params": "^5.1.4",
@@ -29723,7 +29841,7 @@
             "postcss-normalize-url": "^5.1.0",
             "postcss-normalize-whitespace": "^5.1.1",
             "postcss-ordered-values": "^5.1.3",
-            "postcss-reduce-initial": "^5.1.1",
+            "postcss-reduce-initial": "^5.1.2",
             "postcss-reduce-transforms": "^5.1.0",
             "postcss-svgo": "^5.1.0",
             "postcss-unique-selectors": "^5.1.1"
@@ -29731,6 +29849,8 @@
         },
         "cssnano-utils": {
           "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
+          "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
           "dev": true,
           "requires": {}
         },
@@ -32552,6 +32672,8 @@
         },
         "lodash.memoize": {
           "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+          "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
           "dev": true
         },
         "lodash.merge": {
@@ -32560,6 +32682,8 @@
         },
         "lodash.uniq": {
           "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+          "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
           "dev": true
         },
         "lowercase-keys": {
@@ -33399,6 +33523,8 @@
         },
         "postcss-calc": {
           "version": "8.2.4",
+          "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
+          "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
           "dev": true,
           "requires": {
             "postcss-selector-parser": "^6.0.9",
@@ -33434,10 +33560,12 @@
           }
         },
         "postcss-colormin": {
-          "version": "5.3.0",
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
+          "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
           "dev": true,
           "requires": {
-            "browserslist": "^4.16.6",
+            "browserslist": "^4.21.4",
             "caniuse-api": "^3.0.0",
             "colord": "^2.9.1",
             "postcss-value-parser": "^4.2.0"
@@ -33445,6 +33573,8 @@
         },
         "postcss-convert-values": {
           "version": "5.1.3",
+          "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
+          "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
           "dev": true,
           "requires": {
             "browserslist": "^4.21.4",
@@ -33453,21 +33583,29 @@
         },
         "postcss-discard-comments": {
           "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
+          "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
           "dev": true,
           "requires": {}
         },
         "postcss-discard-duplicates": {
           "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
+          "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
           "dev": true,
           "requires": {}
         },
         "postcss-discard-empty": {
           "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
+          "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
           "dev": true,
           "requires": {}
         },
         "postcss-discard-overridden": {
           "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
+          "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
           "dev": true,
           "requires": {}
         },
@@ -33531,6 +33669,8 @@
         },
         "postcss-merge-longhand": {
           "version": "5.1.7",
+          "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
+          "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
           "dev": true,
           "requires": {
             "postcss-value-parser": "^4.2.0",
@@ -33538,7 +33678,9 @@
           }
         },
         "postcss-merge-rules": {
-          "version": "5.1.3",
+          "version": "5.1.4",
+          "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
+          "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
           "dev": true,
           "requires": {
             "browserslist": "^4.21.4",
@@ -33549,6 +33691,8 @@
         },
         "postcss-minify-font-values": {
           "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
+          "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
           "dev": true,
           "requires": {
             "postcss-value-parser": "^4.2.0"
@@ -33556,6 +33700,8 @@
         },
         "postcss-minify-gradients": {
           "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
+          "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
           "dev": true,
           "requires": {
             "colord": "^2.9.1",
@@ -33565,6 +33711,8 @@
         },
         "postcss-minify-params": {
           "version": "5.1.4",
+          "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
+          "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
           "dev": true,
           "requires": {
             "browserslist": "^4.21.4",
@@ -33574,6 +33722,8 @@
         },
         "postcss-minify-selectors": {
           "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
+          "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
           "dev": true,
           "requires": {
             "postcss-selector-parser": "^6.0.5"
@@ -33639,11 +33789,15 @@
         },
         "postcss-normalize-charset": {
           "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
+          "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
           "dev": true,
           "requires": {}
         },
         "postcss-normalize-display-values": {
           "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
+          "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
           "dev": true,
           "requires": {
             "postcss-value-parser": "^4.2.0"
@@ -33651,6 +33805,8 @@
         },
         "postcss-normalize-positions": {
           "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
+          "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
           "dev": true,
           "requires": {
             "postcss-value-parser": "^4.2.0"
@@ -33658,6 +33814,8 @@
         },
         "postcss-normalize-repeat-style": {
           "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
+          "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
           "dev": true,
           "requires": {
             "postcss-value-parser": "^4.2.0"
@@ -33665,6 +33823,8 @@
         },
         "postcss-normalize-string": {
           "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
+          "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
           "dev": true,
           "requires": {
             "postcss-value-parser": "^4.2.0"
@@ -33672,6 +33832,8 @@
         },
         "postcss-normalize-timing-functions": {
           "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
+          "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
           "dev": true,
           "requires": {
             "postcss-value-parser": "^4.2.0"
@@ -33679,6 +33841,8 @@
         },
         "postcss-normalize-unicode": {
           "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
+          "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
           "dev": true,
           "requires": {
             "browserslist": "^4.21.4",
@@ -33687,6 +33851,8 @@
         },
         "postcss-normalize-url": {
           "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
+          "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
           "dev": true,
           "requires": {
             "normalize-url": "^6.0.1",
@@ -33695,6 +33861,8 @@
         },
         "postcss-normalize-whitespace": {
           "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
+          "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
           "dev": true,
           "requires": {
             "postcss-value-parser": "^4.2.0"
@@ -33702,6 +33870,8 @@
         },
         "postcss-ordered-values": {
           "version": "5.1.3",
+          "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
+          "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
           "dev": true,
           "requires": {
             "cssnano-utils": "^3.1.0",
@@ -33709,7 +33879,9 @@
           }
         },
         "postcss-reduce-initial": {
-          "version": "5.1.1",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
+          "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
           "dev": true,
           "requires": {
             "browserslist": "^4.21.4",
@@ -33718,6 +33890,8 @@
         },
         "postcss-reduce-transforms": {
           "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
+          "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
           "dev": true,
           "requires": {
             "postcss-value-parser": "^4.2.0"
@@ -33742,6 +33916,8 @@
         },
         "postcss-svgo": {
           "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
+          "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
           "dev": true,
           "requires": {
             "postcss-value-parser": "^4.2.0",
@@ -33750,6 +33926,8 @@
         },
         "postcss-unique-selectors": {
           "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
+          "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
           "dev": true,
           "requires": {
             "postcss-selector-parser": "^6.0.5"
@@ -34875,6 +35053,8 @@
         },
         "stylehacks": {
           "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
+          "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
           "dev": true,
           "requires": {
             "browserslist": "^4.21.4",
diff --git a/package.json b/package.json
index 350e1923dea8..44d63cf486dc 100644
--- a/package.json
+++ b/package.json
@@ -59,8 +59,8 @@
     "eslint": "^8.34.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "jest": "^29.4.1",
-    "jest-diff": "^29.4.1",
+    "jest": "^29.4.3",
+    "jest-diff": "^29.4.3",
     "prettier": "^2.8.4",
     "rimraf": "^4.1.2",
     "source-map-js": "^1.0.2",

From d2a95a00a811d9c653f9b2f08403cd1e89382e7e Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Thu, 23 Feb 2023 13:32:24 -0500
Subject: [PATCH 25/84] Sort class lists deterministically for Prettier plugin
 (#10672)

* Ensure class sorting is deterministic for Prettier

* Update changelog
---
 CHANGELOG.md                 |  1 +
 src/lib/setupContextUtils.js | 11 +++++++++--
 tests/getSortOrder.test.js   | 31 +++++++++++++++++++++++++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4d96da84e49..449ccc635fa1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Disallow multiple selectors in arbitrary variants ([#10655](https://github.com/tailwindlabs/tailwindcss/pull/10655))
+- Sort class lists deterministically for Prettier plugin ([#10672](https://github.com/tailwindlabs/tailwindcss/pull/10672))
 
 ### Changed
 
diff --git a/src/lib/setupContextUtils.js b/src/lib/setupContextUtils.js
index 9a140096e556..0749da68dbdc 100644
--- a/src/lib/setupContextUtils.js
+++ b/src/lib/setupContextUtils.js
@@ -931,12 +931,19 @@ function registerPlugins(plugins, context) {
     prefix(context, 'peer'),
   ]
   context.getClassOrder = function getClassOrder(classes) {
+    // Sort classes so they're ordered in a deterministic manner
+    let sorted = [...classes].sort((a, z) => {
+      if (a === z) return 0
+      if (a < z) return -1
+      return 1
+    })
+
     // Non-util classes won't be generated, so we default them to null
-    let sortedClassNames = new Map(classes.map((className) => [className, null]))
+    let sortedClassNames = new Map(sorted.map((className) => [className, null]))
 
     // Sort all classes in order
     // Non-tailwind classes won't be generated and will be left as `null`
-    let rules = generateRules(new Set(classes), context)
+    let rules = generateRules(new Set(sorted), context)
     rules = context.offsets.sort(rules)
 
     let idx = BigInt(parasiteUtilities.length)
diff --git a/tests/getSortOrder.test.js b/tests/getSortOrder.test.js
index b65e447d1f35..4526c4874f69 100644
--- a/tests/getSortOrder.test.js
+++ b/tests/getSortOrder.test.js
@@ -51,7 +51,7 @@ crosscheck(() => {
     ['px-3 focus:hover:p-3 hover:p-1 py-3', 'px-3 py-3 hover:p-1 focus:hover:p-3'],
 
     // Utitlies with important
-    ['px-3 !py-4', 'px-3 !py-4'],
+    ['px-3 !py-4', '!py-4 px-3'],
     ['!py-4 px-3', '!py-4 px-3'],
 
     // Components with variants
@@ -89,7 +89,7 @@ crosscheck(() => {
     ],
 
     // Utitlies with important
-    ['tw-px-3 !tw-py-4', 'tw-px-3 !tw-py-4'],
+    ['tw-px-3 !tw-py-4', '!tw-py-4 tw-px-3'],
     ['!tw-py-4 tw-px-3', '!tw-py-4 tw-px-3'],
 
     // Components with variants
@@ -115,4 +115,31 @@ crosscheck(() => {
       expect(defaultSort(context.getClassOrder(input.split(' ')))).toEqual(output)
     }
   )
+
+  it('sorts classes deterministically across multiple class lists', () => {
+    let classes = [
+      [
+        'a-class px-3 p-1 b-class py-3 bg-red-500 bg-blue-500',
+        'a-class b-class bg-blue-500 bg-red-500 p-1 px-3 py-3',
+      ],
+      [
+        'px-3 b-class p-1 py-3 bg-blue-500 a-class bg-red-500',
+        'b-class a-class bg-blue-500 bg-red-500 p-1 px-3 py-3',
+      ],
+    ]
+
+    let config = {}
+
+    // Same context, different class lists
+    let context = createContext(resolveConfig(config))
+    for (const [input, output] of classes) {
+      expect(defaultSort(context.getClassOrder(input.split(' ')))).toEqual(output)
+    }
+
+    // Different context, different class lists
+    for (const [input, output] of classes) {
+      context = createContext(resolveConfig(config))
+      expect(defaultSort(context.getClassOrder(input.split(' ')))).toEqual(output)
+    }
+  })
 })

From b42e7d9b76b5d40185034a23558d9341378ba777 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Sun, 26 Feb 2023 09:55:53 +0000
Subject: [PATCH 26/84] Update postcss-nested to version 6.0.1

---
 package-lock.json | 2791 ++++++++++++++++++++++-----------------------
 package.json      |    2 +-
 2 files changed, 1380 insertions(+), 1413 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 82ed662bbcc0..f94ef37113a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -56,8 +56,8 @@
         "eslint": "^8.34.0",
         "eslint-config-prettier": "^8.6.0",
         "eslint-plugin-prettier": "^4.2.1",
-        "jest": "^29.4.1",
-        "jest-diff": "^29.4.1",
+        "jest": "^29.4.3",
+        "jest-diff": "^29.4.3",
         "prettier": "^2.8.4",
         "rimraf": "^4.1.2",
         "source-map-js": "^1.0.2",
@@ -597,30 +597,30 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.20.14",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz",
-      "integrity": "sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz",
+      "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.20.12",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz",
-      "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz",
+      "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==",
       "dev": true,
       "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
+        "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.7",
+        "@babel/generator": "^7.21.0",
         "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-module-transforms": "^7.20.11",
-        "@babel/helpers": "^7.20.7",
-        "@babel/parser": "^7.20.7",
+        "@babel/helper-module-transforms": "^7.21.0",
+        "@babel/helpers": "^7.21.0",
+        "@babel/parser": "^7.21.0",
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.12",
-        "@babel/types": "^7.20.7",
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -642,13 +642,14 @@
       "dev": true
     },
     "node_modules/@babel/generator": {
-      "version": "7.20.14",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz",
-      "integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==",
+      "version": "7.21.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz",
+      "integrity": "sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.20.7",
+        "@babel/types": "^7.21.0",
         "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
       },
       "engines": {
@@ -713,13 +714,13 @@
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
+        "@babel/template": "^7.20.7",
+        "@babel/types": "^7.21.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -750,9 +751,9 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.20.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz",
-      "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==",
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
+      "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.18.9",
@@ -761,8 +762,8 @@
         "@babel/helper-split-export-declaration": "^7.18.6",
         "@babel/helper-validator-identifier": "^7.19.1",
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.10",
-        "@babel/types": "^7.20.7"
+        "@babel/traverse": "^7.21.2",
+        "@babel/types": "^7.21.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -820,23 +821,23 @@
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
+      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.20.13",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz",
-      "integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
+      "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.13",
-        "@babel/types": "^7.20.7"
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -920,9 +921,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.20.15",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz",
-      "integrity": "sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==",
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
+      "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1123,19 +1124,19 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.20.13",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz",
-      "integrity": "sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==",
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz",
+      "integrity": "sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.7",
+        "@babel/generator": "^7.21.1",
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-function-name": "^7.21.0",
         "@babel/helper-hoist-variables": "^7.18.6",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.20.13",
-        "@babel/types": "^7.20.7",
+        "@babel/parser": "^7.21.2",
+        "@babel/types": "^7.21.2",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1144,9 +1145,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz",
-      "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==",
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz",
+      "integrity": "sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.19.4",
@@ -1636,16 +1637,16 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.4.1.tgz",
-      "integrity": "sha512-m+XpwKSi3PPM9znm5NGS8bBReeAJJpSkL1OuFCqaMaJL2YX9YXLkkI+MBchMPwu+ZuM2rynL51sgfkQteQ1CKQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.4.3.tgz",
+      "integrity": "sha512-W/o/34+wQuXlgqlPYTansOSiBnuxrTv61dEVkA6HNmpcgHLUjfaUbdqt6oVvOzaawwo9IdW9QOtMgQ1ScSZC4A==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^29.4.1",
-        "jest-util": "^29.4.1",
+        "jest-message-util": "^29.4.3",
+        "jest-util": "^29.4.3",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -1653,12 +1654,12 @@
       }
     },
     "node_modules/@jest/console/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -1679,37 +1680,37 @@
       }
     },
     "node_modules/@jest/core": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.4.1.tgz",
-      "integrity": "sha512-RXFTohpBqpaTebNdg5l3I5yadnKo9zLBajMT0I38D0tDhreVBYv3fA8kywthI00sWxPztWLD3yjiUkewwu/wKA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.4.3.tgz",
+      "integrity": "sha512-56QvBq60fS4SPZCuM7T+7scNrkGIe7Mr6PVIXUpu48ouvRaWOFqRPV91eifvFM0ay2HmfswXiGf97NGUN5KofQ==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.4.1",
-        "@jest/reporters": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/transform": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/console": "^29.4.3",
+        "@jest/reporters": "^29.4.3",
+        "@jest/test-result": "^29.4.3",
+        "@jest/transform": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^29.4.0",
-        "jest-config": "^29.4.1",
-        "jest-haste-map": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-regex-util": "^29.2.0",
-        "jest-resolve": "^29.4.1",
-        "jest-resolve-dependencies": "^29.4.1",
-        "jest-runner": "^29.4.1",
-        "jest-runtime": "^29.4.1",
-        "jest-snapshot": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-validate": "^29.4.1",
-        "jest-watcher": "^29.4.1",
+        "jest-changed-files": "^29.4.3",
+        "jest-config": "^29.4.3",
+        "jest-haste-map": "^29.4.3",
+        "jest-message-util": "^29.4.3",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.4.3",
+        "jest-resolve-dependencies": "^29.4.3",
+        "jest-runner": "^29.4.3",
+        "jest-runtime": "^29.4.3",
+        "jest-snapshot": "^29.4.3",
+        "jest-util": "^29.4.3",
+        "jest-validate": "^29.4.3",
+        "jest-watcher": "^29.4.3",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.4.1",
+        "pretty-format": "^29.4.3",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
@@ -1726,12 +1727,12 @@
       }
     },
     "node_modules/@jest/core/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -1763,27 +1764,27 @@
       }
     },
     "node_modules/@jest/environment": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.4.1.tgz",
-      "integrity": "sha512-pJ14dHGSQke7Q3mkL/UZR9ZtTOxqskZaC91NzamEH4dlKRt42W+maRBXiw/LWkdJe+P0f/zDR37+SPMplMRlPg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.4.3.tgz",
+      "integrity": "sha512-dq5S6408IxIa+lr54zeqce+QgI+CJT4nmmA+1yzFgtcsGK8c/EyiUb9XQOgz3BMKrRDfKseeOaxj2eO8LlD3lA==",
       "dev": true,
       "dependencies": {
-        "@jest/fake-timers": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/fake-timers": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
-        "jest-mock": "^29.4.1"
+        "jest-mock": "^29.4.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/environment/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -1804,54 +1805,54 @@
       }
     },
     "node_modules/@jest/expect": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.4.1.tgz",
-      "integrity": "sha512-ZxKJP5DTUNF2XkpJeZIzvnzF1KkfrhEF6Rz0HGG69fHl6Bgx5/GoU3XyaeFYEjuuKSOOsbqD/k72wFvFxc3iTw==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.4.3.tgz",
+      "integrity": "sha512-iktRU/YsxEtumI9zsPctYUk7ptpC+AVLLk1Ax3AsA4g1C+8OOnKDkIQBDHtD5hA/+VtgMd5AWI5gNlcAlt2vxQ==",
       "dev": true,
       "dependencies": {
-        "expect": "^29.4.1",
-        "jest-snapshot": "^29.4.1"
+        "expect": "^29.4.3",
+        "jest-snapshot": "^29.4.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/expect-utils": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.4.1.tgz",
-      "integrity": "sha512-w6YJMn5DlzmxjO00i9wu2YSozUYRBhIoJ6nQwpMYcBMtiqMGJm1QBzOf6DDgRao8dbtpDoaqLg6iiQTvv0UHhQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.4.3.tgz",
+      "integrity": "sha512-/6JWbkxHOP8EoS8jeeTd9dTfc9Uawi+43oLKHfp6zzux3U2hqOOVnV3ai4RpDYHOccL6g+5nrxpoc8DmJxtXVQ==",
       "dev": true,
       "dependencies": {
-        "jest-get-type": "^29.2.0"
+        "jest-get-type": "^29.4.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.4.1.tgz",
-      "integrity": "sha512-/1joI6rfHFmmm39JxNfmNAO3Nwm6Y0VoL5fJDy7H1AtWrD1CgRtqJbN9Ld6rhAkGO76qqp4cwhhxJ9o9kYjQMw==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.4.3.tgz",
+      "integrity": "sha512-4Hote2MGcCTWSD2gwl0dwbCpBRHhE6olYEuTj8FMowdg3oQWNKr2YuxenPQYZ7+PfqPY1k98wKDU4Z+Hvd4Tiw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^29.4.1",
-        "jest-mock": "^29.4.1",
-        "jest-util": "^29.4.1"
+        "jest-message-util": "^29.4.3",
+        "jest-mock": "^29.4.3",
+        "jest-util": "^29.4.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/fake-timers/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -1872,27 +1873,27 @@
       }
     },
     "node_modules/@jest/globals": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.4.1.tgz",
-      "integrity": "sha512-znoK2EuFytbHH0ZSf2mQK2K1xtIgmaw4Da21R2C/NE/+NnItm5mPEFQmn8gmF3f0rfOlmZ3Y3bIf7bFj7DHxAA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.4.3.tgz",
+      "integrity": "sha512-8BQ/5EzfOLG7AaMcDh7yFCbfRLtsc+09E1RQmRBI4D6QQk4m6NSK/MXo+3bJrBN0yU8A2/VIcqhvsOLFmziioA==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.4.1",
-        "@jest/expect": "^29.4.1",
-        "@jest/types": "^29.4.1",
-        "jest-mock": "^29.4.1"
+        "@jest/environment": "^29.4.3",
+        "@jest/expect": "^29.4.3",
+        "@jest/types": "^29.4.3",
+        "jest-mock": "^29.4.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/globals/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -1913,16 +1914,16 @@
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.4.1.tgz",
-      "integrity": "sha512-AISY5xpt2Xpxj9R6y0RF1+O6GRy9JsGa8+vK23Lmzdy1AYcpQn5ItX79wJSsTmfzPKSAcsY1LNt/8Y5Xe5LOSg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.4.3.tgz",
+      "integrity": "sha512-sr2I7BmOjJhyqj9ANC6CTLsL4emMoka7HkQpcoMRlhCbQJjz2zsRzw0BDPiPyEFDXAbxKgGFYuQZiSJ1Y6YoTg==",
       "dev": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/transform": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/console": "^29.4.3",
+        "@jest/test-result": "^29.4.3",
+        "@jest/transform": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@jridgewell/trace-mapping": "^0.3.15",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -1935,9 +1936,9 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-worker": "^29.4.1",
+        "jest-message-util": "^29.4.3",
+        "jest-util": "^29.4.3",
+        "jest-worker": "^29.4.3",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -1956,12 +1957,12 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -1982,9 +1983,9 @@
       }
     },
     "node_modules/@jest/schemas": {
-      "version": "29.4.0",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.0.tgz",
-      "integrity": "sha512-0E01f/gOZeNTG76i5eWWSupvSHaIINrTie7vCyjiYFKgzNdyEGd12BUv4oNBFHOqlHDbtoJi3HrQ38KCC90NsQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.3.tgz",
+      "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==",
       "dev": true,
       "dependencies": {
         "@sinclair/typebox": "^0.25.16"
@@ -1994,9 +1995,9 @@
       }
     },
     "node_modules/@jest/source-map": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.2.0.tgz",
-      "integrity": "sha512-1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.4.3.tgz",
+      "integrity": "sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==",
       "dev": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.15",
@@ -2008,13 +2009,13 @@
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.4.1.tgz",
-      "integrity": "sha512-WRt29Lwt+hEgfN8QDrXqXGgCTidq1rLyFqmZ4lmJOpVArC8daXrZWkWjiaijQvgd3aOUj2fM8INclKHsQW9YyQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.4.3.tgz",
+      "integrity": "sha512-Oi4u9NfBolMq9MASPwuWTlC5WvmNRwI4S8YrQg5R5Gi47DYlBe3sh7ILTqi/LGrK1XUE4XY9KZcQJTH1WJCLLA==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/console": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
@@ -2023,12 +2024,12 @@
       }
     },
     "node_modules/@jest/test-result/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -2049,14 +2050,14 @@
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.4.1.tgz",
-      "integrity": "sha512-v5qLBNSsM0eHzWLXsQ5fiB65xi49A3ILPSFQKPXzGL4Vyux0DPZAIN7NAFJa9b4BiTDP9MBF/Zqc/QA1vuiJ0w==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.4.3.tgz",
+      "integrity": "sha512-yi/t2nES4GB4G0mjLc0RInCq/cNr9dNwJxcGg8sslajua5Kb4kmozAc+qPLzplhBgfw1vLItbjyHzUN92UXicw==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^29.4.1",
+        "@jest/test-result": "^29.4.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.1",
+        "jest-haste-map": "^29.4.3",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -2064,38 +2065,38 @@
       }
     },
     "node_modules/@jest/transform": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.4.1.tgz",
-      "integrity": "sha512-5w6YJrVAtiAgr0phzKjYd83UPbCXsBRTeYI4BXokv9Er9CcrH9hfXL/crCvP2d2nGOcovPUnlYiLPFLZrkG5Hg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.4.3.tgz",
+      "integrity": "sha512-8u0+fBGWolDshsFgPQJESkDa72da/EVwvL+II0trN2DR66wMwiQ9/CihaGfHdlLGFzbBZwMykFtxuwFdZqlKwg==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "@jridgewell/trace-mapping": "^0.3.15",
         "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.1",
-        "jest-regex-util": "^29.2.0",
-        "jest-util": "^29.4.1",
+        "jest-haste-map": "^29.4.3",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.4.3",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
-        "write-file-atomic": "^5.0.0"
+        "write-file-atomic": "^4.0.2"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/transform/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -3599,9 +3600,9 @@
       }
     },
     "node_modules/@sinclair/typebox": {
-      "version": "0.25.21",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.21.tgz",
-      "integrity": "sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==",
+      "version": "0.25.24",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz",
+      "integrity": "sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==",
       "dev": true
     },
     "node_modules/@sindresorhus/is": {
@@ -4826,15 +4827,15 @@
       }
     },
     "node_modules/babel-jest": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.4.1.tgz",
-      "integrity": "sha512-xBZa/pLSsF/1sNpkgsiT3CmY7zV1kAsZ9OxxtrFqYucnOuRftXAfcJqcDVyOPeN4lttWTwhLdu0T9f8uvoPEUg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.4.3.tgz",
+      "integrity": "sha512-o45Wyn32svZE+LnMVWv/Z4x0SwtLbh4FyGcYtR20kIWd+rdrDZ9Fzq8Ml3MYLD+mZvEdzCjZsCnYZ2jpJyQ+Nw==",
       "dev": true,
       "dependencies": {
-        "@jest/transform": "^29.4.1",
+        "@jest/transform": "^29.4.3",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^29.4.0",
+        "babel-preset-jest": "^29.4.3",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "slash": "^3.0.0"
@@ -4863,9 +4864,9 @@
       }
     },
     "node_modules/babel-plugin-jest-hoist": {
-      "version": "29.4.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.4.0.tgz",
-      "integrity": "sha512-a/sZRLQJEmsmejQ2rPEUe35nO1+C9dc9O1gplH1SXmJxveQSRUYdBk8yGZG/VOUuZs1u2aHZJusEGoRMbhhwCg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.4.3.tgz",
+      "integrity": "sha512-mB6q2q3oahKphy5V7CpnNqZOCkxxZ9aokf1eh82Dy3jQmg4xvM1tGrh5y6BQUJh4a3Pj9+eLfwvAZ7VNKg7H8Q==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.3.3",
@@ -4901,12 +4902,12 @@
       }
     },
     "node_modules/babel-preset-jest": {
-      "version": "29.4.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.4.0.tgz",
-      "integrity": "sha512-fUB9vZflUSM3dO/6M2TCAepTzvA4VkOvl67PjErcrQMGt9Eve7uazaeyCZ2th3UtI7ljpiBJES0F7A1vBRsLZA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.4.3.tgz",
+      "integrity": "sha512-gWx6COtSuma6n9bw+8/F+2PCXrIgxV/D1TJFnp6OyBK2cxPWg0K9p/sriNYeifKjpUkMViWQ09DSWtzJQRETsw==",
       "dev": true,
       "dependencies": {
-        "babel-plugin-jest-hoist": "^29.4.0",
+        "babel-plugin-jest-hoist": "^29.4.3",
         "babel-preset-current-node-syntax": "^1.0.0"
       },
       "engines": {
@@ -5698,9 +5699,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz",
-      "integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
       "dev": true,
       "funding": [
         {
@@ -6582,9 +6583,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/diff-sequences": {
-      "version": "29.3.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.3.1.tgz",
-      "integrity": "sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
+      "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
       "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -7397,16 +7398,16 @@
       "dev": true
     },
     "node_modules/expect": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.4.1.tgz",
-      "integrity": "sha512-OKrGESHOaMxK3b6zxIq9SOW8kEXztKff/Dvg88j4xIJxur1hspEbedVkR3GpHe5LO+WB2Qw7OWN0RMTdp6as5A==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.4.3.tgz",
+      "integrity": "sha512-uC05+Q7eXECFpgDrHdXA4k2rpMyStAYPItEDLyQDo5Ta7fVkJnNA/4zh/OIVkVVNZ1oOK1PipQoyNjuZ6sz6Dg==",
       "dev": true,
       "dependencies": {
-        "@jest/expect-utils": "^29.4.1",
-        "jest-get-type": "^29.2.0",
-        "jest-matcher-utils": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-util": "^29.4.1"
+        "@jest/expect-utils": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "jest-matcher-utils": "^29.4.3",
+        "jest-message-util": "^29.4.3",
+        "jest-util": "^29.4.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -8852,15 +8853,15 @@
       }
     },
     "node_modules/jest": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.4.1.tgz",
-      "integrity": "sha512-cknimw7gAXPDOmj0QqztlxVtBVCw2lYY9CeIE5N6kD+kET1H4H79HSNISJmijb1HF+qk+G+ploJgiDi5k/fRlg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.4.3.tgz",
+      "integrity": "sha512-XvK65feuEFGZT8OO0fB/QAQS+LGHvQpaadkH5p47/j3Ocqq3xf2pK9R+G0GzgfuhXVxEv76qCOOcMb5efLk6PA==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/core": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^29.4.1"
+        "jest-cli": "^29.4.3"
       },
       "bin": {
         "jest": "bin/jest.js"
@@ -8878,9 +8879,9 @@
       }
     },
     "node_modules/jest-changed-files": {
-      "version": "29.4.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.4.0.tgz",
-      "integrity": "sha512-rnI1oPxgFghoz32Y8eZsGJMjW54UlqT17ycQeCEktcxxwqqKdlj9afl8LNeO0Pbu+h2JQHThQP0BzS67eTRx4w==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.4.3.tgz",
+      "integrity": "sha512-Vn5cLuWuwmi2GNNbokPOEcvrXGSGrqVnPEZV7rC6P7ck07Dyw9RFnvWglnupSh+hGys0ajGtw/bc2ZgweljQoQ==",
       "dev": true,
       "dependencies": {
         "execa": "^5.0.0",
@@ -8891,28 +8892,28 @@
       }
     },
     "node_modules/jest-circus": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.4.1.tgz",
-      "integrity": "sha512-v02NuL5crMNY4CGPHBEflLzl4v91NFb85a+dH9a1pUNx6Xjggrd8l9pPy4LZ1VYNRXlb+f65+7O/MSIbLir6pA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.4.3.tgz",
+      "integrity": "sha512-Vw/bVvcexmdJ7MLmgdT3ZjkJ3LKu8IlpefYokxiqoZy6OCQ2VAm6Vk3t/qHiAGUXbdbJKJWnc8gH3ypTbB/OBw==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.4.1",
-        "@jest/expect": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/environment": "^29.4.3",
+        "@jest/expect": "^29.4.3",
+        "@jest/test-result": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^0.7.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.4.1",
-        "jest-matcher-utils": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-runtime": "^29.4.1",
-        "jest-snapshot": "^29.4.1",
-        "jest-util": "^29.4.1",
+        "jest-each": "^29.4.3",
+        "jest-matcher-utils": "^29.4.3",
+        "jest-message-util": "^29.4.3",
+        "jest-runtime": "^29.4.3",
+        "jest-snapshot": "^29.4.3",
+        "jest-util": "^29.4.3",
         "p-limit": "^3.1.0",
-        "pretty-format": "^29.4.1",
+        "pretty-format": "^29.4.3",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -8921,12 +8922,12 @@
       }
     },
     "node_modules/jest-circus/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -8947,21 +8948,21 @@
       }
     },
     "node_modules/jest-cli": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.4.1.tgz",
-      "integrity": "sha512-jz7GDIhtxQ37M+9dlbv5K+/FVcIo1O/b1sX3cJgzlQUf/3VG25nvuWzlDC4F1FLLzUThJeWLu8I7JF9eWpuURQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.4.3.tgz",
+      "integrity": "sha512-PiiAPuFNfWWolCE6t3ZrDXQc6OsAuM3/tVW0u27UWc1KE+n/HSn5dSE6B2juqN7WP+PP0jAcnKtGmI4u8GMYCg==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/core": "^29.4.3",
+        "@jest/test-result": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-validate": "^29.4.1",
+        "jest-config": "^29.4.3",
+        "jest-util": "^29.4.3",
+        "jest-validate": "^29.4.3",
         "prompts": "^2.0.1",
         "yargs": "^17.3.1"
       },
@@ -8981,12 +8982,12 @@
       }
     },
     "node_modules/jest-cli/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -9007,31 +9008,31 @@
       }
     },
     "node_modules/jest-config": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.4.1.tgz",
-      "integrity": "sha512-g7p3q4NuXiM4hrS4XFATTkd+2z0Ml2RhFmFPM8c3WyKwVDNszbl4E7cV7WIx1YZeqqCtqbtTtZhGZWJlJqngzg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.4.3.tgz",
+      "integrity": "sha512-eCIpqhGnIjdUCXGtLhz4gdDoxKSWXKjzNcc5r+0S1GKOp2fwOipx5mRcwa9GB/ArsxJ1jlj2lmlD9bZAsBxaWQ==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.4.1",
-        "@jest/types": "^29.4.1",
-        "babel-jest": "^29.4.1",
+        "@jest/test-sequencer": "^29.4.3",
+        "@jest/types": "^29.4.3",
+        "babel-jest": "^29.4.3",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.4.1",
-        "jest-environment-node": "^29.4.1",
-        "jest-get-type": "^29.2.0",
-        "jest-regex-util": "^29.2.0",
-        "jest-resolve": "^29.4.1",
-        "jest-runner": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-validate": "^29.4.1",
+        "jest-circus": "^29.4.3",
+        "jest-environment-node": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.4.3",
+        "jest-runner": "^29.4.3",
+        "jest-util": "^29.4.3",
+        "jest-validate": "^29.4.3",
         "micromatch": "^4.0.4",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.4.1",
+        "pretty-format": "^29.4.3",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
@@ -9052,12 +9053,12 @@
       }
     },
     "node_modules/jest-config/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -9078,24 +9079,24 @@
       }
     },
     "node_modules/jest-diff": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.4.1.tgz",
-      "integrity": "sha512-uazdl2g331iY56CEyfbNA0Ut7Mn2ulAG5vUaEHXycf1L6IPyuImIxSz4F0VYBKi7LYIuxOwTZzK3wh5jHzASMw==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.4.3.tgz",
+      "integrity": "sha512-YB+ocenx7FZ3T5O9lMVMeLYV4265socJKtkwgk/6YUz/VsEzYDkiMuMhWzZmxm3wDRQvayJu/PjkjjSkjoHsCA==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^29.3.1",
-        "jest-get-type": "^29.2.0",
-        "pretty-format": "^29.4.1"
+        "diff-sequences": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.4.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-docblock": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.2.0.tgz",
-      "integrity": "sha512-bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
+      "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
       "dev": true,
       "dependencies": {
         "detect-newline": "^3.0.0"
@@ -9105,28 +9106,28 @@
       }
     },
     "node_modules/jest-each": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.4.1.tgz",
-      "integrity": "sha512-QlYFiX3llJMWUV0BtWht/esGEz9w+0i7BHwODKCze7YzZzizgExB9MOfiivF/vVT0GSQ8wXLhvHXh3x2fVD4QQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.4.3.tgz",
+      "integrity": "sha512-1ElHNAnKcbJb/b+L+7j0/w7bDvljw4gTv1wL9fYOczeJrbTbkMGQ5iQPFJ3eFQH19VPTx1IyfePdqSpePKss7Q==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "chalk": "^4.0.0",
-        "jest-get-type": "^29.2.0",
-        "jest-util": "^29.4.1",
-        "pretty-format": "^29.4.1"
+        "jest-get-type": "^29.4.3",
+        "jest-util": "^29.4.3",
+        "pretty-format": "^29.4.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-each/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -9147,29 +9148,29 @@
       }
     },
     "node_modules/jest-environment-node": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.4.1.tgz",
-      "integrity": "sha512-x/H2kdVgxSkxWAIlIh9MfMuBa0hZySmfsC5lCsWmWr6tZySP44ediRKDUiNggX/eHLH7Cd5ZN10Rw+XF5tXsqg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.4.3.tgz",
+      "integrity": "sha512-gAiEnSKF104fsGDXNkwk49jD/0N0Bqu2K9+aMQXA6avzsA9H3Fiv1PW2D+gzbOSR705bWd2wJZRFEFpV0tXISg==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.4.1",
-        "@jest/fake-timers": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/environment": "^29.4.3",
+        "@jest/fake-timers": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
-        "jest-mock": "^29.4.1",
-        "jest-util": "^29.4.1"
+        "jest-mock": "^29.4.3",
+        "jest-util": "^29.4.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-environment-node/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -9190,29 +9191,29 @@
       }
     },
     "node_modules/jest-get-type": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.2.0.tgz",
-      "integrity": "sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
       "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.4.1.tgz",
-      "integrity": "sha512-imTjcgfVVTvg02khXL11NNLTx9ZaofbAWhilrMg/G8dIkp+HYCswhxf0xxJwBkfhWb3e8dwbjuWburvxmcr58w==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.4.3.tgz",
+      "integrity": "sha512-eZIgAS8tvm5IZMtKlR8Y+feEOMfo2pSQkmNbufdbMzMSn9nitgGxF1waM/+LbryO3OkMcKS98SUb+j/cQxp/vQ==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "@types/graceful-fs": "^4.1.3",
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^29.2.0",
-        "jest-util": "^29.4.1",
-        "jest-worker": "^29.4.1",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.4.3",
+        "jest-worker": "^29.4.3",
         "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       },
@@ -9224,12 +9225,12 @@
       }
     },
     "node_modules/jest-haste-map/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -9250,46 +9251,46 @@
       }
     },
     "node_modules/jest-leak-detector": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.4.1.tgz",
-      "integrity": "sha512-akpZv7TPyGMnH2RimOCgy+hPmWZf55EyFUvymQ4LMsQP8xSPlZumCPtXGoDhFNhUE2039RApZkTQDKU79p/FiQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.4.3.tgz",
+      "integrity": "sha512-9yw4VC1v2NspMMeV3daQ1yXPNxMgCzwq9BocCwYrRgXe4uaEJPAN0ZK37nFBhcy3cUwEVstFecFLaTHpF7NiGA==",
       "dev": true,
       "dependencies": {
-        "jest-get-type": "^29.2.0",
-        "pretty-format": "^29.4.1"
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.4.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.4.1.tgz",
-      "integrity": "sha512-k5h0u8V4nAEy6lSACepxL/rw78FLDkBnXhZVgFneVpnJONhb2DhZj/Gv4eNe+1XqQ5IhgUcqj745UwH0HJmMnA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.4.3.tgz",
+      "integrity": "sha512-TTciiXEONycZ03h6R6pYiZlSkvYgT0l8aa49z/DLSGYjex4orMUcafuLXYyyEDWB1RKglq00jzwY00Ei7yFNVg==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.4.1",
-        "jest-get-type": "^29.2.0",
-        "pretty-format": "^29.4.1"
+        "jest-diff": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.4.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-message-util": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.4.1.tgz",
-      "integrity": "sha512-H4/I0cXUaLeCw6FM+i4AwCnOwHRgitdaUFOdm49022YD5nfyr8C/DrbXOBEyJaj+w/y0gGJ57klssOaUiLLQGQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.4.3.tgz",
+      "integrity": "sha512-1Y8Zd4ZCN7o/QnWdMmT76If8LuDv23Z1DRovBj/vcSFNlGCJGoO8D1nJDw1AdyAGUk0myDLFGN5RbNeJyCRGCw==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.4.1",
+        "pretty-format": "^29.4.3",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -9298,12 +9299,12 @@
       }
     },
     "node_modules/jest-message-util/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -9324,26 +9325,26 @@
       }
     },
     "node_modules/jest-mock": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.4.1.tgz",
-      "integrity": "sha512-MwA4hQ7zBOcgVCVnsM8TzaFLVUD/pFWTfbkY953Y81L5ret3GFRZtmPmRFAjKQSdCKoJvvqOu6Bvfpqlwwb0dQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.4.3.tgz",
+      "integrity": "sha512-LjFgMg+xed9BdkPMyIJh+r3KeHt1klXPJYBULXVVAkbTaaKjPX1o1uVCAZADMEp/kOxGTwy/Ot8XbvgItOrHEg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
-        "jest-util": "^29.4.1"
+        "jest-util": "^29.4.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-mock/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -9381,26 +9382,26 @@
       }
     },
     "node_modules/jest-regex-util": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.2.0.tgz",
-      "integrity": "sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
       "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-resolve": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.4.1.tgz",
-      "integrity": "sha512-j/ZFNV2lm9IJ2wmlq1uYK0Y/1PiyDq9g4HEGsNTNr3viRbJdV+8Lf1SXIiLZXFvyiisu0qUyIXGBnw+OKWkJwQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.4.3.tgz",
+      "integrity": "sha512-GPokE1tzguRyT7dkxBim4wSx6E45S3bOQ7ZdKEG+Qj0Oac9+6AwJPCk0TZh5Vu0xzeX4afpb+eDmgbmZFFwpOw==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.1",
+        "jest-haste-map": "^29.4.3",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.4.1",
-        "jest-validate": "^29.4.1",
+        "jest-util": "^29.4.3",
+        "jest-validate": "^29.4.3",
         "resolve": "^1.20.0",
         "resolve.exports": "^2.0.0",
         "slash": "^3.0.0"
@@ -9410,43 +9411,43 @@
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.4.1.tgz",
-      "integrity": "sha512-Y3QG3M1ncAMxfjbYgtqNXC5B595zmB6e//p/qpA/58JkQXu/IpLDoLeOa8YoYfsSglBKQQzNUqtfGJJT/qLmJg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.4.3.tgz",
+      "integrity": "sha512-uvKMZAQ3nmXLH7O8WAOhS5l0iWyT3WmnJBdmIHiV5tBbdaDZ1wqtNX04FONGoaFvSOSHBJxnwAVnSn1WHdGVaw==",
       "dev": true,
       "dependencies": {
-        "jest-regex-util": "^29.2.0",
-        "jest-snapshot": "^29.4.1"
+        "jest-regex-util": "^29.4.3",
+        "jest-snapshot": "^29.4.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-runner": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.4.1.tgz",
-      "integrity": "sha512-8d6XXXi7GtHmsHrnaqBKWxjKb166Eyj/ksSaUYdcBK09VbjPwIgWov1VwSmtupCIz8q1Xv4Qkzt/BTo3ZqiCeg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.4.3.tgz",
+      "integrity": "sha512-GWPTEiGmtHZv1KKeWlTX9SIFuK19uLXlRQU43ceOQ2hIfA5yPEJC7AMkvFKpdCHx6pNEdOD+2+8zbniEi3v3gA==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.4.1",
-        "@jest/environment": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/transform": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/console": "^29.4.3",
+        "@jest/environment": "^29.4.3",
+        "@jest/test-result": "^29.4.3",
+        "@jest/transform": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
         "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.2.0",
-        "jest-environment-node": "^29.4.1",
-        "jest-haste-map": "^29.4.1",
-        "jest-leak-detector": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-resolve": "^29.4.1",
-        "jest-runtime": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-watcher": "^29.4.1",
-        "jest-worker": "^29.4.1",
+        "jest-docblock": "^29.4.3",
+        "jest-environment-node": "^29.4.3",
+        "jest-haste-map": "^29.4.3",
+        "jest-leak-detector": "^29.4.3",
+        "jest-message-util": "^29.4.3",
+        "jest-resolve": "^29.4.3",
+        "jest-runtime": "^29.4.3",
+        "jest-util": "^29.4.3",
+        "jest-watcher": "^29.4.3",
+        "jest-worker": "^29.4.3",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
@@ -9455,12 +9456,12 @@
       }
     },
     "node_modules/jest-runner/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -9491,32 +9492,31 @@
       }
     },
     "node_modules/jest-runtime": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.4.1.tgz",
-      "integrity": "sha512-UXTMU9uKu2GjYwTtoAw5rn4STxWw/nadOfW7v1sx6LaJYa3V/iymdCLQM6xy3+7C6mY8GfX22vKpgxY171UIoA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^29.4.1",
-        "@jest/fake-timers": "^29.4.1",
-        "@jest/globals": "^29.4.1",
-        "@jest/source-map": "^29.2.0",
-        "@jest/test-result": "^29.4.1",
-        "@jest/transform": "^29.4.1",
-        "@jest/types": "^29.4.1",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.4.3.tgz",
+      "integrity": "sha512-F5bHvxSH+LvLV24vVB3L8K467dt3y3dio6V3W89dUz9nzvTpqd/HcT9zfYKL2aZPvD63vQFgLvaUX/UpUhrP6Q==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.4.3",
+        "@jest/fake-timers": "^29.4.3",
+        "@jest/globals": "^29.4.3",
+        "@jest/source-map": "^29.4.3",
+        "@jest/test-result": "^29.4.3",
+        "@jest/transform": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-mock": "^29.4.1",
-        "jest-regex-util": "^29.2.0",
-        "jest-resolve": "^29.4.1",
-        "jest-snapshot": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "semver": "^7.3.5",
+        "jest-haste-map": "^29.4.3",
+        "jest-message-util": "^29.4.3",
+        "jest-mock": "^29.4.3",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.4.3",
+        "jest-snapshot": "^29.4.3",
+        "jest-util": "^29.4.3",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
@@ -9525,12 +9525,12 @@
       }
     },
     "node_modules/jest-runtime/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -9550,25 +9550,10 @@
         "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jest-runtime/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/jest-snapshot": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.4.1.tgz",
-      "integrity": "sha512-l4iV8EjGgQWVz3ee/LR9sULDk2pCkqb71bjvlqn+qp90lFwpnulHj4ZBT8nm1hA1C5wowXLc7MGnw321u0tsYA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.4.3.tgz",
+      "integrity": "sha512-NGlsqL0jLPDW91dz304QTM/SNO99lpcSYYAjNiX0Ou+sSGgkanKBcSjCfp/pqmiiO1nQaOyLp6XQddAzRcx3Xw==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
@@ -9577,23 +9562,23 @@
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/traverse": "^7.7.2",
         "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.4.1",
-        "@jest/transform": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/expect-utils": "^29.4.3",
+        "@jest/transform": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/babel__traverse": "^7.0.6",
         "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^29.4.1",
+        "expect": "^29.4.3",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.4.1",
-        "jest-get-type": "^29.2.0",
-        "jest-haste-map": "^29.4.1",
-        "jest-matcher-utils": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-util": "^29.4.1",
+        "jest-diff": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "jest-haste-map": "^29.4.3",
+        "jest-matcher-utils": "^29.4.3",
+        "jest-message-util": "^29.4.3",
+        "jest-util": "^29.4.3",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^29.4.1",
+        "pretty-format": "^29.4.3",
         "semver": "^7.3.5"
       },
       "engines": {
@@ -9601,12 +9586,12 @@
       }
     },
     "node_modules/jest-snapshot/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -9642,12 +9627,12 @@
       }
     },
     "node_modules/jest-util": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.4.1.tgz",
-      "integrity": "sha512-bQy9FPGxVutgpN4VRc0hk6w7Hx/m6L53QxpDreTZgJd9gfx/AV2MjyPde9tGyZRINAUrSv57p2inGBu2dRLmkQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.4.3.tgz",
+      "integrity": "sha512-ToSGORAz4SSSoqxDSylWX8JzkOQR7zoBtNRsA7e+1WUX5F8jrOwaNpuh1YfJHJKDHXLHmObv5eOjejUd+/Ws+Q==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
@@ -9659,12 +9644,12 @@
       }
     },
     "node_modules/jest-util/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -9685,29 +9670,29 @@
       }
     },
     "node_modules/jest-validate": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.4.1.tgz",
-      "integrity": "sha512-qNZXcZQdIQx4SfUB/atWnI4/I2HUvhz8ajOSYUu40CSmf9U5emil8EDHgE7M+3j9/pavtk3knlZBDsgFvv/SWw==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.4.3.tgz",
+      "integrity": "sha512-J3u5v7aPQoXPzaar6GndAVhdQcZr/3osWSgTeKg5v574I9ybX/dTyH0AJFb5XgXIB7faVhf+rS7t4p3lL9qFaw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^29.2.0",
+        "jest-get-type": "^29.4.3",
         "leven": "^3.1.0",
-        "pretty-format": "^29.4.1"
+        "pretty-format": "^29.4.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-validate/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -9740,18 +9725,18 @@
       }
     },
     "node_modules/jest-watcher": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.4.1.tgz",
-      "integrity": "sha512-vFOzflGFs27nU6h8dpnVRER3O2rFtL+VMEwnG0H3KLHcllLsU8y9DchSh0AL/Rg5nN1/wSiQ+P4ByMGpuybaVw==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.4.3.tgz",
+      "integrity": "sha512-zwlXH3DN3iksoIZNk73etl1HzKyi5FuQdYLnkQKm5BW4n8HpoG59xSwpVdFrnh60iRRaRBGw0gcymIxjJENPcA==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/test-result": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
-        "jest-util": "^29.4.1",
+        "jest-util": "^29.4.3",
         "string-length": "^4.0.1"
       },
       "engines": {
@@ -9759,12 +9744,12 @@
       }
     },
     "node_modules/jest-watcher/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -9785,13 +9770,13 @@
       }
     },
     "node_modules/jest-worker": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.4.1.tgz",
-      "integrity": "sha512-O9doU/S1EBe+yp/mstQ0VpPwpv0Clgn68TkNwGxL6/usX/KUW9Arnn4ag8C3jc6qHcXznhsT5Na1liYzAsuAbQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.4.3.tgz",
+      "integrity": "sha512-GLHN/GTAAMEy5BFdvpUfzr9Dr80zQqBrh0fz1mtRMe05hqP45+HfQltu7oTBfduD0UeZs09d+maFtFYAXFWvAA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.4.1",
+        "jest-util": "^29.4.3",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -9815,12 +9800,12 @@
       }
     },
     "node_modules/jest/node_modules/@jest/types": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-      "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -12212,12 +12197,12 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.4.1.tgz",
-      "integrity": "sha512-dt/Z761JUVsrIKaY215o1xQJBGlSmTx/h4cSqXqjHLnU1+Kt+mavVE7UgqJJO5ukx5HjSswHfmXz4LjS2oIJfg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.4.3.tgz",
+      "integrity": "sha512-cvpcHTc42lcsvOOAzd3XuNWTcvk1Jmnzqeu+WsOuiPmxUJTnkbAcFNsRKvEpBEUFVUgy/GTZLulZDcDEi+CIlA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "ansi-styles": "^5.0.0",
         "react-is": "^18.0.0"
       },
@@ -14322,9 +14307,9 @@
       "dev": true
     },
     "node_modules/v8-to-istanbul": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz",
-      "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
+      "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
       "dev": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.12",
@@ -15460,16 +15445,16 @@
       "license": "ISC"
     },
     "node_modules/write-file-atomic": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.0.tgz",
-      "integrity": "sha512-R7NYMnHSlV42K54lwY9lvW6MnSm1HSJqZL3xiSgi9E7//FYaI74r2G0rd+/X6VAMkHEdzxQaU5HUOXWUz5kA/w==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
       "dev": true,
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.7"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/xtend": {
@@ -15591,27 +15576,27 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.20.14",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz",
-      "integrity": "sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz",
+      "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==",
       "dev": true
     },
     "@babel/core": {
-      "version": "7.20.12",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz",
-      "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz",
+      "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==",
       "dev": true,
       "requires": {
-        "@ampproject/remapping": "^2.1.0",
+        "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.7",
+        "@babel/generator": "^7.21.0",
         "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-module-transforms": "^7.20.11",
-        "@babel/helpers": "^7.20.7",
-        "@babel/parser": "^7.20.7",
+        "@babel/helper-module-transforms": "^7.21.0",
+        "@babel/helpers": "^7.21.0",
+        "@babel/parser": "^7.21.0",
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.12",
-        "@babel/types": "^7.20.7",
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -15628,13 +15613,14 @@
       }
     },
     "@babel/generator": {
-      "version": "7.20.14",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz",
-      "integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==",
+      "version": "7.21.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz",
+      "integrity": "sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.20.7",
+        "@babel/types": "^7.21.0",
         "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
       },
       "dependencies": {
@@ -15688,13 +15674,13 @@
       "dev": true
     },
     "@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
+        "@babel/template": "^7.20.7",
+        "@babel/types": "^7.21.0"
       }
     },
     "@babel/helper-hoist-variables": {
@@ -15716,9 +15702,9 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.20.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz",
-      "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==",
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
+      "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
       "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.18.9",
@@ -15727,8 +15713,8 @@
         "@babel/helper-split-export-declaration": "^7.18.6",
         "@babel/helper-validator-identifier": "^7.19.1",
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.10",
-        "@babel/types": "^7.20.7"
+        "@babel/traverse": "^7.21.2",
+        "@babel/types": "^7.21.2"
       }
     },
     "@babel/helper-plugin-utils": {
@@ -15768,20 +15754,20 @@
       "dev": true
     },
     "@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
+      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
       "dev": true
     },
     "@babel/helpers": {
-      "version": "7.20.13",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz",
-      "integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
+      "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.13",
-        "@babel/types": "^7.20.7"
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0"
       }
     },
     "@babel/highlight": {
@@ -15838,9 +15824,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.20.15",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz",
-      "integrity": "sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==",
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
+      "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==",
       "dev": true
     },
     "@babel/plugin-syntax-async-generators": {
@@ -15981,27 +15967,27 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.20.13",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz",
-      "integrity": "sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==",
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz",
+      "integrity": "sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.7",
+        "@babel/generator": "^7.21.1",
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-function-name": "^7.21.0",
         "@babel/helper-hoist-variables": "^7.18.6",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.20.13",
-        "@babel/types": "^7.20.7",
+        "@babel/parser": "^7.21.2",
+        "@babel/types": "^7.21.2",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz",
-      "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==",
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz",
+      "integrity": "sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==",
       "dev": true,
       "requires": {
         "@babel/helper-string-parser": "^7.19.4",
@@ -16255,26 +16241,26 @@
       "dev": true
     },
     "@jest/console": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.4.1.tgz",
-      "integrity": "sha512-m+XpwKSi3PPM9znm5NGS8bBReeAJJpSkL1OuFCqaMaJL2YX9YXLkkI+MBchMPwu+ZuM2rynL51sgfkQteQ1CKQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.4.3.tgz",
+      "integrity": "sha512-W/o/34+wQuXlgqlPYTansOSiBnuxrTv61dEVkA6HNmpcgHLUjfaUbdqt6oVvOzaawwo9IdW9QOtMgQ1ScSZC4A==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^29.4.1",
-        "jest-util": "^29.4.1",
+        "jest-message-util": "^29.4.3",
+        "jest-util": "^29.4.3",
         "slash": "^3.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -16294,48 +16280,48 @@
       }
     },
     "@jest/core": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.4.1.tgz",
-      "integrity": "sha512-RXFTohpBqpaTebNdg5l3I5yadnKo9zLBajMT0I38D0tDhreVBYv3fA8kywthI00sWxPztWLD3yjiUkewwu/wKA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.4.3.tgz",
+      "integrity": "sha512-56QvBq60fS4SPZCuM7T+7scNrkGIe7Mr6PVIXUpu48ouvRaWOFqRPV91eifvFM0ay2HmfswXiGf97NGUN5KofQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.4.1",
-        "@jest/reporters": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/transform": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/console": "^29.4.3",
+        "@jest/reporters": "^29.4.3",
+        "@jest/test-result": "^29.4.3",
+        "@jest/transform": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^29.4.0",
-        "jest-config": "^29.4.1",
-        "jest-haste-map": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-regex-util": "^29.2.0",
-        "jest-resolve": "^29.4.1",
-        "jest-resolve-dependencies": "^29.4.1",
-        "jest-runner": "^29.4.1",
-        "jest-runtime": "^29.4.1",
-        "jest-snapshot": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-validate": "^29.4.1",
-        "jest-watcher": "^29.4.1",
+        "jest-changed-files": "^29.4.3",
+        "jest-config": "^29.4.3",
+        "jest-haste-map": "^29.4.3",
+        "jest-message-util": "^29.4.3",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.4.3",
+        "jest-resolve-dependencies": "^29.4.3",
+        "jest-runner": "^29.4.3",
+        "jest-runtime": "^29.4.3",
+        "jest-snapshot": "^29.4.3",
+        "jest-util": "^29.4.3",
+        "jest-validate": "^29.4.3",
+        "jest-watcher": "^29.4.3",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.4.1",
+        "pretty-format": "^29.4.3",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -16362,24 +16348,24 @@
       }
     },
     "@jest/environment": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.4.1.tgz",
-      "integrity": "sha512-pJ14dHGSQke7Q3mkL/UZR9ZtTOxqskZaC91NzamEH4dlKRt42W+maRBXiw/LWkdJe+P0f/zDR37+SPMplMRlPg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.4.3.tgz",
+      "integrity": "sha512-dq5S6408IxIa+lr54zeqce+QgI+CJT4nmmA+1yzFgtcsGK8c/EyiUb9XQOgz3BMKrRDfKseeOaxj2eO8LlD3lA==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/fake-timers": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
-        "jest-mock": "^29.4.1"
+        "jest-mock": "^29.4.3"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -16399,45 +16385,45 @@
       }
     },
     "@jest/expect": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.4.1.tgz",
-      "integrity": "sha512-ZxKJP5DTUNF2XkpJeZIzvnzF1KkfrhEF6Rz0HGG69fHl6Bgx5/GoU3XyaeFYEjuuKSOOsbqD/k72wFvFxc3iTw==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.4.3.tgz",
+      "integrity": "sha512-iktRU/YsxEtumI9zsPctYUk7ptpC+AVLLk1Ax3AsA4g1C+8OOnKDkIQBDHtD5hA/+VtgMd5AWI5gNlcAlt2vxQ==",
       "dev": true,
       "requires": {
-        "expect": "^29.4.1",
-        "jest-snapshot": "^29.4.1"
+        "expect": "^29.4.3",
+        "jest-snapshot": "^29.4.3"
       }
     },
     "@jest/expect-utils": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.4.1.tgz",
-      "integrity": "sha512-w6YJMn5DlzmxjO00i9wu2YSozUYRBhIoJ6nQwpMYcBMtiqMGJm1QBzOf6DDgRao8dbtpDoaqLg6iiQTvv0UHhQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.4.3.tgz",
+      "integrity": "sha512-/6JWbkxHOP8EoS8jeeTd9dTfc9Uawi+43oLKHfp6zzux3U2hqOOVnV3ai4RpDYHOccL6g+5nrxpoc8DmJxtXVQ==",
       "dev": true,
       "requires": {
-        "jest-get-type": "^29.2.0"
+        "jest-get-type": "^29.4.3"
       }
     },
     "@jest/fake-timers": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.4.1.tgz",
-      "integrity": "sha512-/1joI6rfHFmmm39JxNfmNAO3Nwm6Y0VoL5fJDy7H1AtWrD1CgRtqJbN9Ld6rhAkGO76qqp4cwhhxJ9o9kYjQMw==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.4.3.tgz",
+      "integrity": "sha512-4Hote2MGcCTWSD2gwl0dwbCpBRHhE6olYEuTj8FMowdg3oQWNKr2YuxenPQYZ7+PfqPY1k98wKDU4Z+Hvd4Tiw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^29.4.1",
-        "jest-mock": "^29.4.1",
-        "jest-util": "^29.4.1"
+        "jest-message-util": "^29.4.3",
+        "jest-mock": "^29.4.3",
+        "jest-util": "^29.4.3"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -16457,24 +16443,24 @@
       }
     },
     "@jest/globals": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.4.1.tgz",
-      "integrity": "sha512-znoK2EuFytbHH0ZSf2mQK2K1xtIgmaw4Da21R2C/NE/+NnItm5mPEFQmn8gmF3f0rfOlmZ3Y3bIf7bFj7DHxAA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.4.3.tgz",
+      "integrity": "sha512-8BQ/5EzfOLG7AaMcDh7yFCbfRLtsc+09E1RQmRBI4D6QQk4m6NSK/MXo+3bJrBN0yU8A2/VIcqhvsOLFmziioA==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.4.1",
-        "@jest/expect": "^29.4.1",
-        "@jest/types": "^29.4.1",
-        "jest-mock": "^29.4.1"
+        "@jest/environment": "^29.4.3",
+        "@jest/expect": "^29.4.3",
+        "@jest/types": "^29.4.3",
+        "jest-mock": "^29.4.3"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -16494,16 +16480,16 @@
       }
     },
     "@jest/reporters": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.4.1.tgz",
-      "integrity": "sha512-AISY5xpt2Xpxj9R6y0RF1+O6GRy9JsGa8+vK23Lmzdy1AYcpQn5ItX79wJSsTmfzPKSAcsY1LNt/8Y5Xe5LOSg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.4.3.tgz",
+      "integrity": "sha512-sr2I7BmOjJhyqj9ANC6CTLsL4emMoka7HkQpcoMRlhCbQJjz2zsRzw0BDPiPyEFDXAbxKgGFYuQZiSJ1Y6YoTg==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/transform": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/console": "^29.4.3",
+        "@jest/test-result": "^29.4.3",
+        "@jest/transform": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@jridgewell/trace-mapping": "^0.3.15",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -16516,9 +16502,9 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-worker": "^29.4.1",
+        "jest-message-util": "^29.4.3",
+        "jest-util": "^29.4.3",
+        "jest-worker": "^29.4.3",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -16526,12 +16512,12 @@
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -16551,18 +16537,18 @@
       }
     },
     "@jest/schemas": {
-      "version": "29.4.0",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.0.tgz",
-      "integrity": "sha512-0E01f/gOZeNTG76i5eWWSupvSHaIINrTie7vCyjiYFKgzNdyEGd12BUv4oNBFHOqlHDbtoJi3HrQ38KCC90NsQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.3.tgz",
+      "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==",
       "dev": true,
       "requires": {
         "@sinclair/typebox": "^0.25.16"
       }
     },
     "@jest/source-map": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.2.0.tgz",
-      "integrity": "sha512-1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.4.3.tgz",
+      "integrity": "sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==",
       "dev": true,
       "requires": {
         "@jridgewell/trace-mapping": "^0.3.15",
@@ -16571,24 +16557,24 @@
       }
     },
     "@jest/test-result": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.4.1.tgz",
-      "integrity": "sha512-WRt29Lwt+hEgfN8QDrXqXGgCTidq1rLyFqmZ4lmJOpVArC8daXrZWkWjiaijQvgd3aOUj2fM8INclKHsQW9YyQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.4.3.tgz",
+      "integrity": "sha512-Oi4u9NfBolMq9MASPwuWTlC5WvmNRwI4S8YrQg5R5Gi47DYlBe3sh7ILTqi/LGrK1XUE4XY9KZcQJTH1WJCLLA==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/console": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -16608,47 +16594,47 @@
       }
     },
     "@jest/test-sequencer": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.4.1.tgz",
-      "integrity": "sha512-v5qLBNSsM0eHzWLXsQ5fiB65xi49A3ILPSFQKPXzGL4Vyux0DPZAIN7NAFJa9b4BiTDP9MBF/Zqc/QA1vuiJ0w==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.4.3.tgz",
+      "integrity": "sha512-yi/t2nES4GB4G0mjLc0RInCq/cNr9dNwJxcGg8sslajua5Kb4kmozAc+qPLzplhBgfw1vLItbjyHzUN92UXicw==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^29.4.1",
+        "@jest/test-result": "^29.4.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.1",
+        "jest-haste-map": "^29.4.3",
         "slash": "^3.0.0"
       }
     },
     "@jest/transform": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.4.1.tgz",
-      "integrity": "sha512-5w6YJrVAtiAgr0phzKjYd83UPbCXsBRTeYI4BXokv9Er9CcrH9hfXL/crCvP2d2nGOcovPUnlYiLPFLZrkG5Hg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.4.3.tgz",
+      "integrity": "sha512-8u0+fBGWolDshsFgPQJESkDa72da/EVwvL+II0trN2DR66wMwiQ9/CihaGfHdlLGFzbBZwMykFtxuwFdZqlKwg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "@jridgewell/trace-mapping": "^0.3.15",
         "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.1",
-        "jest-regex-util": "^29.2.0",
-        "jest-util": "^29.4.1",
+        "jest-haste-map": "^29.4.3",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.4.3",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
-        "write-file-atomic": "^5.0.0"
+        "write-file-atomic": "^4.0.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -17629,9 +17615,9 @@
       }
     },
     "@sinclair/typebox": {
-      "version": "0.25.21",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.21.tgz",
-      "integrity": "sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==",
+      "version": "0.25.24",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz",
+      "integrity": "sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==",
       "dev": true
     },
     "@sindresorhus/is": {
@@ -18877,15 +18863,15 @@
       }
     },
     "babel-jest": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.4.1.tgz",
-      "integrity": "sha512-xBZa/pLSsF/1sNpkgsiT3CmY7zV1kAsZ9OxxtrFqYucnOuRftXAfcJqcDVyOPeN4lttWTwhLdu0T9f8uvoPEUg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.4.3.tgz",
+      "integrity": "sha512-o45Wyn32svZE+LnMVWv/Z4x0SwtLbh4FyGcYtR20kIWd+rdrDZ9Fzq8Ml3MYLD+mZvEdzCjZsCnYZ2jpJyQ+Nw==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^29.4.1",
+        "@jest/transform": "^29.4.3",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^29.4.0",
+        "babel-preset-jest": "^29.4.3",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "slash": "^3.0.0"
@@ -18905,9 +18891,9 @@
       }
     },
     "babel-plugin-jest-hoist": {
-      "version": "29.4.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.4.0.tgz",
-      "integrity": "sha512-a/sZRLQJEmsmejQ2rPEUe35nO1+C9dc9O1gplH1SXmJxveQSRUYdBk8yGZG/VOUuZs1u2aHZJusEGoRMbhhwCg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.4.3.tgz",
+      "integrity": "sha512-mB6q2q3oahKphy5V7CpnNqZOCkxxZ9aokf1eh82Dy3jQmg4xvM1tGrh5y6BQUJh4a3Pj9+eLfwvAZ7VNKg7H8Q==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.3.3",
@@ -18937,12 +18923,12 @@
       }
     },
     "babel-preset-jest": {
-      "version": "29.4.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.4.0.tgz",
-      "integrity": "sha512-fUB9vZflUSM3dO/6M2TCAepTzvA4VkOvl67PjErcrQMGt9Eve7uazaeyCZ2th3UtI7ljpiBJES0F7A1vBRsLZA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.4.3.tgz",
+      "integrity": "sha512-gWx6COtSuma6n9bw+8/F+2PCXrIgxV/D1TJFnp6OyBK2cxPWg0K9p/sriNYeifKjpUkMViWQ09DSWtzJQRETsw==",
       "dev": true,
       "requires": {
-        "babel-plugin-jest-hoist": "^29.4.0",
+        "babel-plugin-jest-hoist": "^29.4.3",
         "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
@@ -19541,9 +19527,9 @@
       "dev": true
     },
     "ci-info": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz",
-      "integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
       "dev": true
     },
     "cipher-base": {
@@ -20189,9 +20175,9 @@
       "version": "1.2.2"
     },
     "diff-sequences": {
-      "version": "29.3.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.3.1.tgz",
-      "integrity": "sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
+      "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
       "dev": true
     },
     "diffie-hellman": {
@@ -20772,16 +20758,16 @@
       }
     },
     "expect": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.4.1.tgz",
-      "integrity": "sha512-OKrGESHOaMxK3b6zxIq9SOW8kEXztKff/Dvg88j4xIJxur1hspEbedVkR3GpHe5LO+WB2Qw7OWN0RMTdp6as5A==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.4.3.tgz",
+      "integrity": "sha512-uC05+Q7eXECFpgDrHdXA4k2rpMyStAYPItEDLyQDo5Ta7fVkJnNA/4zh/OIVkVVNZ1oOK1PipQoyNjuZ6sz6Dg==",
       "dev": true,
       "requires": {
-        "@jest/expect-utils": "^29.4.1",
-        "jest-get-type": "^29.2.0",
-        "jest-matcher-utils": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-util": "^29.4.1"
+        "@jest/expect-utils": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "jest-matcher-utils": "^29.4.3",
+        "jest-message-util": "^29.4.3",
+        "jest-util": "^29.4.3"
       }
     },
     "ext-list": {
@@ -21798,24 +21784,24 @@
       }
     },
     "jest": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.4.1.tgz",
-      "integrity": "sha512-cknimw7gAXPDOmj0QqztlxVtBVCw2lYY9CeIE5N6kD+kET1H4H79HSNISJmijb1HF+qk+G+ploJgiDi5k/fRlg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.4.3.tgz",
+      "integrity": "sha512-XvK65feuEFGZT8OO0fB/QAQS+LGHvQpaadkH5p47/j3Ocqq3xf2pK9R+G0GzgfuhXVxEv76qCOOcMb5efLk6PA==",
       "dev": true,
       "requires": {
-        "@jest/core": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/core": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^29.4.1"
+        "jest-cli": "^29.4.3"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -21835,9 +21821,9 @@
       }
     },
     "jest-changed-files": {
-      "version": "29.4.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.4.0.tgz",
-      "integrity": "sha512-rnI1oPxgFghoz32Y8eZsGJMjW54UlqT17ycQeCEktcxxwqqKdlj9afl8LNeO0Pbu+h2JQHThQP0BzS67eTRx4w==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.4.3.tgz",
+      "integrity": "sha512-Vn5cLuWuwmi2GNNbokPOEcvrXGSGrqVnPEZV7rC6P7ck07Dyw9RFnvWglnupSh+hGys0ajGtw/bc2ZgweljQoQ==",
       "dev": true,
       "requires": {
         "execa": "^5.0.0",
@@ -21845,39 +21831,39 @@
       }
     },
     "jest-circus": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.4.1.tgz",
-      "integrity": "sha512-v02NuL5crMNY4CGPHBEflLzl4v91NFb85a+dH9a1pUNx6Xjggrd8l9pPy4LZ1VYNRXlb+f65+7O/MSIbLir6pA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.4.3.tgz",
+      "integrity": "sha512-Vw/bVvcexmdJ7MLmgdT3ZjkJ3LKu8IlpefYokxiqoZy6OCQ2VAm6Vk3t/qHiAGUXbdbJKJWnc8gH3ypTbB/OBw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.4.1",
-        "@jest/expect": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/environment": "^29.4.3",
+        "@jest/expect": "^29.4.3",
+        "@jest/test-result": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^0.7.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.4.1",
-        "jest-matcher-utils": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-runtime": "^29.4.1",
-        "jest-snapshot": "^29.4.1",
-        "jest-util": "^29.4.1",
+        "jest-each": "^29.4.3",
+        "jest-matcher-utils": "^29.4.3",
+        "jest-message-util": "^29.4.3",
+        "jest-runtime": "^29.4.3",
+        "jest-snapshot": "^29.4.3",
+        "jest-util": "^29.4.3",
         "p-limit": "^3.1.0",
-        "pretty-format": "^29.4.1",
+        "pretty-format": "^29.4.3",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -21897,32 +21883,32 @@
       }
     },
     "jest-cli": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.4.1.tgz",
-      "integrity": "sha512-jz7GDIhtxQ37M+9dlbv5K+/FVcIo1O/b1sX3cJgzlQUf/3VG25nvuWzlDC4F1FLLzUThJeWLu8I7JF9eWpuURQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.4.3.tgz",
+      "integrity": "sha512-PiiAPuFNfWWolCE6t3ZrDXQc6OsAuM3/tVW0u27UWc1KE+n/HSn5dSE6B2juqN7WP+PP0jAcnKtGmI4u8GMYCg==",
       "dev": true,
       "requires": {
-        "@jest/core": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/core": "^29.4.3",
+        "@jest/test-result": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-validate": "^29.4.1",
+        "jest-config": "^29.4.3",
+        "jest-util": "^29.4.3",
+        "jest-validate": "^29.4.3",
         "prompts": "^2.0.1",
         "yargs": "^17.3.1"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -21942,42 +21928,42 @@
       }
     },
     "jest-config": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.4.1.tgz",
-      "integrity": "sha512-g7p3q4NuXiM4hrS4XFATTkd+2z0Ml2RhFmFPM8c3WyKwVDNszbl4E7cV7WIx1YZeqqCtqbtTtZhGZWJlJqngzg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.4.3.tgz",
+      "integrity": "sha512-eCIpqhGnIjdUCXGtLhz4gdDoxKSWXKjzNcc5r+0S1GKOp2fwOipx5mRcwa9GB/ArsxJ1jlj2lmlD9bZAsBxaWQ==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.4.1",
-        "@jest/types": "^29.4.1",
-        "babel-jest": "^29.4.1",
+        "@jest/test-sequencer": "^29.4.3",
+        "@jest/types": "^29.4.3",
+        "babel-jest": "^29.4.3",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.4.1",
-        "jest-environment-node": "^29.4.1",
-        "jest-get-type": "^29.2.0",
-        "jest-regex-util": "^29.2.0",
-        "jest-resolve": "^29.4.1",
-        "jest-runner": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-validate": "^29.4.1",
+        "jest-circus": "^29.4.3",
+        "jest-environment-node": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.4.3",
+        "jest-runner": "^29.4.3",
+        "jest-util": "^29.4.3",
+        "jest-validate": "^29.4.3",
         "micromatch": "^4.0.4",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.4.1",
+        "pretty-format": "^29.4.3",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -21997,46 +21983,46 @@
       }
     },
     "jest-diff": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.4.1.tgz",
-      "integrity": "sha512-uazdl2g331iY56CEyfbNA0Ut7Mn2ulAG5vUaEHXycf1L6IPyuImIxSz4F0VYBKi7LYIuxOwTZzK3wh5jHzASMw==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.4.3.tgz",
+      "integrity": "sha512-YB+ocenx7FZ3T5O9lMVMeLYV4265socJKtkwgk/6YUz/VsEzYDkiMuMhWzZmxm3wDRQvayJu/PjkjjSkjoHsCA==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^29.3.1",
-        "jest-get-type": "^29.2.0",
-        "pretty-format": "^29.4.1"
+        "diff-sequences": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.4.3"
       }
     },
     "jest-docblock": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.2.0.tgz",
-      "integrity": "sha512-bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
+      "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
       "dev": true,
       "requires": {
         "detect-newline": "^3.0.0"
       }
     },
     "jest-each": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.4.1.tgz",
-      "integrity": "sha512-QlYFiX3llJMWUV0BtWht/esGEz9w+0i7BHwODKCze7YzZzizgExB9MOfiivF/vVT0GSQ8wXLhvHXh3x2fVD4QQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.4.3.tgz",
+      "integrity": "sha512-1ElHNAnKcbJb/b+L+7j0/w7bDvljw4gTv1wL9fYOczeJrbTbkMGQ5iQPFJ3eFQH19VPTx1IyfePdqSpePKss7Q==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "chalk": "^4.0.0",
-        "jest-get-type": "^29.2.0",
-        "jest-util": "^29.4.1",
-        "pretty-format": "^29.4.1"
+        "jest-get-type": "^29.4.3",
+        "jest-util": "^29.4.3",
+        "pretty-format": "^29.4.3"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -22056,26 +22042,26 @@
       }
     },
     "jest-environment-node": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.4.1.tgz",
-      "integrity": "sha512-x/H2kdVgxSkxWAIlIh9MfMuBa0hZySmfsC5lCsWmWr6tZySP44ediRKDUiNggX/eHLH7Cd5ZN10Rw+XF5tXsqg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.4.3.tgz",
+      "integrity": "sha512-gAiEnSKF104fsGDXNkwk49jD/0N0Bqu2K9+aMQXA6avzsA9H3Fiv1PW2D+gzbOSR705bWd2wJZRFEFpV0tXISg==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.4.1",
-        "@jest/fake-timers": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/environment": "^29.4.3",
+        "@jest/fake-timers": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
-        "jest-mock": "^29.4.1",
-        "jest-util": "^29.4.1"
+        "jest-mock": "^29.4.3",
+        "jest-util": "^29.4.3"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -22095,38 +22081,38 @@
       }
     },
     "jest-get-type": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.2.0.tgz",
-      "integrity": "sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
       "dev": true
     },
     "jest-haste-map": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.4.1.tgz",
-      "integrity": "sha512-imTjcgfVVTvg02khXL11NNLTx9ZaofbAWhilrMg/G8dIkp+HYCswhxf0xxJwBkfhWb3e8dwbjuWburvxmcr58w==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.4.3.tgz",
+      "integrity": "sha512-eZIgAS8tvm5IZMtKlR8Y+feEOMfo2pSQkmNbufdbMzMSn9nitgGxF1waM/+LbryO3OkMcKS98SUb+j/cQxp/vQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "@types/graceful-fs": "^4.1.3",
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
         "fsevents": "^2.3.2",
         "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^29.2.0",
-        "jest-util": "^29.4.1",
-        "jest-worker": "^29.4.1",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.4.3",
+        "jest-worker": "^29.4.3",
         "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -22146,51 +22132,51 @@
       }
     },
     "jest-leak-detector": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.4.1.tgz",
-      "integrity": "sha512-akpZv7TPyGMnH2RimOCgy+hPmWZf55EyFUvymQ4LMsQP8xSPlZumCPtXGoDhFNhUE2039RApZkTQDKU79p/FiQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.4.3.tgz",
+      "integrity": "sha512-9yw4VC1v2NspMMeV3daQ1yXPNxMgCzwq9BocCwYrRgXe4uaEJPAN0ZK37nFBhcy3cUwEVstFecFLaTHpF7NiGA==",
       "dev": true,
       "requires": {
-        "jest-get-type": "^29.2.0",
-        "pretty-format": "^29.4.1"
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.4.3"
       }
     },
     "jest-matcher-utils": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.4.1.tgz",
-      "integrity": "sha512-k5h0u8V4nAEy6lSACepxL/rw78FLDkBnXhZVgFneVpnJONhb2DhZj/Gv4eNe+1XqQ5IhgUcqj745UwH0HJmMnA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.4.3.tgz",
+      "integrity": "sha512-TTciiXEONycZ03h6R6pYiZlSkvYgT0l8aa49z/DLSGYjex4orMUcafuLXYyyEDWB1RKglq00jzwY00Ei7yFNVg==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.4.1",
-        "jest-get-type": "^29.2.0",
-        "pretty-format": "^29.4.1"
+        "jest-diff": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.4.3"
       }
     },
     "jest-message-util": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.4.1.tgz",
-      "integrity": "sha512-H4/I0cXUaLeCw6FM+i4AwCnOwHRgitdaUFOdm49022YD5nfyr8C/DrbXOBEyJaj+w/y0gGJ57klssOaUiLLQGQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.4.3.tgz",
+      "integrity": "sha512-1Y8Zd4ZCN7o/QnWdMmT76If8LuDv23Z1DRovBj/vcSFNlGCJGoO8D1nJDw1AdyAGUk0myDLFGN5RbNeJyCRGCw==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.4.1",
+        "pretty-format": "^29.4.3",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -22210,23 +22196,23 @@
       }
     },
     "jest-mock": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.4.1.tgz",
-      "integrity": "sha512-MwA4hQ7zBOcgVCVnsM8TzaFLVUD/pFWTfbkY953Y81L5ret3GFRZtmPmRFAjKQSdCKoJvvqOu6Bvfpqlwwb0dQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.4.3.tgz",
+      "integrity": "sha512-LjFgMg+xed9BdkPMyIJh+r3KeHt1klXPJYBULXVVAkbTaaKjPX1o1uVCAZADMEp/kOxGTwy/Ot8XbvgItOrHEg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
-        "jest-util": "^29.4.1"
+        "jest-util": "^29.4.3"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -22253,74 +22239,74 @@
       "requires": {}
     },
     "jest-regex-util": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.2.0.tgz",
-      "integrity": "sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
       "dev": true
     },
     "jest-resolve": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.4.1.tgz",
-      "integrity": "sha512-j/ZFNV2lm9IJ2wmlq1uYK0Y/1PiyDq9g4HEGsNTNr3viRbJdV+8Lf1SXIiLZXFvyiisu0qUyIXGBnw+OKWkJwQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.4.3.tgz",
+      "integrity": "sha512-GPokE1tzguRyT7dkxBim4wSx6E45S3bOQ7ZdKEG+Qj0Oac9+6AwJPCk0TZh5Vu0xzeX4afpb+eDmgbmZFFwpOw==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.1",
+        "jest-haste-map": "^29.4.3",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.4.1",
-        "jest-validate": "^29.4.1",
+        "jest-util": "^29.4.3",
+        "jest-validate": "^29.4.3",
         "resolve": "^1.20.0",
         "resolve.exports": "^2.0.0",
         "slash": "^3.0.0"
       }
     },
     "jest-resolve-dependencies": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.4.1.tgz",
-      "integrity": "sha512-Y3QG3M1ncAMxfjbYgtqNXC5B595zmB6e//p/qpA/58JkQXu/IpLDoLeOa8YoYfsSglBKQQzNUqtfGJJT/qLmJg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.4.3.tgz",
+      "integrity": "sha512-uvKMZAQ3nmXLH7O8WAOhS5l0iWyT3WmnJBdmIHiV5tBbdaDZ1wqtNX04FONGoaFvSOSHBJxnwAVnSn1WHdGVaw==",
       "dev": true,
       "requires": {
-        "jest-regex-util": "^29.2.0",
-        "jest-snapshot": "^29.4.1"
+        "jest-regex-util": "^29.4.3",
+        "jest-snapshot": "^29.4.3"
       }
     },
     "jest-runner": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.4.1.tgz",
-      "integrity": "sha512-8d6XXXi7GtHmsHrnaqBKWxjKb166Eyj/ksSaUYdcBK09VbjPwIgWov1VwSmtupCIz8q1Xv4Qkzt/BTo3ZqiCeg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.4.3.tgz",
+      "integrity": "sha512-GWPTEiGmtHZv1KKeWlTX9SIFuK19uLXlRQU43ceOQ2hIfA5yPEJC7AMkvFKpdCHx6pNEdOD+2+8zbniEi3v3gA==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.4.1",
-        "@jest/environment": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/transform": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/console": "^29.4.3",
+        "@jest/environment": "^29.4.3",
+        "@jest/test-result": "^29.4.3",
+        "@jest/transform": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
         "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.2.0",
-        "jest-environment-node": "^29.4.1",
-        "jest-haste-map": "^29.4.1",
-        "jest-leak-detector": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-resolve": "^29.4.1",
-        "jest-runtime": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-watcher": "^29.4.1",
-        "jest-worker": "^29.4.1",
+        "jest-docblock": "^29.4.3",
+        "jest-environment-node": "^29.4.3",
+        "jest-haste-map": "^29.4.3",
+        "jest-leak-detector": "^29.4.3",
+        "jest-message-util": "^29.4.3",
+        "jest-resolve": "^29.4.3",
+        "jest-runtime": "^29.4.3",
+        "jest-util": "^29.4.3",
+        "jest-watcher": "^29.4.3",
+        "jest-worker": "^29.4.3",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -22350,43 +22336,42 @@
       }
     },
     "jest-runtime": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.4.1.tgz",
-      "integrity": "sha512-UXTMU9uKu2GjYwTtoAw5rn4STxWw/nadOfW7v1sx6LaJYa3V/iymdCLQM6xy3+7C6mY8GfX22vKpgxY171UIoA==",
-      "dev": true,
-      "requires": {
-        "@jest/environment": "^29.4.1",
-        "@jest/fake-timers": "^29.4.1",
-        "@jest/globals": "^29.4.1",
-        "@jest/source-map": "^29.2.0",
-        "@jest/test-result": "^29.4.1",
-        "@jest/transform": "^29.4.1",
-        "@jest/types": "^29.4.1",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.4.3.tgz",
+      "integrity": "sha512-F5bHvxSH+LvLV24vVB3L8K467dt3y3dio6V3W89dUz9nzvTpqd/HcT9zfYKL2aZPvD63vQFgLvaUX/UpUhrP6Q==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^29.4.3",
+        "@jest/fake-timers": "^29.4.3",
+        "@jest/globals": "^29.4.3",
+        "@jest/source-map": "^29.4.3",
+        "@jest/test-result": "^29.4.3",
+        "@jest/transform": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-mock": "^29.4.1",
-        "jest-regex-util": "^29.2.0",
-        "jest-resolve": "^29.4.1",
-        "jest-snapshot": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "semver": "^7.3.5",
+        "jest-haste-map": "^29.4.3",
+        "jest-message-util": "^29.4.3",
+        "jest-mock": "^29.4.3",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.4.3",
+        "jest-snapshot": "^29.4.3",
+        "jest-util": "^29.4.3",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -22402,22 +22387,13 @@
           "requires": {
             "@types/yargs-parser": "*"
           }
-        },
-        "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
         }
       }
     },
     "jest-snapshot": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.4.1.tgz",
-      "integrity": "sha512-l4iV8EjGgQWVz3ee/LR9sULDk2pCkqb71bjvlqn+qp90lFwpnulHj4ZBT8nm1hA1C5wowXLc7MGnw321u0tsYA==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.4.3.tgz",
+      "integrity": "sha512-NGlsqL0jLPDW91dz304QTM/SNO99lpcSYYAjNiX0Ou+sSGgkanKBcSjCfp/pqmiiO1nQaOyLp6XQddAzRcx3Xw==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
@@ -22426,33 +22402,33 @@
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/traverse": "^7.7.2",
         "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.4.1",
-        "@jest/transform": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/expect-utils": "^29.4.3",
+        "@jest/transform": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/babel__traverse": "^7.0.6",
         "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^29.4.1",
+        "expect": "^29.4.3",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.4.1",
-        "jest-get-type": "^29.2.0",
-        "jest-haste-map": "^29.4.1",
-        "jest-matcher-utils": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-util": "^29.4.1",
+        "jest-diff": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "jest-haste-map": "^29.4.3",
+        "jest-matcher-utils": "^29.4.3",
+        "jest-message-util": "^29.4.3",
+        "jest-util": "^29.4.3",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^29.4.1",
+        "pretty-format": "^29.4.3",
         "semver": "^7.3.5"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -22481,12 +22457,12 @@
       }
     },
     "jest-util": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.4.1.tgz",
-      "integrity": "sha512-bQy9FPGxVutgpN4VRc0hk6w7Hx/m6L53QxpDreTZgJd9gfx/AV2MjyPde9tGyZRINAUrSv57p2inGBu2dRLmkQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.4.3.tgz",
+      "integrity": "sha512-ToSGORAz4SSSoqxDSylWX8JzkOQR7zoBtNRsA7e+1WUX5F8jrOwaNpuh1YfJHJKDHXLHmObv5eOjejUd+/Ws+Q==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
@@ -22495,12 +22471,12 @@
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -22520,26 +22496,26 @@
       }
     },
     "jest-validate": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.4.1.tgz",
-      "integrity": "sha512-qNZXcZQdIQx4SfUB/atWnI4/I2HUvhz8ajOSYUu40CSmf9U5emil8EDHgE7M+3j9/pavtk3knlZBDsgFvv/SWw==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.4.3.tgz",
+      "integrity": "sha512-J3u5v7aPQoXPzaar6GndAVhdQcZr/3osWSgTeKg5v574I9ybX/dTyH0AJFb5XgXIB7faVhf+rS7t4p3lL9qFaw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.4.3",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^29.2.0",
+        "jest-get-type": "^29.4.3",
         "leven": "^3.1.0",
-        "pretty-format": "^29.4.1"
+        "pretty-format": "^29.4.3"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -22565,28 +22541,28 @@
       }
     },
     "jest-watcher": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.4.1.tgz",
-      "integrity": "sha512-vFOzflGFs27nU6h8dpnVRER3O2rFtL+VMEwnG0H3KLHcllLsU8y9DchSh0AL/Rg5nN1/wSiQ+P4ByMGpuybaVw==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.4.3.tgz",
+      "integrity": "sha512-zwlXH3DN3iksoIZNk73etl1HzKyi5FuQdYLnkQKm5BW4n8HpoG59xSwpVdFrnh60iRRaRBGw0gcymIxjJENPcA==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/test-result": "^29.4.3",
+        "@jest/types": "^29.4.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
-        "jest-util": "^29.4.1",
+        "jest-util": "^29.4.3",
         "string-length": "^4.0.1"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-          "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
@@ -22606,13 +22582,13 @@
       }
     },
     "jest-worker": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.4.1.tgz",
-      "integrity": "sha512-O9doU/S1EBe+yp/mstQ0VpPwpv0Clgn68TkNwGxL6/usX/KUW9Arnn4ag8C3jc6qHcXznhsT5Na1liYzAsuAbQ==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.4.3.tgz",
+      "integrity": "sha512-GLHN/GTAAMEy5BFdvpUfzr9Dr80zQqBrh0fz1mtRMe05hqP45+HfQltu7oTBfduD0UeZs09d+maFtFYAXFWvAA==",
       "dev": true,
       "requires": {
         "@types/node": "*",
-        "jest-util": "^29.4.1",
+        "jest-util": "^29.4.3",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -24205,12 +24181,12 @@
       }
     },
     "pretty-format": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.4.1.tgz",
-      "integrity": "sha512-dt/Z761JUVsrIKaY215o1xQJBGlSmTx/h4cSqXqjHLnU1+Kt+mavVE7UgqJJO5ukx5HjSswHfmXz4LjS2oIJfg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.4.3.tgz",
+      "integrity": "sha512-cvpcHTc42lcsvOOAzd3XuNWTcvk1Jmnzqeu+WsOuiPmxUJTnkbAcFNsRKvEpBEUFVUgy/GTZLulZDcDEi+CIlA==",
       "dev": true,
       "requires": {
-        "@jest/schemas": "^29.4.0",
+        "@jest/schemas": "^29.4.3",
         "ansi-styles": "^5.0.0",
         "react-is": "^18.0.0"
       },
@@ -25334,8 +25310,8 @@
         "fast-glob": "^3.2.12",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "jest": "^29.4.1",
-        "jest-diff": "^29.4.1",
+        "jest": "^29.4.3",
+        "jest-diff": "^29.4.3",
         "lightningcss": "^1.18.0",
         "lilconfig": "^2.0.6",
         "micromatch": "^4.0.5",
@@ -25375,27 +25351,27 @@
           }
         },
         "@babel/compat-data": {
-          "version": "7.20.14",
-          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz",
-          "integrity": "sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw==",
+          "version": "7.21.0",
+          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz",
+          "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==",
           "dev": true
         },
         "@babel/core": {
-          "version": "7.20.12",
-          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz",
-          "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==",
+          "version": "7.21.0",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz",
+          "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==",
           "dev": true,
           "requires": {
-            "@ampproject/remapping": "^2.1.0",
+            "@ampproject/remapping": "^2.2.0",
             "@babel/code-frame": "^7.18.6",
-            "@babel/generator": "^7.20.7",
+            "@babel/generator": "^7.21.0",
             "@babel/helper-compilation-targets": "^7.20.7",
-            "@babel/helper-module-transforms": "^7.20.11",
-            "@babel/helpers": "^7.20.7",
-            "@babel/parser": "^7.20.7",
+            "@babel/helper-module-transforms": "^7.21.0",
+            "@babel/helpers": "^7.21.0",
+            "@babel/parser": "^7.21.0",
             "@babel/template": "^7.20.7",
-            "@babel/traverse": "^7.20.12",
-            "@babel/types": "^7.20.7",
+            "@babel/traverse": "^7.21.0",
+            "@babel/types": "^7.21.0",
             "convert-source-map": "^1.7.0",
             "debug": "^4.1.0",
             "gensync": "^1.0.0-beta.2",
@@ -25412,13 +25388,14 @@
           }
         },
         "@babel/generator": {
-          "version": "7.20.14",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz",
-          "integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==",
+          "version": "7.21.1",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz",
+          "integrity": "sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.20.7",
+            "@babel/types": "^7.21.0",
             "@jridgewell/gen-mapping": "^0.3.2",
+            "@jridgewell/trace-mapping": "^0.3.17",
             "jsesc": "^2.5.1"
           },
           "dependencies": {
@@ -25472,13 +25449,13 @@
           "dev": true
         },
         "@babel/helper-function-name": {
-          "version": "7.19.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "version": "7.21.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+          "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
           "dev": true,
           "requires": {
-            "@babel/template": "^7.18.10",
-            "@babel/types": "^7.19.0"
+            "@babel/template": "^7.20.7",
+            "@babel/types": "^7.21.0"
           }
         },
         "@babel/helper-hoist-variables": {
@@ -25500,9 +25477,9 @@
           }
         },
         "@babel/helper-module-transforms": {
-          "version": "7.20.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz",
-          "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==",
+          "version": "7.21.2",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
+          "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
           "dev": true,
           "requires": {
             "@babel/helper-environment-visitor": "^7.18.9",
@@ -25511,8 +25488,8 @@
             "@babel/helper-split-export-declaration": "^7.18.6",
             "@babel/helper-validator-identifier": "^7.19.1",
             "@babel/template": "^7.20.7",
-            "@babel/traverse": "^7.20.10",
-            "@babel/types": "^7.20.7"
+            "@babel/traverse": "^7.21.2",
+            "@babel/types": "^7.21.2"
           }
         },
         "@babel/helper-plugin-utils": {
@@ -25552,20 +25529,20 @@
           "dev": true
         },
         "@babel/helper-validator-option": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-          "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+          "version": "7.21.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
+          "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
           "dev": true
         },
         "@babel/helpers": {
-          "version": "7.20.13",
-          "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz",
-          "integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==",
+          "version": "7.21.0",
+          "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
+          "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
           "dev": true,
           "requires": {
             "@babel/template": "^7.20.7",
-            "@babel/traverse": "^7.20.13",
-            "@babel/types": "^7.20.7"
+            "@babel/traverse": "^7.21.0",
+            "@babel/types": "^7.21.0"
           }
         },
         "@babel/highlight": {
@@ -25622,9 +25599,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.20.15",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz",
-          "integrity": "sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==",
+          "version": "7.21.2",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
+          "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==",
           "dev": true
         },
         "@babel/plugin-syntax-async-generators": {
@@ -25765,27 +25742,27 @@
           }
         },
         "@babel/traverse": {
-          "version": "7.20.13",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz",
-          "integrity": "sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==",
+          "version": "7.21.2",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz",
+          "integrity": "sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.18.6",
-            "@babel/generator": "^7.20.7",
+            "@babel/generator": "^7.21.1",
             "@babel/helper-environment-visitor": "^7.18.9",
-            "@babel/helper-function-name": "^7.19.0",
+            "@babel/helper-function-name": "^7.21.0",
             "@babel/helper-hoist-variables": "^7.18.6",
             "@babel/helper-split-export-declaration": "^7.18.6",
-            "@babel/parser": "^7.20.13",
-            "@babel/types": "^7.20.7",
+            "@babel/parser": "^7.21.2",
+            "@babel/types": "^7.21.2",
             "debug": "^4.1.0",
             "globals": "^11.1.0"
           }
         },
         "@babel/types": {
-          "version": "7.20.7",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz",
-          "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==",
+          "version": "7.21.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz",
+          "integrity": "sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==",
           "dev": true,
           "requires": {
             "@babel/helper-string-parser": "^7.19.4",
@@ -26039,26 +26016,26 @@
           "dev": true
         },
         "@jest/console": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.4.1.tgz",
-          "integrity": "sha512-m+XpwKSi3PPM9znm5NGS8bBReeAJJpSkL1OuFCqaMaJL2YX9YXLkkI+MBchMPwu+ZuM2rynL51sgfkQteQ1CKQ==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.4.3.tgz",
+          "integrity": "sha512-W/o/34+wQuXlgqlPYTansOSiBnuxrTv61dEVkA6HNmpcgHLUjfaUbdqt6oVvOzaawwo9IdW9QOtMgQ1ScSZC4A==",
           "dev": true,
           "requires": {
-            "@jest/types": "^29.4.1",
+            "@jest/types": "^29.4.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "jest-message-util": "^29.4.1",
-            "jest-util": "^29.4.1",
+            "jest-message-util": "^29.4.3",
+            "jest-util": "^29.4.3",
             "slash": "^3.0.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -26078,48 +26055,48 @@
           }
         },
         "@jest/core": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.4.1.tgz",
-          "integrity": "sha512-RXFTohpBqpaTebNdg5l3I5yadnKo9zLBajMT0I38D0tDhreVBYv3fA8kywthI00sWxPztWLD3yjiUkewwu/wKA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.4.3.tgz",
+          "integrity": "sha512-56QvBq60fS4SPZCuM7T+7scNrkGIe7Mr6PVIXUpu48ouvRaWOFqRPV91eifvFM0ay2HmfswXiGf97NGUN5KofQ==",
           "dev": true,
           "requires": {
-            "@jest/console": "^29.4.1",
-            "@jest/reporters": "^29.4.1",
-            "@jest/test-result": "^29.4.1",
-            "@jest/transform": "^29.4.1",
-            "@jest/types": "^29.4.1",
+            "@jest/console": "^29.4.3",
+            "@jest/reporters": "^29.4.3",
+            "@jest/test-result": "^29.4.3",
+            "@jest/transform": "^29.4.3",
+            "@jest/types": "^29.4.3",
             "@types/node": "*",
             "ansi-escapes": "^4.2.1",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
             "exit": "^0.1.2",
             "graceful-fs": "^4.2.9",
-            "jest-changed-files": "^29.4.0",
-            "jest-config": "^29.4.1",
-            "jest-haste-map": "^29.4.1",
-            "jest-message-util": "^29.4.1",
-            "jest-regex-util": "^29.2.0",
-            "jest-resolve": "^29.4.1",
-            "jest-resolve-dependencies": "^29.4.1",
-            "jest-runner": "^29.4.1",
-            "jest-runtime": "^29.4.1",
-            "jest-snapshot": "^29.4.1",
-            "jest-util": "^29.4.1",
-            "jest-validate": "^29.4.1",
-            "jest-watcher": "^29.4.1",
+            "jest-changed-files": "^29.4.3",
+            "jest-config": "^29.4.3",
+            "jest-haste-map": "^29.4.3",
+            "jest-message-util": "^29.4.3",
+            "jest-regex-util": "^29.4.3",
+            "jest-resolve": "^29.4.3",
+            "jest-resolve-dependencies": "^29.4.3",
+            "jest-runner": "^29.4.3",
+            "jest-runtime": "^29.4.3",
+            "jest-snapshot": "^29.4.3",
+            "jest-util": "^29.4.3",
+            "jest-validate": "^29.4.3",
+            "jest-watcher": "^29.4.3",
             "micromatch": "^4.0.4",
-            "pretty-format": "^29.4.1",
+            "pretty-format": "^29.4.3",
             "slash": "^3.0.0",
             "strip-ansi": "^6.0.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -26146,24 +26123,24 @@
           }
         },
         "@jest/environment": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.4.1.tgz",
-          "integrity": "sha512-pJ14dHGSQke7Q3mkL/UZR9ZtTOxqskZaC91NzamEH4dlKRt42W+maRBXiw/LWkdJe+P0f/zDR37+SPMplMRlPg==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.4.3.tgz",
+          "integrity": "sha512-dq5S6408IxIa+lr54zeqce+QgI+CJT4nmmA+1yzFgtcsGK8c/EyiUb9XQOgz3BMKrRDfKseeOaxj2eO8LlD3lA==",
           "dev": true,
           "requires": {
-            "@jest/fake-timers": "^29.4.1",
-            "@jest/types": "^29.4.1",
+            "@jest/fake-timers": "^29.4.3",
+            "@jest/types": "^29.4.3",
             "@types/node": "*",
-            "jest-mock": "^29.4.1"
+            "jest-mock": "^29.4.3"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -26183,45 +26160,45 @@
           }
         },
         "@jest/expect": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.4.1.tgz",
-          "integrity": "sha512-ZxKJP5DTUNF2XkpJeZIzvnzF1KkfrhEF6Rz0HGG69fHl6Bgx5/GoU3XyaeFYEjuuKSOOsbqD/k72wFvFxc3iTw==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.4.3.tgz",
+          "integrity": "sha512-iktRU/YsxEtumI9zsPctYUk7ptpC+AVLLk1Ax3AsA4g1C+8OOnKDkIQBDHtD5hA/+VtgMd5AWI5gNlcAlt2vxQ==",
           "dev": true,
           "requires": {
-            "expect": "^29.4.1",
-            "jest-snapshot": "^29.4.1"
+            "expect": "^29.4.3",
+            "jest-snapshot": "^29.4.3"
           }
         },
         "@jest/expect-utils": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.4.1.tgz",
-          "integrity": "sha512-w6YJMn5DlzmxjO00i9wu2YSozUYRBhIoJ6nQwpMYcBMtiqMGJm1QBzOf6DDgRao8dbtpDoaqLg6iiQTvv0UHhQ==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.4.3.tgz",
+          "integrity": "sha512-/6JWbkxHOP8EoS8jeeTd9dTfc9Uawi+43oLKHfp6zzux3U2hqOOVnV3ai4RpDYHOccL6g+5nrxpoc8DmJxtXVQ==",
           "dev": true,
           "requires": {
-            "jest-get-type": "^29.2.0"
+            "jest-get-type": "^29.4.3"
           }
         },
         "@jest/fake-timers": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.4.1.tgz",
-          "integrity": "sha512-/1joI6rfHFmmm39JxNfmNAO3Nwm6Y0VoL5fJDy7H1AtWrD1CgRtqJbN9Ld6rhAkGO76qqp4cwhhxJ9o9kYjQMw==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.4.3.tgz",
+          "integrity": "sha512-4Hote2MGcCTWSD2gwl0dwbCpBRHhE6olYEuTj8FMowdg3oQWNKr2YuxenPQYZ7+PfqPY1k98wKDU4Z+Hvd4Tiw==",
           "dev": true,
           "requires": {
-            "@jest/types": "^29.4.1",
+            "@jest/types": "^29.4.3",
             "@sinonjs/fake-timers": "^10.0.2",
             "@types/node": "*",
-            "jest-message-util": "^29.4.1",
-            "jest-mock": "^29.4.1",
-            "jest-util": "^29.4.1"
+            "jest-message-util": "^29.4.3",
+            "jest-mock": "^29.4.3",
+            "jest-util": "^29.4.3"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -26241,24 +26218,24 @@
           }
         },
         "@jest/globals": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.4.1.tgz",
-          "integrity": "sha512-znoK2EuFytbHH0ZSf2mQK2K1xtIgmaw4Da21R2C/NE/+NnItm5mPEFQmn8gmF3f0rfOlmZ3Y3bIf7bFj7DHxAA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.4.3.tgz",
+          "integrity": "sha512-8BQ/5EzfOLG7AaMcDh7yFCbfRLtsc+09E1RQmRBI4D6QQk4m6NSK/MXo+3bJrBN0yU8A2/VIcqhvsOLFmziioA==",
           "dev": true,
           "requires": {
-            "@jest/environment": "^29.4.1",
-            "@jest/expect": "^29.4.1",
-            "@jest/types": "^29.4.1",
-            "jest-mock": "^29.4.1"
+            "@jest/environment": "^29.4.3",
+            "@jest/expect": "^29.4.3",
+            "@jest/types": "^29.4.3",
+            "jest-mock": "^29.4.3"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -26278,16 +26255,16 @@
           }
         },
         "@jest/reporters": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.4.1.tgz",
-          "integrity": "sha512-AISY5xpt2Xpxj9R6y0RF1+O6GRy9JsGa8+vK23Lmzdy1AYcpQn5ItX79wJSsTmfzPKSAcsY1LNt/8Y5Xe5LOSg==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.4.3.tgz",
+          "integrity": "sha512-sr2I7BmOjJhyqj9ANC6CTLsL4emMoka7HkQpcoMRlhCbQJjz2zsRzw0BDPiPyEFDXAbxKgGFYuQZiSJ1Y6YoTg==",
           "dev": true,
           "requires": {
             "@bcoe/v8-coverage": "^0.2.3",
-            "@jest/console": "^29.4.1",
-            "@jest/test-result": "^29.4.1",
-            "@jest/transform": "^29.4.1",
-            "@jest/types": "^29.4.1",
+            "@jest/console": "^29.4.3",
+            "@jest/test-result": "^29.4.3",
+            "@jest/transform": "^29.4.3",
+            "@jest/types": "^29.4.3",
             "@jridgewell/trace-mapping": "^0.3.15",
             "@types/node": "*",
             "chalk": "^4.0.0",
@@ -26300,9 +26277,9 @@
             "istanbul-lib-report": "^3.0.0",
             "istanbul-lib-source-maps": "^4.0.0",
             "istanbul-reports": "^3.1.3",
-            "jest-message-util": "^29.4.1",
-            "jest-util": "^29.4.1",
-            "jest-worker": "^29.4.1",
+            "jest-message-util": "^29.4.3",
+            "jest-util": "^29.4.3",
+            "jest-worker": "^29.4.3",
             "slash": "^3.0.0",
             "string-length": "^4.0.1",
             "strip-ansi": "^6.0.0",
@@ -26310,12 +26287,12 @@
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -26335,18 +26312,18 @@
           }
         },
         "@jest/schemas": {
-          "version": "29.4.0",
-          "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.0.tgz",
-          "integrity": "sha512-0E01f/gOZeNTG76i5eWWSupvSHaIINrTie7vCyjiYFKgzNdyEGd12BUv4oNBFHOqlHDbtoJi3HrQ38KCC90NsQ==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.3.tgz",
+          "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==",
           "dev": true,
           "requires": {
             "@sinclair/typebox": "^0.25.16"
           }
         },
         "@jest/source-map": {
-          "version": "29.2.0",
-          "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.2.0.tgz",
-          "integrity": "sha512-1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.4.3.tgz",
+          "integrity": "sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==",
           "dev": true,
           "requires": {
             "@jridgewell/trace-mapping": "^0.3.15",
@@ -26355,24 +26332,24 @@
           }
         },
         "@jest/test-result": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.4.1.tgz",
-          "integrity": "sha512-WRt29Lwt+hEgfN8QDrXqXGgCTidq1rLyFqmZ4lmJOpVArC8daXrZWkWjiaijQvgd3aOUj2fM8INclKHsQW9YyQ==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.4.3.tgz",
+          "integrity": "sha512-Oi4u9NfBolMq9MASPwuWTlC5WvmNRwI4S8YrQg5R5Gi47DYlBe3sh7ILTqi/LGrK1XUE4XY9KZcQJTH1WJCLLA==",
           "dev": true,
           "requires": {
-            "@jest/console": "^29.4.1",
-            "@jest/types": "^29.4.1",
+            "@jest/console": "^29.4.3",
+            "@jest/types": "^29.4.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "collect-v8-coverage": "^1.0.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -26392,47 +26369,47 @@
           }
         },
         "@jest/test-sequencer": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.4.1.tgz",
-          "integrity": "sha512-v5qLBNSsM0eHzWLXsQ5fiB65xi49A3ILPSFQKPXzGL4Vyux0DPZAIN7NAFJa9b4BiTDP9MBF/Zqc/QA1vuiJ0w==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.4.3.tgz",
+          "integrity": "sha512-yi/t2nES4GB4G0mjLc0RInCq/cNr9dNwJxcGg8sslajua5Kb4kmozAc+qPLzplhBgfw1vLItbjyHzUN92UXicw==",
           "dev": true,
           "requires": {
-            "@jest/test-result": "^29.4.1",
+            "@jest/test-result": "^29.4.3",
             "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^29.4.1",
+            "jest-haste-map": "^29.4.3",
             "slash": "^3.0.0"
           }
         },
         "@jest/transform": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.4.1.tgz",
-          "integrity": "sha512-5w6YJrVAtiAgr0phzKjYd83UPbCXsBRTeYI4BXokv9Er9CcrH9hfXL/crCvP2d2nGOcovPUnlYiLPFLZrkG5Hg==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.4.3.tgz",
+          "integrity": "sha512-8u0+fBGWolDshsFgPQJESkDa72da/EVwvL+II0trN2DR66wMwiQ9/CihaGfHdlLGFzbBZwMykFtxuwFdZqlKwg==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.11.6",
-            "@jest/types": "^29.4.1",
+            "@jest/types": "^29.4.3",
             "@jridgewell/trace-mapping": "^0.3.15",
             "babel-plugin-istanbul": "^6.1.1",
             "chalk": "^4.0.0",
             "convert-source-map": "^2.0.0",
             "fast-json-stable-stringify": "^2.1.0",
             "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^29.4.1",
-            "jest-regex-util": "^29.2.0",
-            "jest-util": "^29.4.1",
+            "jest-haste-map": "^29.4.3",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.4.3",
             "micromatch": "^4.0.4",
             "pirates": "^4.0.4",
             "slash": "^3.0.0",
-            "write-file-atomic": "^5.0.0"
+            "write-file-atomic": "^4.0.2"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -27413,9 +27390,9 @@
           }
         },
         "@sinclair/typebox": {
-          "version": "0.25.21",
-          "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.21.tgz",
-          "integrity": "sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==",
+          "version": "0.25.24",
+          "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz",
+          "integrity": "sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==",
           "dev": true
         },
         "@sindresorhus/is": {
@@ -28661,15 +28638,15 @@
           }
         },
         "babel-jest": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.4.1.tgz",
-          "integrity": "sha512-xBZa/pLSsF/1sNpkgsiT3CmY7zV1kAsZ9OxxtrFqYucnOuRftXAfcJqcDVyOPeN4lttWTwhLdu0T9f8uvoPEUg==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.4.3.tgz",
+          "integrity": "sha512-o45Wyn32svZE+LnMVWv/Z4x0SwtLbh4FyGcYtR20kIWd+rdrDZ9Fzq8Ml3MYLD+mZvEdzCjZsCnYZ2jpJyQ+Nw==",
           "dev": true,
           "requires": {
-            "@jest/transform": "^29.4.1",
+            "@jest/transform": "^29.4.3",
             "@types/babel__core": "^7.1.14",
             "babel-plugin-istanbul": "^6.1.1",
-            "babel-preset-jest": "^29.4.0",
+            "babel-preset-jest": "^29.4.3",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.9",
             "slash": "^3.0.0"
@@ -28689,9 +28666,9 @@
           }
         },
         "babel-plugin-jest-hoist": {
-          "version": "29.4.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.4.0.tgz",
-          "integrity": "sha512-a/sZRLQJEmsmejQ2rPEUe35nO1+C9dc9O1gplH1SXmJxveQSRUYdBk8yGZG/VOUuZs1u2aHZJusEGoRMbhhwCg==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.4.3.tgz",
+          "integrity": "sha512-mB6q2q3oahKphy5V7CpnNqZOCkxxZ9aokf1eh82Dy3jQmg4xvM1tGrh5y6BQUJh4a3Pj9+eLfwvAZ7VNKg7H8Q==",
           "dev": true,
           "requires": {
             "@babel/template": "^7.3.3",
@@ -28721,12 +28698,12 @@
           }
         },
         "babel-preset-jest": {
-          "version": "29.4.0",
-          "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.4.0.tgz",
-          "integrity": "sha512-fUB9vZflUSM3dO/6M2TCAepTzvA4VkOvl67PjErcrQMGt9Eve7uazaeyCZ2th3UtI7ljpiBJES0F7A1vBRsLZA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.4.3.tgz",
+          "integrity": "sha512-gWx6COtSuma6n9bw+8/F+2PCXrIgxV/D1TJFnp6OyBK2cxPWg0K9p/sriNYeifKjpUkMViWQ09DSWtzJQRETsw==",
           "dev": true,
           "requires": {
-            "babel-plugin-jest-hoist": "^29.4.0",
+            "babel-plugin-jest-hoist": "^29.4.3",
             "babel-preset-current-node-syntax": "^1.0.0"
           }
         },
@@ -29325,9 +29302,9 @@
           "dev": true
         },
         "ci-info": {
-          "version": "3.7.1",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz",
-          "integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==",
+          "version": "3.8.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+          "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
           "dev": true
         },
         "cipher-base": {
@@ -29973,9 +29950,9 @@
           "version": "1.2.2"
         },
         "diff-sequences": {
-          "version": "29.3.1",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.3.1.tgz",
-          "integrity": "sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
+          "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
           "dev": true
         },
         "diffie-hellman": {
@@ -30556,16 +30533,16 @@
           }
         },
         "expect": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/expect/-/expect-29.4.1.tgz",
-          "integrity": "sha512-OKrGESHOaMxK3b6zxIq9SOW8kEXztKff/Dvg88j4xIJxur1hspEbedVkR3GpHe5LO+WB2Qw7OWN0RMTdp6as5A==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/expect/-/expect-29.4.3.tgz",
+          "integrity": "sha512-uC05+Q7eXECFpgDrHdXA4k2rpMyStAYPItEDLyQDo5Ta7fVkJnNA/4zh/OIVkVVNZ1oOK1PipQoyNjuZ6sz6Dg==",
           "dev": true,
           "requires": {
-            "@jest/expect-utils": "^29.4.1",
-            "jest-get-type": "^29.2.0",
-            "jest-matcher-utils": "^29.4.1",
-            "jest-message-util": "^29.4.1",
-            "jest-util": "^29.4.1"
+            "@jest/expect-utils": "^29.4.3",
+            "jest-get-type": "^29.4.3",
+            "jest-matcher-utils": "^29.4.3",
+            "jest-message-util": "^29.4.3",
+            "jest-util": "^29.4.3"
           }
         },
         "ext-list": {
@@ -31582,24 +31559,24 @@
           }
         },
         "jest": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest/-/jest-29.4.1.tgz",
-          "integrity": "sha512-cknimw7gAXPDOmj0QqztlxVtBVCw2lYY9CeIE5N6kD+kET1H4H79HSNISJmijb1HF+qk+G+ploJgiDi5k/fRlg==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest/-/jest-29.4.3.tgz",
+          "integrity": "sha512-XvK65feuEFGZT8OO0fB/QAQS+LGHvQpaadkH5p47/j3Ocqq3xf2pK9R+G0GzgfuhXVxEv76qCOOcMb5efLk6PA==",
           "dev": true,
           "requires": {
-            "@jest/core": "^29.4.1",
-            "@jest/types": "^29.4.1",
+            "@jest/core": "^29.4.3",
+            "@jest/types": "^29.4.3",
             "import-local": "^3.0.2",
-            "jest-cli": "^29.4.1"
+            "jest-cli": "^29.4.3"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -31619,9 +31596,9 @@
           }
         },
         "jest-changed-files": {
-          "version": "29.4.0",
-          "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.4.0.tgz",
-          "integrity": "sha512-rnI1oPxgFghoz32Y8eZsGJMjW54UlqT17ycQeCEktcxxwqqKdlj9afl8LNeO0Pbu+h2JQHThQP0BzS67eTRx4w==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.4.3.tgz",
+          "integrity": "sha512-Vn5cLuWuwmi2GNNbokPOEcvrXGSGrqVnPEZV7rC6P7ck07Dyw9RFnvWglnupSh+hGys0ajGtw/bc2ZgweljQoQ==",
           "dev": true,
           "requires": {
             "execa": "^5.0.0",
@@ -31629,39 +31606,39 @@
           }
         },
         "jest-circus": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.4.1.tgz",
-          "integrity": "sha512-v02NuL5crMNY4CGPHBEflLzl4v91NFb85a+dH9a1pUNx6Xjggrd8l9pPy4LZ1VYNRXlb+f65+7O/MSIbLir6pA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.4.3.tgz",
+          "integrity": "sha512-Vw/bVvcexmdJ7MLmgdT3ZjkJ3LKu8IlpefYokxiqoZy6OCQ2VAm6Vk3t/qHiAGUXbdbJKJWnc8gH3ypTbB/OBw==",
           "dev": true,
           "requires": {
-            "@jest/environment": "^29.4.1",
-            "@jest/expect": "^29.4.1",
-            "@jest/test-result": "^29.4.1",
-            "@jest/types": "^29.4.1",
+            "@jest/environment": "^29.4.3",
+            "@jest/expect": "^29.4.3",
+            "@jest/test-result": "^29.4.3",
+            "@jest/types": "^29.4.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "co": "^4.6.0",
             "dedent": "^0.7.0",
             "is-generator-fn": "^2.0.0",
-            "jest-each": "^29.4.1",
-            "jest-matcher-utils": "^29.4.1",
-            "jest-message-util": "^29.4.1",
-            "jest-runtime": "^29.4.1",
-            "jest-snapshot": "^29.4.1",
-            "jest-util": "^29.4.1",
+            "jest-each": "^29.4.3",
+            "jest-matcher-utils": "^29.4.3",
+            "jest-message-util": "^29.4.3",
+            "jest-runtime": "^29.4.3",
+            "jest-snapshot": "^29.4.3",
+            "jest-util": "^29.4.3",
             "p-limit": "^3.1.0",
-            "pretty-format": "^29.4.1",
+            "pretty-format": "^29.4.3",
             "slash": "^3.0.0",
             "stack-utils": "^2.0.3"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -31681,32 +31658,32 @@
           }
         },
         "jest-cli": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.4.1.tgz",
-          "integrity": "sha512-jz7GDIhtxQ37M+9dlbv5K+/FVcIo1O/b1sX3cJgzlQUf/3VG25nvuWzlDC4F1FLLzUThJeWLu8I7JF9eWpuURQ==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.4.3.tgz",
+          "integrity": "sha512-PiiAPuFNfWWolCE6t3ZrDXQc6OsAuM3/tVW0u27UWc1KE+n/HSn5dSE6B2juqN7WP+PP0jAcnKtGmI4u8GMYCg==",
           "dev": true,
           "requires": {
-            "@jest/core": "^29.4.1",
-            "@jest/test-result": "^29.4.1",
-            "@jest/types": "^29.4.1",
+            "@jest/core": "^29.4.3",
+            "@jest/test-result": "^29.4.3",
+            "@jest/types": "^29.4.3",
             "chalk": "^4.0.0",
             "exit": "^0.1.2",
             "graceful-fs": "^4.2.9",
             "import-local": "^3.0.2",
-            "jest-config": "^29.4.1",
-            "jest-util": "^29.4.1",
-            "jest-validate": "^29.4.1",
+            "jest-config": "^29.4.3",
+            "jest-util": "^29.4.3",
+            "jest-validate": "^29.4.3",
             "prompts": "^2.0.1",
             "yargs": "^17.3.1"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -31726,42 +31703,42 @@
           }
         },
         "jest-config": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.4.1.tgz",
-          "integrity": "sha512-g7p3q4NuXiM4hrS4XFATTkd+2z0Ml2RhFmFPM8c3WyKwVDNszbl4E7cV7WIx1YZeqqCtqbtTtZhGZWJlJqngzg==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.4.3.tgz",
+          "integrity": "sha512-eCIpqhGnIjdUCXGtLhz4gdDoxKSWXKjzNcc5r+0S1GKOp2fwOipx5mRcwa9GB/ArsxJ1jlj2lmlD9bZAsBxaWQ==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.11.6",
-            "@jest/test-sequencer": "^29.4.1",
-            "@jest/types": "^29.4.1",
-            "babel-jest": "^29.4.1",
+            "@jest/test-sequencer": "^29.4.3",
+            "@jest/types": "^29.4.3",
+            "babel-jest": "^29.4.3",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
             "deepmerge": "^4.2.2",
             "glob": "^7.1.3",
             "graceful-fs": "^4.2.9",
-            "jest-circus": "^29.4.1",
-            "jest-environment-node": "^29.4.1",
-            "jest-get-type": "^29.2.0",
-            "jest-regex-util": "^29.2.0",
-            "jest-resolve": "^29.4.1",
-            "jest-runner": "^29.4.1",
-            "jest-util": "^29.4.1",
-            "jest-validate": "^29.4.1",
+            "jest-circus": "^29.4.3",
+            "jest-environment-node": "^29.4.3",
+            "jest-get-type": "^29.4.3",
+            "jest-regex-util": "^29.4.3",
+            "jest-resolve": "^29.4.3",
+            "jest-runner": "^29.4.3",
+            "jest-util": "^29.4.3",
+            "jest-validate": "^29.4.3",
             "micromatch": "^4.0.4",
             "parse-json": "^5.2.0",
-            "pretty-format": "^29.4.1",
+            "pretty-format": "^29.4.3",
             "slash": "^3.0.0",
             "strip-json-comments": "^3.1.1"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -31781,46 +31758,46 @@
           }
         },
         "jest-diff": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.4.1.tgz",
-          "integrity": "sha512-uazdl2g331iY56CEyfbNA0Ut7Mn2ulAG5vUaEHXycf1L6IPyuImIxSz4F0VYBKi7LYIuxOwTZzK3wh5jHzASMw==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.4.3.tgz",
+          "integrity": "sha512-YB+ocenx7FZ3T5O9lMVMeLYV4265socJKtkwgk/6YUz/VsEzYDkiMuMhWzZmxm3wDRQvayJu/PjkjjSkjoHsCA==",
           "dev": true,
           "requires": {
             "chalk": "^4.0.0",
-            "diff-sequences": "^29.3.1",
-            "jest-get-type": "^29.2.0",
-            "pretty-format": "^29.4.1"
+            "diff-sequences": "^29.4.3",
+            "jest-get-type": "^29.4.3",
+            "pretty-format": "^29.4.3"
           }
         },
         "jest-docblock": {
-          "version": "29.2.0",
-          "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.2.0.tgz",
-          "integrity": "sha512-bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
+          "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
           "dev": true,
           "requires": {
             "detect-newline": "^3.0.0"
           }
         },
         "jest-each": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.4.1.tgz",
-          "integrity": "sha512-QlYFiX3llJMWUV0BtWht/esGEz9w+0i7BHwODKCze7YzZzizgExB9MOfiivF/vVT0GSQ8wXLhvHXh3x2fVD4QQ==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.4.3.tgz",
+          "integrity": "sha512-1ElHNAnKcbJb/b+L+7j0/w7bDvljw4gTv1wL9fYOczeJrbTbkMGQ5iQPFJ3eFQH19VPTx1IyfePdqSpePKss7Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^29.4.1",
+            "@jest/types": "^29.4.3",
             "chalk": "^4.0.0",
-            "jest-get-type": "^29.2.0",
-            "jest-util": "^29.4.1",
-            "pretty-format": "^29.4.1"
+            "jest-get-type": "^29.4.3",
+            "jest-util": "^29.4.3",
+            "pretty-format": "^29.4.3"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -31840,26 +31817,26 @@
           }
         },
         "jest-environment-node": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.4.1.tgz",
-          "integrity": "sha512-x/H2kdVgxSkxWAIlIh9MfMuBa0hZySmfsC5lCsWmWr6tZySP44ediRKDUiNggX/eHLH7Cd5ZN10Rw+XF5tXsqg==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.4.3.tgz",
+          "integrity": "sha512-gAiEnSKF104fsGDXNkwk49jD/0N0Bqu2K9+aMQXA6avzsA9H3Fiv1PW2D+gzbOSR705bWd2wJZRFEFpV0tXISg==",
           "dev": true,
           "requires": {
-            "@jest/environment": "^29.4.1",
-            "@jest/fake-timers": "^29.4.1",
-            "@jest/types": "^29.4.1",
+            "@jest/environment": "^29.4.3",
+            "@jest/fake-timers": "^29.4.3",
+            "@jest/types": "^29.4.3",
             "@types/node": "*",
-            "jest-mock": "^29.4.1",
-            "jest-util": "^29.4.1"
+            "jest-mock": "^29.4.3",
+            "jest-util": "^29.4.3"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -31879,38 +31856,38 @@
           }
         },
         "jest-get-type": {
-          "version": "29.2.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.2.0.tgz",
-          "integrity": "sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+          "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
           "dev": true
         },
         "jest-haste-map": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.4.1.tgz",
-          "integrity": "sha512-imTjcgfVVTvg02khXL11NNLTx9ZaofbAWhilrMg/G8dIkp+HYCswhxf0xxJwBkfhWb3e8dwbjuWburvxmcr58w==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.4.3.tgz",
+          "integrity": "sha512-eZIgAS8tvm5IZMtKlR8Y+feEOMfo2pSQkmNbufdbMzMSn9nitgGxF1waM/+LbryO3OkMcKS98SUb+j/cQxp/vQ==",
           "dev": true,
           "requires": {
-            "@jest/types": "^29.4.1",
+            "@jest/types": "^29.4.3",
             "@types/graceful-fs": "^4.1.3",
             "@types/node": "*",
             "anymatch": "^3.0.3",
             "fb-watchman": "^2.0.0",
             "fsevents": "^2.3.2",
             "graceful-fs": "^4.2.9",
-            "jest-regex-util": "^29.2.0",
-            "jest-util": "^29.4.1",
-            "jest-worker": "^29.4.1",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.4.3",
+            "jest-worker": "^29.4.3",
             "micromatch": "^4.0.4",
             "walker": "^1.0.8"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -31930,51 +31907,51 @@
           }
         },
         "jest-leak-detector": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.4.1.tgz",
-          "integrity": "sha512-akpZv7TPyGMnH2RimOCgy+hPmWZf55EyFUvymQ4LMsQP8xSPlZumCPtXGoDhFNhUE2039RApZkTQDKU79p/FiQ==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.4.3.tgz",
+          "integrity": "sha512-9yw4VC1v2NspMMeV3daQ1yXPNxMgCzwq9BocCwYrRgXe4uaEJPAN0ZK37nFBhcy3cUwEVstFecFLaTHpF7NiGA==",
           "dev": true,
           "requires": {
-            "jest-get-type": "^29.2.0",
-            "pretty-format": "^29.4.1"
+            "jest-get-type": "^29.4.3",
+            "pretty-format": "^29.4.3"
           }
         },
         "jest-matcher-utils": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.4.1.tgz",
-          "integrity": "sha512-k5h0u8V4nAEy6lSACepxL/rw78FLDkBnXhZVgFneVpnJONhb2DhZj/Gv4eNe+1XqQ5IhgUcqj745UwH0HJmMnA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.4.3.tgz",
+          "integrity": "sha512-TTciiXEONycZ03h6R6pYiZlSkvYgT0l8aa49z/DLSGYjex4orMUcafuLXYyyEDWB1RKglq00jzwY00Ei7yFNVg==",
           "dev": true,
           "requires": {
             "chalk": "^4.0.0",
-            "jest-diff": "^29.4.1",
-            "jest-get-type": "^29.2.0",
-            "pretty-format": "^29.4.1"
+            "jest-diff": "^29.4.3",
+            "jest-get-type": "^29.4.3",
+            "pretty-format": "^29.4.3"
           }
         },
         "jest-message-util": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.4.1.tgz",
-          "integrity": "sha512-H4/I0cXUaLeCw6FM+i4AwCnOwHRgitdaUFOdm49022YD5nfyr8C/DrbXOBEyJaj+w/y0gGJ57klssOaUiLLQGQ==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.4.3.tgz",
+          "integrity": "sha512-1Y8Zd4ZCN7o/QnWdMmT76If8LuDv23Z1DRovBj/vcSFNlGCJGoO8D1nJDw1AdyAGUk0myDLFGN5RbNeJyCRGCw==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^29.4.1",
+            "@jest/types": "^29.4.3",
             "@types/stack-utils": "^2.0.0",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.9",
             "micromatch": "^4.0.4",
-            "pretty-format": "^29.4.1",
+            "pretty-format": "^29.4.3",
             "slash": "^3.0.0",
             "stack-utils": "^2.0.3"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -31994,23 +31971,23 @@
           }
         },
         "jest-mock": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.4.1.tgz",
-          "integrity": "sha512-MwA4hQ7zBOcgVCVnsM8TzaFLVUD/pFWTfbkY953Y81L5ret3GFRZtmPmRFAjKQSdCKoJvvqOu6Bvfpqlwwb0dQ==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.4.3.tgz",
+          "integrity": "sha512-LjFgMg+xed9BdkPMyIJh+r3KeHt1klXPJYBULXVVAkbTaaKjPX1o1uVCAZADMEp/kOxGTwy/Ot8XbvgItOrHEg==",
           "dev": true,
           "requires": {
-            "@jest/types": "^29.4.1",
+            "@jest/types": "^29.4.3",
             "@types/node": "*",
-            "jest-util": "^29.4.1"
+            "jest-util": "^29.4.3"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -32037,74 +32014,74 @@
           "requires": {}
         },
         "jest-regex-util": {
-          "version": "29.2.0",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.2.0.tgz",
-          "integrity": "sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+          "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
           "dev": true
         },
         "jest-resolve": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.4.1.tgz",
-          "integrity": "sha512-j/ZFNV2lm9IJ2wmlq1uYK0Y/1PiyDq9g4HEGsNTNr3viRbJdV+8Lf1SXIiLZXFvyiisu0qUyIXGBnw+OKWkJwQ==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.4.3.tgz",
+          "integrity": "sha512-GPokE1tzguRyT7dkxBim4wSx6E45S3bOQ7ZdKEG+Qj0Oac9+6AwJPCk0TZh5Vu0xzeX4afpb+eDmgbmZFFwpOw==",
           "dev": true,
           "requires": {
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^29.4.1",
+            "jest-haste-map": "^29.4.3",
             "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^29.4.1",
-            "jest-validate": "^29.4.1",
+            "jest-util": "^29.4.3",
+            "jest-validate": "^29.4.3",
             "resolve": "^1.20.0",
             "resolve.exports": "^2.0.0",
             "slash": "^3.0.0"
           }
         },
         "jest-resolve-dependencies": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.4.1.tgz",
-          "integrity": "sha512-Y3QG3M1ncAMxfjbYgtqNXC5B595zmB6e//p/qpA/58JkQXu/IpLDoLeOa8YoYfsSglBKQQzNUqtfGJJT/qLmJg==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.4.3.tgz",
+          "integrity": "sha512-uvKMZAQ3nmXLH7O8WAOhS5l0iWyT3WmnJBdmIHiV5tBbdaDZ1wqtNX04FONGoaFvSOSHBJxnwAVnSn1WHdGVaw==",
           "dev": true,
           "requires": {
-            "jest-regex-util": "^29.2.0",
-            "jest-snapshot": "^29.4.1"
+            "jest-regex-util": "^29.4.3",
+            "jest-snapshot": "^29.4.3"
           }
         },
         "jest-runner": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.4.1.tgz",
-          "integrity": "sha512-8d6XXXi7GtHmsHrnaqBKWxjKb166Eyj/ksSaUYdcBK09VbjPwIgWov1VwSmtupCIz8q1Xv4Qkzt/BTo3ZqiCeg==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.4.3.tgz",
+          "integrity": "sha512-GWPTEiGmtHZv1KKeWlTX9SIFuK19uLXlRQU43ceOQ2hIfA5yPEJC7AMkvFKpdCHx6pNEdOD+2+8zbniEi3v3gA==",
           "dev": true,
           "requires": {
-            "@jest/console": "^29.4.1",
-            "@jest/environment": "^29.4.1",
-            "@jest/test-result": "^29.4.1",
-            "@jest/transform": "^29.4.1",
-            "@jest/types": "^29.4.1",
+            "@jest/console": "^29.4.3",
+            "@jest/environment": "^29.4.3",
+            "@jest/test-result": "^29.4.3",
+            "@jest/transform": "^29.4.3",
+            "@jest/types": "^29.4.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "emittery": "^0.13.1",
             "graceful-fs": "^4.2.9",
-            "jest-docblock": "^29.2.0",
-            "jest-environment-node": "^29.4.1",
-            "jest-haste-map": "^29.4.1",
-            "jest-leak-detector": "^29.4.1",
-            "jest-message-util": "^29.4.1",
-            "jest-resolve": "^29.4.1",
-            "jest-runtime": "^29.4.1",
-            "jest-util": "^29.4.1",
-            "jest-watcher": "^29.4.1",
-            "jest-worker": "^29.4.1",
+            "jest-docblock": "^29.4.3",
+            "jest-environment-node": "^29.4.3",
+            "jest-haste-map": "^29.4.3",
+            "jest-leak-detector": "^29.4.3",
+            "jest-message-util": "^29.4.3",
+            "jest-resolve": "^29.4.3",
+            "jest-runtime": "^29.4.3",
+            "jest-util": "^29.4.3",
+            "jest-watcher": "^29.4.3",
+            "jest-worker": "^29.4.3",
             "p-limit": "^3.1.0",
             "source-map-support": "0.5.13"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -32134,43 +32111,42 @@
           }
         },
         "jest-runtime": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.4.1.tgz",
-          "integrity": "sha512-UXTMU9uKu2GjYwTtoAw5rn4STxWw/nadOfW7v1sx6LaJYa3V/iymdCLQM6xy3+7C6mY8GfX22vKpgxY171UIoA==",
-          "dev": true,
-          "requires": {
-            "@jest/environment": "^29.4.1",
-            "@jest/fake-timers": "^29.4.1",
-            "@jest/globals": "^29.4.1",
-            "@jest/source-map": "^29.2.0",
-            "@jest/test-result": "^29.4.1",
-            "@jest/transform": "^29.4.1",
-            "@jest/types": "^29.4.1",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.4.3.tgz",
+          "integrity": "sha512-F5bHvxSH+LvLV24vVB3L8K467dt3y3dio6V3W89dUz9nzvTpqd/HcT9zfYKL2aZPvD63vQFgLvaUX/UpUhrP6Q==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^29.4.3",
+            "@jest/fake-timers": "^29.4.3",
+            "@jest/globals": "^29.4.3",
+            "@jest/source-map": "^29.4.3",
+            "@jest/test-result": "^29.4.3",
+            "@jest/transform": "^29.4.3",
+            "@jest/types": "^29.4.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "cjs-module-lexer": "^1.0.0",
             "collect-v8-coverage": "^1.0.0",
             "glob": "^7.1.3",
             "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^29.4.1",
-            "jest-message-util": "^29.4.1",
-            "jest-mock": "^29.4.1",
-            "jest-regex-util": "^29.2.0",
-            "jest-resolve": "^29.4.1",
-            "jest-snapshot": "^29.4.1",
-            "jest-util": "^29.4.1",
-            "semver": "^7.3.5",
+            "jest-haste-map": "^29.4.3",
+            "jest-message-util": "^29.4.3",
+            "jest-mock": "^29.4.3",
+            "jest-regex-util": "^29.4.3",
+            "jest-resolve": "^29.4.3",
+            "jest-snapshot": "^29.4.3",
+            "jest-util": "^29.4.3",
             "slash": "^3.0.0",
             "strip-bom": "^4.0.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -32186,22 +32162,13 @@
               "requires": {
                 "@types/yargs-parser": "*"
               }
-            },
-            "semver": {
-              "version": "7.3.8",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-              "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-              "dev": true,
-              "requires": {
-                "lru-cache": "^6.0.0"
-              }
             }
           }
         },
         "jest-snapshot": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.4.1.tgz",
-          "integrity": "sha512-l4iV8EjGgQWVz3ee/LR9sULDk2pCkqb71bjvlqn+qp90lFwpnulHj4ZBT8nm1hA1C5wowXLc7MGnw321u0tsYA==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.4.3.tgz",
+          "integrity": "sha512-NGlsqL0jLPDW91dz304QTM/SNO99lpcSYYAjNiX0Ou+sSGgkanKBcSjCfp/pqmiiO1nQaOyLp6XQddAzRcx3Xw==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.11.6",
@@ -32210,33 +32177,33 @@
             "@babel/plugin-syntax-typescript": "^7.7.2",
             "@babel/traverse": "^7.7.2",
             "@babel/types": "^7.3.3",
-            "@jest/expect-utils": "^29.4.1",
-            "@jest/transform": "^29.4.1",
-            "@jest/types": "^29.4.1",
+            "@jest/expect-utils": "^29.4.3",
+            "@jest/transform": "^29.4.3",
+            "@jest/types": "^29.4.3",
             "@types/babel__traverse": "^7.0.6",
             "@types/prettier": "^2.1.5",
             "babel-preset-current-node-syntax": "^1.0.0",
             "chalk": "^4.0.0",
-            "expect": "^29.4.1",
+            "expect": "^29.4.3",
             "graceful-fs": "^4.2.9",
-            "jest-diff": "^29.4.1",
-            "jest-get-type": "^29.2.0",
-            "jest-haste-map": "^29.4.1",
-            "jest-matcher-utils": "^29.4.1",
-            "jest-message-util": "^29.4.1",
-            "jest-util": "^29.4.1",
+            "jest-diff": "^29.4.3",
+            "jest-get-type": "^29.4.3",
+            "jest-haste-map": "^29.4.3",
+            "jest-matcher-utils": "^29.4.3",
+            "jest-message-util": "^29.4.3",
+            "jest-util": "^29.4.3",
             "natural-compare": "^1.4.0",
-            "pretty-format": "^29.4.1",
+            "pretty-format": "^29.4.3",
             "semver": "^7.3.5"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -32265,12 +32232,12 @@
           }
         },
         "jest-util": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.4.1.tgz",
-          "integrity": "sha512-bQy9FPGxVutgpN4VRc0hk6w7Hx/m6L53QxpDreTZgJd9gfx/AV2MjyPde9tGyZRINAUrSv57p2inGBu2dRLmkQ==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.4.3.tgz",
+          "integrity": "sha512-ToSGORAz4SSSoqxDSylWX8JzkOQR7zoBtNRsA7e+1WUX5F8jrOwaNpuh1YfJHJKDHXLHmObv5eOjejUd+/Ws+Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^29.4.1",
+            "@jest/types": "^29.4.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
@@ -32279,12 +32246,12 @@
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -32304,26 +32271,26 @@
           }
         },
         "jest-validate": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.4.1.tgz",
-          "integrity": "sha512-qNZXcZQdIQx4SfUB/atWnI4/I2HUvhz8ajOSYUu40CSmf9U5emil8EDHgE7M+3j9/pavtk3knlZBDsgFvv/SWw==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.4.3.tgz",
+          "integrity": "sha512-J3u5v7aPQoXPzaar6GndAVhdQcZr/3osWSgTeKg5v574I9ybX/dTyH0AJFb5XgXIB7faVhf+rS7t4p3lL9qFaw==",
           "dev": true,
           "requires": {
-            "@jest/types": "^29.4.1",
+            "@jest/types": "^29.4.3",
             "camelcase": "^6.2.0",
             "chalk": "^4.0.0",
-            "jest-get-type": "^29.2.0",
+            "jest-get-type": "^29.4.3",
             "leven": "^3.1.0",
-            "pretty-format": "^29.4.1"
+            "pretty-format": "^29.4.3"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -32349,28 +32316,28 @@
           }
         },
         "jest-watcher": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.4.1.tgz",
-          "integrity": "sha512-vFOzflGFs27nU6h8dpnVRER3O2rFtL+VMEwnG0H3KLHcllLsU8y9DchSh0AL/Rg5nN1/wSiQ+P4ByMGpuybaVw==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.4.3.tgz",
+          "integrity": "sha512-zwlXH3DN3iksoIZNk73etl1HzKyi5FuQdYLnkQKm5BW4n8HpoG59xSwpVdFrnh60iRRaRBGw0gcymIxjJENPcA==",
           "dev": true,
           "requires": {
-            "@jest/test-result": "^29.4.1",
-            "@jest/types": "^29.4.1",
+            "@jest/test-result": "^29.4.3",
+            "@jest/types": "^29.4.3",
             "@types/node": "*",
             "ansi-escapes": "^4.2.1",
             "chalk": "^4.0.0",
             "emittery": "^0.13.1",
-            "jest-util": "^29.4.1",
+            "jest-util": "^29.4.3",
             "string-length": "^4.0.1"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.1",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.1.tgz",
-              "integrity": "sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==",
+              "version": "29.4.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
+              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
               "dev": true,
               "requires": {
-                "@jest/schemas": "^29.4.0",
+                "@jest/schemas": "^29.4.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
@@ -32390,13 +32357,13 @@
           }
         },
         "jest-worker": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.4.1.tgz",
-          "integrity": "sha512-O9doU/S1EBe+yp/mstQ0VpPwpv0Clgn68TkNwGxL6/usX/KUW9Arnn4ag8C3jc6qHcXznhsT5Na1liYzAsuAbQ==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.4.3.tgz",
+          "integrity": "sha512-GLHN/GTAAMEy5BFdvpUfzr9Dr80zQqBrh0fz1mtRMe05hqP45+HfQltu7oTBfduD0UeZs09d+maFtFYAXFWvAA==",
           "dev": true,
           "requires": {
             "@types/node": "*",
-            "jest-util": "^29.4.1",
+            "jest-util": "^29.4.3",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           },
@@ -33989,12 +33956,12 @@
           }
         },
         "pretty-format": {
-          "version": "29.4.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.4.1.tgz",
-          "integrity": "sha512-dt/Z761JUVsrIKaY215o1xQJBGlSmTx/h4cSqXqjHLnU1+Kt+mavVE7UgqJJO5ukx5HjSswHfmXz4LjS2oIJfg==",
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.4.3.tgz",
+          "integrity": "sha512-cvpcHTc42lcsvOOAzd3XuNWTcvk1Jmnzqeu+WsOuiPmxUJTnkbAcFNsRKvEpBEUFVUgy/GTZLulZDcDEi+CIlA==",
           "dev": true,
           "requires": {
-            "@jest/schemas": "^29.4.0",
+            "@jest/schemas": "^29.4.3",
             "ansi-styles": "^5.0.0",
             "react-is": "^18.0.0"
           },
@@ -35570,9 +35537,9 @@
           "dev": true
         },
         "v8-to-istanbul": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz",
-          "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==",
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
+          "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
           "dev": true,
           "requires": {
             "@jridgewell/trace-mapping": "^0.3.12",
@@ -36341,9 +36308,9 @@
           "dev": true
         },
         "write-file-atomic": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.0.tgz",
-          "integrity": "sha512-R7NYMnHSlV42K54lwY9lvW6MnSm1HSJqZL3xiSgi9E7//FYaI74r2G0rd+/X6VAMkHEdzxQaU5HUOXWUz5kA/w==",
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+          "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
           "dev": true,
           "requires": {
             "imurmurhash": "^0.1.4",
@@ -36879,9 +36846,9 @@
       "dev": true
     },
     "v8-to-istanbul": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz",
-      "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
+      "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
       "dev": true,
       "requires": {
         "@jridgewell/trace-mapping": "^0.3.12",
@@ -37650,9 +37617,9 @@
       "dev": true
     },
     "write-file-atomic": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.0.tgz",
-      "integrity": "sha512-R7NYMnHSlV42K54lwY9lvW6MnSm1HSJqZL3xiSgi9E7//FYaI74r2G0rd+/X6VAMkHEdzxQaU5HUOXWUz5kA/w==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
       "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4",
diff --git a/package.json b/package.json
index 44d63cf486dc..8fa34a02f2e7 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "postcss-import": "^14.1.0",
     "postcss-js": "^4.0.1",
     "postcss-load-config": "^3.1.4",
-    "postcss-nested": "6.0.0",
+    "postcss-nested": "6.0.1",
     "postcss-selector-parser": "^6.0.11",
     "postcss-value-parser": "^4.2.0",
     "quick-lru": "^5.1.1",

From 0c9b3f93335b3137282b9646e25606d27079b83b Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Mon, 27 Feb 2023 06:27:56 +0000
Subject: [PATCH 27/84] Update esbuild to version 0.17.10

---
 package-lock.json | 23 ++++++++++++++---------
 package.json      |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f94ef37113a3..36f13adc8af6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
         "postcss-import": "^14.1.0",
         "postcss-js": "^4.0.1",
         "postcss-load-config": "^3.1.4",
-        "postcss-nested": "6.0.0",
+        "postcss-nested": "6.0.1",
         "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
         "quick-lru": "^5.1.1",
@@ -11858,10 +11858,11 @@
       }
     },
     "node_modules/postcss-nested": {
-      "version": "6.0.0",
-      "license": "MIT",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
+      "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
+        "postcss-selector-parser": "^6.0.11"
       },
       "engines": {
         "node": ">=12.0"
@@ -23974,9 +23975,11 @@
       }
     },
     "postcss-nested": {
-      "version": "6.0.0",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
+      "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
       "requires": {
-        "postcss-selector-parser": "^6.0.10"
+        "postcss-selector-parser": "^6.0.11"
       }
     },
     "postcss-normalize-charset": {
@@ -25322,7 +25325,7 @@
         "postcss-import": "^14.1.0",
         "postcss-js": "^4.0.1",
         "postcss-load-config": "^3.1.4",
-        "postcss-nested": "6.0.0",
+        "postcss-nested": "6.0.1",
         "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
         "prettier": "^2.8.4",
@@ -33749,9 +33752,11 @@
           }
         },
         "postcss-nested": {
-          "version": "6.0.0",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
+          "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
           "requires": {
-            "postcss-selector-parser": "^6.0.10"
+            "postcss-selector-parser": "^6.0.11"
           }
         },
         "postcss-normalize-charset": {
diff --git a/package.json b/package.json
index 8fa34a02f2e7..fca0cd9fc42d 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "autoprefixer": "^10.4.13",
     "concurrently": "^7.5.0",
     "cssnano": "^5.1.15",
-    "esbuild": "^0.17.4",
+    "esbuild": "^0.17.10",
     "eslint": "^8.34.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",

From 1874798bddf1ffbdc3abd8a7cb16a02fd42856ae Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Tue, 28 Feb 2023 16:50:06 +0100
Subject: [PATCH 28/84] Ensure CLI builds have a non-zero exit code on failure
 (#10703)

* ensure simple builds have a non-zero exit code on failure

This is not used for the watcher.

* update changelog
---
 CHANGELOG.md                  | 1 +
 src/cli/build/index.js        | 5 ++++-
 src/cli/build/plugin.js       | 6 +++++-
 src/oxide/cli/build/index.ts  | 5 ++++-
 src/oxide/cli/build/plugin.ts | 6 +++++-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 449ccc635fa1..e7a9320ca13c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Disallow multiple selectors in arbitrary variants ([#10655](https://github.com/tailwindlabs/tailwindcss/pull/10655))
 - Sort class lists deterministically for Prettier plugin ([#10672](https://github.com/tailwindlabs/tailwindcss/pull/10672))
+- Ensure CLI builds have a non-zero exit code on failure ([#10703](https://github.com/tailwindlabs/tailwindcss/pull/10703))
 
 ### Changed
 
diff --git a/src/cli/build/index.js b/src/cli/build/index.js
index c75b719da8eb..ebb4aa38b6bf 100644
--- a/src/cli/build/index.js
+++ b/src/cli/build/index.js
@@ -44,6 +44,9 @@ export async function build(args, configs) {
 
     await processor.watch()
   } else {
-    await processor.build()
+    await processor.build().catch((e) => {
+      console.error(e)
+      process.exit(1)
+    })
   }
 }
diff --git a/src/cli/build/plugin.js b/src/cli/build/plugin.js
index 251f470220cd..893a8c955c6f 100644
--- a/src/cli/build/plugin.js
+++ b/src/cli/build/plugin.js
@@ -383,7 +383,11 @@ export async function createProcessor(args, cliConfigPath) {
           // The watcher will start watching the imported CSS files and will be
           // resilient to future errors.
 
-          console.error(err)
+          if (state.watcher) {
+            console.error(err)
+          } else {
+            return Promise.reject(err)
+          }
         }
       )
   }
diff --git a/src/oxide/cli/build/index.ts b/src/oxide/cli/build/index.ts
index 79a5463a8332..b7fb2d93294b 100644
--- a/src/oxide/cli/build/index.ts
+++ b/src/oxide/cli/build/index.ts
@@ -42,6 +42,9 @@ export async function build(args, configs) {
 
     await processor.watch()
   } else {
-    await processor.build()
+    await processor.build().catch((e) => {
+      console.error(e)
+      process.exit(1)
+    })
   }
 }
diff --git a/src/oxide/cli/build/plugin.ts b/src/oxide/cli/build/plugin.ts
index f61eadc15fe4..bea85a09c838 100644
--- a/src/oxide/cli/build/plugin.ts
+++ b/src/oxide/cli/build/plugin.ts
@@ -380,7 +380,11 @@ export async function createProcessor(args, cliConfigPath) {
           // The watcher will start watching the imported CSS files and will be
           // resilient to future errors.
 
-          console.error(err)
+          if (state.watcher) {
+            console.error(err)
+          } else {
+            return Promise.reject(err)
+          }
         }
       )
   }

From 52ca21bceabe9dadf55f413d18d4cf16a484c676 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 02:13:38 +0000
Subject: [PATCH 29/84] Update sass to version 1.58.3

---
 integrations/rollup-sass/package.json |   2 +-
 package-lock.json                     | 582 +++++++++++++-------------
 2 files changed, 292 insertions(+), 292 deletions(-)

diff --git a/integrations/rollup-sass/package.json b/integrations/rollup-sass/package.json
index 5f2875f21c83..813df77564c0 100644
--- a/integrations/rollup-sass/package.json
+++ b/integrations/rollup-sass/package.json
@@ -16,6 +16,6 @@
   "devDependencies": {
     "rollup": "^3.15.0",
     "rollup-plugin-postcss": "^4.0.2",
-    "sass": "^1.58.0"
+    "sass": "^1.58.3"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 36f13adc8af6..2fcc3339edbf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -52,7 +52,7 @@
         "autoprefixer": "^10.4.13",
         "concurrently": "^7.5.0",
         "cssnano": "^5.1.15",
-        "esbuild": "^0.17.4",
+        "esbuild": "^0.17.10",
         "eslint": "^8.34.0",
         "eslint-config-prettier": "^8.6.0",
         "eslint-plugin-prettier": "^4.2.1",
@@ -107,7 +107,7 @@
       "devDependencies": {
         "rollup": "^3.15.0",
         "rollup-plugin-postcss": "^4.0.2",
-        "sass": "^1.58.0"
+        "sass": "1.58.3"
       }
     },
     "integrations/tailwindcss-cli": {
@@ -1174,9 +1174,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.5.tgz",
-      "integrity": "sha512-crmPUzgCmF+qZXfl1YkiFoUta2XAfixR1tEnr/gXIixE+WL8Z0BGqfydP5oox0EUOgQMMRgtATtakyAcClQVqQ==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.10.tgz",
+      "integrity": "sha512-7YEBfZ5lSem9Tqpsz+tjbdsEshlO9j/REJrfv4DXgKTt1+/MHqGwbtlyxQuaSlMeUZLxUKBaX8wdzlTfHkmnLw==",
       "cpu": [
         "arm"
       ],
@@ -1190,9 +1190,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.5.tgz",
-      "integrity": "sha512-KHWkDqYAMmKZjY4RAN1PR96q6UOtfkWlTS8uEwWxdLtkRt/0F/csUhXIrVfaSIFxnscIBMPynGfhsMwQDRIBQw==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.10.tgz",
+      "integrity": "sha512-ht1P9CmvrPF5yKDtyC+z43RczVs4rrHpRqrmIuoSvSdn44Fs1n6DGlpZKdK6rM83pFLbVaSUwle8IN+TPmkv7g==",
       "cpu": [
         "arm64"
       ],
@@ -1206,9 +1206,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.5.tgz",
-      "integrity": "sha512-8fI/AnIdmWz/+1iza2WrCw8kwXK9wZp/yZY/iS8ioC+U37yJCeppi9EHY05ewJKN64ASoBIseufZROtcFnX5GA==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.10.tgz",
+      "integrity": "sha512-CYzrm+hTiY5QICji64aJ/xKdN70IK8XZ6iiyq0tZkd3tfnwwSWTYH1t3m6zyaaBxkuj40kxgMyj1km/NqdjQZA==",
       "cpu": [
         "x64"
       ],
@@ -1222,9 +1222,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.5.tgz",
-      "integrity": "sha512-EAvaoyIySV6Iif3NQCglUNpnMfHSUgC5ugt2efl3+QDntucJe5spn0udNZjTgNi6tKVqSceOw9tQ32liNZc1Xw==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.10.tgz",
+      "integrity": "sha512-3HaGIowI+nMZlopqyW6+jxYr01KvNaLB5znXfbyyjuo4lE0VZfvFGcguIJapQeQMS4cX/NEispwOekJt3gr5Dg==",
       "cpu": [
         "arm64"
       ],
@@ -1238,9 +1238,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.5.tgz",
-      "integrity": "sha512-ha7QCJh1fuSwwCgoegfdaljowwWozwTDjBgjD3++WAy/qwee5uUi1gvOg2WENJC6EUyHBOkcd3YmLDYSZ2TPPA==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.10.tgz",
+      "integrity": "sha512-J4MJzGchuCRG5n+B4EHpAMoJmBeAE1L3wGYDIN5oWNqX0tEr7VKOzw0ymSwpoeSpdCa030lagGUfnfhS7OvzrQ==",
       "cpu": [
         "x64"
       ],
@@ -1254,9 +1254,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.5.tgz",
-      "integrity": "sha512-VbdXJkn2aI2pQ/wxNEjEcnEDwPpxt3CWWMFYmO7CcdFBoOsABRy2W8F3kjbF9F/pecEUDcI3b5i2w+By4VQFPg==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.10.tgz",
+      "integrity": "sha512-ZkX40Z7qCbugeK4U5/gbzna/UQkM9d9LNV+Fro8r7HA7sRof5Rwxc46SsqeMvB5ZaR0b1/ITQ/8Y1NmV2F0fXQ==",
       "cpu": [
         "arm64"
       ],
@@ -1270,9 +1270,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.5.tgz",
-      "integrity": "sha512-olgGYND1/XnnWxwhjtY3/ryjOG/M4WfcA6XH8dBTH1cxMeBemMODXSFhkw71Kf4TeZFFTN25YOomaNh0vq2iXg==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.10.tgz",
+      "integrity": "sha512-0m0YX1IWSLG9hWh7tZa3kdAugFbZFFx9XrvfpaCMMvrswSTvUZypp0NFKriUurHpBA3xsHVE9Qb/0u2Bbi/otg==",
       "cpu": [
         "x64"
       ],
@@ -1286,9 +1286,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.5.tgz",
-      "integrity": "sha512-YBdCyQwA3OQupi6W2/WO4FnI+NWFWe79cZEtlbqSESOHEg7a73htBIRiE6uHPQe7Yp5E4aALv+JxkRLGEUL7tw==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.10.tgz",
+      "integrity": "sha512-whRdrrl0X+9D6o5f0sTZtDM9s86Xt4wk1bf7ltx6iQqrIIOH+sre1yjpcCdrVXntQPCNw/G+XqsD4HuxeS+2QA==",
       "cpu": [
         "arm"
       ],
@@ -1302,9 +1302,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.5.tgz",
-      "integrity": "sha512-8a0bqSwu3OlLCfu2FBbDNgQyBYdPJh1B9PvNX7jMaKGC9/KopgHs37t+pQqeMLzcyRqG6z55IGNQAMSlCpBuqg==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.10.tgz",
+      "integrity": "sha512-g1EZJR1/c+MmCgVwpdZdKi4QAJ8DCLP5uTgLWSAVd9wlqk9GMscaNMEViG3aE1wS+cNMzXXgdWiW/VX4J+5nTA==",
       "cpu": [
         "arm64"
       ],
@@ -1318,9 +1318,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.5.tgz",
-      "integrity": "sha512-uCwm1r/+NdP7vndctgq3PoZrnmhmnecWAr114GWMRwg2QMFFX+kIWnp7IO220/JLgnXK/jP7VKAFBGmeOYBQYQ==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.10.tgz",
+      "integrity": "sha512-1vKYCjfv/bEwxngHERp7huYfJ4jJzldfxyfaF7hc3216xiDA62xbXJfRlradiMhGZbdNLj2WA1YwYFzs9IWNPw==",
       "cpu": [
         "ia32"
       ],
@@ -1334,9 +1334,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.5.tgz",
-      "integrity": "sha512-3YxhSBl5Sb6TtBjJu+HP93poBruFzgXmf3PVfIe4xOXMj1XpxboYZyw3W8BhoX/uwxzZz4K1I99jTE/5cgDT1g==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.10.tgz",
+      "integrity": "sha512-mvwAr75q3Fgc/qz3K6sya3gBmJIYZCgcJ0s7XshpoqIAIBszzfXsqhpRrRdVFAyV1G9VUjj7VopL2HnAS8aHFA==",
       "cpu": [
         "loong64"
       ],
@@ -1350,9 +1350,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.5.tgz",
-      "integrity": "sha512-Hy5Z0YVWyYHdtQ5mfmfp8LdhVwGbwVuq8mHzLqrG16BaMgEmit2xKO+iDakHs+OetEx0EN/2mUzDdfdktI+Nmg==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.10.tgz",
+      "integrity": "sha512-XilKPgM2u1zR1YuvCsFQWl9Fc35BqSqktooumOY2zj7CSn5czJn279j9TE1JEqSqz88izJo7yE4x3LSf7oxHzg==",
       "cpu": [
         "mips64el"
       ],
@@ -1366,9 +1366,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.5.tgz",
-      "integrity": "sha512-5dbQvBLbU/Y3Q4ABc9gi23hww1mQcM7KZ9KBqabB7qhJswYMf8WrDDOSw3gdf3p+ffmijMd28mfVMvFucuECyg==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.10.tgz",
+      "integrity": "sha512-kM4Rmh9l670SwjlGkIe7pYWezk8uxKHX4Lnn5jBZYBNlWpKMBCVfpAgAJqp5doLobhzF3l64VZVrmGeZ8+uKmQ==",
       "cpu": [
         "ppc64"
       ],
@@ -1382,9 +1382,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.5.tgz",
-      "integrity": "sha512-fp/KUB/ZPzEWGTEUgz9wIAKCqu7CjH1GqXUO2WJdik1UNBQ7Xzw7myIajpxztE4Csb9504ERiFMxZg5KZ6HlZQ==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.10.tgz",
+      "integrity": "sha512-r1m9ZMNJBtOvYYGQVXKy+WvWd0BPvSxMsVq8Hp4GzdMBQvfZRvRr5TtX/1RdN6Va8JMVQGpxqde3O+e8+khNJQ==",
       "cpu": [
         "riscv64"
       ],
@@ -1398,9 +1398,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.5.tgz",
-      "integrity": "sha512-kRV3yw19YDqHTp8SfHXfObUFXlaiiw4o2lvT1XjsPZ++22GqZwSsYWJLjMi1Sl7j9qDlDUduWDze/nQx0d6Lzw==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.10.tgz",
+      "integrity": "sha512-LsY7QvOLPw9WRJ+fU5pNB3qrSfA00u32ND5JVDrn/xG5hIQo3kvTxSlWFRP0NJ0+n6HmhPGG0Q4jtQsb6PFoyg==",
       "cpu": [
         "s390x"
       ],
@@ -1414,9 +1414,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.5.tgz",
-      "integrity": "sha512-vnxuhh9e4pbtABNLbT2ANW4uwQ/zvcHRCm1JxaYkzSehugoFd5iXyC4ci1nhXU13mxEwCnrnTIiiSGwa/uAF1g==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.10.tgz",
+      "integrity": "sha512-zJUfJLebCYzBdIz/Z9vqwFjIA7iSlLCFvVi7glMgnu2MK7XYigwsonXshy9wP9S7szF+nmwrelNaP3WGanstEg==",
       "cpu": [
         "x64"
       ],
@@ -1430,9 +1430,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.5.tgz",
-      "integrity": "sha512-cigBpdiSx/vPy7doUyImsQQBnBjV5f1M99ZUlaJckDAJjgXWl6y9W17FIfJTy8TxosEF6MXq+fpLsitMGts2nA==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.10.tgz",
+      "integrity": "sha512-lOMkailn4Ok9Vbp/q7uJfgicpDTbZFlXlnKT2DqC8uBijmm5oGtXAJy2ZZVo5hX7IOVXikV9LpCMj2U8cTguWA==",
       "cpu": [
         "x64"
       ],
@@ -1446,9 +1446,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.5.tgz",
-      "integrity": "sha512-VdqRqPVIjjZfkf40LrqOaVuhw9EQiAZ/GNCSM2UplDkaIzYVsSnycxcFfAnHdWI8Gyt6dO15KHikbpxwx+xHbw==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.10.tgz",
+      "integrity": "sha512-/VE0Kx6y7eekqZ+ZLU4AjMlB80ov9tEz4H067Y0STwnGOYL8CsNg4J+cCmBznk1tMpxMoUOf0AbWlb1d2Pkbig==",
       "cpu": [
         "x64"
       ],
@@ -1462,9 +1462,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.5.tgz",
-      "integrity": "sha512-ItxPaJ3MBLtI4nK+mALLEoUs6amxsx+J1ibnfcYMkqaCqHST1AkF4aENpBehty3czqw64r/XqL+W9WqU6kc2Qw==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.10.tgz",
+      "integrity": "sha512-ERNO0838OUm8HfUjjsEs71cLjLMu/xt6bhOlxcJ0/1MG3hNqCmbWaS+w/8nFLa0DDjbwZQuGKVtCUJliLmbVgg==",
       "cpu": [
         "x64"
       ],
@@ -1478,9 +1478,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.5.tgz",
-      "integrity": "sha512-4u2Q6qsJTYNFdS9zHoAi80spzf78C16m2wla4eJPh4kSbRv+BpXIfl6TmBSWupD8e47B1NrTfrOlEuco7mYQtg==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.10.tgz",
+      "integrity": "sha512-fXv+L+Bw2AeK+XJHwDAQ9m3NRlNemG6Z6ijLwJAAVdu4cyoFbBWbEtyZzDeL+rpG2lWI51cXeMt70HA8g2MqIg==",
       "cpu": [
         "arm64"
       ],
@@ -1494,9 +1494,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.5.tgz",
-      "integrity": "sha512-KYlm+Xu9TXsfTWAcocLuISRtqxKp/Y9ZBVg6CEEj0O5J9mn7YvBKzAszo2j1ndyzUPk+op+Tie2PJeN+BnXGqQ==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.10.tgz",
+      "integrity": "sha512-3s+HADrOdCdGOi5lnh5DMQEzgbsFsd4w57L/eLKKjMnN0CN4AIEP0DCP3F3N14xnxh3ruNc32A0Na9zYe1Z/AQ==",
       "cpu": [
         "ia32"
       ],
@@ -1510,9 +1510,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.5.tgz",
-      "integrity": "sha512-XgA9qWRqby7xdYXuF6KALsn37QGBMHsdhmnpjfZtYxKxbTOwfnDM6MYi2WuUku5poNaX2n9XGVr20zgT/2QwCw==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.10.tgz",
+      "integrity": "sha512-oP+zFUjYNaMNmjTwlFtWep85hvwUu19cZklB3QsBOcZSs6y7hmH4LNCJ7075bsqzYaNvZFXJlAVaQ2ApITDXtw==",
       "cpu": [
         "x64"
       ],
@@ -6843,9 +6843,9 @@
       "dev": true
     },
     "node_modules/esbuild": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.5.tgz",
-      "integrity": "sha512-Bu6WLCc9NMsNoMJUjGl3yBzTjVLXdysMltxQWiLAypP+/vQrf+3L1Xe8fCXzxaECus2cEJ9M7pk4yKatEwQMqQ==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.10.tgz",
+      "integrity": "sha512-n7V3v29IuZy5qgxx25TKJrEm0FHghAlS6QweUcyIgh/U0zYmQcvogWROitrTyZId1mHSkuhhuyEXtI9OXioq7A==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -6855,28 +6855,28 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/android-arm": "0.17.5",
-        "@esbuild/android-arm64": "0.17.5",
-        "@esbuild/android-x64": "0.17.5",
-        "@esbuild/darwin-arm64": "0.17.5",
-        "@esbuild/darwin-x64": "0.17.5",
-        "@esbuild/freebsd-arm64": "0.17.5",
-        "@esbuild/freebsd-x64": "0.17.5",
-        "@esbuild/linux-arm": "0.17.5",
-        "@esbuild/linux-arm64": "0.17.5",
-        "@esbuild/linux-ia32": "0.17.5",
-        "@esbuild/linux-loong64": "0.17.5",
-        "@esbuild/linux-mips64el": "0.17.5",
-        "@esbuild/linux-ppc64": "0.17.5",
-        "@esbuild/linux-riscv64": "0.17.5",
-        "@esbuild/linux-s390x": "0.17.5",
-        "@esbuild/linux-x64": "0.17.5",
-        "@esbuild/netbsd-x64": "0.17.5",
-        "@esbuild/openbsd-x64": "0.17.5",
-        "@esbuild/sunos-x64": "0.17.5",
-        "@esbuild/win32-arm64": "0.17.5",
-        "@esbuild/win32-ia32": "0.17.5",
-        "@esbuild/win32-x64": "0.17.5"
+        "@esbuild/android-arm": "0.17.10",
+        "@esbuild/android-arm64": "0.17.10",
+        "@esbuild/android-x64": "0.17.10",
+        "@esbuild/darwin-arm64": "0.17.10",
+        "@esbuild/darwin-x64": "0.17.10",
+        "@esbuild/freebsd-arm64": "0.17.10",
+        "@esbuild/freebsd-x64": "0.17.10",
+        "@esbuild/linux-arm": "0.17.10",
+        "@esbuild/linux-arm64": "0.17.10",
+        "@esbuild/linux-ia32": "0.17.10",
+        "@esbuild/linux-loong64": "0.17.10",
+        "@esbuild/linux-mips64el": "0.17.10",
+        "@esbuild/linux-ppc64": "0.17.10",
+        "@esbuild/linux-riscv64": "0.17.10",
+        "@esbuild/linux-s390x": "0.17.10",
+        "@esbuild/linux-x64": "0.17.10",
+        "@esbuild/netbsd-x64": "0.17.10",
+        "@esbuild/openbsd-x64": "0.17.10",
+        "@esbuild/sunos-x64": "0.17.10",
+        "@esbuild/win32-arm64": "0.17.10",
+        "@esbuild/win32-ia32": "0.17.10",
+        "@esbuild/win32-x64": "0.17.10"
       }
     },
     "node_modules/escalade": {
@@ -12815,9 +12815,9 @@
       "dev": true
     },
     "node_modules/sass": {
-      "version": "1.58.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.0.tgz",
-      "integrity": "sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==",
+      "version": "1.58.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.3.tgz",
+      "integrity": "sha512-Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -16009,156 +16009,156 @@
       "dev": true
     },
     "@esbuild/android-arm": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.5.tgz",
-      "integrity": "sha512-crmPUzgCmF+qZXfl1YkiFoUta2XAfixR1tEnr/gXIixE+WL8Z0BGqfydP5oox0EUOgQMMRgtATtakyAcClQVqQ==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.10.tgz",
+      "integrity": "sha512-7YEBfZ5lSem9Tqpsz+tjbdsEshlO9j/REJrfv4DXgKTt1+/MHqGwbtlyxQuaSlMeUZLxUKBaX8wdzlTfHkmnLw==",
       "dev": true,
       "optional": true
     },
     "@esbuild/android-arm64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.5.tgz",
-      "integrity": "sha512-KHWkDqYAMmKZjY4RAN1PR96q6UOtfkWlTS8uEwWxdLtkRt/0F/csUhXIrVfaSIFxnscIBMPynGfhsMwQDRIBQw==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.10.tgz",
+      "integrity": "sha512-ht1P9CmvrPF5yKDtyC+z43RczVs4rrHpRqrmIuoSvSdn44Fs1n6DGlpZKdK6rM83pFLbVaSUwle8IN+TPmkv7g==",
       "dev": true,
       "optional": true
     },
     "@esbuild/android-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.5.tgz",
-      "integrity": "sha512-8fI/AnIdmWz/+1iza2WrCw8kwXK9wZp/yZY/iS8ioC+U37yJCeppi9EHY05ewJKN64ASoBIseufZROtcFnX5GA==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.10.tgz",
+      "integrity": "sha512-CYzrm+hTiY5QICji64aJ/xKdN70IK8XZ6iiyq0tZkd3tfnwwSWTYH1t3m6zyaaBxkuj40kxgMyj1km/NqdjQZA==",
       "dev": true,
       "optional": true
     },
     "@esbuild/darwin-arm64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.5.tgz",
-      "integrity": "sha512-EAvaoyIySV6Iif3NQCglUNpnMfHSUgC5ugt2efl3+QDntucJe5spn0udNZjTgNi6tKVqSceOw9tQ32liNZc1Xw==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.10.tgz",
+      "integrity": "sha512-3HaGIowI+nMZlopqyW6+jxYr01KvNaLB5znXfbyyjuo4lE0VZfvFGcguIJapQeQMS4cX/NEispwOekJt3gr5Dg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/darwin-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.5.tgz",
-      "integrity": "sha512-ha7QCJh1fuSwwCgoegfdaljowwWozwTDjBgjD3++WAy/qwee5uUi1gvOg2WENJC6EUyHBOkcd3YmLDYSZ2TPPA==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.10.tgz",
+      "integrity": "sha512-J4MJzGchuCRG5n+B4EHpAMoJmBeAE1L3wGYDIN5oWNqX0tEr7VKOzw0ymSwpoeSpdCa030lagGUfnfhS7OvzrQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/freebsd-arm64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.5.tgz",
-      "integrity": "sha512-VbdXJkn2aI2pQ/wxNEjEcnEDwPpxt3CWWMFYmO7CcdFBoOsABRy2W8F3kjbF9F/pecEUDcI3b5i2w+By4VQFPg==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.10.tgz",
+      "integrity": "sha512-ZkX40Z7qCbugeK4U5/gbzna/UQkM9d9LNV+Fro8r7HA7sRof5Rwxc46SsqeMvB5ZaR0b1/ITQ/8Y1NmV2F0fXQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/freebsd-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.5.tgz",
-      "integrity": "sha512-olgGYND1/XnnWxwhjtY3/ryjOG/M4WfcA6XH8dBTH1cxMeBemMODXSFhkw71Kf4TeZFFTN25YOomaNh0vq2iXg==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.10.tgz",
+      "integrity": "sha512-0m0YX1IWSLG9hWh7tZa3kdAugFbZFFx9XrvfpaCMMvrswSTvUZypp0NFKriUurHpBA3xsHVE9Qb/0u2Bbi/otg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-arm": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.5.tgz",
-      "integrity": "sha512-YBdCyQwA3OQupi6W2/WO4FnI+NWFWe79cZEtlbqSESOHEg7a73htBIRiE6uHPQe7Yp5E4aALv+JxkRLGEUL7tw==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.10.tgz",
+      "integrity": "sha512-whRdrrl0X+9D6o5f0sTZtDM9s86Xt4wk1bf7ltx6iQqrIIOH+sre1yjpcCdrVXntQPCNw/G+XqsD4HuxeS+2QA==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-arm64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.5.tgz",
-      "integrity": "sha512-8a0bqSwu3OlLCfu2FBbDNgQyBYdPJh1B9PvNX7jMaKGC9/KopgHs37t+pQqeMLzcyRqG6z55IGNQAMSlCpBuqg==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.10.tgz",
+      "integrity": "sha512-g1EZJR1/c+MmCgVwpdZdKi4QAJ8DCLP5uTgLWSAVd9wlqk9GMscaNMEViG3aE1wS+cNMzXXgdWiW/VX4J+5nTA==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-ia32": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.5.tgz",
-      "integrity": "sha512-uCwm1r/+NdP7vndctgq3PoZrnmhmnecWAr114GWMRwg2QMFFX+kIWnp7IO220/JLgnXK/jP7VKAFBGmeOYBQYQ==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.10.tgz",
+      "integrity": "sha512-1vKYCjfv/bEwxngHERp7huYfJ4jJzldfxyfaF7hc3216xiDA62xbXJfRlradiMhGZbdNLj2WA1YwYFzs9IWNPw==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-loong64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.5.tgz",
-      "integrity": "sha512-3YxhSBl5Sb6TtBjJu+HP93poBruFzgXmf3PVfIe4xOXMj1XpxboYZyw3W8BhoX/uwxzZz4K1I99jTE/5cgDT1g==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.10.tgz",
+      "integrity": "sha512-mvwAr75q3Fgc/qz3K6sya3gBmJIYZCgcJ0s7XshpoqIAIBszzfXsqhpRrRdVFAyV1G9VUjj7VopL2HnAS8aHFA==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-mips64el": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.5.tgz",
-      "integrity": "sha512-Hy5Z0YVWyYHdtQ5mfmfp8LdhVwGbwVuq8mHzLqrG16BaMgEmit2xKO+iDakHs+OetEx0EN/2mUzDdfdktI+Nmg==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.10.tgz",
+      "integrity": "sha512-XilKPgM2u1zR1YuvCsFQWl9Fc35BqSqktooumOY2zj7CSn5czJn279j9TE1JEqSqz88izJo7yE4x3LSf7oxHzg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-ppc64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.5.tgz",
-      "integrity": "sha512-5dbQvBLbU/Y3Q4ABc9gi23hww1mQcM7KZ9KBqabB7qhJswYMf8WrDDOSw3gdf3p+ffmijMd28mfVMvFucuECyg==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.10.tgz",
+      "integrity": "sha512-kM4Rmh9l670SwjlGkIe7pYWezk8uxKHX4Lnn5jBZYBNlWpKMBCVfpAgAJqp5doLobhzF3l64VZVrmGeZ8+uKmQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-riscv64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.5.tgz",
-      "integrity": "sha512-fp/KUB/ZPzEWGTEUgz9wIAKCqu7CjH1GqXUO2WJdik1UNBQ7Xzw7myIajpxztE4Csb9504ERiFMxZg5KZ6HlZQ==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.10.tgz",
+      "integrity": "sha512-r1m9ZMNJBtOvYYGQVXKy+WvWd0BPvSxMsVq8Hp4GzdMBQvfZRvRr5TtX/1RdN6Va8JMVQGpxqde3O+e8+khNJQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-s390x": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.5.tgz",
-      "integrity": "sha512-kRV3yw19YDqHTp8SfHXfObUFXlaiiw4o2lvT1XjsPZ++22GqZwSsYWJLjMi1Sl7j9qDlDUduWDze/nQx0d6Lzw==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.10.tgz",
+      "integrity": "sha512-LsY7QvOLPw9WRJ+fU5pNB3qrSfA00u32ND5JVDrn/xG5hIQo3kvTxSlWFRP0NJ0+n6HmhPGG0Q4jtQsb6PFoyg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.5.tgz",
-      "integrity": "sha512-vnxuhh9e4pbtABNLbT2ANW4uwQ/zvcHRCm1JxaYkzSehugoFd5iXyC4ci1nhXU13mxEwCnrnTIiiSGwa/uAF1g==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.10.tgz",
+      "integrity": "sha512-zJUfJLebCYzBdIz/Z9vqwFjIA7iSlLCFvVi7glMgnu2MK7XYigwsonXshy9wP9S7szF+nmwrelNaP3WGanstEg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/netbsd-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.5.tgz",
-      "integrity": "sha512-cigBpdiSx/vPy7doUyImsQQBnBjV5f1M99ZUlaJckDAJjgXWl6y9W17FIfJTy8TxosEF6MXq+fpLsitMGts2nA==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.10.tgz",
+      "integrity": "sha512-lOMkailn4Ok9Vbp/q7uJfgicpDTbZFlXlnKT2DqC8uBijmm5oGtXAJy2ZZVo5hX7IOVXikV9LpCMj2U8cTguWA==",
       "dev": true,
       "optional": true
     },
     "@esbuild/openbsd-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.5.tgz",
-      "integrity": "sha512-VdqRqPVIjjZfkf40LrqOaVuhw9EQiAZ/GNCSM2UplDkaIzYVsSnycxcFfAnHdWI8Gyt6dO15KHikbpxwx+xHbw==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.10.tgz",
+      "integrity": "sha512-/VE0Kx6y7eekqZ+ZLU4AjMlB80ov9tEz4H067Y0STwnGOYL8CsNg4J+cCmBznk1tMpxMoUOf0AbWlb1d2Pkbig==",
       "dev": true,
       "optional": true
     },
     "@esbuild/sunos-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.5.tgz",
-      "integrity": "sha512-ItxPaJ3MBLtI4nK+mALLEoUs6amxsx+J1ibnfcYMkqaCqHST1AkF4aENpBehty3czqw64r/XqL+W9WqU6kc2Qw==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.10.tgz",
+      "integrity": "sha512-ERNO0838OUm8HfUjjsEs71cLjLMu/xt6bhOlxcJ0/1MG3hNqCmbWaS+w/8nFLa0DDjbwZQuGKVtCUJliLmbVgg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/win32-arm64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.5.tgz",
-      "integrity": "sha512-4u2Q6qsJTYNFdS9zHoAi80spzf78C16m2wla4eJPh4kSbRv+BpXIfl6TmBSWupD8e47B1NrTfrOlEuco7mYQtg==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.10.tgz",
+      "integrity": "sha512-fXv+L+Bw2AeK+XJHwDAQ9m3NRlNemG6Z6ijLwJAAVdu4cyoFbBWbEtyZzDeL+rpG2lWI51cXeMt70HA8g2MqIg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/win32-ia32": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.5.tgz",
-      "integrity": "sha512-KYlm+Xu9TXsfTWAcocLuISRtqxKp/Y9ZBVg6CEEj0O5J9mn7YvBKzAszo2j1ndyzUPk+op+Tie2PJeN+BnXGqQ==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.10.tgz",
+      "integrity": "sha512-3s+HADrOdCdGOi5lnh5DMQEzgbsFsd4w57L/eLKKjMnN0CN4AIEP0DCP3F3N14xnxh3ruNc32A0Na9zYe1Z/AQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/win32-x64": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.5.tgz",
-      "integrity": "sha512-XgA9qWRqby7xdYXuF6KALsn37QGBMHsdhmnpjfZtYxKxbTOwfnDM6MYi2WuUku5poNaX2n9XGVr20zgT/2QwCw==",
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.10.tgz",
+      "integrity": "sha512-oP+zFUjYNaMNmjTwlFtWep85hvwUu19cZklB3QsBOcZSs6y7hmH4LNCJ7075bsqzYaNvZFXJlAVaQ2ApITDXtw==",
       "dev": true,
       "optional": true
     },
@@ -17831,7 +17831,7 @@
       "requires": {
         "rollup": "^3.15.0",
         "rollup-plugin-postcss": "^4.0.2",
-        "sass": "^1.58.0"
+        "sass": "1.58.3"
       }
     },
     "@tailwindcss/integrations-tailwindcss-cli": {
@@ -20372,33 +20372,33 @@
       "dev": true
     },
     "esbuild": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.5.tgz",
-      "integrity": "sha512-Bu6WLCc9NMsNoMJUjGl3yBzTjVLXdysMltxQWiLAypP+/vQrf+3L1Xe8fCXzxaECus2cEJ9M7pk4yKatEwQMqQ==",
-      "dev": true,
-      "requires": {
-        "@esbuild/android-arm": "0.17.5",
-        "@esbuild/android-arm64": "0.17.5",
-        "@esbuild/android-x64": "0.17.5",
-        "@esbuild/darwin-arm64": "0.17.5",
-        "@esbuild/darwin-x64": "0.17.5",
-        "@esbuild/freebsd-arm64": "0.17.5",
-        "@esbuild/freebsd-x64": "0.17.5",
-        "@esbuild/linux-arm": "0.17.5",
-        "@esbuild/linux-arm64": "0.17.5",
-        "@esbuild/linux-ia32": "0.17.5",
-        "@esbuild/linux-loong64": "0.17.5",
-        "@esbuild/linux-mips64el": "0.17.5",
-        "@esbuild/linux-ppc64": "0.17.5",
-        "@esbuild/linux-riscv64": "0.17.5",
-        "@esbuild/linux-s390x": "0.17.5",
-        "@esbuild/linux-x64": "0.17.5",
-        "@esbuild/netbsd-x64": "0.17.5",
-        "@esbuild/openbsd-x64": "0.17.5",
-        "@esbuild/sunos-x64": "0.17.5",
-        "@esbuild/win32-arm64": "0.17.5",
-        "@esbuild/win32-ia32": "0.17.5",
-        "@esbuild/win32-x64": "0.17.5"
+      "version": "0.17.10",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.10.tgz",
+      "integrity": "sha512-n7V3v29IuZy5qgxx25TKJrEm0FHghAlS6QweUcyIgh/U0zYmQcvogWROitrTyZId1mHSkuhhuyEXtI9OXioq7A==",
+      "dev": true,
+      "requires": {
+        "@esbuild/android-arm": "0.17.10",
+        "@esbuild/android-arm64": "0.17.10",
+        "@esbuild/android-x64": "0.17.10",
+        "@esbuild/darwin-arm64": "0.17.10",
+        "@esbuild/darwin-x64": "0.17.10",
+        "@esbuild/freebsd-arm64": "0.17.10",
+        "@esbuild/freebsd-x64": "0.17.10",
+        "@esbuild/linux-arm": "0.17.10",
+        "@esbuild/linux-arm64": "0.17.10",
+        "@esbuild/linux-ia32": "0.17.10",
+        "@esbuild/linux-loong64": "0.17.10",
+        "@esbuild/linux-mips64el": "0.17.10",
+        "@esbuild/linux-ppc64": "0.17.10",
+        "@esbuild/linux-riscv64": "0.17.10",
+        "@esbuild/linux-s390x": "0.17.10",
+        "@esbuild/linux-x64": "0.17.10",
+        "@esbuild/netbsd-x64": "0.17.10",
+        "@esbuild/openbsd-x64": "0.17.10",
+        "@esbuild/sunos-x64": "0.17.10",
+        "@esbuild/win32-arm64": "0.17.10",
+        "@esbuild/win32-ia32": "0.17.10",
+        "@esbuild/win32-x64": "0.17.10"
       }
     },
     "escalade": {
@@ -24635,9 +24635,9 @@
       "dev": true
     },
     "sass": {
-      "version": "1.58.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.0.tgz",
-      "integrity": "sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==",
+      "version": "1.58.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.3.tgz",
+      "integrity": "sha512-Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -25306,7 +25306,7 @@
         "detective": "^5.2.1",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
-        "esbuild": "^0.17.4",
+        "esbuild": "^0.17.10",
         "eslint": "^8.34.0",
         "eslint-config-prettier": "^8.6.0",
         "eslint-plugin-prettier": "^4.2.1",
@@ -25786,156 +25786,156 @@
           "dev": true
         },
         "@esbuild/android-arm": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.5.tgz",
-          "integrity": "sha512-crmPUzgCmF+qZXfl1YkiFoUta2XAfixR1tEnr/gXIixE+WL8Z0BGqfydP5oox0EUOgQMMRgtATtakyAcClQVqQ==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.10.tgz",
+          "integrity": "sha512-7YEBfZ5lSem9Tqpsz+tjbdsEshlO9j/REJrfv4DXgKTt1+/MHqGwbtlyxQuaSlMeUZLxUKBaX8wdzlTfHkmnLw==",
           "dev": true,
           "optional": true
         },
         "@esbuild/android-arm64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.5.tgz",
-          "integrity": "sha512-KHWkDqYAMmKZjY4RAN1PR96q6UOtfkWlTS8uEwWxdLtkRt/0F/csUhXIrVfaSIFxnscIBMPynGfhsMwQDRIBQw==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.10.tgz",
+          "integrity": "sha512-ht1P9CmvrPF5yKDtyC+z43RczVs4rrHpRqrmIuoSvSdn44Fs1n6DGlpZKdK6rM83pFLbVaSUwle8IN+TPmkv7g==",
           "dev": true,
           "optional": true
         },
         "@esbuild/android-x64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.5.tgz",
-          "integrity": "sha512-8fI/AnIdmWz/+1iza2WrCw8kwXK9wZp/yZY/iS8ioC+U37yJCeppi9EHY05ewJKN64ASoBIseufZROtcFnX5GA==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.10.tgz",
+          "integrity": "sha512-CYzrm+hTiY5QICji64aJ/xKdN70IK8XZ6iiyq0tZkd3tfnwwSWTYH1t3m6zyaaBxkuj40kxgMyj1km/NqdjQZA==",
           "dev": true,
           "optional": true
         },
         "@esbuild/darwin-arm64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.5.tgz",
-          "integrity": "sha512-EAvaoyIySV6Iif3NQCglUNpnMfHSUgC5ugt2efl3+QDntucJe5spn0udNZjTgNi6tKVqSceOw9tQ32liNZc1Xw==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.10.tgz",
+          "integrity": "sha512-3HaGIowI+nMZlopqyW6+jxYr01KvNaLB5znXfbyyjuo4lE0VZfvFGcguIJapQeQMS4cX/NEispwOekJt3gr5Dg==",
           "dev": true,
           "optional": true
         },
         "@esbuild/darwin-x64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.5.tgz",
-          "integrity": "sha512-ha7QCJh1fuSwwCgoegfdaljowwWozwTDjBgjD3++WAy/qwee5uUi1gvOg2WENJC6EUyHBOkcd3YmLDYSZ2TPPA==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.10.tgz",
+          "integrity": "sha512-J4MJzGchuCRG5n+B4EHpAMoJmBeAE1L3wGYDIN5oWNqX0tEr7VKOzw0ymSwpoeSpdCa030lagGUfnfhS7OvzrQ==",
           "dev": true,
           "optional": true
         },
         "@esbuild/freebsd-arm64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.5.tgz",
-          "integrity": "sha512-VbdXJkn2aI2pQ/wxNEjEcnEDwPpxt3CWWMFYmO7CcdFBoOsABRy2W8F3kjbF9F/pecEUDcI3b5i2w+By4VQFPg==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.10.tgz",
+          "integrity": "sha512-ZkX40Z7qCbugeK4U5/gbzna/UQkM9d9LNV+Fro8r7HA7sRof5Rwxc46SsqeMvB5ZaR0b1/ITQ/8Y1NmV2F0fXQ==",
           "dev": true,
           "optional": true
         },
         "@esbuild/freebsd-x64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.5.tgz",
-          "integrity": "sha512-olgGYND1/XnnWxwhjtY3/ryjOG/M4WfcA6XH8dBTH1cxMeBemMODXSFhkw71Kf4TeZFFTN25YOomaNh0vq2iXg==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.10.tgz",
+          "integrity": "sha512-0m0YX1IWSLG9hWh7tZa3kdAugFbZFFx9XrvfpaCMMvrswSTvUZypp0NFKriUurHpBA3xsHVE9Qb/0u2Bbi/otg==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-arm": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.5.tgz",
-          "integrity": "sha512-YBdCyQwA3OQupi6W2/WO4FnI+NWFWe79cZEtlbqSESOHEg7a73htBIRiE6uHPQe7Yp5E4aALv+JxkRLGEUL7tw==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.10.tgz",
+          "integrity": "sha512-whRdrrl0X+9D6o5f0sTZtDM9s86Xt4wk1bf7ltx6iQqrIIOH+sre1yjpcCdrVXntQPCNw/G+XqsD4HuxeS+2QA==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-arm64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.5.tgz",
-          "integrity": "sha512-8a0bqSwu3OlLCfu2FBbDNgQyBYdPJh1B9PvNX7jMaKGC9/KopgHs37t+pQqeMLzcyRqG6z55IGNQAMSlCpBuqg==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.10.tgz",
+          "integrity": "sha512-g1EZJR1/c+MmCgVwpdZdKi4QAJ8DCLP5uTgLWSAVd9wlqk9GMscaNMEViG3aE1wS+cNMzXXgdWiW/VX4J+5nTA==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-ia32": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.5.tgz",
-          "integrity": "sha512-uCwm1r/+NdP7vndctgq3PoZrnmhmnecWAr114GWMRwg2QMFFX+kIWnp7IO220/JLgnXK/jP7VKAFBGmeOYBQYQ==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.10.tgz",
+          "integrity": "sha512-1vKYCjfv/bEwxngHERp7huYfJ4jJzldfxyfaF7hc3216xiDA62xbXJfRlradiMhGZbdNLj2WA1YwYFzs9IWNPw==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-loong64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.5.tgz",
-          "integrity": "sha512-3YxhSBl5Sb6TtBjJu+HP93poBruFzgXmf3PVfIe4xOXMj1XpxboYZyw3W8BhoX/uwxzZz4K1I99jTE/5cgDT1g==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.10.tgz",
+          "integrity": "sha512-mvwAr75q3Fgc/qz3K6sya3gBmJIYZCgcJ0s7XshpoqIAIBszzfXsqhpRrRdVFAyV1G9VUjj7VopL2HnAS8aHFA==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-mips64el": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.5.tgz",
-          "integrity": "sha512-Hy5Z0YVWyYHdtQ5mfmfp8LdhVwGbwVuq8mHzLqrG16BaMgEmit2xKO+iDakHs+OetEx0EN/2mUzDdfdktI+Nmg==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.10.tgz",
+          "integrity": "sha512-XilKPgM2u1zR1YuvCsFQWl9Fc35BqSqktooumOY2zj7CSn5czJn279j9TE1JEqSqz88izJo7yE4x3LSf7oxHzg==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-ppc64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.5.tgz",
-          "integrity": "sha512-5dbQvBLbU/Y3Q4ABc9gi23hww1mQcM7KZ9KBqabB7qhJswYMf8WrDDOSw3gdf3p+ffmijMd28mfVMvFucuECyg==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.10.tgz",
+          "integrity": "sha512-kM4Rmh9l670SwjlGkIe7pYWezk8uxKHX4Lnn5jBZYBNlWpKMBCVfpAgAJqp5doLobhzF3l64VZVrmGeZ8+uKmQ==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-riscv64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.5.tgz",
-          "integrity": "sha512-fp/KUB/ZPzEWGTEUgz9wIAKCqu7CjH1GqXUO2WJdik1UNBQ7Xzw7myIajpxztE4Csb9504ERiFMxZg5KZ6HlZQ==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.10.tgz",
+          "integrity": "sha512-r1m9ZMNJBtOvYYGQVXKy+WvWd0BPvSxMsVq8Hp4GzdMBQvfZRvRr5TtX/1RdN6Va8JMVQGpxqde3O+e8+khNJQ==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-s390x": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.5.tgz",
-          "integrity": "sha512-kRV3yw19YDqHTp8SfHXfObUFXlaiiw4o2lvT1XjsPZ++22GqZwSsYWJLjMi1Sl7j9qDlDUduWDze/nQx0d6Lzw==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.10.tgz",
+          "integrity": "sha512-LsY7QvOLPw9WRJ+fU5pNB3qrSfA00u32ND5JVDrn/xG5hIQo3kvTxSlWFRP0NJ0+n6HmhPGG0Q4jtQsb6PFoyg==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-x64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.5.tgz",
-          "integrity": "sha512-vnxuhh9e4pbtABNLbT2ANW4uwQ/zvcHRCm1JxaYkzSehugoFd5iXyC4ci1nhXU13mxEwCnrnTIiiSGwa/uAF1g==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.10.tgz",
+          "integrity": "sha512-zJUfJLebCYzBdIz/Z9vqwFjIA7iSlLCFvVi7glMgnu2MK7XYigwsonXshy9wP9S7szF+nmwrelNaP3WGanstEg==",
           "dev": true,
           "optional": true
         },
         "@esbuild/netbsd-x64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.5.tgz",
-          "integrity": "sha512-cigBpdiSx/vPy7doUyImsQQBnBjV5f1M99ZUlaJckDAJjgXWl6y9W17FIfJTy8TxosEF6MXq+fpLsitMGts2nA==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.10.tgz",
+          "integrity": "sha512-lOMkailn4Ok9Vbp/q7uJfgicpDTbZFlXlnKT2DqC8uBijmm5oGtXAJy2ZZVo5hX7IOVXikV9LpCMj2U8cTguWA==",
           "dev": true,
           "optional": true
         },
         "@esbuild/openbsd-x64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.5.tgz",
-          "integrity": "sha512-VdqRqPVIjjZfkf40LrqOaVuhw9EQiAZ/GNCSM2UplDkaIzYVsSnycxcFfAnHdWI8Gyt6dO15KHikbpxwx+xHbw==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.10.tgz",
+          "integrity": "sha512-/VE0Kx6y7eekqZ+ZLU4AjMlB80ov9tEz4H067Y0STwnGOYL8CsNg4J+cCmBznk1tMpxMoUOf0AbWlb1d2Pkbig==",
           "dev": true,
           "optional": true
         },
         "@esbuild/sunos-x64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.5.tgz",
-          "integrity": "sha512-ItxPaJ3MBLtI4nK+mALLEoUs6amxsx+J1ibnfcYMkqaCqHST1AkF4aENpBehty3czqw64r/XqL+W9WqU6kc2Qw==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.10.tgz",
+          "integrity": "sha512-ERNO0838OUm8HfUjjsEs71cLjLMu/xt6bhOlxcJ0/1MG3hNqCmbWaS+w/8nFLa0DDjbwZQuGKVtCUJliLmbVgg==",
           "dev": true,
           "optional": true
         },
         "@esbuild/win32-arm64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.5.tgz",
-          "integrity": "sha512-4u2Q6qsJTYNFdS9zHoAi80spzf78C16m2wla4eJPh4kSbRv+BpXIfl6TmBSWupD8e47B1NrTfrOlEuco7mYQtg==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.10.tgz",
+          "integrity": "sha512-fXv+L+Bw2AeK+XJHwDAQ9m3NRlNemG6Z6ijLwJAAVdu4cyoFbBWbEtyZzDeL+rpG2lWI51cXeMt70HA8g2MqIg==",
           "dev": true,
           "optional": true
         },
         "@esbuild/win32-ia32": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.5.tgz",
-          "integrity": "sha512-KYlm+Xu9TXsfTWAcocLuISRtqxKp/Y9ZBVg6CEEj0O5J9mn7YvBKzAszo2j1ndyzUPk+op+Tie2PJeN+BnXGqQ==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.10.tgz",
+          "integrity": "sha512-3s+HADrOdCdGOi5lnh5DMQEzgbsFsd4w57L/eLKKjMnN0CN4AIEP0DCP3F3N14xnxh3ruNc32A0Na9zYe1Z/AQ==",
           "dev": true,
           "optional": true
         },
         "@esbuild/win32-x64": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.5.tgz",
-          "integrity": "sha512-XgA9qWRqby7xdYXuF6KALsn37QGBMHsdhmnpjfZtYxKxbTOwfnDM6MYi2WuUku5poNaX2n9XGVr20zgT/2QwCw==",
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.10.tgz",
+          "integrity": "sha512-oP+zFUjYNaMNmjTwlFtWep85hvwUu19cZklB3QsBOcZSs6y7hmH4LNCJ7075bsqzYaNvZFXJlAVaQ2ApITDXtw==",
           "dev": true,
           "optional": true
         },
@@ -27608,7 +27608,7 @@
           "requires": {
             "rollup": "^3.15.0",
             "rollup-plugin-postcss": "^4.0.2",
-            "sass": "^1.58.0"
+            "sass": "1.58.3"
           }
         },
         "@tailwindcss/integrations-tailwindcss-cli": {
@@ -30149,33 +30149,33 @@
           "dev": true
         },
         "esbuild": {
-          "version": "0.17.5",
-          "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.5.tgz",
-          "integrity": "sha512-Bu6WLCc9NMsNoMJUjGl3yBzTjVLXdysMltxQWiLAypP+/vQrf+3L1Xe8fCXzxaECus2cEJ9M7pk4yKatEwQMqQ==",
-          "dev": true,
-          "requires": {
-            "@esbuild/android-arm": "0.17.5",
-            "@esbuild/android-arm64": "0.17.5",
-            "@esbuild/android-x64": "0.17.5",
-            "@esbuild/darwin-arm64": "0.17.5",
-            "@esbuild/darwin-x64": "0.17.5",
-            "@esbuild/freebsd-arm64": "0.17.5",
-            "@esbuild/freebsd-x64": "0.17.5",
-            "@esbuild/linux-arm": "0.17.5",
-            "@esbuild/linux-arm64": "0.17.5",
-            "@esbuild/linux-ia32": "0.17.5",
-            "@esbuild/linux-loong64": "0.17.5",
-            "@esbuild/linux-mips64el": "0.17.5",
-            "@esbuild/linux-ppc64": "0.17.5",
-            "@esbuild/linux-riscv64": "0.17.5",
-            "@esbuild/linux-s390x": "0.17.5",
-            "@esbuild/linux-x64": "0.17.5",
-            "@esbuild/netbsd-x64": "0.17.5",
-            "@esbuild/openbsd-x64": "0.17.5",
-            "@esbuild/sunos-x64": "0.17.5",
-            "@esbuild/win32-arm64": "0.17.5",
-            "@esbuild/win32-ia32": "0.17.5",
-            "@esbuild/win32-x64": "0.17.5"
+          "version": "0.17.10",
+          "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.10.tgz",
+          "integrity": "sha512-n7V3v29IuZy5qgxx25TKJrEm0FHghAlS6QweUcyIgh/U0zYmQcvogWROitrTyZId1mHSkuhhuyEXtI9OXioq7A==",
+          "dev": true,
+          "requires": {
+            "@esbuild/android-arm": "0.17.10",
+            "@esbuild/android-arm64": "0.17.10",
+            "@esbuild/android-x64": "0.17.10",
+            "@esbuild/darwin-arm64": "0.17.10",
+            "@esbuild/darwin-x64": "0.17.10",
+            "@esbuild/freebsd-arm64": "0.17.10",
+            "@esbuild/freebsd-x64": "0.17.10",
+            "@esbuild/linux-arm": "0.17.10",
+            "@esbuild/linux-arm64": "0.17.10",
+            "@esbuild/linux-ia32": "0.17.10",
+            "@esbuild/linux-loong64": "0.17.10",
+            "@esbuild/linux-mips64el": "0.17.10",
+            "@esbuild/linux-ppc64": "0.17.10",
+            "@esbuild/linux-riscv64": "0.17.10",
+            "@esbuild/linux-s390x": "0.17.10",
+            "@esbuild/linux-x64": "0.17.10",
+            "@esbuild/netbsd-x64": "0.17.10",
+            "@esbuild/openbsd-x64": "0.17.10",
+            "@esbuild/sunos-x64": "0.17.10",
+            "@esbuild/win32-arm64": "0.17.10",
+            "@esbuild/win32-ia32": "0.17.10",
+            "@esbuild/win32-x64": "0.17.10"
           }
         },
         "escalade": {
@@ -34412,9 +34412,9 @@
           "dev": true
         },
         "sass": {
-          "version": "1.58.0",
-          "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.0.tgz",
-          "integrity": "sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==",
+          "version": "1.58.3",
+          "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.3.tgz",
+          "integrity": "sha512-Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A==",
           "dev": true,
           "requires": {
             "chokidar": ">=3.0.0 <4.0.0",

From e366985a82b6e6f6eb03b5c296c096630b6b0563 Mon Sep 17 00:00:00 2001
From: Dany Castillo <31006608+dcastil@users.noreply.github.com>
Date: Wed, 1 Mar 2023 15:03:50 +0100
Subject: [PATCH 30/84] Add `content-normal` and `content-stretch` utilities
 (#10645)

* Add content-stretch utility

* Add `content-normal` utility

---------

Co-authored-by: Jonathan Reinink <jonathan@reinink.ca>
---
 src/corePlugins.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/corePlugins.js b/src/corePlugins.js
index 48f215cbd8b5..3e63c12a370a 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -1196,6 +1196,7 @@ export let corePlugins = {
 
   alignContent: ({ addUtilities }) => {
     addUtilities({
+      '.content-normal': { 'align-content': 'normal' },
       '.content-center': { 'align-content': 'center' },
       '.content-start': { 'align-content': 'flex-start' },
       '.content-end': { 'align-content': 'flex-end' },
@@ -1203,6 +1204,7 @@ export let corePlugins = {
       '.content-around': { 'align-content': 'space-around' },
       '.content-evenly': { 'align-content': 'space-evenly' },
       '.content-baseline': { 'align-content': 'baseline' },
+      '.content-stretch': { 'align-content': 'stretch' },
     })
   },
 

From d91344c1488d8019f08d622e7a33830b5866eb20 Mon Sep 17 00:00:00 2001
From: Jonathan Reinink <jonathan@reinink.ca>
Date: Wed, 1 Mar 2023 09:04:46 -0500
Subject: [PATCH 31/84] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7a9320ca13c..cf070956b577 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add support for configuring default `font-variation-settings` for a `font-family` ([#10034](https://github.com/tailwindlabs/tailwindcss/pull/10034), [#10515](https://github.com/tailwindlabs/tailwindcss/pull/10515))
 - Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
 - Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
+- Add `content-normal` and `content-stretch` utilities ([#10645](https://github.com/tailwindlabs/tailwindcss/pull/10645))
 
 ### Fixed
 

From bfdf3a7d1f8451d7dfe67faa48b094bf4a5a59a9 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Thu, 2 Mar 2023 21:41:20 +0000
Subject: [PATCH 32/84] Update @swc/cli to version 0.1.62

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2fcc3339edbf..71519d5983fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -107,7 +107,7 @@
       "devDependencies": {
         "rollup": "^3.15.0",
         "rollup-plugin-postcss": "^4.0.2",
-        "sass": "1.58.3"
+        "sass": "^1.58.3"
       }
     },
     "integrations/tailwindcss-cli": {
@@ -17831,7 +17831,7 @@
       "requires": {
         "rollup": "^3.15.0",
         "rollup-plugin-postcss": "^4.0.2",
-        "sass": "1.58.3"
+        "sass": "^1.58.3"
       }
     },
     "@tailwindcss/integrations-tailwindcss-cli": {
@@ -27608,7 +27608,7 @@
           "requires": {
             "rollup": "^3.15.0",
             "rollup-plugin-postcss": "^4.0.2",
-            "sass": "1.58.3"
+            "sass": "^1.58.3"
           }
         },
         "@tailwindcss/integrations-tailwindcss-cli": {
diff --git a/package.json b/package.json
index fca0cd9fc42d..849193b780f7 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "*.js"
   ],
   "devDependencies": {
-    "@swc/cli": "0.1.61",
+    "@swc/cli": "0.1.62",
     "@swc/core": "1.3.35",
     "@swc/jest": "0.2.24",
     "@swc/register": "0.1.10",

From 994b541779fdc82b15d67b27b290820e37e94733 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Fri, 3 Mar 2023 02:40:59 +0000
Subject: [PATCH 33/84] Update vite to version 4.1.4

---
 integrations/vite/package.json |  2 +-
 package-lock.json              | 46 +++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/integrations/vite/package.json b/integrations/vite/package.json
index 46b0146d3595..a04c235964f3 100644
--- a/integrations/vite/package.json
+++ b/integrations/vite/package.json
@@ -17,6 +17,6 @@
   },
   "devDependencies": {
     "isomorphic-fetch": "^3.0.0",
-    "vite": "^4.1.1"
+    "vite": "^4.1.4"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 71519d5983fc..80adeb877032 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45,7 +45,7 @@
         "tailwindcss": "lib/cli.js"
       },
       "devDependencies": {
-        "@swc/cli": "0.1.61",
+        "@swc/cli": "0.1.62",
         "@swc/core": "1.3.35",
         "@swc/jest": "0.2.24",
         "@swc/register": "0.1.10",
@@ -122,7 +122,7 @@
       "version": "0.0.0",
       "devDependencies": {
         "isomorphic-fetch": "^3.0.0",
-        "vite": "^4.1.1"
+        "vite": "4.1.4"
       }
     },
     "integrations/webpack-4": {
@@ -3636,9 +3636,9 @@
       }
     },
     "node_modules/@swc/cli": {
-      "version": "0.1.61",
-      "resolved": "https://registry.npmjs.org/@swc/cli/-/cli-0.1.61.tgz",
-      "integrity": "sha512-HeYMJ+8gKfJzM9xgcZqTpAHJYAJVGSljBSmWRUx2B6UiGraLsLjEcqxITwi6/t6Af+QboBMiQX5Wwll89oPK7g==",
+      "version": "0.1.62",
+      "resolved": "https://registry.npmjs.org/@swc/cli/-/cli-0.1.62.tgz",
+      "integrity": "sha512-kOFLjKY3XH1DWLfXL1/B5MizeNorHR8wHKEi92S/Zi9Md/AK17KSqR8MgyRJ6C1fhKHvbBCl8wboyKAFXStkYw==",
       "dev": true,
       "dependencies": {
         "@mole-inc/bin-wrapper": "^8.0.1",
@@ -14328,9 +14328,9 @@
       "dev": true
     },
     "node_modules/vite": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.1.1.tgz",
-      "integrity": "sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.1.4.tgz",
+      "integrity": "sha512-3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.16.14",
@@ -17646,9 +17646,9 @@
       }
     },
     "@swc/cli": {
-      "version": "0.1.61",
-      "resolved": "https://registry.npmjs.org/@swc/cli/-/cli-0.1.61.tgz",
-      "integrity": "sha512-HeYMJ+8gKfJzM9xgcZqTpAHJYAJVGSljBSmWRUx2B6UiGraLsLjEcqxITwi6/t6Af+QboBMiQX5Wwll89oPK7g==",
+      "version": "0.1.62",
+      "resolved": "https://registry.npmjs.org/@swc/cli/-/cli-0.1.62.tgz",
+      "integrity": "sha512-kOFLjKY3XH1DWLfXL1/B5MizeNorHR8wHKEi92S/Zi9Md/AK17KSqR8MgyRJ6C1fhKHvbBCl8wboyKAFXStkYw==",
       "dev": true,
       "requires": {
         "@mole-inc/bin-wrapper": "^8.0.1",
@@ -17844,7 +17844,7 @@
       "version": "file:integrations/vite",
       "requires": {
         "isomorphic-fetch": "^3.0.0",
-        "vite": "^4.1.1"
+        "vite": "4.1.4"
       }
     },
     "@tailwindcss/integrations-webpack-4": {
@@ -25282,7 +25282,7 @@
     "tailwindcss": {
       "version": "file:",
       "requires": {
-        "@swc/cli": "0.1.61",
+        "@swc/cli": "0.1.62",
         "@swc/core": "1.3.35",
         "@swc/jest": "0.2.24",
         "@swc/register": "0.1.10",
@@ -27423,9 +27423,9 @@
           }
         },
         "@swc/cli": {
-          "version": "0.1.61",
-          "resolved": "https://registry.npmjs.org/@swc/cli/-/cli-0.1.61.tgz",
-          "integrity": "sha512-HeYMJ+8gKfJzM9xgcZqTpAHJYAJVGSljBSmWRUx2B6UiGraLsLjEcqxITwi6/t6Af+QboBMiQX5Wwll89oPK7g==",
+          "version": "0.1.62",
+          "resolved": "https://registry.npmjs.org/@swc/cli/-/cli-0.1.62.tgz",
+          "integrity": "sha512-kOFLjKY3XH1DWLfXL1/B5MizeNorHR8wHKEi92S/Zi9Md/AK17KSqR8MgyRJ6C1fhKHvbBCl8wboyKAFXStkYw==",
           "dev": true,
           "requires": {
             "@mole-inc/bin-wrapper": "^8.0.1",
@@ -27621,7 +27621,7 @@
           "version": "file:integrations/vite",
           "requires": {
             "isomorphic-fetch": "^3.0.0",
-            "vite": "^4.1.1"
+            "vite": "4.1.4"
           }
         },
         "@tailwindcss/integrations-webpack-4": {
@@ -35561,9 +35561,9 @@
           }
         },
         "vite": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/vite/-/vite-4.1.1.tgz",
-          "integrity": "sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==",
+          "version": "4.1.4",
+          "resolved": "https://registry.npmjs.org/vite/-/vite-4.1.4.tgz",
+          "integrity": "sha512-3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg==",
           "dev": true,
           "requires": {
             "esbuild": "^0.16.14",
@@ -36870,9 +36870,9 @@
       }
     },
     "vite": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.1.1.tgz",
-      "integrity": "sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.1.4.tgz",
+      "integrity": "sha512-3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg==",
       "dev": true,
       "requires": {
         "esbuild": "^0.16.14",

From a64ce192cc47c495ef4cdca28ea0bb07ceb218b7 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Wed, 8 Mar 2023 00:25:58 +0000
Subject: [PATCH 34/84] Update turbo to version 1.8.3

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 80adeb877032..1a3e124d1f8b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -122,7 +122,7 @@
       "version": "0.0.0",
       "devDependencies": {
         "isomorphic-fetch": "^3.0.0",
-        "vite": "4.1.4"
+        "vite": "^4.1.4"
       }
     },
     "integrations/webpack-4": {
@@ -17844,7 +17844,7 @@
       "version": "file:integrations/vite",
       "requires": {
         "isomorphic-fetch": "^3.0.0",
-        "vite": "4.1.4"
+        "vite": "^4.1.4"
       }
     },
     "@tailwindcss/integrations-webpack-4": {
@@ -27621,7 +27621,7 @@
           "version": "file:integrations/vite",
           "requires": {
             "isomorphic-fetch": "^3.0.0",
-            "vite": "4.1.4"
+            "vite": "^4.1.4"
           }
         },
         "@tailwindcss/integrations-webpack-4": {
diff --git a/package.json b/package.json
index 849193b780f7..4a7ce9939d6a 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "prettier": "^2.8.4",
     "rimraf": "^4.1.2",
     "source-map-js": "^1.0.2",
-    "turbo": "^1.7.4"
+    "turbo": "^1.8.3"
   },
   "peerDependencies": {
     "postcss": "^8.0.9"

From 5bb351ea756505f5bc18dbe7464722d44d3aac0a Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Wed, 8 Mar 2023 10:00:39 +0000
Subject: [PATCH 35/84] Update @napi-rs/cli to version 2.14.8

---
 oxide/crates/node/package.json |   2 +-
 package-lock.json              | 166 ++++++++++++++++-----------------
 2 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/oxide/crates/node/package.json b/oxide/crates/node/package.json
index c97f3864e21d..f2d9dce31e06 100644
--- a/oxide/crates/node/package.json
+++ b/oxide/crates/node/package.json
@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@napi-rs/cli": "^2.14.7"
+    "@napi-rs/cli": "^2.14.8"
   },
   "engines": {
     "node": ">= 10"
diff --git a/package-lock.json b/package-lock.json
index 1a3e124d1f8b..f35cc9040425 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -61,7 +61,7 @@
         "prettier": "^2.8.4",
         "rimraf": "^4.1.2",
         "source-map-js": "^1.0.2",
-        "turbo": "^1.7.4"
+        "turbo": "^1.8.3"
       },
       "engines": {
         "node": ">=16.0.0"
@@ -13978,27 +13978,27 @@
       "dev": true
     },
     "node_modules/turbo": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.7.4.tgz",
-      "integrity": "sha512-8RLedDoUL0kkVKWEZ/RMM70BvKLyDFen06QuKKhYC2XNOfNKqFDqzIdcY/vGick869bNIWalChoy4O07k0HLsA==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.8.3.tgz",
+      "integrity": "sha512-zGrkU1EuNFmkq6iky6LcMqD4h0OLE8XysVFxQWRIZbcTNnf0XAycbsbeEyiJpiWeqb7qtg2bVuY9EYcNoNhVuQ==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
         "turbo": "bin/turbo"
       },
       "optionalDependencies": {
-        "turbo-darwin-64": "1.7.4",
-        "turbo-darwin-arm64": "1.7.4",
-        "turbo-linux-64": "1.7.4",
-        "turbo-linux-arm64": "1.7.4",
-        "turbo-windows-64": "1.7.4",
-        "turbo-windows-arm64": "1.7.4"
+        "turbo-darwin-64": "1.8.3",
+        "turbo-darwin-arm64": "1.8.3",
+        "turbo-linux-64": "1.8.3",
+        "turbo-linux-arm64": "1.8.3",
+        "turbo-windows-64": "1.8.3",
+        "turbo-windows-arm64": "1.8.3"
       }
     },
     "node_modules/turbo-darwin-64": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.7.4.tgz",
-      "integrity": "sha512-ZyYrQlUl8K/mYN1e6R7bEhPPYjMakz0DYMaexkyD7TAijQtWmTSd4a+I7VknOYNEssnUZ/v41GU3gPV1JAzxxQ==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.8.3.tgz",
+      "integrity": "sha512-bLM084Wr17VAAY/EvCWj7+OwYHvI9s/NdsvlqGp8iT5HEYVimcornCHespgJS/yvZDfC+mX9EQkn3V2JmYgGGw==",
       "cpu": [
         "x64"
       ],
@@ -14009,9 +14009,9 @@
       ]
     },
     "node_modules/turbo-darwin-arm64": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.7.4.tgz",
-      "integrity": "sha512-CKIXg9uqp1a+Yeq/c4U0alPOqvwLUq5SBZf1PGYhGqJsfG0fRBtJfkUjHuBsuJIOGXg8rCmcGSWGIsIF6fqYuw==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.8.3.tgz",
+      "integrity": "sha512-4oZjXtzakopMK110kue3z/hqu3WLv+eDLZOX1NGdo49gqca9BeD8GbH+sXpAp6tqyeuzpss+PIliVYuyt7LgbA==",
       "cpu": [
         "arm64"
       ],
@@ -14022,9 +14022,9 @@
       ]
     },
     "node_modules/turbo-linux-64": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.7.4.tgz",
-      "integrity": "sha512-RIUl4RUFFyzD2T024vL7509Ygwcw+SEa8NOwPfaN6TtJHK7RZV/SBP3fLNVOptG9WRLnOWX3OvsLMbiOqDLLyA==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.8.3.tgz",
+      "integrity": "sha512-uvX2VKotf5PU14FCxJA5iHItPQno2JWzerMd+g3/h/Asay6dvxvtVjc39MQeGT0H5njSvzVKFkT+3/5q8lgOEg==",
       "cpu": [
         "x64"
       ],
@@ -14035,9 +14035,9 @@
       ]
     },
     "node_modules/turbo-linux-arm64": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.7.4.tgz",
-      "integrity": "sha512-Bg65F0AjYYYxqE6RPf2H5TIGuA/EyWMeGOATHVSZOWAbYcnG3Ly03GZii8AHnUi7ntWBdjwvXf/QbOS1ayNB6A==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.8.3.tgz",
+      "integrity": "sha512-E1p+oH3XKMaPS4rqWhYsL4j2Pzc0d/9P5KU7Kn1kqVLo2T3iRA7n2KVULEieUNE0nTH+aIJPXYXOpqCI5wFJaA==",
       "cpu": [
         "arm64"
       ],
@@ -14048,9 +14048,9 @@
       ]
     },
     "node_modules/turbo-windows-64": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.7.4.tgz",
-      "integrity": "sha512-rTaV50XZ2BRxRHOHqt1UsWfeDmYLbn8UKE6g2D2ED+uW+kmnTvR9s01nmlGWd2sAuWcRYQyQ2V+O09VfKPKcQw==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.8.3.tgz",
+      "integrity": "sha512-cnzAytHtoLXd0J7aNzRpZFpL/GTjcBmkvAPlbOdf/Pl1iwS4qzGrudZQ+OM1lmLgLIfBPIavsGHBknTwTNib4A==",
       "cpu": [
         "x64"
       ],
@@ -14061,9 +14061,9 @@
       ]
     },
     "node_modules/turbo-windows-arm64": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.7.4.tgz",
-      "integrity": "sha512-h8sxdKPvHTnWUPtwnYszFMmSO0P/iUUwmYY9n7iYThA71zSao28UeZ0H0Gw75cY3MPjvkjn2C4EBAUGPjuZJLw==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.8.3.tgz",
+      "integrity": "sha512-ulIiItNm2w/zYJdD5/oAzjzNns1IjbpweRzpsE8tLXaWwo6+fnXXkyloUug0IUhcd2k6fJXfoiDZfygqpOVuXg==",
       "cpu": [
         "arm64"
       ],
@@ -25333,7 +25333,7 @@
         "resolve": "^1.22.1",
         "rimraf": "^4.1.2",
         "source-map-js": "^1.0.2",
-        "turbo": "^1.7.4"
+        "turbo": "^1.8.3"
       },
       "dependencies": {
         "@ampproject/remapping": {
@@ -35303,58 +35303,58 @@
           "dev": true
         },
         "turbo": {
-          "version": "1.7.4",
-          "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.7.4.tgz",
-          "integrity": "sha512-8RLedDoUL0kkVKWEZ/RMM70BvKLyDFen06QuKKhYC2XNOfNKqFDqzIdcY/vGick869bNIWalChoy4O07k0HLsA==",
+          "version": "1.8.3",
+          "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.8.3.tgz",
+          "integrity": "sha512-zGrkU1EuNFmkq6iky6LcMqD4h0OLE8XysVFxQWRIZbcTNnf0XAycbsbeEyiJpiWeqb7qtg2bVuY9EYcNoNhVuQ==",
           "dev": true,
           "requires": {
-            "turbo-darwin-64": "1.7.4",
-            "turbo-darwin-arm64": "1.7.4",
-            "turbo-linux-64": "1.7.4",
-            "turbo-linux-arm64": "1.7.4",
-            "turbo-windows-64": "1.7.4",
-            "turbo-windows-arm64": "1.7.4"
+            "turbo-darwin-64": "1.8.3",
+            "turbo-darwin-arm64": "1.8.3",
+            "turbo-linux-64": "1.8.3",
+            "turbo-linux-arm64": "1.8.3",
+            "turbo-windows-64": "1.8.3",
+            "turbo-windows-arm64": "1.8.3"
           }
         },
         "turbo-darwin-64": {
-          "version": "1.7.4",
-          "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.7.4.tgz",
-          "integrity": "sha512-ZyYrQlUl8K/mYN1e6R7bEhPPYjMakz0DYMaexkyD7TAijQtWmTSd4a+I7VknOYNEssnUZ/v41GU3gPV1JAzxxQ==",
+          "version": "1.8.3",
+          "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.8.3.tgz",
+          "integrity": "sha512-bLM084Wr17VAAY/EvCWj7+OwYHvI9s/NdsvlqGp8iT5HEYVimcornCHespgJS/yvZDfC+mX9EQkn3V2JmYgGGw==",
           "dev": true,
           "optional": true
         },
         "turbo-darwin-arm64": {
-          "version": "1.7.4",
-          "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.7.4.tgz",
-          "integrity": "sha512-CKIXg9uqp1a+Yeq/c4U0alPOqvwLUq5SBZf1PGYhGqJsfG0fRBtJfkUjHuBsuJIOGXg8rCmcGSWGIsIF6fqYuw==",
+          "version": "1.8.3",
+          "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.8.3.tgz",
+          "integrity": "sha512-4oZjXtzakopMK110kue3z/hqu3WLv+eDLZOX1NGdo49gqca9BeD8GbH+sXpAp6tqyeuzpss+PIliVYuyt7LgbA==",
           "dev": true,
           "optional": true
         },
         "turbo-linux-64": {
-          "version": "1.7.4",
-          "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.7.4.tgz",
-          "integrity": "sha512-RIUl4RUFFyzD2T024vL7509Ygwcw+SEa8NOwPfaN6TtJHK7RZV/SBP3fLNVOptG9WRLnOWX3OvsLMbiOqDLLyA==",
+          "version": "1.8.3",
+          "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.8.3.tgz",
+          "integrity": "sha512-uvX2VKotf5PU14FCxJA5iHItPQno2JWzerMd+g3/h/Asay6dvxvtVjc39MQeGT0H5njSvzVKFkT+3/5q8lgOEg==",
           "dev": true,
           "optional": true
         },
         "turbo-linux-arm64": {
-          "version": "1.7.4",
-          "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.7.4.tgz",
-          "integrity": "sha512-Bg65F0AjYYYxqE6RPf2H5TIGuA/EyWMeGOATHVSZOWAbYcnG3Ly03GZii8AHnUi7ntWBdjwvXf/QbOS1ayNB6A==",
+          "version": "1.8.3",
+          "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.8.3.tgz",
+          "integrity": "sha512-E1p+oH3XKMaPS4rqWhYsL4j2Pzc0d/9P5KU7Kn1kqVLo2T3iRA7n2KVULEieUNE0nTH+aIJPXYXOpqCI5wFJaA==",
           "dev": true,
           "optional": true
         },
         "turbo-windows-64": {
-          "version": "1.7.4",
-          "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.7.4.tgz",
-          "integrity": "sha512-rTaV50XZ2BRxRHOHqt1UsWfeDmYLbn8UKE6g2D2ED+uW+kmnTvR9s01nmlGWd2sAuWcRYQyQ2V+O09VfKPKcQw==",
+          "version": "1.8.3",
+          "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.8.3.tgz",
+          "integrity": "sha512-cnzAytHtoLXd0J7aNzRpZFpL/GTjcBmkvAPlbOdf/Pl1iwS4qzGrudZQ+OM1lmLgLIfBPIavsGHBknTwTNib4A==",
           "dev": true,
           "optional": true
         },
         "turbo-windows-arm64": {
-          "version": "1.7.4",
-          "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.7.4.tgz",
-          "integrity": "sha512-h8sxdKPvHTnWUPtwnYszFMmSO0P/iUUwmYY9n7iYThA71zSao28UeZ0H0Gw75cY3MPjvkjn2C4EBAUGPjuZJLw==",
+          "version": "1.8.3",
+          "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.8.3.tgz",
+          "integrity": "sha512-ulIiItNm2w/zYJdD5/oAzjzNns1IjbpweRzpsE8tLXaWwo6+fnXXkyloUug0IUhcd2k6fJXfoiDZfygqpOVuXg==",
           "dev": true,
           "optional": true
         },
@@ -36612,58 +36612,58 @@
       "dev": true
     },
     "turbo": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.7.4.tgz",
-      "integrity": "sha512-8RLedDoUL0kkVKWEZ/RMM70BvKLyDFen06QuKKhYC2XNOfNKqFDqzIdcY/vGick869bNIWalChoy4O07k0HLsA==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.8.3.tgz",
+      "integrity": "sha512-zGrkU1EuNFmkq6iky6LcMqD4h0OLE8XysVFxQWRIZbcTNnf0XAycbsbeEyiJpiWeqb7qtg2bVuY9EYcNoNhVuQ==",
       "dev": true,
       "requires": {
-        "turbo-darwin-64": "1.7.4",
-        "turbo-darwin-arm64": "1.7.4",
-        "turbo-linux-64": "1.7.4",
-        "turbo-linux-arm64": "1.7.4",
-        "turbo-windows-64": "1.7.4",
-        "turbo-windows-arm64": "1.7.4"
+        "turbo-darwin-64": "1.8.3",
+        "turbo-darwin-arm64": "1.8.3",
+        "turbo-linux-64": "1.8.3",
+        "turbo-linux-arm64": "1.8.3",
+        "turbo-windows-64": "1.8.3",
+        "turbo-windows-arm64": "1.8.3"
       }
     },
     "turbo-darwin-64": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.7.4.tgz",
-      "integrity": "sha512-ZyYrQlUl8K/mYN1e6R7bEhPPYjMakz0DYMaexkyD7TAijQtWmTSd4a+I7VknOYNEssnUZ/v41GU3gPV1JAzxxQ==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.8.3.tgz",
+      "integrity": "sha512-bLM084Wr17VAAY/EvCWj7+OwYHvI9s/NdsvlqGp8iT5HEYVimcornCHespgJS/yvZDfC+mX9EQkn3V2JmYgGGw==",
       "dev": true,
       "optional": true
     },
     "turbo-darwin-arm64": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.7.4.tgz",
-      "integrity": "sha512-CKIXg9uqp1a+Yeq/c4U0alPOqvwLUq5SBZf1PGYhGqJsfG0fRBtJfkUjHuBsuJIOGXg8rCmcGSWGIsIF6fqYuw==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.8.3.tgz",
+      "integrity": "sha512-4oZjXtzakopMK110kue3z/hqu3WLv+eDLZOX1NGdo49gqca9BeD8GbH+sXpAp6tqyeuzpss+PIliVYuyt7LgbA==",
       "dev": true,
       "optional": true
     },
     "turbo-linux-64": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.7.4.tgz",
-      "integrity": "sha512-RIUl4RUFFyzD2T024vL7509Ygwcw+SEa8NOwPfaN6TtJHK7RZV/SBP3fLNVOptG9WRLnOWX3OvsLMbiOqDLLyA==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.8.3.tgz",
+      "integrity": "sha512-uvX2VKotf5PU14FCxJA5iHItPQno2JWzerMd+g3/h/Asay6dvxvtVjc39MQeGT0H5njSvzVKFkT+3/5q8lgOEg==",
       "dev": true,
       "optional": true
     },
     "turbo-linux-arm64": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.7.4.tgz",
-      "integrity": "sha512-Bg65F0AjYYYxqE6RPf2H5TIGuA/EyWMeGOATHVSZOWAbYcnG3Ly03GZii8AHnUi7ntWBdjwvXf/QbOS1ayNB6A==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.8.3.tgz",
+      "integrity": "sha512-E1p+oH3XKMaPS4rqWhYsL4j2Pzc0d/9P5KU7Kn1kqVLo2T3iRA7n2KVULEieUNE0nTH+aIJPXYXOpqCI5wFJaA==",
       "dev": true,
       "optional": true
     },
     "turbo-windows-64": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.7.4.tgz",
-      "integrity": "sha512-rTaV50XZ2BRxRHOHqt1UsWfeDmYLbn8UKE6g2D2ED+uW+kmnTvR9s01nmlGWd2sAuWcRYQyQ2V+O09VfKPKcQw==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.8.3.tgz",
+      "integrity": "sha512-cnzAytHtoLXd0J7aNzRpZFpL/GTjcBmkvAPlbOdf/Pl1iwS4qzGrudZQ+OM1lmLgLIfBPIavsGHBknTwTNib4A==",
       "dev": true,
       "optional": true
     },
     "turbo-windows-arm64": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.7.4.tgz",
-      "integrity": "sha512-h8sxdKPvHTnWUPtwnYszFMmSO0P/iUUwmYY9n7iYThA71zSao28UeZ0H0Gw75cY3MPjvkjn2C4EBAUGPjuZJLw==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.8.3.tgz",
+      "integrity": "sha512-ulIiItNm2w/zYJdD5/oAzjzNns1IjbpweRzpsE8tLXaWwo6+fnXXkyloUug0IUhcd2k6fJXfoiDZfygqpOVuXg==",
       "dev": true,
       "optional": true
     },

From 5e9470c5cbbf5d2c80f6fa0d4d6351173b2e4ada Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Thu, 9 Mar 2023 20:41:27 +0000
Subject: [PATCH 36/84] Update lilconfig to version 2.1.0

---
 package-lock.json | 24 ++++++++++++------------
 package.json      |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f35cc9040425..c9e9745dbb15 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2404,9 +2404,9 @@
       ]
     },
     "node_modules/@napi-rs/cli": {
-      "version": "2.14.7",
-      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.7.tgz",
-      "integrity": "sha512-H+YCgdbBNMWn8c878C3RsRYcMxamWI7rB0H+1TqOy9n6u31isikcRyW1VDyoNHp7ApfmzV0+tpPopVi0W7WHAA==",
+      "version": "2.14.8",
+      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.8.tgz",
+      "integrity": "sha512-IvA3s8BqohMdUbOkFn7+23u1dhIJZCkA8Xps7DD4SLdCMbcbUF6MUuKiqxuqmVHBFTaxU25sU56WdX3efqGgPw==",
       "dev": true,
       "bin": {
         "napi": "scripts/index.js"
@@ -15540,7 +15540,7 @@
       "version": "0.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@napi-rs/cli": "^2.14.7"
+        "@napi-rs/cli": "^2.14.8"
       },
       "engines": {
         "node": ">= 10"
@@ -16847,9 +16847,9 @@
       "optional": true
     },
     "@napi-rs/cli": {
-      "version": "2.14.7",
-      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.7.tgz",
-      "integrity": "sha512-H+YCgdbBNMWn8c878C3RsRYcMxamWI7rB0H+1TqOy9n6u31isikcRyW1VDyoNHp7ApfmzV0+tpPopVi0W7WHAA==",
+      "version": "2.14.8",
+      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.8.tgz",
+      "integrity": "sha512-IvA3s8BqohMdUbOkFn7+23u1dhIJZCkA8Xps7DD4SLdCMbcbUF6MUuKiqxuqmVHBFTaxU25sU56WdX3efqGgPw==",
       "dev": true
     },
     "@nodelib/fs.scandir": {
@@ -18126,7 +18126,7 @@
     "@tailwindcss/oxide": {
       "version": "file:oxide/crates/node",
       "requires": {
-        "@napi-rs/cli": "^2.14.7",
+        "@napi-rs/cli": "^2.14.8",
         "@tailwindcss/oxide-darwin-arm64": "0.0.0",
         "@tailwindcss/oxide-darwin-x64": "0.0.0",
         "@tailwindcss/oxide-freebsd-x64": "0.0.0",
@@ -26624,9 +26624,9 @@
           "optional": true
         },
         "@napi-rs/cli": {
-          "version": "2.14.7",
-          "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.7.tgz",
-          "integrity": "sha512-H+YCgdbBNMWn8c878C3RsRYcMxamWI7rB0H+1TqOy9n6u31isikcRyW1VDyoNHp7ApfmzV0+tpPopVi0W7WHAA==",
+          "version": "2.14.8",
+          "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.8.tgz",
+          "integrity": "sha512-IvA3s8BqohMdUbOkFn7+23u1dhIJZCkA8Xps7DD4SLdCMbcbUF6MUuKiqxuqmVHBFTaxU25sU56WdX3efqGgPw==",
           "dev": true
         },
         "@nodelib/fs.scandir": {
@@ -27903,7 +27903,7 @@
         "@tailwindcss/oxide": {
           "version": "file:oxide/crates/node",
           "requires": {
-            "@napi-rs/cli": "^2.14.7",
+            "@napi-rs/cli": "^2.14.8",
             "@tailwindcss/oxide-darwin-arm64": "0.0.0",
             "@tailwindcss/oxide-darwin-x64": "0.0.0",
             "@tailwindcss/oxide-freebsd-x64": "0.0.0",
diff --git a/package.json b/package.json
index 4a7ce9939d6a..6bf118971f28 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "glob-parent": "^6.0.2",
     "is-glob": "^4.0.3",
     "lightningcss": "^1.18.0",
-    "lilconfig": "^2.0.6",
+    "lilconfig": "^2.1.0",
     "micromatch": "^4.0.5",
     "normalize-path": "^3.0.0",
     "object-hash": "^3.0.0",

From c7d605f8c59a616f0969bd2fb2f913a6aa308568 Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Fri, 10 Mar 2023 10:35:41 -0500
Subject: [PATCH 37/84] Remove warnings when using RTL/LTR variants (#10764)

* Remove warnings when using RTL/LTR variants

* Update changelog

---------

Co-authored-by: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
---
 CHANGELOG.md       |  1 +
 src/corePlugins.js | 19 ++-----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf070956b577..51150e083b06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - [Oxide] Disable color opacity plugins by default in the `oxide` engine ([#10618](https://github.com/tailwindlabs/tailwindcss/pull/10618))
 - [Oxide] Enable relative content paths for the `oxide` engine ([#10621](https://github.com/tailwindlabs/tailwindcss/pull/10621))
+- Mark `rtl` and `ltr` variants as stable and remove warnings ([#10764](https://github.com/tailwindlabs/tailwindcss/pull/10764))
 
 ## [3.2.7] - 2023-02-16
 
diff --git a/src/corePlugins.js b/src/corePlugins.js
index 3e63c12a370a..dc73002931e5 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -199,23 +199,8 @@ export let variantPlugins = {
   },
 
   directionVariants: ({ addVariant }) => {
-    addVariant('ltr', () => {
-      log.warn('rtl-experimental', [
-        'The RTL features in Tailwind CSS are currently in preview.',
-        'Preview features are not covered by semver, and may be improved in breaking ways at any time.',
-      ])
-
-      return '[dir="ltr"] &'
-    })
-
-    addVariant('rtl', () => {
-      log.warn('rtl-experimental', [
-        'The RTL features in Tailwind CSS are currently in preview.',
-        'Preview features are not covered by semver, and may be improved in breaking ways at any time.',
-      ])
-
-      return '[dir="rtl"] &'
-    })
+    addVariant('ltr', '[dir="ltr"] &')
+    addVariant('rtl', '[dir="rtl"] &')
   },
 
   reducedMotionVariants: ({ addVariant }) => {

From ba56e426affd68c37e72ad3583360346c060cdfd Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Fri, 10 Mar 2023 16:52:08 +0100
Subject: [PATCH 38/84] Use `inset` instead of `top`, `right`, `bottom`, and
 `left` properties (#10765)

* use `inset` instead of `top`, `right`, `bottom` and `left` properties

* update changelog
---
 CHANGELOG.md                          |  1 +
 src/corePlugins.js                    |  2 +-
 tests/any-type.test.js                | 10 ++--------
 tests/arbitrary-values.oxide.test.css |  5 +----
 tests/arbitrary-values.test.css       |  5 +----
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51150e083b06..73b0620facdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Oxide] Disable color opacity plugins by default in the `oxide` engine ([#10618](https://github.com/tailwindlabs/tailwindcss/pull/10618))
 - [Oxide] Enable relative content paths for the `oxide` engine ([#10621](https://github.com/tailwindlabs/tailwindcss/pull/10621))
 - Mark `rtl` and `ltr` variants as stable and remove warnings ([#10764](https://github.com/tailwindlabs/tailwindcss/pull/10764))
+- Use `inset` instead of `top`, `right`, `bottom`, and `left` properties ([#10765](https://github.com/tailwindlabs/tailwindcss/pull/10765))
 
 ## [3.2.7] - 2023-02-16
 
diff --git a/src/corePlugins.js b/src/corePlugins.js
index dc73002931e5..4a97713fabe6 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -626,7 +626,7 @@ export let corePlugins = {
   inset: createUtilityPlugin(
     'inset',
     [
-      ['inset', ['top', 'right', 'bottom', 'left']],
+      ['inset', ['inset']],
       [
         ['inset-x', ['left', 'right']],
         ['inset-y', ['top', 'bottom']],
diff --git a/tests/any-type.test.js b/tests/any-type.test.js
index a7e266176828..17b670386bbf 100644
--- a/tests/any-type.test.js
+++ b/tests/any-type.test.js
@@ -187,10 +187,7 @@ crosscheck(({ stable, oxide }) => {
     return run(input, config).then((result) => {
       let oxideExpected = css`
         .inset-\[var\(--any-value\)\] {
-          top: var(--any-value);
-          right: var(--any-value);
-          bottom: var(--any-value);
-          left: var(--any-value);
+          inset: var(--any-value);
         }
         .inset-x-\[var\(--any-value\)\] {
           left: var(--any-value);
@@ -738,10 +735,7 @@ crosscheck(({ stable, oxide }) => {
       `
       let stableExpected = css`
         .inset-\[var\(--any-value\)\] {
-          top: var(--any-value);
-          right: var(--any-value);
-          bottom: var(--any-value);
-          left: var(--any-value);
+          inset: var(--any-value);
         }
         .inset-x-\[var\(--any-value\)\] {
           left: var(--any-value);
diff --git a/tests/arbitrary-values.oxide.test.css b/tests/arbitrary-values.oxide.test.css
index c8dfb24a7007..411056bb6c4e 100644
--- a/tests/arbitrary-values.oxide.test.css
+++ b/tests/arbitrary-values.oxide.test.css
@@ -2,10 +2,7 @@
   inset: 11px;
 }
 .inset-\[var\(--value\)\] {
-  top: var(--value);
-  right: var(--value);
-  bottom: var(--value);
-  left: var(--value);
+  inset: var(--value);
 }
 .inset-x-\[11px\] {
   left: 11px;
diff --git a/tests/arbitrary-values.test.css b/tests/arbitrary-values.test.css
index 3c357c605df2..a20e619b53f3 100644
--- a/tests/arbitrary-values.test.css
+++ b/tests/arbitrary-values.test.css
@@ -2,10 +2,7 @@
   inset: 11px;
 }
 .inset-\[var\(--value\)\] {
-  top: var(--value);
-  right: var(--value);
-  bottom: var(--value);
-  left: var(--value);
+  inset: var(--value);
 }
 .inset-x-\[11px\] {
   left: 11px;

From e40b73a12765d3d09e84fb79e3cb298c701e94be Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Fri, 10 Mar 2023 12:03:38 -0500
Subject: [PATCH 39/84] Make `dark` and `rtl`/`ltr` variants insensitive to DOM
 order (#10766)

* Make `dark` and `rtl`/`ltr` variants insensitive to DOM order

* Add explicit test for stacking dark and rtl variants

* Update changelog

---------

Co-authored-by: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
---
 CHANGELOG.md                     |  1 +
 src/corePlugins.js               |  6 +++---
 tests/apply.test.js              | 12 ++++++------
 tests/custom-separator.test.js   |  4 ++--
 tests/dark-mode.test.js          |  4 ++--
 tests/important-boolean.test.js  |  4 ++--
 tests/important-selector.test.js |  4 ++--
 tests/kitchen-sink.test.js       | 16 ++++++++--------
 tests/prefix.test.js             |  8 ++++----
 tests/variants.oxide.test.css    | 17 ++++++++---------
 tests/variants.test.css          | 16 ++++++++--------
 tests/variants.test.js           | 24 ++++++++++++++++++++++++
 12 files changed, 70 insertions(+), 46 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73b0620facdf..0f8dce96de86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Oxide] Enable relative content paths for the `oxide` engine ([#10621](https://github.com/tailwindlabs/tailwindcss/pull/10621))
 - Mark `rtl` and `ltr` variants as stable and remove warnings ([#10764](https://github.com/tailwindlabs/tailwindcss/pull/10764))
 - Use `inset` instead of `top`, `right`, `bottom`, and `left` properties ([#10765](https://github.com/tailwindlabs/tailwindcss/pull/10765))
+- Make `dark` and `rtl`/`ltr` variants insensitive to DOM order ([#10766](https://github.com/tailwindlabs/tailwindcss/pull/10766))
 
 ## [3.2.7] - 2023-02-16
 
diff --git a/src/corePlugins.js b/src/corePlugins.js
index 4a97713fabe6..717c9ec5c350 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -199,8 +199,8 @@ export let variantPlugins = {
   },
 
   directionVariants: ({ addVariant }) => {
-    addVariant('ltr', '[dir="ltr"] &')
-    addVariant('rtl', '[dir="rtl"] &')
+    addVariant('ltr', ':is([dir="ltr"] &)')
+    addVariant('rtl', ':is([dir="rtl"] &)')
   },
 
   reducedMotionVariants: ({ addVariant }) => {
@@ -221,7 +221,7 @@ export let variantPlugins = {
     }
 
     if (mode === 'class') {
-      addVariant('dark', `${className} &`)
+      addVariant('dark', `:is(${className} &)`)
     } else if (mode === 'media') {
       addVariant('dark', '@media (prefers-color-scheme: dark)')
     }
diff --git a/tests/apply.test.js b/tests/apply.test.js
index cb5c6be068a6..14b84550a8a8 100644
--- a/tests/apply.test.js
+++ b/tests/apply.test.js
@@ -216,14 +216,14 @@ crosscheck(({ stable, oxide }) => {
             text-align: left;
           }
         }
-        .dark .apply-dark-variant {
+        :is(.dark .apply-dark-variant) {
           text-align: center;
         }
-        .dark .apply-dark-variant:hover {
+        :is(.dark .apply-dark-variant:hover) {
           text-align: right;
         }
         @media (min-width: 1024px) {
-          .dark .apply-dark-variant {
+          :is(.dark .apply-dark-variant) {
             text-align: left;
           }
         }
@@ -513,14 +513,14 @@ crosscheck(({ stable, oxide }) => {
             text-align: left;
           }
         }
-        .dark .apply-dark-variant {
+        :is(.dark .apply-dark-variant) {
           text-align: center;
         }
-        .dark .apply-dark-variant:hover {
+        :is(.dark .apply-dark-variant:hover) {
           text-align: right;
         }
         @media (min-width: 1024px) {
-          .dark .apply-dark-variant {
+          :is(.dark .apply-dark-variant) {
             text-align: left;
           }
         }
diff --git a/tests/custom-separator.test.js b/tests/custom-separator.test.js
index 8e788c5519ff..adc1d55afd65 100644
--- a/tests/custom-separator.test.js
+++ b/tests/custom-separator.test.js
@@ -23,7 +23,7 @@ crosscheck(() => {
         .group:hover .group-hover_focus-within_text-left:focus-within {
           text-align: left;
         }
-        [dir='rtl'] .rtl_active_text-center:active {
+        :is([dir='rtl'] .rtl_active_text-center:active) {
           text-align: center;
         }
         @media (prefers-reduced-motion: no-preference) {
@@ -31,7 +31,7 @@ crosscheck(() => {
             text-align: center;
           }
         }
-        .dark .dark_focus_text-left:focus {
+        :is(.dark .dark_focus_text-left:focus) {
           text-align: left;
         }
         @media (min-width: 768px) {
diff --git a/tests/dark-mode.test.js b/tests/dark-mode.test.js
index 2a1cbf43dd07..ce06496b2124 100644
--- a/tests/dark-mode.test.js
+++ b/tests/dark-mode.test.js
@@ -17,7 +17,7 @@ crosscheck(() => {
     return run(input, config).then((result) => {
       expect(result.css).toMatchFormattedCss(css`
         ${defaults}
-        .dark .dark\:font-bold {
+        :is(.dark .dark\:font-bold) {
           font-weight: 700;
         }
       `)
@@ -40,7 +40,7 @@ crosscheck(() => {
     return run(input, config).then((result) => {
       expect(result.css).toMatchFormattedCss(css`
         ${defaults}
-        .test-dark .dark\:font-bold {
+        :is(.test-dark .dark\:font-bold) {
           font-weight: 700;
         }
       `)
diff --git a/tests/important-boolean.test.js b/tests/important-boolean.test.js
index a7524e1f8fc1..895ca053c901 100644
--- a/tests/important-boolean.test.js
+++ b/tests/important-boolean.test.js
@@ -138,7 +138,7 @@ crosscheck(() => {
         .group:hover .group-hover\:focus-within\:text-left:focus-within {
           text-align: left !important;
         }
-        [dir='rtl'] .rtl\:active\:text-center:active {
+        :is([dir='rtl'] .rtl\:active\:text-center:active) {
           text-align: center !important;
         }
         @media (prefers-reduced-motion: no-preference) {
@@ -146,7 +146,7 @@ crosscheck(() => {
             text-align: center !important;
           }
         }
-        .dark .dark\:focus\:text-left:focus {
+        :is(.dark .dark\:focus\:text-left:focus) {
           text-align: left !important;
         }
         @media (min-width: 768px) {
diff --git a/tests/important-selector.test.js b/tests/important-selector.test.js
index cfa094342042..044037be1114 100644
--- a/tests/important-selector.test.js
+++ b/tests/important-selector.test.js
@@ -134,7 +134,7 @@ crosscheck(() => {
         #app .group:hover .group-hover\:focus-within\:text-left:focus-within {
           text-align: left;
         }
-        #app [dir='rtl'] .rtl\:active\:text-center:active {
+        #app :is([dir='rtl'] .rtl\:active\:text-center:active) {
           text-align: center;
         }
         @media (prefers-reduced-motion: no-preference) {
@@ -142,7 +142,7 @@ crosscheck(() => {
             text-align: center;
           }
         }
-        #app .dark .dark\:focus\:text-left:focus {
+        #app :is(.dark .dark\:focus\:text-left:focus) {
           text-align: left;
         }
         @media (min-width: 768px) {
diff --git a/tests/kitchen-sink.test.js b/tests/kitchen-sink.test.js
index d6d74225d293..a421e3a0b374 100644
--- a/tests/kitchen-sink.test.js
+++ b/tests/kitchen-sink.test.js
@@ -303,7 +303,7 @@ crosscheck(({ stable, oxide }) => {
         }
         .drop-empty-rules:hover,
         .group:hover .apply-group,
-        .dark .apply-dark-mode {
+        :is(.dark .apply-dark-mode) {
           font-weight: 700;
         }
         .apply-with-existing:hover {
@@ -338,7 +338,7 @@ crosscheck(({ stable, oxide }) => {
         .apply-order-b {
           margin: 1.5rem 1.25rem 1.25rem;
         }
-        .dark .group:hover .apply-dark-group-example-a {
+        :is(.dark .group:hover .apply-dark-group-example-a) {
           --tw-bg-opacity: 1;
           background-color: rgb(34 197 94 / var(--tw-bg-opacity));
         }
@@ -715,7 +715,7 @@ crosscheck(({ stable, oxide }) => {
             transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
           }
         }
-        .dark .dark\:custom-util {
+        :is(.dark .dark\:custom-util) {
           background: #abcdef;
         }
         @media (min-width: 640px) {
@@ -762,7 +762,7 @@ crosscheck(({ stable, oxide }) => {
               transition-duration: 0.15s;
               transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
             }
-            .dark .md\:dark\:motion-safe\:foo\:active\:custom-util:active {
+            :is(.dark .md\:dark\:motion-safe\:foo\:active\:custom-util:active) {
               background: #abcdef !important;
             }
           }
@@ -849,7 +849,7 @@ crosscheck(({ stable, oxide }) => {
         }
         .drop-empty-rules:hover,
         .group:hover .apply-group,
-        .dark .apply-dark-mode {
+        :is(.dark .apply-dark-mode) {
           font-weight: 700;
         }
         .apply-with-existing:hover {
@@ -883,7 +883,7 @@ crosscheck(({ stable, oxide }) => {
         .apply-order-b {
           margin: 1.5rem 1.25rem 1.25rem;
         }
-        .dark .group:hover .apply-dark-group-example-a {
+        :is(.dark .group:hover .apply-dark-group-example-a) {
           background-color: #22c55e;
         }
         @media (min-width: 640px) {
@@ -1250,7 +1250,7 @@ crosscheck(({ stable, oxide }) => {
             transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
           }
         }
-        .dark .dark\:custom-util {
+        :is(.dark .dark\:custom-util) {
           background: #abcdef;
         }
         @media (min-width: 640px) {
@@ -1297,7 +1297,7 @@ crosscheck(({ stable, oxide }) => {
               transition-duration: 0.15s;
               transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
             }
-            .dark .md\:dark\:motion-safe\:foo\:active\:custom-util:active {
+            :is(.dark .md\:dark\:motion-safe\:foo\:active\:custom-util:active) {
               background: #abcdef !important;
             }
           }
diff --git a/tests/prefix.test.js b/tests/prefix.test.js
index e0139ad9a979..ea3d041ffeac 100644
--- a/tests/prefix.test.js
+++ b/tests/prefix.test.js
@@ -128,7 +128,7 @@ crosscheck(({ stable, oxide }) => {
         .custom-component {
           font-weight: 700;
         }
-        .tw-dark .tw-group:hover .custom-component {
+        :is(.tw-dark .tw-group:hover .custom-component) {
           font-weight: 400;
         }
         .tw--ml-4 {
@@ -155,7 +155,7 @@ crosscheck(({ stable, oxide }) => {
         .tw-group:hover .group-hover\:focus-within\:tw-text-left:focus-within {
           text-align: left;
         }
-        [dir='rtl'] .rtl\:active\:tw-text-center:active {
+        :is([dir='rtl'] .rtl\:active\:tw-text-center:active) {
           text-align: center;
         }
         @media (prefers-reduced-motion: no-preference) {
@@ -163,11 +163,11 @@ crosscheck(({ stable, oxide }) => {
             text-align: center;
           }
         }
-        .tw-dark .dark\:tw-bg-\[rgb\(255\,0\,0\)\] {
+        :is(.tw-dark .dark\:tw-bg-\[rgb\(255\,0\,0\)\]) {
           --tw-bg-opacity: 1;
           background-color: rgb(255 0 0 / var(--tw-bg-opacity));
         }
-        .tw-dark .dark\:focus\:tw-text-left:focus {
+        :is(.tw-dark .dark\:focus\:tw-text-left:focus) {
           text-align: left;
         }
         @media (min-width: 768px) {
diff --git a/tests/variants.oxide.test.css b/tests/variants.oxide.test.css
index db3a5283f1a1..c2a490f4a805 100644
--- a/tests/variants.oxide.test.css
+++ b/tests/variants.oxide.test.css
@@ -283,8 +283,8 @@
 .peer:disabled ~ .peer-disabled\:shadow-md,
 .peer:disabled:focus:hover ~ .peer-disabled\:peer-focus\:peer-hover\:shadow-md,
 .peer:disabled:focus:hover ~ .peer-disabled\:peer-focus\:peer-hover\:first\:shadow-md:first-child,
-[dir="ltr"] .ltr\:shadow-md,
-[dir="rtl"] .rtl\:shadow-md {
+:is([dir='ltr'] .ltr\:shadow-md),
+:is([dir='rtl'] .rtl\:shadow-md) {
   --tw-shadow: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
   --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color);
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
@@ -318,9 +318,9 @@
     background-color: #fde047;
   }
 }
-.dark .dark\:shadow-md,
-.dark .group:disabled:focus:hover .dark\:group-disabled\:group-focus\:group-hover\:shadow-md,
-.dark .peer:disabled:focus:hover ~ .dark\:peer-disabled\:peer-focus\:peer-hover\:shadow-md {
+:is(.dark .dark\:shadow-md),
+:is(.dark .group:disabled:focus:hover .dark\:group-disabled\:group-focus\:group-hover\:shadow-md),
+:is(.dark .peer:disabled:focus:hover ~ .dark\:peer-disabled\:peer-focus\:peer-hover\:shadow-md) {
   --tw-shadow: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
   --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color);
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
@@ -361,7 +361,7 @@
     animation: 1s linear infinite spin;
   }
   .lg\:shadow-md,
-  .dark .lg\:dark\:shadow-md {
+  :is(.dark .lg\:dark\:shadow-md) {
     --tw-shadow: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
     --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color),
       0 2px 4px -2px var(--tw-shadow-color);
@@ -371,7 +371,7 @@
 }
 @media (min-width: 1280px) {
   .xl\:shadow-md,
-  .dark .xl\:dark\:disabled\:shadow-md:disabled {
+  :is(.dark .xl\:dark\:disabled\:shadow-md:disabled) {
     --tw-shadow: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
     --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color),
       0 2px 4px -2px var(--tw-shadow-color);
@@ -388,7 +388,7 @@
       var(--tw-shadow);
   }
   @media (prefers-reduced-motion: no-preference) {
-    .dark .\32 xl\:dark\:motion-safe\:focus-within\:shadow-md:focus-within {
+    :is(.dark .\32 xl\:dark\:motion-safe\:focus-within\:shadow-md:focus-within) {
       --tw-shadow: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
       --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color),
         0 2px 4px -2px var(--tw-shadow-color);
@@ -407,4 +407,3 @@
     background-color: #fde047;
   }
 }
-
diff --git a/tests/variants.test.css b/tests/variants.test.css
index 7d0120d127a6..2f8181cf23c4 100644
--- a/tests/variants.test.css
+++ b/tests/variants.test.css
@@ -299,8 +299,8 @@
 .peer:disabled ~ .peer-disabled\:shadow-md,
 .peer:disabled:focus:hover ~ .peer-disabled\:peer-focus\:peer-hover\:shadow-md,
 .peer:disabled:focus:hover ~ .peer-disabled\:peer-focus\:peer-hover\:first\:shadow-md:first-child,
-[dir='ltr'] .ltr\:shadow-md,
-[dir='rtl'] .rtl\:shadow-md {
+:is([dir='ltr'] .ltr\:shadow-md),
+:is([dir='rtl'] .rtl\:shadow-md) {
   --tw-shadow: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
   --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color);
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
@@ -336,9 +336,9 @@
     background-color: rgb(253 224 71 / var(--tw-bg-opacity));
   }
 }
-.dark .dark\:shadow-md,
-.dark .group:disabled:focus:hover .dark\:group-disabled\:group-focus\:group-hover\:shadow-md,
-.dark .peer:disabled:focus:hover ~ .dark\:peer-disabled\:peer-focus\:peer-hover\:shadow-md {
+:is(.dark .dark\:shadow-md),
+:is(.dark .group:disabled:focus:hover .dark\:group-disabled\:group-focus\:group-hover\:shadow-md),
+:is(.dark .peer:disabled:focus:hover ~ .dark\:peer-disabled\:peer-focus\:peer-hover\:shadow-md) {
   --tw-shadow: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
   --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color);
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
@@ -380,7 +380,7 @@
     animation: 1s linear infinite spin;
   }
   .lg\:shadow-md,
-  .dark .lg\:dark\:shadow-md {
+  :is(.dark .lg\:dark\:shadow-md) {
     --tw-shadow: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
     --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color),
       0 2px 4px -2px var(--tw-shadow-color);
@@ -390,7 +390,7 @@
 }
 @media (min-width: 1280px) {
   .xl\:shadow-md,
-  .dark .xl\:dark\:disabled\:shadow-md:disabled {
+  :is(.dark .xl\:dark\:disabled\:shadow-md:disabled) {
     --tw-shadow: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
     --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color),
       0 2px 4px -2px var(--tw-shadow-color);
@@ -407,7 +407,7 @@
       var(--tw-shadow);
   }
   @media (prefers-reduced-motion: no-preference) {
-    .dark .\32 xl\:dark\:motion-safe\:focus-within\:shadow-md:focus-within {
+    :is(.dark .\32 xl\:dark\:motion-safe\:focus-within\:shadow-md:focus-within) {
       --tw-shadow: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
       --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color),
         0 2px 4px -2px var(--tw-shadow-color);
diff --git a/tests/variants.test.js b/tests/variants.test.js
index a762745f082f..09c8ee538d08 100644
--- a/tests/variants.test.js
+++ b/tests/variants.test.js
@@ -1128,4 +1128,28 @@ crosscheck(({ stable, oxide }) => {
       }
     `)
   })
+
+  test('stacking dark and rtl variants', async () => {
+    let config = {
+      darkMode: 'class',
+      content: [
+        {
+          raw: html` <div class="dark:rtl:italic" /> `,
+        },
+      ],
+      corePlugins: { preflight: false },
+    }
+
+    let input = css`
+      @tailwind utilities;
+    `
+
+    let result = await run(input, config)
+
+    expect(result.css).toMatchFormattedCss(css`
+      :is(.dark :is([dir='rtl'] .dark\:rtl\:italic)) {
+        font-style: italic;
+      }
+    `)
+  })
 })

From 7eab762a3d7fa56b12d8d1e0cbce35133c0eb324 Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Fri, 10 Mar 2023 18:47:43 +0100
Subject: [PATCH 40/84] Add `line-clamp` utilities from
 `@tailwindcss/line-clamp` to core (#10768)

* add `lineClamp` utility

This is coming from the `@tailwindcss/line-clamp` package that we now
merged into the core of Tailwind itself.

* update changelog
---
 CHANGELOG.md                |  1 +
 src/corePlugins.js          | 18 +++++++++++++++
 stubs/defaultConfig.stub.js |  8 +++++++
 tests/kitchen-sink.test.js  | 45 +++++++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f8dce96de86..739ccfd1fd57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
 - Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
 - Add `content-normal` and `content-stretch` utilities ([#10645](https://github.com/tailwindlabs/tailwindcss/pull/10645))
+- Add `line-clamp` utilities from `@tailwindcss/line-clamp` to core ([#10768](https://github.com/tailwindlabs/tailwindcss/pull/10768))
 
 ### Fixed
 
diff --git a/src/corePlugins.js b/src/corePlugins.js
index 717c9ec5c350..147bd8b0119b 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -703,6 +703,24 @@ export let corePlugins = {
     })
   },
 
+  lineClamp: ({ matchUtilities, addUtilities, theme }) => {
+    matchUtilities(
+      {
+        'line-clamp': (value) => ({
+          overflow: 'hidden',
+          display: '-webkit-box',
+          '-webkit-box-orient': 'vertical',
+          '-webkit-line-clamp': `${value}`,
+        }),
+      },
+      { values: theme('lineClamp') }
+    )
+
+    addUtilities({
+      '.line-clamp-none': { '-webkit-line-clamp': 'unset' },
+    })
+  },
+
   display: ({ addUtilities }) => {
     addUtilities({
       '.block': { display: 'block' },
diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js
index 75ebb7c01cfb..b29eb4cf479d 100644
--- a/stubs/defaultConfig.stub.js
+++ b/stubs/defaultConfig.stub.js
@@ -582,6 +582,14 @@ module.exports = {
       auto: 'auto',
       ...theme('spacing'),
     }),
+    lineClamp: {
+      1: '1',
+      2: '2',
+      3: '3',
+      4: '4',
+      5: '5',
+      6: '6',
+    },
     maxHeight: ({ theme }) => ({
       ...theme('spacing'),
       none: 'none',
diff --git a/tests/kitchen-sink.test.js b/tests/kitchen-sink.test.js
index a421e3a0b374..a1425b2d75a3 100644
--- a/tests/kitchen-sink.test.js
+++ b/tests/kitchen-sink.test.js
@@ -7,6 +7,9 @@ crosscheck(({ stable, oxide }) => {
       content: [
         {
           raw: html`
+            <div
+              class="line-clamp-2 line-clamp-[33] line-clamp-[var(--line-clamp-variable)] line-clamp-none"
+            ></div>
             <div class="range:text-right multi:text-left"></div>
             <div
               class="container hover:container sm:container md:container text-center sm:text-center md:text-center"
@@ -432,6 +435,27 @@ crosscheck(({ stable, oxide }) => {
         .mt-6 {
           margin-top: 1.5rem;
         }
+        .line-clamp-2 {
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
+          display: -webkit-box;
+          overflow: hidden;
+        }
+        .line-clamp-\[33\] {
+          -webkit-line-clamp: 33;
+          -webkit-box-orient: vertical;
+          display: -webkit-box;
+          overflow: hidden;
+        }
+        .line-clamp-\[var\(--line-clamp-variable\)\] {
+          -webkit-line-clamp: var(--line-clamp-variable);
+          -webkit-box-orient: vertical;
+          display: -webkit-box;
+          overflow: hidden;
+        }
+        .line-clamp-none {
+          -webkit-line-clamp: unset;
+        }
         .scale-50 {
           --tw-scale-x: 0.5;
           --tw-scale-y: 0.5;
@@ -976,6 +1000,27 @@ crosscheck(({ stable, oxide }) => {
         .mt-6 {
           margin-top: 1.5rem;
         }
+        .line-clamp-2 {
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
+          display: -webkit-box;
+          overflow: hidden;
+        }
+        .line-clamp-\[33\] {
+          -webkit-line-clamp: 33;
+          -webkit-box-orient: vertical;
+          display: -webkit-box;
+          overflow: hidden;
+        }
+        .line-clamp-\[var\(--line-clamp-variable\)\] {
+          -webkit-line-clamp: var(--line-clamp-variable);
+          -webkit-box-orient: vertical;
+          display: -webkit-box;
+          overflow: hidden;
+        }
+        .line-clamp-none {
+          -webkit-line-clamp: unset;
+        }
         .scale-50 {
           --tw-scale-x: 0.5;
           --tw-scale-y: 0.5;

From 990398f52c86adbc7b7692518019c8fac0c1bc1e Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Fri, 10 Mar 2023 20:43:13 +0000
Subject: [PATCH 41/84] Update eslint to version 8.35.0

---
 package-lock.json | 17 +++++++++++------
 package.json      |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c9e9745dbb15..a08a94e0506b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
         "lightningcss": "^1.18.0",
-        "lilconfig": "^2.0.6",
+        "lilconfig": "^2.1.0",
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
         "object-hash": "^3.0.0",
@@ -10170,8 +10170,9 @@
       }
     },
     "node_modules/lilconfig": {
-      "version": "2.0.6",
-      "license": "MIT",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
       "engines": {
         "node": ">=10"
       }
@@ -22792,7 +22793,9 @@
       "optional": true
     },
     "lilconfig": {
-      "version": "2.0.6"
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="
     },
     "lines-and-columns": {
       "version": "1.2.4",
@@ -25316,7 +25319,7 @@
         "jest": "^29.4.3",
         "jest-diff": "^29.4.3",
         "lightningcss": "^1.18.0",
-        "lilconfig": "^2.0.6",
+        "lilconfig": "^2.1.0",
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
         "object-hash": "^3.0.0",
@@ -32569,7 +32572,9 @@
           "optional": true
         },
         "lilconfig": {
-          "version": "2.0.6"
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+          "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="
         },
         "lines-and-columns": {
           "version": "1.2.4",
diff --git a/package.json b/package.json
index 6bf118971f28..507967df7197 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "concurrently": "^7.5.0",
     "cssnano": "^5.1.15",
     "esbuild": "^0.17.10",
-    "eslint": "^8.34.0",
+    "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^29.4.3",

From 7b4385cdfd88aba20ce17cb1ddd8b4c00205aa2a Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Fri, 10 Mar 2023 22:44:25 +0100
Subject: [PATCH 42/84] fix typo

---
 tests/variants.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/variants.test.js b/tests/variants.test.js
index 09c8ee538d08..b17e669f7876 100644
--- a/tests/variants.test.js
+++ b/tests/variants.test.js
@@ -1036,7 +1036,7 @@ crosscheck(({ stable, oxide }) => {
     })
   })
 
-  test('variants with slashes suspport modifiers', () => {
+  test('variants with slashes support modifiers', () => {
     let config = {
       content: [
         {

From c33c5234ef2a13749bc1ceb8c429a11c0ef21a4e Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Mon, 13 Mar 2023 11:17:00 +0000
Subject: [PATCH 43/84] Update eslint-config-prettier to version 8.7.0

---
 package-lock.json | 291 ++++++++++++++++++++++++----------------------
 package.json      |   2 +-
 2 files changed, 153 insertions(+), 140 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a08a94e0506b..c55ff7e6e2f8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -53,7 +53,7 @@
         "concurrently": "^7.5.0",
         "cssnano": "^5.1.15",
         "esbuild": "^0.17.10",
-        "eslint": "^8.34.0",
+        "eslint": "^8.35.0",
         "eslint-config-prettier": "^8.6.0",
         "eslint-plugin-prettier": "^4.2.1",
         "jest": "^29.4.3",
@@ -1525,15 +1525,39 @@
         "node": ">=12"
       }
     },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz",
+      "integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
+      "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
-      "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz",
+      "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.4.0",
+        "espree": "^9.5.0",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -1555,9 +1579,9 @@
       "dev": true
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.19.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1581,6 +1605,15 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/@eslint/js": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz",
+      "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.8",
       "dev": true,
@@ -6898,12 +6931,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.34.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz",
-      "integrity": "sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz",
+      "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==",
       "dev": true,
       "dependencies": {
-        "@eslint/eslintrc": "^1.4.1",
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.0.1",
+        "@eslint/js": "8.36.0",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -6914,10 +6950,9 @@
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
         "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
+        "espree": "^9.5.0",
+        "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
@@ -6938,7 +6973,6 @@
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
         "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
@@ -6998,31 +7032,6 @@
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/eslint-visitor-keys": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
@@ -7106,9 +7115,9 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz",
+      "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.8.0",
@@ -7123,9 +7132,9 @@
       }
     },
     "node_modules/espree/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -7148,9 +7157,10 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.4.0",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -12524,17 +12534,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
     "node_modules/remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -16163,15 +16162,30 @@
       "dev": true,
       "optional": true
     },
+    "@eslint-community/eslint-utils": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz",
+      "integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
+    "@eslint-community/regexpp": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
+      "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+      "dev": true
+    },
     "@eslint/eslintrc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
-      "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz",
+      "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.4.0",
+        "espree": "^9.5.0",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -16187,9 +16201,9 @@
           "dev": true
         },
         "globals": {
-          "version": "13.19.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-          "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
+          "version": "13.20.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
@@ -16206,6 +16220,12 @@
         }
       }
     },
+    "@eslint/js": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz",
+      "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==",
+      "dev": true
+    },
     "@humanwhocodes/config-array": {
       "version": "0.11.8",
       "dev": true,
@@ -20410,12 +20430,15 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.34.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz",
-      "integrity": "sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz",
+      "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==",
       "dev": true,
       "requires": {
-        "@eslint/eslintrc": "^1.4.1",
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.0.1",
+        "@eslint/js": "8.36.0",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -20426,10 +20449,9 @@
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
         "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
+        "espree": "^9.5.0",
+        "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
@@ -20450,7 +20472,6 @@
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
         "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
@@ -20520,19 +20541,6 @@
         "estraverse": "^5.2.0"
       }
     },
-    "eslint-utils": {
-      "version": "3.0.0",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.1.0",
-          "dev": true
-        }
-      }
-    },
     "eslint-visitor-keys": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
@@ -20540,9 +20548,9 @@
       "dev": true
     },
     "espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz",
+      "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==",
       "dev": true,
       "requires": {
         "acorn": "^8.8.0",
@@ -20551,9 +20559,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "8.8.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+          "version": "8.8.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+          "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
           "dev": true
         }
       }
@@ -20565,7 +20573,9 @@
       "dev": true
     },
     "esquery": {
-      "version": "1.4.0",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
@@ -24439,10 +24449,6 @@
         "safe-regex": "^1.1.0"
       }
     },
-    "regexpp": {
-      "version": "3.2.0",
-      "dev": true
-    },
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -25310,7 +25316,7 @@
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
         "esbuild": "^0.17.10",
-        "eslint": "^8.34.0",
+        "eslint": "^8.35.0",
         "eslint-config-prettier": "^8.6.0",
         "eslint-plugin-prettier": "^4.2.1",
         "fast-glob": "^3.2.12",
@@ -25942,15 +25948,30 @@
           "dev": true,
           "optional": true
         },
+        "@eslint-community/eslint-utils": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz",
+          "integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^3.3.0"
+          }
+        },
+        "@eslint-community/regexpp": {
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
+          "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+          "dev": true
+        },
         "@eslint/eslintrc": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
-          "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz",
+          "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==",
           "dev": true,
           "requires": {
             "ajv": "^6.12.4",
             "debug": "^4.3.2",
-            "espree": "^9.4.0",
+            "espree": "^9.5.0",
             "globals": "^13.19.0",
             "ignore": "^5.2.0",
             "import-fresh": "^3.2.1",
@@ -25966,9 +25987,9 @@
               "dev": true
             },
             "globals": {
-              "version": "13.19.0",
-              "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-              "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
+              "version": "13.20.0",
+              "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+              "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
               "dev": true,
               "requires": {
                 "type-fest": "^0.20.2"
@@ -25985,6 +26006,12 @@
             }
           }
         },
+        "@eslint/js": {
+          "version": "8.36.0",
+          "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz",
+          "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==",
+          "dev": true
+        },
         "@humanwhocodes/config-array": {
           "version": "0.11.8",
           "dev": true,
@@ -30189,12 +30216,15 @@
           "dev": true
         },
         "eslint": {
-          "version": "8.34.0",
-          "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz",
-          "integrity": "sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==",
+          "version": "8.36.0",
+          "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz",
+          "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==",
           "dev": true,
           "requires": {
-            "@eslint/eslintrc": "^1.4.1",
+            "@eslint-community/eslint-utils": "^4.2.0",
+            "@eslint-community/regexpp": "^4.4.0",
+            "@eslint/eslintrc": "^2.0.1",
+            "@eslint/js": "8.36.0",
             "@humanwhocodes/config-array": "^0.11.8",
             "@humanwhocodes/module-importer": "^1.0.1",
             "@nodelib/fs.walk": "^1.2.8",
@@ -30205,10 +30235,9 @@
             "doctrine": "^3.0.0",
             "escape-string-regexp": "^4.0.0",
             "eslint-scope": "^7.1.1",
-            "eslint-utils": "^3.0.0",
             "eslint-visitor-keys": "^3.3.0",
-            "espree": "^9.4.0",
-            "esquery": "^1.4.0",
+            "espree": "^9.5.0",
+            "esquery": "^1.4.2",
             "esutils": "^2.0.2",
             "fast-deep-equal": "^3.1.3",
             "file-entry-cache": "^6.0.1",
@@ -30229,7 +30258,6 @@
             "minimatch": "^3.1.2",
             "natural-compare": "^1.4.0",
             "optionator": "^0.9.1",
-            "regexpp": "^3.2.0",
             "strip-ansi": "^6.0.1",
             "strip-json-comments": "^3.1.0",
             "text-table": "^0.2.0"
@@ -30299,19 +30327,6 @@
             "estraverse": "^5.2.0"
           }
         },
-        "eslint-utils": {
-          "version": "3.0.0",
-          "dev": true,
-          "requires": {
-            "eslint-visitor-keys": "^2.0.0"
-          },
-          "dependencies": {
-            "eslint-visitor-keys": {
-              "version": "2.1.0",
-              "dev": true
-            }
-          }
-        },
         "eslint-visitor-keys": {
           "version": "3.3.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
@@ -30319,9 +30334,9 @@
           "dev": true
         },
         "espree": {
-          "version": "9.4.1",
-          "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-          "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+          "version": "9.5.0",
+          "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz",
+          "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==",
           "dev": true,
           "requires": {
             "acorn": "^8.8.0",
@@ -30330,9 +30345,9 @@
           },
           "dependencies": {
             "acorn": {
-              "version": "8.8.1",
-              "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-              "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+              "version": "8.8.2",
+              "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+              "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
               "dev": true
             }
           }
@@ -30344,7 +30359,9 @@
           "dev": true
         },
         "esquery": {
-          "version": "1.4.0",
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+          "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
           "dev": true,
           "requires": {
             "estraverse": "^5.1.0"
@@ -34218,10 +34235,6 @@
             "safe-regex": "^1.1.0"
           }
         },
-        "regexpp": {
-          "version": "3.2.0",
-          "dev": true
-        },
         "remove-trailing-separator": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
diff --git a/package.json b/package.json
index 507967df7197..3cd2133c8160 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "cssnano": "^5.1.15",
     "esbuild": "^0.17.10",
     "eslint": "^8.35.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^29.4.3",
     "jest-diff": "^29.4.3",

From 66fd0c99835e8192772c65b23cd06eb31130bbf8 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Wed, 15 Mar 2023 12:57:13 +0000
Subject: [PATCH 44/84] Update all of jest to version 29.5.0

---
 package-lock.json | 23 +++++++++++------------
 package.json      |  4 ++--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c55ff7e6e2f8..3d276249dfd5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,7 +54,7 @@
         "cssnano": "^5.1.15",
         "esbuild": "^0.17.10",
         "eslint": "^8.35.0",
-        "eslint-config-prettier": "^8.6.0",
+        "eslint-config-prettier": "^8.7.0",
         "eslint-plugin-prettier": "^4.2.1",
         "jest": "^29.4.3",
         "jest-diff": "^29.4.3",
@@ -6988,11 +6988,10 @@
       }
     },
     "node_modules/eslint-config-prettier": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz",
-      "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.7.0.tgz",
+      "integrity": "sha512-HHVXLSlVUhMSmyW4ZzEuvjpwqamgmlfkutD53cYXLikh4pt/modINRcCIApJ84czDxM4GZInwUrromsDdTImTA==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -20520,9 +20519,9 @@
       }
     },
     "eslint-config-prettier": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz",
-      "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.7.0.tgz",
+      "integrity": "sha512-HHVXLSlVUhMSmyW4ZzEuvjpwqamgmlfkutD53cYXLikh4pt/modINRcCIApJ84czDxM4GZInwUrromsDdTImTA==",
       "dev": true,
       "requires": {}
     },
@@ -25317,7 +25316,7 @@
         "dlv": "^1.1.3",
         "esbuild": "^0.17.10",
         "eslint": "^8.35.0",
-        "eslint-config-prettier": "^8.6.0",
+        "eslint-config-prettier": "^8.7.0",
         "eslint-plugin-prettier": "^4.2.1",
         "fast-glob": "^3.2.12",
         "glob-parent": "^6.0.2",
@@ -30306,9 +30305,9 @@
           }
         },
         "eslint-config-prettier": {
-          "version": "8.6.0",
-          "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz",
-          "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==",
+          "version": "8.7.0",
+          "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.7.0.tgz",
+          "integrity": "sha512-HHVXLSlVUhMSmyW4ZzEuvjpwqamgmlfkutD53cYXLikh4pt/modINRcCIApJ84czDxM4GZInwUrromsDdTImTA==",
           "dev": true,
           "requires": {}
         },
diff --git a/package.json b/package.json
index 3cd2133c8160..594f3778b33a 100644
--- a/package.json
+++ b/package.json
@@ -59,8 +59,8 @@
     "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "jest": "^29.4.3",
-    "jest-diff": "^29.4.3",
+    "jest": "^29.5.0",
+    "jest-diff": "^29.5.0",
     "prettier": "^2.8.4",
     "rimraf": "^4.1.2",
     "source-map-js": "^1.0.2",

From c0da7bb0c5905f88c1dbee2b3340e5a4f03b42e9 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Mon, 13 Mar 2023 17:35:50 +0000
Subject: [PATCH 45/84] Update rimraf to version 4.4.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 594f3778b33a..a397522b1d9f 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "jest": "^29.5.0",
     "jest-diff": "^29.5.0",
     "prettier": "^2.8.4",
-    "rimraf": "^4.1.2",
+    "rimraf": "^4.4.0",
     "source-map-js": "^1.0.2",
     "turbo": "^1.8.3"
   },

From 694aea0e2cbe998c7014c1f7c67041986f77b464 Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Wed, 15 Mar 2023 13:54:03 -0400
Subject: [PATCH 46/84] Update lockfile

---
 package-lock.json | 223 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 210 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3d276249dfd5..f2776eb92490 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -59,7 +59,7 @@
         "jest": "^29.4.3",
         "jest-diff": "^29.4.3",
         "prettier": "^2.8.4",
-        "rimraf": "^4.1.2",
+        "rimraf": "^4.4.0",
         "source-map-js": "^1.0.2",
         "turbo": "^1.8.3"
       },
@@ -10570,6 +10570,15 @@
       "version": "1.2.6",
       "license": "MIT"
     },
+    "node_modules/minipass": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz",
+      "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/mississippi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
@@ -11328,6 +11337,31 @@
       "version": "1.0.7",
       "license": "MIT"
     },
+    "node_modules/path-scurry": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.6.1.tgz",
+      "integrity": "sha512-OW+5s+7cw6253Q4E+8qQ/u1fVvcJQCJo/VFD8pje+dbJCF1n5ZRMV2AEHbGp+5Q7jxQIYJxkHopnj6nzdGeZLA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^7.14.1",
+        "minipass": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -12661,10 +12695,13 @@
       }
     },
     "node_modules/rimraf": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.1.2.tgz",
-      "integrity": "sha512-BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.0.tgz",
+      "integrity": "sha512-X36S+qpCUR0HjXlkDe4NAOhS//aHH0Z+h8Ckf2auGJk3PTnx5rLmrHkwNdbVQuCSUhOyFrlRvFEllZOYE+yZGQ==",
       "dev": true,
+      "dependencies": {
+        "glob": "^9.2.0"
+      },
       "bin": {
         "rimraf": "dist/cjs/src/bin.js"
       },
@@ -12675,6 +12712,48 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/rimraf/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/rimraf/node_modules/glob": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.0.tgz",
+      "integrity": "sha512-EAZejC7JvnQINayvB/7BJbpZpNOJ8Lrw2OZNEvQxe0vaLn1SuwMcfV7/MNaX8L/T0wmptBFI4YMtDvSBxYDc7w==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "minimatch": "^7.4.1",
+        "minipass": "^4.2.4",
+        "path-scurry": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rimraf/node_modules/minimatch": {
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.2.tgz",
+      "integrity": "sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@@ -23098,6 +23177,12 @@
     "minimist": {
       "version": "1.2.6"
     },
+    "minipass": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz",
+      "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==",
+      "dev": true
+    },
     "mississippi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
@@ -23665,6 +23750,24 @@
     "path-parse": {
       "version": "1.0.7"
     },
+    "path-scurry": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.6.1.tgz",
+      "integrity": "sha512-OW+5s+7cw6253Q4E+8qQ/u1fVvcJQCJo/VFD8pje+dbJCF1n5ZRMV2AEHbGp+5Q7jxQIYJxkHopnj6nzdGeZLA==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^7.14.1",
+        "minipass": "^4.0.2"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+          "dev": true
+        }
+      }
+    },
     "path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -24533,10 +24636,45 @@
       "version": "1.0.4"
     },
     "rimraf": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.1.2.tgz",
-      "integrity": "sha512-BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ==",
-      "dev": true
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.0.tgz",
+      "integrity": "sha512-X36S+qpCUR0HjXlkDe4NAOhS//aHH0Z+h8Ckf2auGJk3PTnx5rLmrHkwNdbVQuCSUhOyFrlRvFEllZOYE+yZGQ==",
+      "dev": true,
+      "requires": {
+        "glob": "^9.2.0"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "glob": {
+          "version": "9.3.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.0.tgz",
+          "integrity": "sha512-EAZejC7JvnQINayvB/7BJbpZpNOJ8Lrw2OZNEvQxe0vaLn1SuwMcfV7/MNaX8L/T0wmptBFI4YMtDvSBxYDc7w==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "minimatch": "^7.4.1",
+            "minipass": "^4.2.4",
+            "path-scurry": "^1.6.1"
+          }
+        },
+        "minimatch": {
+          "version": "7.4.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.2.tgz",
+          "integrity": "sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        }
+      }
     },
     "ripemd160": {
       "version": "2.0.2",
@@ -25339,7 +25477,7 @@
         "prettier": "^2.8.4",
         "quick-lru": "^5.1.1",
         "resolve": "^1.22.1",
-        "rimraf": "^4.1.2",
+        "rimraf": "^4.4.0",
         "source-map-js": "^1.0.2",
         "turbo": "^1.8.3"
       },
@@ -32884,6 +33022,12 @@
         "minimist": {
           "version": "1.2.6"
         },
+        "minipass": {
+          "version": "4.2.5",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz",
+          "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==",
+          "dev": true
+        },
         "mississippi": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
@@ -33451,6 +33595,24 @@
         "path-parse": {
           "version": "1.0.7"
         },
+        "path-scurry": {
+          "version": "1.6.1",
+          "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.6.1.tgz",
+          "integrity": "sha512-OW+5s+7cw6253Q4E+8qQ/u1fVvcJQCJo/VFD8pje+dbJCF1n5ZRMV2AEHbGp+5Q7jxQIYJxkHopnj6nzdGeZLA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^7.14.1",
+            "minipass": "^4.0.2"
+          },
+          "dependencies": {
+            "lru-cache": {
+              "version": "7.18.3",
+              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+              "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+              "dev": true
+            }
+          }
+        },
         "path-type": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -34319,10 +34481,45 @@
           "version": "1.0.4"
         },
         "rimraf": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.1.2.tgz",
-          "integrity": "sha512-BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ==",
-          "dev": true
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.0.tgz",
+          "integrity": "sha512-X36S+qpCUR0HjXlkDe4NAOhS//aHH0Z+h8Ckf2auGJk3PTnx5rLmrHkwNdbVQuCSUhOyFrlRvFEllZOYE+yZGQ==",
+          "dev": true,
+          "requires": {
+            "glob": "^9.2.0"
+          },
+          "dependencies": {
+            "brace-expansion": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+              "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+              "dev": true,
+              "requires": {
+                "balanced-match": "^1.0.0"
+              }
+            },
+            "glob": {
+              "version": "9.3.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.0.tgz",
+              "integrity": "sha512-EAZejC7JvnQINayvB/7BJbpZpNOJ8Lrw2OZNEvQxe0vaLn1SuwMcfV7/MNaX8L/T0wmptBFI4YMtDvSBxYDc7w==",
+              "dev": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "minimatch": "^7.4.1",
+                "minipass": "^4.2.4",
+                "path-scurry": "^1.6.1"
+              }
+            },
+            "minimatch": {
+              "version": "7.4.2",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.2.tgz",
+              "integrity": "sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==",
+              "dev": true,
+              "requires": {
+                "brace-expansion": "^2.0.1"
+              }
+            }
+          }
         },
         "ripemd160": {
           "version": "2.0.2",

From 7e9a53f6cbf17456423a201d3c3d1220801a733f Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Wed, 15 Mar 2023 22:04:18 +0100
Subject: [PATCH 47/84] Enable ESM and TS based config files (#10785)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add `jiti` and `detective-typescript` dependencies

* use `jiti` and `detective-typescript`

Instead of `detective`, this way we will be able to support
`tailwind.config.ts` files and `ESM` files.

* use `@swc/core` instead of the built-in `babel` form `jiti`

* update changelog

* add `jiti` and `detective-typescript` dependencies to `stable`

* use `sucrase` to transform the configs

* add `sucrase` dependency to `stable` engine

* make loading the config easier

* use abstracted loading config utils

* WIP: make `load` related files public API

* use new config loader in PostCSS plugin

* add list of default config files to look for

* cleanup unused arguments

* find default config path when using CLI

* improve `init` command

* make eslint happy

* keep all files in `stubs` folder

* add `tailwind.config.js` stub file

* Initialize PostCSS config using the same format as Tailwind config

* Rename config content stubs to config.*.js

* Improve option descriptions for init options

* Remove unused code, remove `constants` file

* Fix TS warning

* apply CLI changes to the Oxide version

* update `--help` output in CLI tests

* WIP: make tests work on CI

TODO: Test all combinations of `--full`, `--ts`, `--postcss`, and `--esm`.

* wip

* remove unused `fs`

* Fix init tests

Did you know you could pass an empty args to a command? No? Me neither. ¯\_(ツ)_/¯

* bump `napi-derive`

* list extensions we are interested in

* no-op the `removeFile` if file doesn't exist

* ensure all `init` flags work

* ensure we cleanup the new files

* test ESM/CJS generation based on package.json

* remove unnecessary test

We are not displaying output in the `--help` anymore based on whether
`type: module` is present or not.
Therefore this test is unneeded.

* only look for `TypeScript` files when the entryFile is `TypeScript` as well

* refactor `load` to be `loadConfig`

This will allow you to use:

```js
import loadConfig from 'tailwindcss/loadConfig'

let config = loadConfig("/Users/xyz/projects/my-app/tailwind.config.ts")
```

The `loadConfig` function will return the configuration object based on
the given absolute path of a tailwind configuration file.

The given path can be a CJS, an ESM or a TS file.

* use the `config.full.js` stub instead of the `defaultConfig.stub.js` file

The root `defaultConfig` is still there for backwards compatibilty
reasons. But the `module.exports = requrie('./config.full.js')` was
causing some problems when actually using tailwindcss.

So dropped it instead.

* apply `load` -> `loadConfig` changes to `Oxide` engine CLI

* ensure we write the config file in the Oxide engine

* improve type in Oxide engine CLI

* catch errors instead of checking if the file exists

A little smaller but just for tests so doesn't matter too much here 👍

* ensure we publish the correct stub files

---------

Co-authored-by: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
Co-authored-by: Jordan Pittman <jordan@cryptica.me>
Co-authored-by: Nate Moore <nate@natemoo.re>
Co-authored-by: Enzo Innocenzi <enzo@innocenzi.dev>
---
 CHANGELOG.md                                  |   1 +
 integrations/execute.js                       |   2 +-
 integrations/io.js                            |   6 +-
 .../tailwindcss-cli/tests/cli.test.js         |  82 +-
 loadConfig.d.ts                               |   4 +
 loadConfig.js                                 |   2 +
 oxide/Cargo.lock                              |  21 +-
 oxide/crates/node/Cargo.toml                  |   2 +-
 package-lock.json                             | 805 +++++++++++----
 package-lock.stable.json                      | 963 ++++++++++++++----
 package.json                                  |   8 +-
 package.stable.json                           |  21 +-
 src/cli/build/index.js                        |   9 +-
 src/cli/build/plugin.js                       |  45 +-
 src/cli/build/watching.js                     |   2 +-
 src/cli/index.js                              |  34 +-
 src/cli/init/index.js                         |  45 +-
 src/constants.js                              |  17 -
 src/lib/getModuleDependencies.js              |  51 +-
 src/lib/load-config.ts                        |  27 +
 src/lib/setupTrackingContext.js               |   8 +-
 src/oxide/cli/build/index.ts                  |   9 +-
 src/oxide/cli/build/plugin.ts                 |  44 +-
 src/oxide/cli/build/watching.ts               |   2 +-
 src/oxide/cli/index.ts                        |  22 +-
 src/oxide/cli/init/index.ts                   |  41 +-
 src/public/default-config.js                  |   2 +-
 src/public/default-theme.js                   |   4 +-
 src/public/load-config.js                     |   2 +
 src/util/getAllConfigs.js                     |   4 +-
 src/util/resolveConfigPath.js                 |  13 +-
 stubs/.gitignore                              |   1 +
 .../{defaultConfig.stub.js => config.full.js} |   1 -
 stubs/config.simple.js                        |   7 +
 ...stCssConfig.stub.js => postcss.config.cjs} |   0
 stubs/postcss.config.js                       |   6 +
 stubs/tailwind.config.cjs                     |   2 +
 stubs/tailwind.config.js                      |   2 +
 stubs/tailwind.config.ts                      |   3 +
 tests/customConfig.test.js                    |   4 +-
 tests/defaultConfig.test.js                   |   2 +-
 tests/defaultTheme.test.js                    |   2 +-
 tests/screenAtRule.test.js                    |   2 +-
 43 files changed, 1709 insertions(+), 621 deletions(-)
 create mode 100644 loadConfig.d.ts
 create mode 100644 loadConfig.js
 delete mode 100644 src/constants.js
 create mode 100644 src/lib/load-config.ts
 create mode 100644 src/public/load-config.js
 create mode 100644 stubs/.gitignore
 rename stubs/{defaultConfig.stub.js => config.full.js} (99%)
 create mode 100644 stubs/config.simple.js
 rename stubs/{defaultPostCssConfig.stub.js => postcss.config.cjs} (100%)
 create mode 100644 stubs/postcss.config.js
 create mode 100644 stubs/tailwind.config.cjs
 create mode 100644 stubs/tailwind.config.js
 create mode 100644 stubs/tailwind.config.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 739ccfd1fd57..be254901c24c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
 - Add `content-normal` and `content-stretch` utilities ([#10645](https://github.com/tailwindlabs/tailwindcss/pull/10645))
 - Add `line-clamp` utilities from `@tailwindcss/line-clamp` to core ([#10768](https://github.com/tailwindlabs/tailwindcss/pull/10768))
+- Enable ESM and TS based config files ([#10785](https://github.com/tailwindlabs/tailwindcss/pull/10785))
 
 ### Fixed
 
diff --git a/integrations/execute.js b/integrations/execute.js
index 57dc14e8ed41..f5ab2131804a 100644
--- a/integrations/execute.js
+++ b/integrations/execute.js
@@ -26,7 +26,7 @@ module.exports = function $(command, options = {}) {
   let args = options.shell
     ? [command]
     : (() => {
-        let args = command.split(' ')
+        let args = command.trim().split(/\s+/)
         command = args.shift()
         command =
           command === 'node'
diff --git a/integrations/io.js b/integrations/io.js
index 383776838a4e..c555ac8ba02c 100644
--- a/integrations/io.js
+++ b/integrations/io.js
@@ -97,10 +97,12 @@ module.exports = function ({
     },
     async removeFile(file) {
       let filePath = path.resolve(toolRoot, file)
+
       if (!fileCache[filePath]) {
-        fileCache[filePath] = await fs.readFile(filePath, 'utf8')
+        fileCache[filePath] = await fs.readFile(filePath, 'utf8').catch(() => null)
       }
-      await fs.unlink(filePath)
+
+      await fs.unlink(filePath).catch(() => null)
     },
     async readOutputFile(file) {
       file = await resolveFile(file, absoluteOutputFolder)
diff --git a/integrations/tailwindcss-cli/tests/cli.test.js b/integrations/tailwindcss-cli/tests/cli.test.js
index def432cab4e5..f30260b0b6de 100644
--- a/integrations/tailwindcss-cli/tests/cli.test.js
+++ b/integrations/tailwindcss-cli/tests/cli.test.js
@@ -532,6 +532,46 @@ describe('Build command', () => {
 })
 
 describe('Init command', () => {
+  it.each([
+    { flags: [], name: 'tailwind.config.js' },
+    { flags: ['--ts'], name: 'tailwind.config.ts' },
+    { flags: ['--esm'], name: 'tailwind.config.js' },
+    { flags: ['--full'], name: 'tailwind.config.js' },
+    { flags: ['--ts', '--full'], name: 'tailwind.config.ts' },
+    { flags: ['--esm', '--full'], name: 'tailwind.config.js' },
+  ])('works with all these flags: %j', async ({ flags, name }) => {
+    cleanupFile(name)
+    await removeFile(name)
+
+    let { combined } = await $(`${EXECUTABLE} init ${flags.join(' ')}`)
+
+    expect(combined).toMatchInlineSnapshot(`
+      "
+      Created Tailwind CSS config file: ${name}
+      "
+    `)
+
+    expect(await fileExists(name)).toBe(true)
+
+    let content = await readOutputFile(`../${name}`)
+
+    if (flags.includes('--ts') || flags.includes('--esm')) {
+      expect(content).toContain('export default')
+      expect(content).not.toContain('module.exports =')
+    } else {
+      expect(content).toContain('module.exports =')
+      expect(content).not.toContain('export default')
+    }
+
+    if (flags.includes('--ts')) {
+      expect(content).toContain('satisfies Config')
+    }
+
+    if (flags.includes('--full')) {
+      expect(content.split('\n').length).toBeGreaterThan(50)
+    }
+  })
+
   test('--full', async () => {
     cleanupFile('full.config.js')
 
@@ -577,14 +617,19 @@ describe('Init command', () => {
            tailwindcss init [options]
 
         Options:
-           -f, --full               Initialize a full \`tailwind.config.js\` file
+               --esm                Initialize configuration file as ESM
+               --ts                 Initialize configuration file as TypeScript
            -p, --postcss            Initialize a \`postcss.config.js\` file
+           -f, --full               Include the default values for all options in the generated configuration file
            -h, --help               Display usage information
       `)
     )
   })
 
-  test('--help in ESM package', async () => {
+  test('ESM config is created by default in an ESM project', async () => {
+    cleanupFile('tailwind.config.js')
+    await removeFile('tailwind.config.js')
+
     let pkg = await readOutputFile('../package.json')
 
     await writeInputFile(
@@ -595,27 +640,25 @@ describe('Init command', () => {
       })
     )
 
-    let { combined } = await $(`${EXECUTABLE} init --help`)
+    let { combined } = await $(`${EXECUTABLE} init`)
 
-    expect(dedent(combined)).toEqual(
-      dedent(`
-        tailwindcss v${version}
+    expect(combined).toMatchInlineSnapshot(`
+      "
+      Created Tailwind CSS config file: tailwind.config.js
+      "
+    `)
 
-        Usage:
-           tailwindcss init [options]
+    expect(await fileExists('./tailwind.config.js')).toBe(true)
 
-        Options:
-           -f, --full               Initialize a full \`tailwind.config.cjs\` file
-           -p, --postcss            Initialize a \`postcss.config.cjs\` file
-           -h, --help               Display usage information
-      `)
-    )
+    // Not a clean way to test this.
+    expect(await readOutputFile('../tailwind.config.js')).toContain('export default')
 
     await writeInputFile('../package.json', pkg)
   })
 
-  test('cjs config created when in ESM package', async () => {
-    cleanupFile('tailwind.config.cjs')
+  test('CJS config is created by default in a non-ESM project', async () => {
+    cleanupFile('tailwind.config.js')
+    await removeFile('tailwind.config.js')
 
     let pkg = await readOutputFile('../package.json')
 
@@ -623,7 +666,6 @@ describe('Init command', () => {
       '../package.json',
       JSON.stringify({
         ...JSON.parse(pkg),
-        type: 'module',
       })
     )
 
@@ -631,14 +673,14 @@ describe('Init command', () => {
 
     expect(combined).toMatchInlineSnapshot(`
       "
-      Created Tailwind CSS config file: tailwind.config.cjs
+      Created Tailwind CSS config file: tailwind.config.js
       "
     `)
 
-    expect(await fileExists('./tailwind.config.cjs')).toBe(true)
+    expect(await fileExists('./tailwind.config.js')).toBe(true)
 
     // Not a clean way to test this.
-    expect(await readOutputFile('../tailwind.config.cjs')).toContain('module.exports =')
+    expect(await readOutputFile('../tailwind.config.js')).toContain('module.exports')
 
     await writeInputFile('../package.json', pkg)
   })
diff --git a/loadConfig.d.ts b/loadConfig.d.ts
new file mode 100644
index 000000000000..f17ad23d9afc
--- /dev/null
+++ b/loadConfig.d.ts
@@ -0,0 +1,4 @@
+import type { Config } from './types/config'
+
+declare function loadConfig(path: string): Config
+export = loadConfig
diff --git a/loadConfig.js b/loadConfig.js
new file mode 100644
index 000000000000..838d72de05bc
--- /dev/null
+++ b/loadConfig.js
@@ -0,0 +1,2 @@
+let loadConfig = require('./lib/public/load-config')
+module.exports = (loadConfig.__esModule ? loadConfig : { default: loadConfig }).default
diff --git a/oxide/Cargo.lock b/oxide/Cargo.lock
index f15b12ee3afd..5b959d72682a 100644
--- a/oxide/Cargo.lock
+++ b/oxide/Cargo.lock
@@ -132,9 +132,12 @@ dependencies = [
 
 [[package]]
 name = "convert_case"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
 
 [[package]]
 name = "criterion"
@@ -461,9 +464,9 @@ checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e"
 
 [[package]]
 name = "napi-derive"
-version = "2.9.1"
+version = "2.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f3d8b02ef355898ea98f69082d9a183c8701c836942c2daf3e92364e88a0fa"
+checksum = "6e367c72b3f0243d490f0cf4feed9a28e40e4e9cba16912951dbeccf6c607576"
 dependencies = [
  "convert_case",
  "napi-derive-backend",
@@ -474,9 +477,9 @@ dependencies = [
 
 [[package]]
 name = "napi-derive-backend"
-version = "1.0.38"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c35640513eb442fcbd1653a1c112fb6b2cc12b54d82f9c141f5859c721cab36"
+checksum = "c2cf4ba5f1f6d51b9b5e2d809e229201f3aa14f198d58ec9ba4ecf82dbabb381"
 dependencies = [
  "convert_case",
  "once_cell",
@@ -908,6 +911,12 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
 [[package]]
 name = "unicode-width"
 version = "0.1.10"
diff --git a/oxide/crates/node/Cargo.toml b/oxide/crates/node/Cargo.toml
index 38735bf5c056..54995fa9ebd3 100644
--- a/oxide/crates/node/Cargo.toml
+++ b/oxide/crates/node/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
 napi = { version = "2.10.0", default-features = false, features = ["napi4"] }
-napi-derive = "2.9.1"
+napi-derive = "2.11.1"
 tailwindcss-core = { path = "../core" }
 rayon = "1.5.3"
 
diff --git a/package-lock.json b/package-lock.json
index f2776eb92490..72fafcb4895d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,12 +18,13 @@
         "browserslist": "^4.21.5",
         "chokidar": "^3.5.3",
         "color-name": "^1.1.4",
-        "detective": "^5.2.1",
+        "detective-typescript": "^9.0.0",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
         "fast-glob": "^3.2.12",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
+        "jiti": "^1.17.2",
         "lightningcss": "^1.18.0",
         "lilconfig": "^2.1.0",
         "micromatch": "^4.0.5",
@@ -38,7 +39,8 @@
         "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
         "quick-lru": "^5.1.1",
-        "resolve": "^1.22.1"
+        "resolve": "^1.22.1",
+        "sucrase": "^3.29.0"
       },
       "bin": {
         "tailwind": "lib/cli.js",
@@ -924,7 +926,6 @@
       "version": "7.21.2",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
       "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==",
-      "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -4190,6 +4191,101 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@typescript-eslint/types": {
+      "version": "5.54.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.1.tgz",
+      "integrity": "sha512-G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.54.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.1.tgz",
+      "integrity": "sha512-bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.54.1",
+        "@typescript-eslint/visitor-keys": "5.54.1",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.54.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.1.tgz",
+      "integrity": "sha512-q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.54.1",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -4504,7 +4600,9 @@
     },
     "node_modules/acorn": {
       "version": "7.4.1",
+      "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4521,22 +4619,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/acorn-node": {
-      "version": "1.8.2",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/ajv": {
       "version": "6.12.6",
       "dev": true,
@@ -4658,6 +4740,11 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+    },
     "node_modules/anymatch": {
       "version": "3.1.2",
       "license": "ISC",
@@ -4808,6 +4895,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ast-module-types": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-3.0.0.tgz",
+      "integrity": "sha512-CMxMCOCS+4D+DkOQfuZf+vLrSEmY/7xtORwdxs4wtcC1wVgvk2MqFFTwQCFhvWsI4KPU9lcWXPI8DgRiz+xetQ==",
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
     "node_modules/async-each": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
@@ -4952,7 +5047,6 @@
     },
     "node_modules/balanced-match": {
       "version": "1.0.0",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/base": {
@@ -5236,7 +5330,6 @@
     },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -5983,7 +6076,6 @@
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/concat-stream": {
@@ -6461,9 +6553,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.2",
-      "dev": true,
-      "license": "MIT",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -6553,10 +6645,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/defined": {
-      "version": "1.0.0",
-      "license": "MIT"
-    },
     "node_modules/dependency-graph": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz",
@@ -6596,19 +6684,18 @@
         "node": ">=8"
       }
     },
-    "node_modules/detective": {
-      "version": "5.2.1",
-      "license": "MIT",
+    "node_modules/detective-typescript": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-9.0.0.tgz",
+      "integrity": "sha512-lR78AugfUSBojwlSRZBeEqQ1l8LI7rbxOl1qTUnGLcjZQDjZmrZCb7R46rK8U8B5WzFvJrxa7fEBA8FoD/n5fA==",
       "dependencies": {
-        "acorn-node": "^1.8.2",
-        "defined": "^1.0.0",
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "detective": "bin/detective.js"
+        "@typescript-eslint/typescript-estree": "^5.13.0",
+        "ast-module-types": "^3.0.0",
+        "node-source-walk": "^5.0.0",
+        "typescript": "^4.5.5"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
       }
     },
     "node_modules/didyoumean": {
@@ -6645,7 +6732,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -7035,7 +7121,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
       "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
@@ -7944,7 +8029,6 @@
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/fsevents": {
@@ -8050,7 +8134,6 @@
     },
     "node_modules/glob": {
       "version": "7.1.6",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -8448,7 +8531,6 @@
     },
     "node_modules/ignore": {
       "version": "5.2.4",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -8541,7 +8623,6 @@
     },
     "node_modules/inflight": {
       "version": "1.0.6",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
@@ -8550,7 +8631,6 @@
     },
     "node_modules/inherits": {
       "version": "2.0.4",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/interpret": {
@@ -9834,6 +9914,14 @@
         "@types/yargs-parser": "*"
       }
     },
+    "node_modules/jiti": {
+      "version": "1.17.2",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.17.2.tgz",
+      "integrity": "sha512-Xf0nU8+8wuiQpLcqdb2HRyHqYwGk2Pd+F7kstyp20ZuqTyCmB9dqpX2NxaxFc1kovraa2bG6c1RL3W7XfapiZg==",
+      "bin": {
+        "jiti": "bin/jiti.js"
+      }
+    },
     "node_modules/js-sdsl": {
       "version": "4.1.4",
       "dev": true,
@@ -10188,7 +10276,6 @@
     },
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lmdb": {
@@ -10297,7 +10384,6 @@
     },
     "node_modules/lru-cache": {
       "version": "6.0.0",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
@@ -10557,7 +10643,6 @@
     },
     "node_modules/minimatch": {
       "version": "3.1.2",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -10568,6 +10653,7 @@
     },
     "node_modules/minimist": {
       "version": "1.2.6",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/minipass": {
@@ -10653,7 +10739,6 @@
     },
     "node_modules/ms": {
       "version": "2.1.2",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/msgpackr": {
@@ -10687,6 +10772,16 @@
         "@msgpackr-extract/msgpackr-extract-win32-x64": "2.2.0"
       }
     },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
     "node_modules/nan": {
       "version": "2.17.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
@@ -10844,6 +10939,17 @@
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
       "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="
     },
+    "node_modules/node-source-walk": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-5.0.0.tgz",
+      "integrity": "sha512-58APXoMXpmmU+oVBJFajhTCoD8d/OGtngnVAWzIo2A8yn0IXwBzvIVIsTzoie/SrA37u+1hnpNz2HMWx/VIqlw==",
+      "dependencies": {
+        "@babel/parser": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "license": "MIT",
@@ -10901,7 +11007,6 @@
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -11025,7 +11130,6 @@
     },
     "node_modules/once": {
       "version": "1.4.0",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "wrappy": "1"
@@ -11319,7 +11423,6 @@
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -11366,7 +11469,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -11422,9 +11524,9 @@
       }
     },
     "node_modules/pirates": {
-      "version": "4.0.4",
-      "dev": true,
-      "license": "MIT",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
       "engines": {
         "node": ">= 6"
       }
@@ -13072,7 +13174,6 @@
     },
     "node_modules/slash": {
       "version": "3.0.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -13696,6 +13797,34 @@
         "postcss": "^8.2.15"
       }
     },
+    "node_modules/sucrase": {
+      "version": "3.29.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.29.0.tgz",
+      "integrity": "sha512-bZPAuGA5SdFHuzqIhTAqt9fvNEo9rESqXIG3oiKdF8K4UmkQxC4KlNL3lVyAErXp+mPvUqZ5l13qx6TrDIGf3A==",
+      "dependencies": {
+        "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"
+      },
+      "bin": {
+        "sucrase": "bin/sucrase",
+        "sucrase-node": "bin/sucrase-node"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sucrase/node_modules/commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "dev": true,
@@ -13888,6 +14017,25 @@
       "integrity": "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==",
       "dev": true
     },
+    "node_modules/thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dependencies": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "node_modules/thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "dependencies": {
+        "thenify": ">= 3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/through2": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
@@ -14044,11 +14192,35 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/ts-interface-checker": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
+    },
     "node_modules/tslib": {
       "version": "2.4.1",
       "dev": true,
       "license": "0BSD"
     },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
     "node_modules/tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -14177,6 +14349,18 @@
       "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
       "dev": true
     },
+    "node_modules/typescript": {
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
     "node_modules/union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -15520,7 +15704,6 @@
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/write-file-atomic": {
@@ -15538,6 +15721,7 @@
     },
     "node_modules/xtend": {
       "version": "4.0.2",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.4"
@@ -15559,7 +15743,6 @@
     },
     "node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/yaml": {
@@ -15905,8 +16088,7 @@
     "@babel/parser": {
       "version": "7.21.2",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
-      "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==",
-      "dev": true
+      "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="
     },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
@@ -18416,6 +18598,62 @@
       "version": "20.2.1",
       "dev": true
     },
+    "@typescript-eslint/types": {
+      "version": "5.54.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.1.tgz",
+      "integrity": "sha512-G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw=="
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "5.54.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.1.tgz",
+      "integrity": "sha512-bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg==",
+      "requires": {
+        "@typescript-eslint/types": "5.54.1",
+        "@typescript-eslint/visitor-keys": "5.54.1",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "dependencies": {
+        "array-union": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+          "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
+        },
+        "globby": {
+          "version": "11.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+          "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+          "requires": {
+            "array-union": "^2.1.0",
+            "dir-glob": "^3.0.1",
+            "fast-glob": "^3.2.9",
+            "ignore": "^5.2.0",
+            "merge2": "^1.4.1",
+            "slash": "^3.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
+    "@typescript-eslint/visitor-keys": {
+      "version": "5.54.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.1.tgz",
+      "integrity": "sha512-q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg==",
+      "requires": {
+        "@typescript-eslint/types": "5.54.1",
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
     "@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -18722,7 +18960,9 @@
       "dev": true
     },
     "acorn": {
-      "version": "7.4.1"
+      "version": "7.4.1",
+      "dev": true,
+      "peer": true
     },
     "acorn-jsx": {
       "version": "5.3.2",
@@ -18731,17 +18971,6 @@
       "dev": true,
       "requires": {}
     },
-    "acorn-node": {
-      "version": "1.8.2",
-      "requires": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "acorn-walk": {
-      "version": "7.2.0"
-    },
     "ajv": {
       "version": "6.12.6",
       "dev": true,
@@ -18823,6 +19052,11 @@
         "color-convert": "^2.0.1"
       }
     },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+    },
     "anymatch": {
       "version": "3.1.2",
       "requires": {
@@ -18937,6 +19171,11 @@
       "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
       "dev": true
     },
+    "ast-module-types": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-3.0.0.tgz",
+      "integrity": "sha512-CMxMCOCS+4D+DkOQfuZf+vLrSEmY/7xtORwdxs4wtcC1wVgvk2MqFFTwQCFhvWsI4KPU9lcWXPI8DgRiz+xetQ=="
+    },
     "async-each": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
@@ -19033,8 +19272,7 @@
       }
     },
     "balanced-match": {
-      "version": "1.0.0",
-      "dev": true
+      "version": "1.0.0"
     },
     "base": {
       "version": "0.11.2",
@@ -19249,7 +19487,6 @@
     },
     "brace-expansion": {
       "version": "1.1.11",
-      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -19824,8 +20061,7 @@
       "dev": true
     },
     "concat-map": {
-      "version": "0.0.1",
-      "dev": true
+      "version": "0.0.1"
     },
     "concat-stream": {
       "version": "1.6.2",
@@ -20174,8 +20410,9 @@
       "dev": true
     },
     "debug": {
-      "version": "4.3.2",
-      "dev": true,
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "requires": {
         "ms": "2.1.2"
       }
@@ -20233,9 +20470,6 @@
         "isobject": "^3.0.1"
       }
     },
-    "defined": {
-      "version": "1.0.0"
-    },
     "dependency-graph": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz",
@@ -20263,12 +20497,15 @@
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "dev": true
     },
-    "detective": {
-      "version": "5.2.1",
+    "detective-typescript": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-9.0.0.tgz",
+      "integrity": "sha512-lR78AugfUSBojwlSRZBeEqQ1l8LI7rbxOl1qTUnGLcjZQDjZmrZCb7R46rK8U8B5WzFvJrxa7fEBA8FoD/n5fA==",
       "requires": {
-        "acorn-node": "^1.8.2",
-        "defined": "^1.0.0",
-        "minimist": "^1.2.6"
+        "@typescript-eslint/typescript-estree": "^5.13.0",
+        "ast-module-types": "^3.0.0",
+        "node-source-walk": "^5.0.0",
+        "typescript": "^4.5.5"
       }
     },
     "didyoumean": {
@@ -20303,7 +20540,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
       "requires": {
         "path-type": "^4.0.0"
       }
@@ -20622,8 +20858,7 @@
     "eslint-visitor-keys": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="
     },
     "espree": {
       "version": "9.5.0",
@@ -21251,8 +21486,7 @@
       }
     },
     "fs.realpath": {
-      "version": "1.0.0",
-      "dev": true
+      "version": "1.0.0"
     },
     "fsevents": {
       "version": "2.3.2",
@@ -21320,7 +21554,6 @@
     },
     "glob": {
       "version": "7.1.6",
-      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -21579,8 +21812,7 @@
       "dev": true
     },
     "ignore": {
-      "version": "5.2.4",
-      "dev": true
+      "version": "5.2.4"
     },
     "immutable": {
       "version": "4.2.2",
@@ -21640,15 +21872,13 @@
     },
     "inflight": {
       "version": "1.0.6",
-      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
       }
     },
     "inherits": {
-      "version": "2.0.4",
-      "dev": true
+      "version": "2.0.4"
     },
     "interpret": {
       "version": "2.2.0",
@@ -22694,6 +22924,11 @@
         }
       }
     },
+    "jiti": {
+      "version": "1.17.2",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.17.2.tgz",
+      "integrity": "sha512-Xf0nU8+8wuiQpLcqdb2HRyHqYwGk2Pd+F7kstyp20ZuqTyCmB9dqpX2NxaxFc1kovraa2bG6c1RL3W7XfapiZg=="
+    },
     "js-sdsl": {
       "version": "4.1.4",
       "dev": true
@@ -22886,8 +23121,7 @@
       "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="
     },
     "lines-and-columns": {
-      "version": "1.2.4",
-      "dev": true
+      "version": "1.2.4"
     },
     "lmdb": {
       "version": "2.5.2",
@@ -22978,7 +23212,6 @@
     },
     "lru-cache": {
       "version": "6.0.0",
-      "dev": true,
       "requires": {
         "yallist": "^4.0.0"
       }
@@ -23169,13 +23402,13 @@
     },
     "minimatch": {
       "version": "3.1.2",
-      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
-      "version": "1.2.6"
+      "version": "1.2.6",
+      "dev": true
     },
     "minipass": {
       "version": "4.2.5",
@@ -23246,8 +23479,7 @@
       }
     },
     "ms": {
-      "version": "2.1.2",
-      "dev": true
+      "version": "2.1.2"
     },
     "msgpackr": {
       "version": "1.8.2",
@@ -23274,6 +23506,16 @@
         "node-gyp-build-optional-packages": "5.0.3"
       }
     },
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "requires": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
     "nan": {
       "version": "2.17.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
@@ -23401,6 +23643,14 @@
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
       "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="
     },
+    "node-source-walk": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-5.0.0.tgz",
+      "integrity": "sha512-58APXoMXpmmU+oVBJFajhTCoD8d/OGtngnVAWzIo2A8yn0IXwBzvIVIsTzoie/SrA37u+1hnpNz2HMWx/VIqlw==",
+      "requires": {
+        "@babel/parser": "^7.0.0"
+      }
+    },
     "normalize-path": {
       "version": "3.0.0"
     },
@@ -23435,8 +23685,7 @@
       "dev": true
     },
     "object-assign": {
-      "version": "4.1.1",
-      "dev": true
+      "version": "4.1.1"
     },
     "object-copy": {
       "version": "0.1.0",
@@ -23529,7 +23778,6 @@
     },
     "once": {
       "version": "1.4.0",
-      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -23740,8 +23988,7 @@
       "dev": true
     },
     "path-is-absolute": {
-      "version": "1.0.1",
-      "dev": true
+      "version": "1.0.1"
     },
     "path-key": {
       "version": "3.1.1",
@@ -23771,8 +24018,7 @@
     "path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
     },
     "pbkdf2": {
       "version": "3.1.2",
@@ -23803,8 +24049,9 @@
       "version": "2.3.0"
     },
     "pirates": {
-      "version": "4.0.4",
-      "dev": true
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="
     },
     "pkg-dir": {
       "version": "4.2.0",
@@ -24912,8 +25159,7 @@
       "dev": true
     },
     "slash": {
-      "version": "3.0.0",
-      "dev": true
+      "version": "3.0.0"
     },
     "snapdragon": {
       "version": "0.8.2",
@@ -25402,6 +25648,26 @@
         "postcss-selector-parser": "^6.0.4"
       }
     },
+    "sucrase": {
+      "version": "3.29.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.29.0.tgz",
+      "integrity": "sha512-bZPAuGA5SdFHuzqIhTAqt9fvNEo9rESqXIG3oiKdF8K4UmkQxC4KlNL3lVyAErXp+mPvUqZ5l13qx6TrDIGf3A==",
+      "requires": {
+        "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"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="
+        }
+      }
+    },
     "supports-color": {
       "version": "7.2.0",
       "dev": true,
@@ -25449,7 +25715,7 @@
         "color-name": "^1.1.4",
         "concurrently": "^7.5.0",
         "cssnano": "^5.1.15",
-        "detective": "^5.2.1",
+        "detective-typescript": "^9.0.0",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
         "esbuild": "^0.17.10",
@@ -25461,6 +25727,7 @@
         "is-glob": "^4.0.3",
         "jest": "^29.4.3",
         "jest-diff": "^29.4.3",
+        "jiti": "^1.17.2",
         "lightningcss": "^1.18.0",
         "lilconfig": "^2.1.0",
         "micromatch": "^4.0.5",
@@ -25479,6 +25746,7 @@
         "resolve": "^1.22.1",
         "rimraf": "^4.4.0",
         "source-map-js": "^1.0.2",
+        "sucrase": "^3.29.0",
         "turbo": "^1.8.3"
       },
       "dependencies": {
@@ -25750,8 +26018,7 @@
         "@babel/parser": {
           "version": "7.21.2",
           "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
-          "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==",
-          "dev": true
+          "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="
         },
         "@babel/plugin-syntax-async-generators": {
           "version": "7.8.4",
@@ -28261,6 +28528,62 @@
           "version": "20.2.1",
           "dev": true
         },
+        "@typescript-eslint/types": {
+          "version": "5.54.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.1.tgz",
+          "integrity": "sha512-G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw=="
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "5.54.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.1.tgz",
+          "integrity": "sha512-bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg==",
+          "requires": {
+            "@typescript-eslint/types": "5.54.1",
+            "@typescript-eslint/visitor-keys": "5.54.1",
+            "debug": "^4.3.4",
+            "globby": "^11.1.0",
+            "is-glob": "^4.0.3",
+            "semver": "^7.3.7",
+            "tsutils": "^3.21.0"
+          },
+          "dependencies": {
+            "array-union": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+              "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
+            },
+            "globby": {
+              "version": "11.1.0",
+              "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+              "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+              "requires": {
+                "array-union": "^2.1.0",
+                "dir-glob": "^3.0.1",
+                "fast-glob": "^3.2.9",
+                "ignore": "^5.2.0",
+                "merge2": "^1.4.1",
+                "slash": "^3.0.0"
+              }
+            },
+            "semver": {
+              "version": "7.3.8",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+              "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+              "requires": {
+                "lru-cache": "^6.0.0"
+              }
+            }
+          }
+        },
+        "@typescript-eslint/visitor-keys": {
+          "version": "5.54.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.1.tgz",
+          "integrity": "sha512-q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg==",
+          "requires": {
+            "@typescript-eslint/types": "5.54.1",
+            "eslint-visitor-keys": "^3.3.0"
+          }
+        },
         "@webassemblyjs/ast": {
           "version": "1.11.1",
           "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -28567,7 +28890,9 @@
           "dev": true
         },
         "acorn": {
-          "version": "7.4.1"
+          "version": "7.4.1",
+          "dev": true,
+          "peer": true
         },
         "acorn-jsx": {
           "version": "5.3.2",
@@ -28576,17 +28901,6 @@
           "dev": true,
           "requires": {}
         },
-        "acorn-node": {
-          "version": "1.8.2",
-          "requires": {
-            "acorn": "^7.0.0",
-            "acorn-walk": "^7.0.0",
-            "xtend": "^4.0.2"
-          }
-        },
-        "acorn-walk": {
-          "version": "7.2.0"
-        },
         "ajv": {
           "version": "6.12.6",
           "dev": true,
@@ -28668,6 +28982,11 @@
             "color-convert": "^2.0.1"
           }
         },
+        "any-promise": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+          "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+        },
         "anymatch": {
           "version": "3.1.2",
           "requires": {
@@ -28782,6 +29101,11 @@
           "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
           "dev": true
         },
+        "ast-module-types": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-3.0.0.tgz",
+          "integrity": "sha512-CMxMCOCS+4D+DkOQfuZf+vLrSEmY/7xtORwdxs4wtcC1wVgvk2MqFFTwQCFhvWsI4KPU9lcWXPI8DgRiz+xetQ=="
+        },
         "async-each": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
@@ -28878,8 +29202,7 @@
           }
         },
         "balanced-match": {
-          "version": "1.0.0",
-          "dev": true
+          "version": "1.0.0"
         },
         "base": {
           "version": "0.11.2",
@@ -29094,7 +29417,6 @@
         },
         "brace-expansion": {
           "version": "1.1.11",
-          "dev": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -29669,8 +29991,7 @@
           "dev": true
         },
         "concat-map": {
-          "version": "0.0.1",
-          "dev": true
+          "version": "0.0.1"
         },
         "concat-stream": {
           "version": "1.6.2",
@@ -30019,8 +30340,9 @@
           "dev": true
         },
         "debug": {
-          "version": "4.3.2",
-          "dev": true,
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -30078,9 +30400,6 @@
             "isobject": "^3.0.1"
           }
         },
-        "defined": {
-          "version": "1.0.0"
-        },
         "dependency-graph": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz",
@@ -30108,12 +30427,15 @@
           "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
           "dev": true
         },
-        "detective": {
-          "version": "5.2.1",
+        "detective-typescript": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-9.0.0.tgz",
+          "integrity": "sha512-lR78AugfUSBojwlSRZBeEqQ1l8LI7rbxOl1qTUnGLcjZQDjZmrZCb7R46rK8U8B5WzFvJrxa7fEBA8FoD/n5fA==",
           "requires": {
-            "acorn-node": "^1.8.2",
-            "defined": "^1.0.0",
-            "minimist": "^1.2.6"
+            "@typescript-eslint/typescript-estree": "^5.13.0",
+            "ast-module-types": "^3.0.0",
+            "node-source-walk": "^5.0.0",
+            "typescript": "^4.5.5"
           }
         },
         "didyoumean": {
@@ -30148,7 +30470,6 @@
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
           "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-          "dev": true,
           "requires": {
             "path-type": "^4.0.0"
           }
@@ -30467,8 +30788,7 @@
         "eslint-visitor-keys": {
           "version": "3.3.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
+          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="
         },
         "espree": {
           "version": "9.5.0",
@@ -31096,8 +31416,7 @@
           }
         },
         "fs.realpath": {
-          "version": "1.0.0",
-          "dev": true
+          "version": "1.0.0"
         },
         "fsevents": {
           "version": "2.3.2",
@@ -31165,7 +31484,6 @@
         },
         "glob": {
           "version": "7.1.6",
-          "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
             "inflight": "^1.0.4",
@@ -31424,8 +31742,7 @@
           "dev": true
         },
         "ignore": {
-          "version": "5.2.4",
-          "dev": true
+          "version": "5.2.4"
         },
         "immutable": {
           "version": "4.2.2",
@@ -31485,15 +31802,13 @@
         },
         "inflight": {
           "version": "1.0.6",
-          "dev": true,
           "requires": {
             "once": "^1.3.0",
             "wrappy": "1"
           }
         },
         "inherits": {
-          "version": "2.0.4",
-          "dev": true
+          "version": "2.0.4"
         },
         "interpret": {
           "version": "2.2.0",
@@ -32539,6 +32854,11 @@
             }
           }
         },
+        "jiti": {
+          "version": "1.17.2",
+          "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.17.2.tgz",
+          "integrity": "sha512-Xf0nU8+8wuiQpLcqdb2HRyHqYwGk2Pd+F7kstyp20ZuqTyCmB9dqpX2NxaxFc1kovraa2bG6c1RL3W7XfapiZg=="
+        },
         "js-sdsl": {
           "version": "4.1.4",
           "dev": true
@@ -32731,8 +33051,7 @@
           "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="
         },
         "lines-and-columns": {
-          "version": "1.2.4",
-          "dev": true
+          "version": "1.2.4"
         },
         "lmdb": {
           "version": "2.5.2",
@@ -32823,7 +33142,6 @@
         },
         "lru-cache": {
           "version": "6.0.0",
-          "dev": true,
           "requires": {
             "yallist": "^4.0.0"
           }
@@ -33014,13 +33332,13 @@
         },
         "minimatch": {
           "version": "3.1.2",
-          "dev": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
-          "version": "1.2.6"
+          "version": "1.2.6",
+          "dev": true
         },
         "minipass": {
           "version": "4.2.5",
@@ -33091,8 +33409,7 @@
           }
         },
         "ms": {
-          "version": "2.1.2",
-          "dev": true
+          "version": "2.1.2"
         },
         "msgpackr": {
           "version": "1.8.2",
@@ -33119,6 +33436,16 @@
             "node-gyp-build-optional-packages": "5.0.3"
           }
         },
+        "mz": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+          "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+          "requires": {
+            "any-promise": "^1.0.0",
+            "object-assign": "^4.0.1",
+            "thenify-all": "^1.0.0"
+          }
+        },
         "nan": {
           "version": "2.17.0",
           "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
@@ -33246,6 +33573,14 @@
           "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
           "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="
         },
+        "node-source-walk": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-5.0.0.tgz",
+          "integrity": "sha512-58APXoMXpmmU+oVBJFajhTCoD8d/OGtngnVAWzIo2A8yn0IXwBzvIVIsTzoie/SrA37u+1hnpNz2HMWx/VIqlw==",
+          "requires": {
+            "@babel/parser": "^7.0.0"
+          }
+        },
         "normalize-path": {
           "version": "3.0.0"
         },
@@ -33280,8 +33615,7 @@
           "dev": true
         },
         "object-assign": {
-          "version": "4.1.1",
-          "dev": true
+          "version": "4.1.1"
         },
         "object-copy": {
           "version": "0.1.0",
@@ -33374,7 +33708,6 @@
         },
         "once": {
           "version": "1.4.0",
-          "dev": true,
           "requires": {
             "wrappy": "1"
           }
@@ -33585,8 +33918,7 @@
           "dev": true
         },
         "path-is-absolute": {
-          "version": "1.0.1",
-          "dev": true
+          "version": "1.0.1"
         },
         "path-key": {
           "version": "3.1.1",
@@ -33616,8 +33948,7 @@
         "path-type": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-          "dev": true
+          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
         },
         "pbkdf2": {
           "version": "3.1.2",
@@ -33648,8 +33979,9 @@
           "version": "2.3.0"
         },
         "pirates": {
-          "version": "4.0.4",
-          "dev": true
+          "version": "4.0.5",
+          "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+          "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="
         },
         "pkg-dir": {
           "version": "4.2.0",
@@ -34757,8 +35089,7 @@
           "dev": true
         },
         "slash": {
-          "version": "3.0.0",
-          "dev": true
+          "version": "3.0.0"
         },
         "snapdragon": {
           "version": "0.8.2",
@@ -35247,6 +35578,26 @@
             "postcss-selector-parser": "^6.0.4"
           }
         },
+        "sucrase": {
+          "version": "3.29.0",
+          "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.29.0.tgz",
+          "integrity": "sha512-bZPAuGA5SdFHuzqIhTAqt9fvNEo9rESqXIG3oiKdF8K4UmkQxC4KlNL3lVyAErXp+mPvUqZ5l13qx6TrDIGf3A==",
+          "requires": {
+            "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"
+          },
+          "dependencies": {
+            "commander": {
+              "version": "4.1.1",
+              "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+              "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="
+            }
+          }
+        },
         "supports-color": {
           "version": "7.2.0",
           "dev": true,
@@ -35384,6 +35735,22 @@
           "integrity": "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==",
           "dev": true
         },
+        "thenify": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+          "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+          "requires": {
+            "any-promise": "^1.0.0"
+          }
+        },
+        "thenify-all": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+          "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+          "requires": {
+            "thenify": ">= 3.1.0 < 4"
+          }
+        },
         "through2": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
@@ -35506,10 +35873,30 @@
             }
           }
         },
+        "ts-interface-checker": {
+          "version": "0.1.13",
+          "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+          "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
+        },
         "tslib": {
           "version": "2.4.1",
           "dev": true
         },
+        "tsutils": {
+          "version": "3.21.0",
+          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+          "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+          "requires": {
+            "tslib": "^1.8.1"
+          },
+          "dependencies": {
+            "tslib": {
+              "version": "1.14.1",
+              "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+              "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+            }
+          }
+        },
         "tty-browserify": {
           "version": "0.0.0",
           "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -35588,6 +35975,11 @@
           "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
           "dev": true
         },
+        "typescript": {
+          "version": "4.9.5",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+          "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="
+        },
         "union-value": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -36523,8 +36915,7 @@
           }
         },
         "wrappy": {
-          "version": "1.0.2",
-          "dev": true
+          "version": "1.0.2"
         },
         "write-file-atomic": {
           "version": "4.0.2",
@@ -36537,7 +36928,8 @@
           }
         },
         "xtend": {
-          "version": "4.0.2"
+          "version": "4.0.2",
+          "dev": true
         },
         "xxhash-wasm": {
           "version": "0.4.2",
@@ -36550,8 +36942,7 @@
           "dev": true
         },
         "yallist": {
-          "version": "4.0.0",
-          "dev": true
+          "version": "4.0.0"
         },
         "yaml": {
           "version": "1.10.2"
@@ -36693,6 +37084,22 @@
       "integrity": "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==",
       "dev": true
     },
+    "thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "requires": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "requires": {
+        "thenify": ">= 3.1.0 < 4"
+      }
+    },
     "through2": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
@@ -36815,10 +37222,30 @@
         }
       }
     },
+    "ts-interface-checker": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
+    },
     "tslib": {
       "version": "2.4.1",
       "dev": true
     },
+    "tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "requires": {
+        "tslib": "^1.8.1"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -36897,6 +37324,11 @@
       "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
       "dev": true
     },
+    "typescript": {
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="
+    },
     "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -37832,8 +38264,7 @@
       }
     },
     "wrappy": {
-      "version": "1.0.2",
-      "dev": true
+      "version": "1.0.2"
     },
     "write-file-atomic": {
       "version": "4.0.2",
@@ -37846,7 +38277,8 @@
       }
     },
     "xtend": {
-      "version": "4.0.2"
+      "version": "4.0.2",
+      "dev": true
     },
     "xxhash-wasm": {
       "version": "0.4.2",
@@ -37859,8 +38291,7 @@
       "dev": true
     },
     "yallist": {
-      "version": "4.0.0",
-      "dev": true
+      "version": "4.0.0"
     },
     "yaml": {
       "version": "1.10.2"
diff --git a/package-lock.stable.json b/package-lock.stable.json
index 552ad21e8c46..0561cd3a167d 100644
--- a/package-lock.stable.json
+++ b/package-lock.stable.json
@@ -1,24 +1,24 @@
 {
   "name": "tailwindcss",
-  "version": "3.2.6",
+  "version": "3.2.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tailwindcss",
-      "version": "3.2.6",
+      "version": "3.2.7",
       "license": "MIT",
       "dependencies": {
-        "@tailwindcss/oxide": "file:./oxide-node-api-shim",
         "arg": "^5.0.2",
         "chokidar": "^3.5.3",
         "color-name": "^1.1.4",
-        "detective": "^5.2.1",
+        "detective-typescript": "^9.0.0",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
         "fast-glob": "^3.2.12",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
+        "jiti": "^1.17.2",
         "lilconfig": "^2.0.6",
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
@@ -32,7 +32,8 @@
         "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
         "quick-lru": "^5.1.1",
-        "resolve": "^1.22.1"
+        "resolve": "^1.22.1",
+        "sucrase": "^3.29.0"
       },
       "bin": {
         "tailwind": "lib/cli.js",
@@ -453,7 +454,6 @@
     },
     "node_modules/@babel/parser": {
       "version": "7.18.9",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -665,10 +665,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.10.tgz",
       "integrity": "sha512-RmJjQTRrO6VwUWDrzTBLmV4OJZTarYsiepLGlF2rYTVB701hSorPywPGvP6d8HCuuRibyXa5JX4s3jN2kHEtjQ==",
-      "cpu": ["arm"],
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["android"],
+      "os": [
+        "android"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -677,10 +681,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.10.tgz",
       "integrity": "sha512-47Y+NwVKTldTlDhSgJHZ/RpvBQMUDG7eKihqaF/u6g7s0ZPz4J1vy8A3rwnnUOF2CuDn7w7Gj/QcMoWz3U3SJw==",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["android"],
+      "os": [
+        "android"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -689,21 +697,29 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.10.tgz",
       "integrity": "sha512-C4PfnrBMcuAcOurQzpF1tTtZz94IXO5JmICJJ3NFJRHbXXsQUg9RFG45KvydKqtFfBaFLCHpduUkUfXwIvGnRg==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["android"],
+      "os": [
+        "android"
+      ],
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
       "version": "0.16.10",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "license": "MIT",
       "optional": true,
-      "os": ["darwin"],
+      "os": [
+        "darwin"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -712,10 +728,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.10.tgz",
       "integrity": "sha512-OXt7ijoLuy+AjDSKQWu+KdDFMBbdeaL6wtgMKtDUXKWHiAMKHan5+R1QAG6HD4+K0nnOvEJXKHeA9QhXNAjOTQ==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["darwin"],
+      "os": [
+        "darwin"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -724,10 +744,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.10.tgz",
       "integrity": "sha512-shSQX/3GHuspE3Uxtq5kcFG/zqC+VuMnJkqV7LczO41cIe6CQaXHD3QdMLA4ziRq/m0vZo7JdterlgbmgNIAlQ==",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["freebsd"],
+      "os": [
+        "freebsd"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -736,10 +760,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.10.tgz",
       "integrity": "sha512-5YVc1zdeaJGASijZmTzSO4h6uKzsQGG3pkjI6fuXvolhm3hVRhZwnHJkforaZLmzvNv5Tb7a3QL2FAVmrgySIA==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["freebsd"],
+      "os": [
+        "freebsd"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -748,10 +776,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.10.tgz",
       "integrity": "sha512-c360287ZWI2miBnvIj23bPyVctgzeMT2kQKR+x94pVqIN44h3GF8VMEs1SFPH1UgyDr3yBbx3vowDS1SVhyVhA==",
-      "cpu": ["arm"],
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -760,10 +792,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.10.tgz",
       "integrity": "sha512-2aqeNVxIaRfPcIaMZIFoblLh588sWyCbmj1HHCCs9WmeNWm+EIN0SmvsmPvTa/TsNZFKnxTcvkX2eszTcCqIrA==",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -772,10 +808,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.10.tgz",
       "integrity": "sha512-sqMIEWeyrLGU7J5RB5fTkLRIFwsgsQ7ieWXlDLEmC2HblPYGb3AucD7inw2OrKFpRPKsec1l+lssiM3+NV5aOw==",
-      "cpu": ["ia32"],
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -784,10 +824,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.10.tgz",
       "integrity": "sha512-FN8mZOH7531iPHM0kaFhAOqqNHoAb6r/YHW2ZIxNi0a85UBi2DO4Vuyn7t1p4UN8a4LoAnLOT1PqNgHkgBJgbA==",
-      "cpu": ["mips64el"],
+      "cpu": [
+        "mips64el"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -796,10 +840,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.10.tgz",
       "integrity": "sha512-Dg9RiqdvHOAWnOKIOTsIx8dFX9EDlY2IbPEY7YFzchrCiTZmMkD7jWA9UdZbNUygPjdmQBVPRCrLydReFlX9yg==",
-      "cpu": ["ppc64"],
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -808,10 +856,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.10.tgz",
       "integrity": "sha512-XMqtpjwzbmlar0BJIxmzu/RZ7EWlfVfH68Vadrva0Wj5UKOdKvqskuev2jY2oPV3aoQUyXwnMbMrFmloO2GfAw==",
-      "cpu": ["riscv64"],
+      "cpu": [
+        "riscv64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -820,10 +872,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.10.tgz",
       "integrity": "sha512-fu7XtnoeRNFMx8DjK3gPWpFBDM2u5ba+FYwg27SjMJwKvJr4bDyKz5c+FLXLUSSAkMAt/UL+cUbEbra+rYtUgw==",
-      "cpu": ["s390x"],
+      "cpu": [
+        "s390x"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -832,10 +888,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.10.tgz",
       "integrity": "sha512-61lcjVC/RldNNMUzQQdyCWjCxp9YLEQgIxErxU9XluX7juBdGKb0pvddS0vPNuCvotRbzijZ1pzII+26haWzbA==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -844,10 +904,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.10.tgz",
       "integrity": "sha512-JeZXCX3viSA9j4HqSoygjssdqYdfHd6yCFWyfSekLbz4Ef+D2EjvsN02ZQPwYl5a5gg/ehdHgegHhlfOFP0HCA==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["netbsd"],
+      "os": [
+        "netbsd"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -856,10 +920,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.10.tgz",
       "integrity": "sha512-3qpxQKuEVIIg8SebpXsp82OBrqjPV/OwNWmG+TnZDr3VGyChNnGMHccC1xkbxCHDQNnnXjxhMQNyHmdFJbmbRA==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["openbsd"],
+      "os": [
+        "openbsd"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -868,10 +936,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.10.tgz",
       "integrity": "sha512-z+q0xZ+et/7etz7WoMyXTHZ1rB8PMSNp/FOqURLJLOPb3GWJ2aj4oCqFCjPwEbW1rsT7JPpxeH/DwGAWk/I1Bg==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["sunos"],
+      "os": [
+        "sunos"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -880,10 +952,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.10.tgz",
       "integrity": "sha512-+YYu5sbQ9npkNT9Dec+tn1F/kjg6SMgr6bfi/6FpXYZvCRfu2YFPZGb+3x8K30s8eRxFpoG4sGhiSUkr1xbHEw==",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["win32"],
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -892,10 +968,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.10.tgz",
       "integrity": "sha512-Aw7Fupk7XNehR1ftHGYwUteyJ2q+em/aE+fVU3YMTBN2V5A7Z4aVCSV+SvCp9HIIHZavPFBpbdP3VfjQpdf6Xg==",
-      "cpu": ["ia32"],
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["win32"],
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -904,10 +984,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.10.tgz",
       "integrity": "sha512-qddWullt3sC1EIpfHvCRBq3H4g3L86DZpD6n8k2XFjFVyp01D++uNbN1hT/JRsHxTbyyemZcpwL5aRlJwc/zFw==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["win32"],
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -1672,11 +1756,15 @@
     },
     "node_modules/@swc/core-darwin-arm64": {
       "version": "1.3.24",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "license": "Apache-2.0 AND MIT",
       "optional": true,
-      "os": ["darwin"],
+      "os": [
+        "darwin"
+      ],
       "engines": {
         "node": ">=10"
       }
@@ -1685,10 +1773,14 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.24.tgz",
       "integrity": "sha512-px+5vkGtgPH0m3FkkTBHynlRdS5rRz+lK+wiXIuBZFJSySWFl6RkKbvwkD+sf0MpazQlqwlv/rTOGJBw6oDffg==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["darwin"],
+      "os": [
+        "darwin"
+      ],
       "engines": {
         "node": ">=10"
       }
@@ -1697,10 +1789,14 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.24.tgz",
       "integrity": "sha512-jLs8ZOdTV4UW4J12E143QJ4mOMONQtqgAnuhBbRuWFzQ3ny1dfoC3P1jNWAJ2Xi59XdxAIXn0PggPNH4Kh34kw==",
-      "cpu": ["arm"],
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=10"
       }
@@ -1709,10 +1805,14 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.24.tgz",
       "integrity": "sha512-A/v0h70BekrwGpp1DlzIFGcHQ3QQ2PexXcnnuIBZeMc9gNmHlcZmg3EcwAnaUDiokhNuSUFA/wV94yk1OqmSkw==",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=10"
       }
@@ -1721,10 +1821,14 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.24.tgz",
       "integrity": "sha512-pbc9eArWPTiMrbpS/pJo0IiQNAKAQBcBIDjWBGP1tcw2iDXYLw4bruwz9kI/VjakbshWb8MoE4T5ClkeuULvSw==",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=10"
       }
@@ -1733,10 +1837,14 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.24.tgz",
       "integrity": "sha512-pP5pOLlY1xd352qo7rTlpVPUI9/9VhOd4b3Lk+LzfZDq9bTL2NDlGfyrPiwa5DGHMSzrugH56K2J68eutkxYVA==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=10"
       }
@@ -1745,10 +1853,14 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.24.tgz",
       "integrity": "sha512-phNbP7zGp+Wcyxq1Qxlpe5KkxO7WLT2kVQUC7aDFGlVdCr+xdXsfH1MzheHtnr0kqTVQX1aiM8XXXHfFxR0oNA==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=10"
       }
@@ -1757,10 +1869,14 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.24.tgz",
       "integrity": "sha512-qhbiJTWAOqyR+K9xnGmCkOWSz2EmWpDBstEJCEOTc6FZiEdbiTscDmqTcMbCKaTHGu8t+6erVA4t65/Eg6uWPA==",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["win32"],
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=10"
       }
@@ -1769,10 +1885,14 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.24.tgz",
       "integrity": "sha512-JfghIlscE4Rz+Lc08lSoDh+R0cWxrISed5biogFfE6vZqhaDnw3E5Qshqw7O3pIaiq8L2u1nmzuyP581ZmpbRA==",
-      "cpu": ["ia32"],
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["win32"],
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=10"
       }
@@ -1781,10 +1901,14 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.24.tgz",
       "integrity": "sha512-3AmJRr0hwciwDBbzUNqaftvppzS8v9X/iv/Wl7YaVLBVpPfQvaZzfqLycvNMGLZb5vIKXR/u58txg3dRBGsJtw==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["win32"],
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=10"
       }
@@ -1822,10 +1946,6 @@
         "@swc/core": "^1.0.46"
       }
     },
-    "node_modules/@tailwindcss/oxide": {
-      "resolved": "oxide-node-api-shim",
-      "link": true
-    },
     "node_modules/@trysound/sax": {
       "version": "0.2.0",
       "dev": true,
@@ -1928,9 +2048,79 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@typescript-eslint/types": {
+      "version": "5.55.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.55.0.tgz",
+      "integrity": "sha512-M4iRh4AG1ChrOL6Y+mETEKGeDnT7Sparn6fhZ5LtVJF1909D5O4uqK+C5NPbLmpfZ0XIIxCdwzKiijpZUOvOug==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.55.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.55.0.tgz",
+      "integrity": "sha512-I7X4A9ovA8gdpWMpr7b1BN9eEbvlEtWhQvpxp/yogt48fy9Lj3iE3ild/1H3jKBBIYj5YYJmS2+9ystVhC7eaQ==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.55.0",
+        "@typescript-eslint/visitor-keys": "5.55.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.55.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.55.0.tgz",
+      "integrity": "sha512-q2dlHHwWgirKh1D3acnuApXG+VNXpEY5/AwRxDVuEQpxWaB0jCDe0jFMVMALJ3ebSfuOVE8/rMS+9ZOYGg1GWw==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.55.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/acorn": {
       "version": "7.4.1",
+      "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1947,22 +2137,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/acorn-node": {
-      "version": "1.8.2",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/ajv": {
       "version": "6.12.6",
       "dev": true,
@@ -2025,6 +2199,11 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+    },
     "node_modules/anymatch": {
       "version": "3.1.2",
       "license": "ISC",
@@ -2086,6 +2265,22 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ast-module-types": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-3.0.0.tgz",
+      "integrity": "sha512-CMxMCOCS+4D+DkOQfuZf+vLrSEmY/7xtORwdxs4wtcC1wVgvk2MqFFTwQCFhvWsI4KPU9lcWXPI8DgRiz+xetQ==",
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
     "node_modules/autoprefixer": {
       "version": "10.4.13",
       "dev": true,
@@ -2206,7 +2401,6 @@
     },
     "node_modules/balanced-match": {
       "version": "1.0.0",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/base64-js": {
@@ -2534,7 +2728,6 @@
     },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -2916,7 +3109,6 @@
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/concurrently": {
@@ -3180,9 +3372,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.2",
-      "dev": true,
-      "license": "MIT",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -3392,10 +3584,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/defined": {
-      "version": "1.0.0",
-      "license": "MIT"
-    },
     "node_modules/detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@@ -3416,19 +3604,18 @@
         "node": ">=8"
       }
     },
-    "node_modules/detective": {
-      "version": "5.2.1",
-      "license": "MIT",
+    "node_modules/detective-typescript": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-9.0.0.tgz",
+      "integrity": "sha512-lR78AugfUSBojwlSRZBeEqQ1l8LI7rbxOl1qTUnGLcjZQDjZmrZCb7R46rK8U8B5WzFvJrxa7fEBA8FoD/n5fA==",
       "dependencies": {
-        "acorn-node": "^1.8.2",
-        "defined": "^1.0.0",
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "detective": "bin/detective.js"
+        "@typescript-eslint/typescript-estree": "^5.13.0",
+        "ast-module-types": "^3.0.0",
+        "node-source-walk": "^5.0.0",
+        "typescript": "^4.5.5"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
       }
     },
     "node_modules/didyoumean": {
@@ -3443,6 +3630,17 @@
         "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/dlv": {
       "version": "1.1.3",
       "license": "MIT"
@@ -3648,10 +3846,14 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.10.tgz",
       "integrity": "sha512-O7Pd5hLEtTg37NC73pfhUOGTjx/+aXu5YoSq3ahCxcN7Bcr2F47mv+kG5t840thnsEzrv0oB70+LJu3gUgchvg==",
-      "cpu": ["loong64"],
+      "cpu": [
+        "loong64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=12"
       }
@@ -3805,7 +4007,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
       "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
@@ -4215,14 +4416,15 @@
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.2",
       "license": "MIT",
       "optional": true,
-      "os": ["darwin"],
+      "os": [
+        "darwin"
+      ],
       "engines": {
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
@@ -4279,7 +4481,6 @@
     },
     "node_modules/glob": {
       "version": "7.1.6",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -4314,6 +4515,25 @@
         "node": ">=4"
       }
     },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/got": {
       "version": "8.3.2",
       "dev": true,
@@ -4443,7 +4663,6 @@
     },
     "node_modules/ignore": {
       "version": "5.2.4",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -4508,7 +4727,6 @@
     },
     "node_modules/inflight": {
       "version": "1.0.6",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
@@ -4517,7 +4735,6 @@
     },
     "node_modules/inherits": {
       "version": "2.0.4",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/ini": {
@@ -5636,6 +5853,14 @@
         "@types/yargs-parser": "*"
       }
     },
+    "node_modules/jiti": {
+      "version": "1.17.2",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.17.2.tgz",
+      "integrity": "sha512-Xf0nU8+8wuiQpLcqdb2HRyHqYwGk2Pd+F7kstyp20ZuqTyCmB9dqpX2NxaxFc1kovraa2bG6c1RL3W7XfapiZg==",
+      "bin": {
+        "jiti": "bin/jiti.js"
+      }
+    },
     "node_modules/js-sdsl": {
       "version": "4.1.4",
       "dev": true,
@@ -5790,10 +6015,14 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.18.0.tgz",
       "integrity": "sha512-OqjydwtiNPgdH1ByIjA1YzqvDG/OMR6L3LPN6wRl1729LB0y4Mik7L06kmZaTb+pvUHr+NmDd2KCwnlrQ4zO3w==",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["darwin"],
+      "os": [
+        "darwin"
+      ],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -5806,10 +6035,14 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.18.0.tgz",
       "integrity": "sha512-mNiuPHj89/JHZmJMp+5H8EZSt6EL5DZRWJ31O6k3DrLLnRIQjXuXdDdN8kP7LoIkeWI5xvyD60CsReJm+YWYAw==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["darwin"],
+      "os": [
+        "darwin"
+      ],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -5822,10 +6055,14 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.18.0.tgz",
       "integrity": "sha512-S+25JjI6601HiAVoTDXW6SqH+E94a+FHA7WQqseyNHunOgVWKcAkNEc2LJvVxgwTq6z41sDIb9/M3Z9wa9lk4A==",
-      "cpu": ["arm"],
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -5838,10 +6075,14 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.18.0.tgz",
       "integrity": "sha512-JSqh4+21dCgBecIQUet35dtE4PhhSEMyqe3y0ZNQrAJQ5kyUPSQHiw81WXnPJcOSTTpG0TyMLiC8K//+BsFGQA==",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -5854,10 +6095,14 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.18.0.tgz",
       "integrity": "sha512-2FWHa8iUhShnZnqhn2wfIcK5adJat9hAAaX7etNsoXJymlliDIOFuBQEsba2KBAZSM4QqfQtvRdR7m8i0I7ybQ==",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -5870,10 +6115,14 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.18.0.tgz",
       "integrity": "sha512-plCPGQJtDZHcLVKVRLnQVF2XRsIC32WvuJhQ7fJ7F6BV98b/VZX0OlX05qUaOESD9dCDHjYSfxsgcvOKgCWh7A==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -5886,10 +6135,14 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.18.0.tgz",
       "integrity": "sha512-na+BGtVU6fpZvOHKhnlA0XHeibkT3/46nj6vLluG3kzdJYoBKU6dIl7DSOk++8jv4ybZyFJ0aOFMMSc8g2h58A==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"],
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -5902,10 +6155,14 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.18.0.tgz",
       "integrity": "sha512-5qeAH4RMNy2yMNEl7e5TI6upt/7xD2ZpHWH4RkT8iJ7/6POS5mjHbXWUO9Q1hhDhqkdzGa76uAdMzEouIeCyNw==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["win32"],
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -5923,7 +6180,6 @@
     },
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/locate-path": {
@@ -5972,7 +6228,6 @@
     },
     "node_modules/lru-cache": {
       "version": "6.0.0",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
@@ -6094,7 +6349,6 @@
     },
     "node_modules/minimatch": {
       "version": "3.1.2",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -6103,15 +6357,20 @@
         "node": "*"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.6",
-      "license": "MIT"
-    },
     "node_modules/ms": {
       "version": "2.1.2",
-      "dev": true,
       "license": "MIT"
     },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
     "node_modules/nanoid": {
       "version": "3.3.4",
       "license": "MIT",
@@ -6142,6 +6401,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/node-source-walk": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-5.0.0.tgz",
+      "integrity": "sha512-58APXoMXpmmU+oVBJFajhTCoD8d/OGtngnVAWzIo2A8yn0IXwBzvIVIsTzoie/SrA37u+1hnpNz2HMWx/VIqlw==",
+      "dependencies": {
+        "@babel/parser": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "license": "MIT",
@@ -6212,7 +6482,6 @@
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -6227,7 +6496,6 @@
     },
     "node_modules/once": {
       "version": "1.4.0",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "wrappy": "1"
@@ -6424,7 +6692,6 @@
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -6442,6 +6709,14 @@
       "version": "1.0.7",
       "license": "MIT"
     },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/pend": {
       "version": "1.2.0",
       "dev": true,
@@ -6489,7 +6764,6 @@
     },
     "node_modules/pirates": {
       "version": "4.0.4",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 6"
@@ -7393,7 +7667,6 @@
     },
     "node_modules/slash": {
       "version": "3.0.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -7609,6 +7882,34 @@
         "postcss": "^8.2.15"
       }
     },
+    "node_modules/sucrase": {
+      "version": "3.29.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.29.0.tgz",
+      "integrity": "sha512-bZPAuGA5SdFHuzqIhTAqt9fvNEo9rESqXIG3oiKdF8K4UmkQxC4KlNL3lVyAErXp+mPvUqZ5l13qx6TrDIGf3A==",
+      "dependencies": {
+        "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"
+      },
+      "bin": {
+        "sucrase": "bin/sucrase",
+        "sucrase-node": "bin/sucrase-node"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sucrase/node_modules/commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "dev": true,
@@ -7712,6 +8013,25 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dependencies": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "node_modules/thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "dependencies": {
+        "thenify": ">= 3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/through": {
       "version": "2.3.8",
       "dev": true,
@@ -7770,11 +8090,35 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/ts-interface-checker": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
+    },
     "node_modules/tslib": {
       "version": "2.4.1",
       "dev": true,
       "license": "0BSD"
     },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "dev": true,
@@ -7808,55 +8152,79 @@
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.6.3.tgz",
       "integrity": "sha512-QmDIX0Yh1wYQl0bUS0gGWwNxpJwrzZU2GIAYt3aOKoirWA2ecnyb3R6ludcS1znfNV2MfunP+l8E3ncxUHwtjA==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["darwin"]
+      "os": [
+        "darwin"
+      ]
     },
     "node_modules/turbo-darwin-arm64": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.6.3.tgz",
       "integrity": "sha512-75DXhFpwE7CinBbtxTxH08EcWrxYSPFow3NaeFwsG8aymkWXF+U2aukYHJA6I12n9/dGqf7yRXzkF0S/9UtdyQ==",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["darwin"]
+      "os": [
+        "darwin"
+      ]
     },
     "node_modules/turbo-linux-64": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.6.3.tgz",
       "integrity": "sha512-O9uc6J0yoRPWdPg9THRQi69K6E2iZ98cRHNvus05lZbcPzZTxJYkYGb5iagCmCW/pq6fL4T4oLWAd6evg2LGQA==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"]
+      "os": [
+        "linux"
+      ]
     },
     "node_modules/turbo-linux-arm64": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.6.3.tgz",
       "integrity": "sha512-dCy667qqEtZIhulsRTe8hhWQNCJO0i20uHXv7KjLHuFZGCeMbWxB8rsneRoY+blf8+QNqGuXQJxak7ayjHLxiA==",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["linux"]
+      "os": [
+        "linux"
+      ]
     },
     "node_modules/turbo-windows-64": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.6.3.tgz",
       "integrity": "sha512-lKRqwL3mrVF09b9KySSaOwetehmGknV9EcQTF7d2dxngGYYX1WXoQLjFP9YYH8ZV07oPm+RUOAKSCQuDuMNhiA==",
-      "cpu": ["x64"],
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["win32"]
+      "os": [
+        "win32"
+      ]
     },
     "node_modules/turbo-windows-arm64": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.6.3.tgz",
       "integrity": "sha512-BXY1sDPEA1DgPwuENvDCD8B7Hb0toscjus941WpL8CVd10hg9pk/MWn9CNgwDO5Q9ks0mw+liDv2EMnleEjeNA==",
-      "cpu": ["arm64"],
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "optional": true,
-      "os": ["win32"]
+      "os": [
+        "win32"
+      ]
     },
     "node_modules/type-detect": {
       "version": "4.0.8",
@@ -7877,6 +8245,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/typescript": {
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
     "node_modules/unbzip2-stream": {
       "version": "1.4.3",
       "dev": true,
@@ -8003,7 +8383,6 @@
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/write-file-atomic": {
@@ -8020,6 +8399,7 @@
     },
     "node_modules/xtend": {
       "version": "4.0.2",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.4"
@@ -8035,7 +8415,6 @@
     },
     "node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/yaml": {
@@ -8095,10 +8474,13 @@
       "version": "0.1.0",
       "extraneous": true,
       "license": "MIT",
-      "workspaces": ["node"]
+      "workspaces": [
+        "node"
+      ]
     },
     "oxide-node-api-shim": {
       "name": "@tailwindcss/oxide-shim",
+      "extraneous": true,
       "license": "MIT"
     },
     "oxide/crates/node": {
@@ -8325,8 +8707,7 @@
       }
     },
     "@babel/parser": {
-      "version": "7.18.9",
-      "dev": true
+      "version": "7.18.9"
     },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
@@ -9244,9 +9625,6 @@
         "source-map-support": "^0.5.13"
       }
     },
-    "@tailwindcss/oxide": {
-      "version": "file:oxide-node-api-shim"
-    },
     "@trysound/sax": {
       "version": "0.2.0",
       "dev": true
@@ -9332,8 +9710,48 @@
       "version": "20.2.1",
       "dev": true
     },
+    "@typescript-eslint/types": {
+      "version": "5.55.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.55.0.tgz",
+      "integrity": "sha512-M4iRh4AG1ChrOL6Y+mETEKGeDnT7Sparn6fhZ5LtVJF1909D5O4uqK+C5NPbLmpfZ0XIIxCdwzKiijpZUOvOug=="
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "5.55.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.55.0.tgz",
+      "integrity": "sha512-I7X4A9ovA8gdpWMpr7b1BN9eEbvlEtWhQvpxp/yogt48fy9Lj3iE3ild/1H3jKBBIYj5YYJmS2+9ystVhC7eaQ==",
+      "requires": {
+        "@typescript-eslint/types": "5.55.0",
+        "@typescript-eslint/visitor-keys": "5.55.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
+    "@typescript-eslint/visitor-keys": {
+      "version": "5.55.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.55.0.tgz",
+      "integrity": "sha512-q2dlHHwWgirKh1D3acnuApXG+VNXpEY5/AwRxDVuEQpxWaB0jCDe0jFMVMALJ3ebSfuOVE8/rMS+9ZOYGg1GWw==",
+      "requires": {
+        "@typescript-eslint/types": "5.55.0",
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
     "acorn": {
-      "version": "7.4.1"
+      "version": "7.4.1",
+      "dev": true,
+      "peer": true
     },
     "acorn-jsx": {
       "version": "5.3.2",
@@ -9342,17 +9760,6 @@
       "dev": true,
       "requires": {}
     },
-    "acorn-node": {
-      "version": "1.8.2",
-      "requires": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "acorn-walk": {
-      "version": "7.2.0"
-    },
     "ajv": {
       "version": "6.12.6",
       "dev": true,
@@ -9387,6 +9794,11 @@
         "color-convert": "^2.0.1"
       }
     },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+    },
     "anymatch": {
       "version": "3.1.2",
       "requires": {
@@ -9421,6 +9833,16 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
+    },
+    "ast-module-types": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-3.0.0.tgz",
+      "integrity": "sha512-CMxMCOCS+4D+DkOQfuZf+vLrSEmY/7xtORwdxs4wtcC1wVgvk2MqFFTwQCFhvWsI4KPU9lcWXPI8DgRiz+xetQ=="
+    },
     "autoprefixer": {
       "version": "10.4.13",
       "dev": true,
@@ -9494,8 +9916,7 @@
       }
     },
     "balanced-match": {
-      "version": "1.0.0",
-      "dev": true
+      "version": "1.0.0"
     },
     "base64-js": {
       "version": "1.5.1",
@@ -9710,7 +10131,6 @@
     },
     "brace-expansion": {
       "version": "1.1.11",
-      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -9946,8 +10366,7 @@
       "dev": true
     },
     "concat-map": {
-      "version": "0.0.1",
-      "dev": true
+      "version": "0.0.1"
     },
     "concurrently": {
       "version": "7.5.0",
@@ -10106,8 +10525,9 @@
       "dev": true
     },
     "debug": {
-      "version": "4.3.2",
-      "dev": true,
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "requires": {
         "ms": "2.1.2"
       }
@@ -10247,9 +10667,6 @@
       "version": "4.2.2",
       "dev": true
     },
-    "defined": {
-      "version": "1.0.0"
-    },
     "detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@@ -10260,12 +10677,15 @@
       "version": "3.1.0",
       "dev": true
     },
-    "detective": {
-      "version": "5.2.1",
+    "detective-typescript": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-9.0.0.tgz",
+      "integrity": "sha512-lR78AugfUSBojwlSRZBeEqQ1l8LI7rbxOl1qTUnGLcjZQDjZmrZCb7R46rK8U8B5WzFvJrxa7fEBA8FoD/n5fA==",
       "requires": {
-        "acorn-node": "^1.8.2",
-        "defined": "^1.0.0",
-        "minimist": "^1.2.6"
+        "@typescript-eslint/typescript-estree": "^5.13.0",
+        "ast-module-types": "^3.0.0",
+        "node-source-walk": "^5.0.0",
+        "typescript": "^4.5.5"
       }
     },
     "didyoumean": {
@@ -10275,6 +10695,14 @@
       "version": "28.1.1",
       "dev": true
     },
+    "dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "requires": {
+        "path-type": "^4.0.0"
+      }
+    },
     "dlv": {
       "version": "1.1.3"
     },
@@ -10555,8 +10983,7 @@
     "eslint-visitor-keys": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="
     },
     "espree": {
       "version": "9.4.1",
@@ -10777,8 +11204,7 @@
       "dev": true
     },
     "fs.realpath": {
-      "version": "1.0.0",
-      "dev": true
+      "version": "1.0.0"
     },
     "fsevents": {
       "version": "2.3.2",
@@ -10812,7 +11238,6 @@
     },
     "glob": {
       "version": "7.1.6",
-      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -10832,6 +11257,19 @@
       "version": "11.12.0",
       "dev": true
     },
+    "globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "requires": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      }
+    },
     "got": {
       "version": "8.3.2",
       "dev": true,
@@ -10911,8 +11349,7 @@
       "dev": true
     },
     "ignore": {
-      "version": "5.2.4",
-      "dev": true
+      "version": "5.2.4"
     },
     "import-fresh": {
       "version": "3.3.0",
@@ -10946,15 +11383,13 @@
     },
     "inflight": {
       "version": "1.0.6",
-      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
       }
     },
     "inherits": {
-      "version": "2.0.4",
-      "dev": true
+      "version": "2.0.4"
     },
     "ini": {
       "version": "1.3.8",
@@ -11780,6 +12215,11 @@
         }
       }
     },
+    "jiti": {
+      "version": "1.17.2",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.17.2.tgz",
+      "integrity": "sha512-Xf0nU8+8wuiQpLcqdb2HRyHqYwGk2Pd+F7kstyp20ZuqTyCmB9dqpX2NxaxFc1kovraa2bG6c1RL3W7XfapiZg=="
+    },
     "js-sdsl": {
       "version": "4.1.4",
       "dev": true
@@ -11937,8 +12377,7 @@
       "version": "2.0.6"
     },
     "lines-and-columns": {
-      "version": "1.2.4",
-      "dev": true
+      "version": "1.2.4"
     },
     "locate-path": {
       "version": "5.0.0",
@@ -11973,7 +12412,6 @@
     },
     "lru-cache": {
       "version": "6.0.0",
-      "dev": true,
       "requires": {
         "yallist": "^4.0.0"
       }
@@ -12047,17 +12485,22 @@
     },
     "minimatch": {
       "version": "3.1.2",
-      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
     },
-    "minimist": {
-      "version": "1.2.6"
-    },
     "ms": {
-      "version": "2.1.2",
-      "dev": true
+      "version": "2.1.2"
+    },
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "requires": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
     },
     "nanoid": {
       "version": "3.3.4"
@@ -12078,6 +12521,14 @@
       "version": "2.0.6",
       "dev": true
     },
+    "node-source-walk": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-5.0.0.tgz",
+      "integrity": "sha512-58APXoMXpmmU+oVBJFajhTCoD8d/OGtngnVAWzIo2A8yn0IXwBzvIVIsTzoie/SrA37u+1hnpNz2HMWx/VIqlw==",
+      "requires": {
+        "@babel/parser": "^7.0.0"
+      }
+    },
     "normalize-path": {
       "version": "3.0.0"
     },
@@ -12118,15 +12569,13 @@
       }
     },
     "object-assign": {
-      "version": "4.1.1",
-      "dev": true
+      "version": "4.1.1"
     },
     "object-hash": {
       "version": "3.0.0"
     },
     "once": {
       "version": "1.4.0",
-      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -12245,8 +12694,7 @@
       "dev": true
     },
     "path-is-absolute": {
-      "version": "1.0.1",
-      "dev": true
+      "version": "1.0.1"
     },
     "path-key": {
       "version": "3.1.1",
@@ -12255,6 +12703,11 @@
     "path-parse": {
       "version": "1.0.7"
     },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
+    },
     "pend": {
       "version": "1.2.0",
       "dev": true
@@ -12280,8 +12733,7 @@
       }
     },
     "pirates": {
-      "version": "4.0.4",
-      "dev": true
+      "version": "4.0.4"
     },
     "pkg-dir": {
       "version": "4.2.0",
@@ -12764,8 +13216,7 @@
       "dev": true
     },
     "slash": {
-      "version": "3.0.0",
-      "dev": true
+      "version": "3.0.0"
     },
     "sort-keys": {
       "version": "1.1.2",
@@ -12902,6 +13353,26 @@
         "postcss-selector-parser": "^6.0.4"
       }
     },
+    "sucrase": {
+      "version": "3.29.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.29.0.tgz",
+      "integrity": "sha512-bZPAuGA5SdFHuzqIhTAqt9fvNEo9rESqXIG3oiKdF8K4UmkQxC4KlNL3lVyAErXp+mPvUqZ5l13qx6TrDIGf3A==",
+      "requires": {
+        "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"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="
+        }
+      }
+    },
     "supports-color": {
       "version": "7.2.0",
       "dev": true,
@@ -12967,6 +13438,22 @@
       "version": "0.2.0",
       "dev": true
     },
+    "thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "requires": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "requires": {
+        "thenify": ">= 3.1.0 < 4"
+      }
+    },
     "through": {
       "version": "2.3.8",
       "dev": true
@@ -13004,10 +13491,30 @@
         }
       }
     },
+    "ts-interface-checker": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
+    },
     "tslib": {
       "version": "2.4.1",
       "dev": true
     },
+    "tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "requires": {
+        "tslib": "^1.8.1"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
     "tunnel-agent": {
       "version": "0.6.0",
       "dev": true,
@@ -13079,6 +13586,11 @@
       "version": "0.20.2",
       "dev": true
     },
+    "typescript": {
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="
+    },
     "unbzip2-stream": {
       "version": "1.4.3",
       "dev": true,
@@ -13153,8 +13665,7 @@
       }
     },
     "wrappy": {
-      "version": "1.0.2",
-      "dev": true
+      "version": "1.0.2"
     },
     "write-file-atomic": {
       "version": "4.0.1",
@@ -13165,15 +13676,15 @@
       }
     },
     "xtend": {
-      "version": "4.0.2"
+      "version": "4.0.2",
+      "dev": true
     },
     "y18n": {
       "version": "5.0.8",
       "dev": true
     },
     "yallist": {
-      "version": "4.0.0",
-      "dev": true
+      "version": "4.0.0"
     },
     "yaml": {
       "version": "1.10.2"
diff --git a/package.json b/package.json
index a397522b1d9f..39075af2ac02 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "lib/*",
     "peers/*",
     "scripts/*.js",
-    "stubs/*.stub.js",
+    "stubs/*.{js,ts,cjs}",
     "nesting/*",
     "types/**/*",
     "*.d.ts",
@@ -75,12 +75,13 @@
     "browserslist": "^4.21.5",
     "chokidar": "^3.5.3",
     "color-name": "^1.1.4",
-    "detective": "^5.2.1",
+    "detective-typescript": "^9.0.0",
     "didyoumean": "^1.2.2",
     "dlv": "^1.1.3",
     "fast-glob": "^3.2.12",
     "glob-parent": "^6.0.2",
     "is-glob": "^4.0.3",
+    "jiti": "^1.17.2",
     "lightningcss": "^1.18.0",
     "lilconfig": "^2.1.0",
     "micromatch": "^4.0.5",
@@ -95,7 +96,8 @@
     "postcss-selector-parser": "^6.0.11",
     "postcss-value-parser": "^4.2.0",
     "quick-lru": "^5.1.1",
-    "resolve": "^1.22.1"
+    "resolve": "^1.22.1",
+    "sucrase": "^3.29.0"
   },
   "browserslist": [
     "> 1%",
diff --git a/package.stable.json b/package.stable.json
index 3c2efc25fd19..0f40e61ca4d4 100644
--- a/package.stable.json
+++ b/package.stable.json
@@ -73,12 +73,13 @@
     "arg": "^5.0.2",
     "chokidar": "^3.5.3",
     "color-name": "^1.1.4",
-    "detective": "^5.2.1",
+    "detective-typescript": "^9.0.0",
     "didyoumean": "^1.2.2",
     "dlv": "^1.1.3",
     "fast-glob": "^3.2.12",
     "glob-parent": "^6.0.2",
     "is-glob": "^4.0.3",
+    "jiti": "^1.17.2",
     "lilconfig": "^2.0.6",
     "micromatch": "^4.0.5",
     "normalize-path": "^3.0.0",
@@ -92,19 +93,29 @@
     "postcss-selector-parser": "^6.0.11",
     "postcss-value-parser": "^4.2.0",
     "quick-lru": "^5.1.1",
-    "resolve": "^1.22.1"
+    "resolve": "^1.22.1",
+    "sucrase": "^3.29.0"
   },
-  "browserslist": ["> 1%", "not edge <= 18", "not ie 11", "not op_mini all"],
+  "browserslist": [
+    "> 1%",
+    "not edge <= 18",
+    "not ie 11",
+    "not op_mini all"
+  ],
   "jest": {
     "testTimeout": 30000,
-    "setupFilesAfterEnv": ["<rootDir>/jest/customMatchers.js"],
+    "setupFilesAfterEnv": [
+      "<rootDir>/jest/customMatchers.js"
+    ],
     "testPathIgnorePatterns": [
       "/node_modules/",
       "/integrations/",
       "/standalone-cli/",
       "\\.test\\.skip\\.js$"
     ],
-    "transformIgnorePatterns": ["node_modules/(?!lightningcss)"],
+    "transformIgnorePatterns": [
+      "node_modules/(?!lightningcss)"
+    ],
     "transform": {
       "\\.js$": "@swc/jest",
       "\\.ts$": "@swc/jest"
diff --git a/src/cli/build/index.js b/src/cli/build/index.js
index ebb4aa38b6bf..62c020e59f1a 100644
--- a/src/cli/build/index.js
+++ b/src/cli/build/index.js
@@ -2,9 +2,10 @@
 
 import fs from 'fs'
 import path from 'path'
+import { resolveDefaultConfigPath } from '../../util/resolveConfigPath.js'
 import { createProcessor } from './plugin.js'
 
-export async function build(args, configs) {
+export async function build(args) {
   let input = args['--input']
   let shouldWatch = args['--watch']
 
@@ -25,11 +26,7 @@ export async function build(args, configs) {
   }
 
   // TODO: Reference the @config path here if exists
-  let configPath = args['--config']
-    ? args['--config']
-    : ((defaultPath) => (fs.existsSync(defaultPath) ? defaultPath : null))(
-        path.resolve(`./${configs.tailwind}`)
-      )
+  let configPath = args['--config'] ? args['--config'] : resolveDefaultConfigPath()
 
   let processor = await createProcessor(args, configPath)
 
diff --git a/src/cli/build/plugin.js b/src/cli/build/plugin.js
index 893a8c955c6f..5705326c988a 100644
--- a/src/cli/build/plugin.js
+++ b/src/cli/build/plugin.js
@@ -12,12 +12,13 @@ import { loadAutoprefixer, loadCssNano, loadPostcss, loadPostcssImport } from '.
 import { formatNodes, drainStdin, outputFile } from './utils'
 import { env } from '../../lib/sharedState'
 import resolveConfig from '../../../resolveConfig.js'
-import getModuleDependencies from '../../lib/getModuleDependencies.js'
 import { parseCandidateFiles } from '../../lib/content.js'
 import { createWatcher } from './watching.js'
 import fastGlob from 'fast-glob'
 import { findAtConfigPath } from '../../lib/findAtConfigPath.js'
 import log from '../../util/log'
+import { loadConfig } from '../../lib/load-config'
+import getModuleDependencies from '../../lib/getModuleDependencies'
 
 /**
  *
@@ -117,7 +118,9 @@ let state = {
   /** @type {{content: string, extension: string}[]} */
   changedContent: [],
 
-  configDependencies: new Set(),
+  /** @type {ReturnType<typeof load> | null} */
+  configBag: null,
+
   contextDependencies: new Set(),
 
   /** @type {import('../../lib/content.js').ContentPath[]} */
@@ -142,37 +145,35 @@ let state = {
 
   loadConfig(configPath, content) {
     if (this.watcher && configPath) {
-      this.refreshConfigDependencies(configPath)
+      this.refreshConfigDependencies()
     }
 
-    let config = configPath ? require(configPath) : {}
+    let config = loadConfig(configPath)
+    let dependencies = getModuleDependencies(configPath)
+    this.configBag = {
+      config,
+      dependencies,
+      dispose() {
+        for (let file of dependencies) {
+          delete require.cache[require.resolve(file)]
+        }
+      },
+    }
 
     // @ts-ignore
-    config = resolveConfig(config, { content: { files: [] } })
+    this.configBag.config = resolveConfig(this.configBag.config, { content: { files: [] } })
 
     // Override content files if `--content` has been passed explicitly
     if (content?.length > 0) {
-      config.content.files = content
+      this.configBag.config.content.files = content
     }
 
-    return config
+    return this.configBag.config
   },
 
-  refreshConfigDependencies(configPath) {
+  refreshConfigDependencies() {
     env.DEBUG && console.time('Module dependencies')
-
-    for (let file of this.configDependencies) {
-      delete require.cache[require.resolve(file)]
-    }
-
-    if (configPath) {
-      let deps = getModuleDependencies(configPath).map(({ file }) => file)
-
-      for (let dependency of deps) {
-        this.configDependencies.add(dependency)
-      }
-    }
-
+    this.configBag?.dispose()
     env.DEBUG && console.timeEnd('Module dependencies')
   },
 
@@ -420,7 +421,7 @@ export async function createProcessor(args, cliConfigPath) {
         async rebuild(changes) {
           let needsNewContext = changes.some((change) => {
             return (
-              state.configDependencies.has(change.file) ||
+              state.configBag?.dependencies.has(change.file) ||
               state.contextDependencies.has(change.file)
             )
           })
diff --git a/src/cli/build/watching.js b/src/cli/build/watching.js
index ffbfd1ac096a..7a3724348f50 100644
--- a/src/cli/build/watching.js
+++ b/src/cli/build/watching.js
@@ -220,7 +220,7 @@ export function createWatcher(args, { state, rebuild }) {
 
     refreshWatchedFiles() {
       watcher.add(Array.from(state.contextDependencies))
-      watcher.add(Array.from(state.configDependencies))
+      watcher.add(Array.from(state.configBag.dependencies))
       watcher.add(state.contentPatterns.all)
     },
   }
diff --git a/src/cli/index.js b/src/cli/index.js
index 14e387250a49..fc1497f6272e 100644
--- a/src/cli/index.js
+++ b/src/cli/index.js
@@ -8,29 +8,6 @@ import { build } from './build'
 import { help } from './help'
 import { init } from './init'
 
-function isESM() {
-  const pkgPath = path.resolve('./package.json')
-
-  try {
-    let pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
-    return pkg.type && pkg.type === 'module'
-  } catch (err) {
-    return false
-  }
-}
-
-let configs = isESM()
-  ? {
-      tailwind: 'tailwind.config.cjs',
-      postcss: 'postcss.config.cjs',
-    }
-  : {
-      tailwind: 'tailwind.config.js',
-      postcss: 'postcss.config.js',
-    }
-
-// ---
-
 function oneOf(...options) {
   return Object.assign(
     (value = true) => {
@@ -51,8 +28,13 @@ let commands = {
   init: {
     run: init,
     args: {
-      '--full': { type: Boolean, description: `Initialize a full \`${configs.tailwind}\` file` },
-      '--postcss': { type: Boolean, description: `Initialize a \`${configs.postcss}\` file` },
+      '--esm': { type: Boolean, description: `Initialize configuration file as ESM` },
+      '--ts': { type: Boolean, description: `Initialize configuration file as TypeScript` },
+      '--postcss': { type: Boolean, description: `Initialize a \`postcss.config.js\` file` },
+      '--full': {
+        type: Boolean,
+        description: `Include the default values for all options in the generated configuration file`,
+      },
       '-f': '--full',
       '-p': '--postcss',
     },
@@ -231,4 +213,4 @@ if (args['--help']) {
   process.exit(0)
 }
 
-run(args, configs)
+run(args)
diff --git a/src/cli/init/index.js b/src/cli/init/index.js
index 470680318fa6..6bd7e41e2ced 100644
--- a/src/cli/init/index.js
+++ b/src/cli/init/index.js
@@ -3,22 +3,49 @@
 import fs from 'fs'
 import path from 'path'
 
-export function init(args, configs) {
+function isESM() {
+  const pkgPath = path.resolve('./package.json')
+
+  try {
+    let pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
+    return pkg.type && pkg.type === 'module'
+  } catch (err) {
+    return false
+  }
+}
+
+export function init(args) {
   let messages = []
 
-  let tailwindConfigLocation = path.resolve(args['_'][1] ?? `./${configs.tailwind}`)
+  let isProjectESM = args['--ts'] || args['--esm'] || isESM()
+  let syntax = args['--ts'] ? 'ts' : isProjectESM ? 'js' : 'cjs'
+  let extension = args['--ts'] ? 'ts' : 'js'
+
+  let tailwindConfigLocation = path.resolve(args['_'][1] ?? `./tailwind.config.${extension}`)
+
   if (fs.existsSync(tailwindConfigLocation)) {
     messages.push(`${path.basename(tailwindConfigLocation)} already exists.`)
   } else {
-    let stubFile = fs.readFileSync(
+    let stubContentsFile = fs.readFileSync(
       args['--full']
-        ? path.resolve(__dirname, '../../../stubs/defaultConfig.stub.js')
-        : path.resolve(__dirname, '../../../stubs/simpleConfig.stub.js'),
+        ? path.resolve(__dirname, '../../../stubs/config.full.js')
+        : path.resolve(__dirname, '../../../stubs/config.simple.js'),
+      'utf8'
+    )
+
+    let stubFile = fs.readFileSync(
+      path.resolve(__dirname, `../../../stubs/tailwind.config.${syntax}`),
       'utf8'
     )
 
     // Change colors import
-    stubFile = stubFile.replace('../colors', 'tailwindcss/colors')
+    stubContentsFile = stubContentsFile.replace('../colors', 'tailwindcss/colors')
+
+    // Replace contents of {ts,js,cjs} file with the stub {simple,full}.
+    stubFile =
+      stubFile
+        .replace('__CONFIG__', stubContentsFile.replace('module.exports =', '').trim())
+        .trim() + '\n\n'
 
     fs.writeFileSync(tailwindConfigLocation, stubFile, 'utf8')
 
@@ -26,12 +53,14 @@ export function init(args, configs) {
   }
 
   if (args['--postcss']) {
-    let postcssConfigLocation = path.resolve(`./${configs.postcss}`)
+    let postcssConfigLocation = path.resolve('./postcss.config.js')
     if (fs.existsSync(postcssConfigLocation)) {
       messages.push(`${path.basename(postcssConfigLocation)} already exists.`)
     } else {
       let stubFile = fs.readFileSync(
-        path.resolve(__dirname, '../../../stubs/defaultPostCssConfig.stub.js'),
+        isProjectESM
+          ? path.resolve(__dirname, '../../../stubs/postcss.config.js')
+          : path.resolve(__dirname, '../../../stubs/postcss.config.cjs'),
         'utf8'
       )
 
diff --git a/src/constants.js b/src/constants.js
deleted file mode 100644
index 4d6e08c07616..000000000000
--- a/src/constants.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import path from 'path'
-
-export const cli = 'tailwind'
-export const defaultConfigFile = './tailwind.config.js'
-export const defaultPostCssConfigFile = './postcss.config.js'
-export const cjsConfigFile = './tailwind.config.cjs'
-export const cjsPostCssConfigFile = './postcss.config.cjs'
-
-export const supportedConfigFiles = [cjsConfigFile, defaultConfigFile]
-export const supportedPostCssConfigFile = [cjsPostCssConfigFile, defaultPostCssConfigFile]
-
-export const defaultConfigStubFile = path.resolve(__dirname, '../stubs/defaultConfig.stub.js')
-export const simpleConfigStubFile = path.resolve(__dirname, '../stubs/simpleConfig.stub.js')
-export const defaultPostCssConfigStubFile = path.resolve(
-  __dirname,
-  '../stubs/defaultPostCssConfig.stub.js'
-)
diff --git a/src/lib/getModuleDependencies.js b/src/lib/getModuleDependencies.js
index 92ba78f1e626..c8192bc69adc 100644
--- a/src/lib/getModuleDependencies.js
+++ b/src/lib/getModuleDependencies.js
@@ -1,39 +1,40 @@
 import fs from 'fs'
 import path from 'path'
 import resolve from 'resolve'
-import detective from 'detective'
+import detective from 'detective-typescript'
 
 function createModule(file) {
-  const source = fs.readFileSync(file, 'utf-8')
-  const requires = detective(source)
-
-  return { file, requires }
+  let source = fs.readFileSync(file, 'utf-8')
+  return { file, requires: detective(source, { mixedImports: true }) }
 }
 
-export default function getModuleDependencies(entryFile) {
-  const rootModule = createModule(entryFile)
-  const modules = [rootModule]
+function* _getModuleDependencies(entryFile) {
+  yield entryFile
+
+  let mod = createModule(entryFile)
+
+  let ext = path.extname(entryFile)
+  let isTypeScript = ext === '.ts' || ext === '.cts' || ext === '.mts'
+  let extensions = [...(isTypeScript ? ['.ts', '.cts', '.mts'] : []), '.js', '.cjs', '.mjs']
 
   // Iterate over the modules, even when new
   // ones are being added
-  for (const mdl of modules) {
-    mdl.requires
-      .filter((dep) => {
-        // Only track local modules, not node_modules
-        return dep.startsWith('./') || dep.startsWith('../')
-      })
-      .forEach((dep) => {
-        try {
-          const basedir = path.dirname(mdl.file)
-          const depPath = resolve.sync(dep, { basedir })
-          const depModule = createModule(depPath)
+  for (let dep of mod.requires) {
+    // Only track local modules, not node_modules
+    if (!dep.startsWith('./') && !dep.startsWith('../')) {
+      continue
+    }
 
-          modules.push(depModule)
-        } catch (_err) {
-          // eslint-disable-next-line no-empty
-        }
-      })
+    try {
+      let basedir = path.dirname(mod.file)
+      let depPath = resolve.sync(dep, { basedir, extensions })
+      yield* _getModuleDependencies(depPath)
+    } catch (_err) {
+      // eslint-disable-next-line no-empty
+    }
   }
+}
 
-  return modules
+export default function getModuleDependencies(entryFile) {
+  return new Set(_getModuleDependencies(entryFile))
 }
diff --git a/src/lib/load-config.ts b/src/lib/load-config.ts
new file mode 100644
index 000000000000..89ce3a368d0b
--- /dev/null
+++ b/src/lib/load-config.ts
@@ -0,0 +1,27 @@
+import jitiFactory from 'jiti'
+import { transform } from 'sucrase'
+
+import { Config } from '../../types/config'
+
+let jiti: ReturnType<typeof jitiFactory> | null = null
+function lazyJiti() {
+  return (
+    jiti ??
+    (jiti = jitiFactory(__filename, {
+      interopDefault: true,
+      transform: (opts) => {
+        return transform(opts.source, {
+          transforms: ['typescript', 'imports'],
+        })
+      },
+    }))
+  )
+}
+
+export function loadConfig(path: string): Config {
+  try {
+    return path ? require(path) : {}
+  } catch {
+    return lazyJiti()(path)
+  }
+}
diff --git a/src/lib/setupTrackingContext.js b/src/lib/setupTrackingContext.js
index a6a7659bbd13..5abf05170298 100644
--- a/src/lib/setupTrackingContext.js
+++ b/src/lib/setupTrackingContext.js
@@ -4,13 +4,14 @@ import fs from 'fs'
 import LRU from 'quick-lru'
 
 import hash from '../util/hashConfig'
-import getModuleDependencies from '../lib/getModuleDependencies'
 import resolveConfig from '../public/resolve-config'
 import resolveConfigPath from '../util/resolveConfigPath'
 import { getContext, getFileModifiedMap } from './setupContextUtils'
 import parseDependency from '../util/parseDependency'
 import { validateConfig } from '../util/validateConfig.js'
 import { parseCandidateFiles, resolvedChangedContent } from './content.js'
+import { loadConfig } from '../lib/load-config'
+import getModuleDependencies from './getModuleDependencies'
 
 let configPathCache = new LRU({ maxSize: 100 })
 
@@ -34,7 +35,7 @@ function getTailwindConfig(configOrPath) {
     let [prevConfig, prevConfigHash, prevDeps, prevModified] =
       configPathCache.get(userConfigPath) || []
 
-    let newDeps = getModuleDependencies(userConfigPath).map((dep) => dep.file)
+    let newDeps = getModuleDependencies(userConfigPath)
 
     let modified = false
     let newModified = new Map()
@@ -55,8 +56,7 @@ function getTailwindConfig(configOrPath) {
     for (let file of newDeps) {
       delete require.cache[file]
     }
-    let newConfig = resolveConfig(require(userConfigPath))
-    newConfig = validateConfig(newConfig)
+    let newConfig = validateConfig(resolveConfig(loadConfig(userConfigPath)))
     let newHash = hash(newConfig)
     configPathCache.set(userConfigPath, [newConfig, newHash, newDeps, newModified])
     return [newConfig, userConfigPath, newHash, newDeps]
diff --git a/src/oxide/cli/build/index.ts b/src/oxide/cli/build/index.ts
index b7fb2d93294b..ba7c87459603 100644
--- a/src/oxide/cli/build/index.ts
+++ b/src/oxide/cli/build/index.ts
@@ -1,8 +1,9 @@
 import fs from 'fs'
 import path from 'path'
+import { resolveDefaultConfigPath } from '../../../util/resolveConfigPath'
 import { createProcessor } from './plugin'
 
-export async function build(args, configs) {
+export async function build(args) {
   let input = args['--input']
   let shouldWatch = args['--watch']
 
@@ -23,11 +24,7 @@ export async function build(args, configs) {
   }
 
   // TODO: Reference the @config path here if exists
-  let configPath = args['--config']
-    ? args['--config']
-    : ((defaultPath) => (fs.existsSync(defaultPath) ? defaultPath : null))(
-        path.resolve(`./${configs.tailwind}`)
-      )
+  let configPath = args['--config'] ? args['--config'] : resolveDefaultConfigPath()
 
   let processor = await createProcessor(args, configPath)
 
diff --git a/src/oxide/cli/build/plugin.ts b/src/oxide/cli/build/plugin.ts
index bea85a09c838..078820c85c9a 100644
--- a/src/oxide/cli/build/plugin.ts
+++ b/src/oxide/cli/build/plugin.ts
@@ -10,12 +10,14 @@ import { loadPostcss, loadPostcssImport, lightningcss } from './deps'
 import { formatNodes, drainStdin, outputFile } from './utils'
 import { env } from '../../../lib/sharedState'
 import resolveConfig from '../../../../resolveConfig'
-import getModuleDependencies from '../../../lib/getModuleDependencies'
 import { parseCandidateFiles } from '../../../lib/content'
 import { createWatcher } from './watching'
 import fastGlob from 'fast-glob'
 import { findAtConfigPath } from '../../../lib/findAtConfigPath'
 import log from '../../../util/log'
+import { loadConfig } from '../../../lib/load-config'
+import getModuleDependencies from '../../../lib/getModuleDependencies'
+import type { Config } from '../../../../types'
 
 /**
  *
@@ -115,7 +117,9 @@ let state = {
   /** @type {{content: string, extension: string}[]} */
   changedContent: [],
 
-  configDependencies: new Set(),
+  /** @type {{config: Config, dependencies: Set<string>, dispose: Function } | null} */
+  configBag: null,
+
   contextDependencies: new Set(),
 
   /** @type {import('../../lib/content.js').ContentPath[]} */
@@ -140,37 +144,35 @@ let state = {
 
   loadConfig(configPath, content) {
     if (this.watcher && configPath) {
-      this.refreshConfigDependencies(configPath)
+      this.refreshConfigDependencies()
     }
 
-    let config = configPath ? require(configPath) : {}
+    let config = loadConfig(configPath)
+    let dependencies = getModuleDependencies(configPath)
+    this.configBag = {
+      config,
+      dependencies,
+      dispose() {
+        for (let file of dependencies) {
+          delete require.cache[require.resolve(file)]
+        }
+      },
+    }
 
     // @ts-ignore
-    config = resolveConfig(config, { content: { files: [] } })
+    this.configBag.config = resolveConfig(this.configBag.config, { content: { files: [] } })
 
     // Override content files if `--content` has been passed explicitly
     if (content?.length > 0) {
-      config.content.files = content
+      this.configBag.config.content.files = content
     }
 
-    return config
+    return this.configBag.config
   },
 
   refreshConfigDependencies(configPath) {
     env.DEBUG && console.time('Module dependencies')
-
-    for (let file of this.configDependencies) {
-      delete require.cache[require.resolve(file)]
-    }
-
-    if (configPath) {
-      let deps = getModuleDependencies(configPath).map(({ file }) => file)
-
-      for (let dependency of deps) {
-        this.configDependencies.add(dependency)
-      }
-    }
-
+    this.configBag?.dispose()
     env.DEBUG && console.timeEnd('Module dependencies')
   },
 
@@ -417,7 +419,7 @@ export async function createProcessor(args, cliConfigPath) {
         async rebuild(changes) {
           let needsNewContext = changes.some((change) => {
             return (
-              state.configDependencies.has(change.file) ||
+              state.configBag?.dependencies.has(change.file) ||
               state.contextDependencies.has(change.file)
             )
           })
diff --git a/src/oxide/cli/build/watching.ts b/src/oxide/cli/build/watching.ts
index 2d7b12a08c9b..9d5680a16300 100644
--- a/src/oxide/cli/build/watching.ts
+++ b/src/oxide/cli/build/watching.ts
@@ -218,7 +218,7 @@ export function createWatcher(args, { state, rebuild }) {
 
     refreshWatchedFiles() {
       watcher.add(Array.from(state.contextDependencies))
-      watcher.add(Array.from(state.configDependencies))
+      watcher.add(Array.from(state.configBag.dependencies))
       watcher.add(state.contentPatterns.all)
     },
   }
diff --git a/src/oxide/cli/index.ts b/src/oxide/cli/index.ts
index ca6b9263ca4f..96b284db9393 100644
--- a/src/oxide/cli/index.ts
+++ b/src/oxide/cli/index.ts
@@ -8,19 +8,6 @@ import { build } from './build'
 import { help } from './help'
 import { init } from './init'
 
-function isESM() {
-  const pkgPath = path.resolve('./package.json')
-
-  try {
-    let pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
-    return pkg.type && pkg.type === 'module'
-  } catch (err) {
-    return false
-  }
-}
-
-let configs = isESM() ? { tailwind: 'tailwind.config.cjs' } : { tailwind: 'tailwind.config.js' }
-
 // ---
 
 function oneOf(...options) {
@@ -43,7 +30,12 @@ let commands = {
   init: {
     run: init,
     args: {
-      '--full': { type: Boolean, description: `Initialize a full \`${configs.tailwind}\` file` },
+      '--esm': { type: Boolean, description: `Initialize configuration file as ESM` },
+      '--ts': { type: Boolean, description: `Initialize configuration file as TypeScript` },
+      '--full': {
+        type: Boolean,
+        description: `Include the default values for all options in the generated configuration file`,
+      },
       '-f': '--full',
     },
   },
@@ -209,4 +201,4 @@ if (args['--help']) {
   process.exit(0)
 }
 
-run(args, configs)
+run(args)
diff --git a/src/oxide/cli/init/index.ts b/src/oxide/cli/init/index.ts
index 5bf8af2709fc..abc93cdc1351 100644
--- a/src/oxide/cli/init/index.ts
+++ b/src/oxide/cli/init/index.ts
@@ -1,22 +1,49 @@
 import fs from 'fs'
 import path from 'path'
 
-export function init(args, configs) {
-  let messages = []
+function isESM() {
+  const pkgPath = path.resolve('./package.json')
+
+  try {
+    let pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
+    return pkg.type && pkg.type === 'module'
+  } catch (err) {
+    return false
+  }
+}
+
+export function init(args) {
+  let messages: string[] = []
+
+  let isProjectESM = args['--ts'] || args['--esm'] || isESM()
+  let syntax = args['--ts'] ? 'ts' : isProjectESM ? 'js' : 'cjs'
+  let extension = args['--ts'] ? 'ts' : 'js'
+
+  let tailwindConfigLocation = path.resolve(args['_'][1] ?? `./tailwind.config.${extension}`)
 
-  let tailwindConfigLocation = path.resolve(args['_'][1] ?? `./${configs.tailwind}`)
   if (fs.existsSync(tailwindConfigLocation)) {
     messages.push(`${path.basename(tailwindConfigLocation)} already exists.`)
   } else {
-    let stubFile = fs.readFileSync(
+    let stubContentsFile = fs.readFileSync(
       args['--full']
-        ? path.resolve(__dirname, '../../../../stubs/defaultConfig.stub.js')
-        : path.resolve(__dirname, '../../../../stubs/simpleConfig.stub.js'),
+        ? path.resolve(__dirname, '../../../../stubs/config.full.js')
+        : path.resolve(__dirname, '../../../../stubs/config.simple.js'),
+      'utf8'
+    )
+
+    let stubFile = fs.readFileSync(
+      path.resolve(__dirname, `../../../../stubs/tailwind.config.${syntax}`),
       'utf8'
     )
 
     // Change colors import
-    stubFile = stubFile.replace('../colors', 'tailwindcss/colors')
+    stubContentsFile = stubContentsFile.replace('../colors', 'tailwindcss/colors')
+
+    // Replace contents of {ts,js,cjs} file with the stub {simple,full}.
+    stubFile =
+      stubFile
+        .replace('__CONFIG__', stubContentsFile.replace('module.exports =', '').trim())
+        .trim() + '\n\n'
 
     fs.writeFileSync(tailwindConfigLocation, stubFile, 'utf8')
 
diff --git a/src/public/default-config.js b/src/public/default-config.js
index 78dc69c14780..4c7e90712959 100644
--- a/src/public/default-config.js
+++ b/src/public/default-config.js
@@ -1,4 +1,4 @@
 import { cloneDeep } from '../util/cloneDeep'
-import defaultConfig from '../../stubs/defaultConfig.stub'
+import defaultConfig from '../../stubs/config.full'
 
 export default cloneDeep(defaultConfig)
diff --git a/src/public/default-theme.js b/src/public/default-theme.js
index dc2400c31288..582edc303e5e 100644
--- a/src/public/default-theme.js
+++ b/src/public/default-theme.js
@@ -1,4 +1,4 @@
 import { cloneDeep } from '../util/cloneDeep'
-import defaultConfig from '../../stubs/defaultConfig.stub'
+import defaultFullConfig from '../../stubs/config.full'
 
-export default cloneDeep(defaultConfig.theme)
+export default cloneDeep(defaultFullConfig.theme)
diff --git a/src/public/load-config.js b/src/public/load-config.js
new file mode 100644
index 000000000000..d5d371271324
--- /dev/null
+++ b/src/public/load-config.js
@@ -0,0 +1,2 @@
+import { loadConfig } from '../lib/load-config'
+export default loadConfig
diff --git a/src/util/getAllConfigs.js b/src/util/getAllConfigs.js
index ebf28e172e3a..ce3665b977d0 100644
--- a/src/util/getAllConfigs.js
+++ b/src/util/getAllConfigs.js
@@ -1,8 +1,8 @@
-import defaultConfig from '../../stubs/defaultConfig.stub.js'
+import defaultFullConfig from '../../stubs/config.full.js'
 import { flagEnabled } from '../featureFlags'
 
 export default function getAllConfigs(config) {
-  const configs = (config?.presets ?? [defaultConfig])
+  const configs = (config?.presets ?? [defaultFullConfig])
     .slice()
     .reverse()
     .flatMap((preset) => getAllConfigs(preset instanceof Function ? preset() : preset))
diff --git a/src/util/resolveConfigPath.js b/src/util/resolveConfigPath.js
index 646a46fd4255..2b5078949761 100644
--- a/src/util/resolveConfigPath.js
+++ b/src/util/resolveConfigPath.js
@@ -1,6 +1,13 @@
 import fs from 'fs'
 import path from 'path'
 
+const defaultConfigFiles = [
+  './tailwind.config.js',
+  './tailwind.config.cjs',
+  './tailwind.config.mjs',
+  './tailwind.config.ts',
+]
+
 function isObject(value) {
   return typeof value === 'object' && value !== null
 }
@@ -43,7 +50,11 @@ export default function resolveConfigPath(pathOrConfig) {
   }
 
   // require('tailwindcss')
-  for (const configFile of ['./tailwind.config.js', './tailwind.config.cjs']) {
+  return resolveDefaultConfigPath()
+}
+
+export function resolveDefaultConfigPath() {
+  for (const configFile of defaultConfigFiles) {
     try {
       const configPath = path.resolve(configFile)
       fs.accessSync(configPath)
diff --git a/stubs/.gitignore b/stubs/.gitignore
new file mode 100644
index 000000000000..f9be8dfe0908
--- /dev/null
+++ b/stubs/.gitignore
@@ -0,0 +1 @@
+!*
diff --git a/stubs/defaultConfig.stub.js b/stubs/config.full.js
similarity index 99%
rename from stubs/defaultConfig.stub.js
rename to stubs/config.full.js
index b29eb4cf479d..d2c9526390fe 100644
--- a/stubs/defaultConfig.stub.js
+++ b/stubs/config.full.js
@@ -1,4 +1,3 @@
-/** @type {import('tailwindcss').Config} */
 module.exports = {
   content: [],
   presets: [],
diff --git a/stubs/config.simple.js b/stubs/config.simple.js
new file mode 100644
index 000000000000..9843c05570a6
--- /dev/null
+++ b/stubs/config.simple.js
@@ -0,0 +1,7 @@
+module.exports = {
+  content: [],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+}
diff --git a/stubs/defaultPostCssConfig.stub.js b/stubs/postcss.config.cjs
similarity index 100%
rename from stubs/defaultPostCssConfig.stub.js
rename to stubs/postcss.config.cjs
diff --git a/stubs/postcss.config.js b/stubs/postcss.config.js
new file mode 100644
index 000000000000..2e7af2b7f1a6
--- /dev/null
+++ b/stubs/postcss.config.js
@@ -0,0 +1,6 @@
+export default {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+}
diff --git a/stubs/tailwind.config.cjs b/stubs/tailwind.config.cjs
new file mode 100644
index 000000000000..48b702b09916
--- /dev/null
+++ b/stubs/tailwind.config.cjs
@@ -0,0 +1,2 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = __CONFIG__
diff --git a/stubs/tailwind.config.js b/stubs/tailwind.config.js
new file mode 100644
index 000000000000..c5f54b450048
--- /dev/null
+++ b/stubs/tailwind.config.js
@@ -0,0 +1,2 @@
+/** @type {import('tailwindcss').Config} */
+export default __CONFIG__
diff --git a/stubs/tailwind.config.ts b/stubs/tailwind.config.ts
new file mode 100644
index 000000000000..d9ea7111ea76
--- /dev/null
+++ b/stubs/tailwind.config.ts
@@ -0,0 +1,3 @@
+import type { Config } from 'tailwindcss'
+
+export default __CONFIG__ satisfies Config
diff --git a/tests/customConfig.test.js b/tests/customConfig.test.js
index 7c5a9ead28d7..5b83f9f2e81f 100644
--- a/tests/customConfig.test.js
+++ b/tests/customConfig.test.js
@@ -1,10 +1,12 @@
 import fs from 'fs'
 import path from 'path'
-import { cjsConfigFile, defaultConfigFile } from '../src/constants'
 import inTempDirectory from '../jest/runInTempDirectory'
 
 import { crosscheck, run, html, css, javascript } from './util/run'
 
+const defaultConfigFile = 'tailwind.config.js'
+const cjsConfigFile = 'tailwind.config.cjs'
+
 crosscheck(() => {
   test('it uses the values from the custom config file', () => {
     let config = require(path.resolve(`${__dirname}/fixtures/custom-config.js`))
diff --git a/tests/defaultConfig.test.js b/tests/defaultConfig.test.js
index b98251d8513d..4e7ca558b14f 100644
--- a/tests/defaultConfig.test.js
+++ b/tests/defaultConfig.test.js
@@ -1,5 +1,5 @@
 import config from '../src/public/default-config'
-import configStub from '../stubs/defaultConfig.stub.js'
+import configStub from '../stubs/config.full'
 
 test.todo('remove mutation from these tests so we can run against both engines')
 
diff --git a/tests/defaultTheme.test.js b/tests/defaultTheme.test.js
index d618bcfafde1..c6356b89acdd 100644
--- a/tests/defaultTheme.test.js
+++ b/tests/defaultTheme.test.js
@@ -1,5 +1,5 @@
 import theme from '../src/public/default-theme'
-import configStub from '../stubs/defaultConfig.stub.js'
+import configStub from '../stubs/config.full.js'
 
 test.todo('remove mutation from these tests so we can run against both engines')
 
diff --git a/tests/screenAtRule.test.js b/tests/screenAtRule.test.js
index 42ed22e0bed4..6352fcde09bd 100644
--- a/tests/screenAtRule.test.js
+++ b/tests/screenAtRule.test.js
@@ -1,6 +1,6 @@
 import postcss from 'postcss'
 import plugin from '../src/lib/substituteScreenAtRules'
-import config from '../stubs/defaultConfig.stub.js'
+import config from '../stubs/config.full.js'
 import { crosscheck, css } from './util/run'
 
 function run(input, opts = config) {

From 27cb947784c8f5b477275acd8fdba21110c42b1f Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Wed, 15 Mar 2023 22:30:42 +0100
Subject: [PATCH 48/84] delete unused stub

---
 stubs/simpleConfig.stub.js | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 stubs/simpleConfig.stub.js

diff --git a/stubs/simpleConfig.stub.js b/stubs/simpleConfig.stub.js
deleted file mode 100644
index 32e3abdef124..000000000000
--- a/stubs/simpleConfig.stub.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-  content: [],
-  theme: {
-    extend: {},
-  },
-  plugins: [],
-}

From ac1738e74807136a0aa05c3a39197f6ec80b689a Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Wed, 15 Mar 2023 22:31:12 +0100
Subject: [PATCH 49/84] fix `stubs` glob in `files` of package.json

---
 package.json        |  2 +-
 package.stable.json | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 39075af2ac02..110a92b925e0 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "lib/*",
     "peers/*",
     "scripts/*.js",
-    "stubs/*.{js,ts,cjs}",
+    "stubs/*",
     "nesting/*",
     "types/**/*",
     "*.d.ts",
diff --git a/package.stable.json b/package.stable.json
index 0f40e61ca4d4..1e56317d9082 100644
--- a/package.stable.json
+++ b/package.stable.json
@@ -38,7 +38,7 @@
     "lib/*",
     "peers/*",
     "scripts/*.js",
-    "stubs/*.stub.js",
+    "stubs/*",
     "nesting/*",
     "types/**/*",
     "*.d.ts",
@@ -96,26 +96,17 @@
     "resolve": "^1.22.1",
     "sucrase": "^3.29.0"
   },
-  "browserslist": [
-    "> 1%",
-    "not edge <= 18",
-    "not ie 11",
-    "not op_mini all"
-  ],
+  "browserslist": ["> 1%", "not edge <= 18", "not ie 11", "not op_mini all"],
   "jest": {
     "testTimeout": 30000,
-    "setupFilesAfterEnv": [
-      "<rootDir>/jest/customMatchers.js"
-    ],
+    "setupFilesAfterEnv": ["<rootDir>/jest/customMatchers.js"],
     "testPathIgnorePatterns": [
       "/node_modules/",
       "/integrations/",
       "/standalone-cli/",
       "\\.test\\.skip\\.js$"
     ],
-    "transformIgnorePatterns": [
-      "node_modules/(?!lightningcss)"
-    ],
+    "transformIgnorePatterns": ["node_modules/(?!lightningcss)"],
     "transform": {
       "\\.js$": "@swc/jest",
       "\\.ts$": "@swc/jest"

From 2de0aa9d91a93ffe50aa5d14237dd9a453420b28 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Thu, 16 Mar 2023 22:11:56 +0000
Subject: [PATCH 50/84] Update autoprefixer to version 10.4.14

---
 package-lock.json | 2202 +++++++++++++++++++++++----------------------
 package.json      |    2 +-
 2 files changed, 1116 insertions(+), 1088 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 72fafcb4895d..28519e48b7ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -58,8 +58,8 @@
         "eslint": "^8.35.0",
         "eslint-config-prettier": "^8.7.0",
         "eslint-plugin-prettier": "^4.2.1",
-        "jest": "^29.4.3",
-        "jest-diff": "^29.4.3",
+        "jest": "^29.5.0",
+        "jest-diff": "^29.5.0",
         "prettier": "^2.8.4",
         "rimraf": "^4.4.0",
         "source-map-js": "^1.0.2",
@@ -608,21 +608,21 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz",
-      "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==",
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.3.tgz",
+      "integrity": "sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.21.0",
+        "@babel/generator": "^7.21.3",
         "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-module-transforms": "^7.21.0",
+        "@babel/helper-module-transforms": "^7.21.2",
         "@babel/helpers": "^7.21.0",
-        "@babel/parser": "^7.21.0",
+        "@babel/parser": "^7.21.3",
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.0",
-        "@babel/types": "^7.21.0",
+        "@babel/traverse": "^7.21.3",
+        "@babel/types": "^7.21.3",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -644,12 +644,12 @@
       "dev": true
     },
     "node_modules/@babel/generator": {
-      "version": "7.21.1",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz",
-      "integrity": "sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==",
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz",
+      "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.21.0",
+        "@babel/types": "^7.21.3",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -923,9 +923,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
-      "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==",
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
+      "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1125,19 +1125,19 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz",
-      "integrity": "sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==",
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz",
+      "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.21.1",
+        "@babel/generator": "^7.21.3",
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-function-name": "^7.21.0",
         "@babel/helper-hoist-variables": "^7.18.6",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.21.2",
-        "@babel/types": "^7.21.2",
+        "@babel/parser": "^7.21.3",
+        "@babel/types": "^7.21.3",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1146,9 +1146,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz",
-      "integrity": "sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==",
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz",
+      "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.19.4",
@@ -1671,16 +1671,16 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.4.3.tgz",
-      "integrity": "sha512-W/o/34+wQuXlgqlPYTansOSiBnuxrTv61dEVkA6HNmpcgHLUjfaUbdqt6oVvOzaawwo9IdW9QOtMgQ1ScSZC4A==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.5.0.tgz",
+      "integrity": "sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^29.4.3",
-        "jest-util": "^29.4.3",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -1688,9 +1688,9 @@
       }
     },
     "node_modules/@jest/console/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -1714,37 +1714,37 @@
       }
     },
     "node_modules/@jest/core": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.4.3.tgz",
-      "integrity": "sha512-56QvBq60fS4SPZCuM7T+7scNrkGIe7Mr6PVIXUpu48ouvRaWOFqRPV91eifvFM0ay2HmfswXiGf97NGUN5KofQ==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.5.0.tgz",
+      "integrity": "sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.4.3",
-        "@jest/reporters": "^29.4.3",
-        "@jest/test-result": "^29.4.3",
-        "@jest/transform": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/console": "^29.5.0",
+        "@jest/reporters": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^29.4.3",
-        "jest-config": "^29.4.3",
-        "jest-haste-map": "^29.4.3",
-        "jest-message-util": "^29.4.3",
+        "jest-changed-files": "^29.5.0",
+        "jest-config": "^29.5.0",
+        "jest-haste-map": "^29.5.0",
+        "jest-message-util": "^29.5.0",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.4.3",
-        "jest-resolve-dependencies": "^29.4.3",
-        "jest-runner": "^29.4.3",
-        "jest-runtime": "^29.4.3",
-        "jest-snapshot": "^29.4.3",
-        "jest-util": "^29.4.3",
-        "jest-validate": "^29.4.3",
-        "jest-watcher": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-resolve-dependencies": "^29.5.0",
+        "jest-runner": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
+        "jest-watcher": "^29.5.0",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.4.3",
+        "pretty-format": "^29.5.0",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
@@ -1761,9 +1761,9 @@
       }
     },
     "node_modules/@jest/core/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -1798,24 +1798,24 @@
       }
     },
     "node_modules/@jest/environment": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.4.3.tgz",
-      "integrity": "sha512-dq5S6408IxIa+lr54zeqce+QgI+CJT4nmmA+1yzFgtcsGK8c/EyiUb9XQOgz3BMKrRDfKseeOaxj2eO8LlD3lA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.5.0.tgz",
+      "integrity": "sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==",
       "dev": true,
       "dependencies": {
-        "@jest/fake-timers": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
-        "jest-mock": "^29.4.3"
+        "jest-mock": "^29.5.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/environment/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -1839,22 +1839,22 @@
       }
     },
     "node_modules/@jest/expect": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.4.3.tgz",
-      "integrity": "sha512-iktRU/YsxEtumI9zsPctYUk7ptpC+AVLLk1Ax3AsA4g1C+8OOnKDkIQBDHtD5hA/+VtgMd5AWI5gNlcAlt2vxQ==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.5.0.tgz",
+      "integrity": "sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==",
       "dev": true,
       "dependencies": {
-        "expect": "^29.4.3",
-        "jest-snapshot": "^29.4.3"
+        "expect": "^29.5.0",
+        "jest-snapshot": "^29.5.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/expect-utils": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.4.3.tgz",
-      "integrity": "sha512-/6JWbkxHOP8EoS8jeeTd9dTfc9Uawi+43oLKHfp6zzux3U2hqOOVnV3ai4RpDYHOccL6g+5nrxpoc8DmJxtXVQ==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.5.0.tgz",
+      "integrity": "sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==",
       "dev": true,
       "dependencies": {
         "jest-get-type": "^29.4.3"
@@ -1864,26 +1864,26 @@
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.4.3.tgz",
-      "integrity": "sha512-4Hote2MGcCTWSD2gwl0dwbCpBRHhE6olYEuTj8FMowdg3oQWNKr2YuxenPQYZ7+PfqPY1k98wKDU4Z+Hvd4Tiw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.5.0.tgz",
+      "integrity": "sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^29.4.3",
-        "jest-mock": "^29.4.3",
-        "jest-util": "^29.4.3"
+        "jest-message-util": "^29.5.0",
+        "jest-mock": "^29.5.0",
+        "jest-util": "^29.5.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/fake-timers/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -1907,24 +1907,24 @@
       }
     },
     "node_modules/@jest/globals": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.4.3.tgz",
-      "integrity": "sha512-8BQ/5EzfOLG7AaMcDh7yFCbfRLtsc+09E1RQmRBI4D6QQk4m6NSK/MXo+3bJrBN0yU8A2/VIcqhvsOLFmziioA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.5.0.tgz",
+      "integrity": "sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.4.3",
-        "@jest/expect": "^29.4.3",
-        "@jest/types": "^29.4.3",
-        "jest-mock": "^29.4.3"
+        "@jest/environment": "^29.5.0",
+        "@jest/expect": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "jest-mock": "^29.5.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/globals/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -1948,16 +1948,16 @@
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.4.3.tgz",
-      "integrity": "sha512-sr2I7BmOjJhyqj9ANC6CTLsL4emMoka7HkQpcoMRlhCbQJjz2zsRzw0BDPiPyEFDXAbxKgGFYuQZiSJ1Y6YoTg==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.5.0.tgz",
+      "integrity": "sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==",
       "dev": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.4.3",
-        "@jest/test-result": "^29.4.3",
-        "@jest/transform": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/console": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@jridgewell/trace-mapping": "^0.3.15",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -1970,9 +1970,9 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.4.3",
-        "jest-util": "^29.4.3",
-        "jest-worker": "^29.4.3",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-worker": "^29.5.0",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -1991,9 +1991,9 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -2043,13 +2043,13 @@
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.4.3.tgz",
-      "integrity": "sha512-Oi4u9NfBolMq9MASPwuWTlC5WvmNRwI4S8YrQg5R5Gi47DYlBe3sh7ILTqi/LGrK1XUE4XY9KZcQJTH1WJCLLA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.5.0.tgz",
+      "integrity": "sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/console": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
@@ -2058,9 +2058,9 @@
       }
     },
     "node_modules/@jest/test-result/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -2084,14 +2084,14 @@
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.4.3.tgz",
-      "integrity": "sha512-yi/t2nES4GB4G0mjLc0RInCq/cNr9dNwJxcGg8sslajua5Kb4kmozAc+qPLzplhBgfw1vLItbjyHzUN92UXicw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz",
+      "integrity": "sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^29.4.3",
+        "@jest/test-result": "^29.5.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.3",
+        "jest-haste-map": "^29.5.0",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -2099,22 +2099,22 @@
       }
     },
     "node_modules/@jest/transform": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.4.3.tgz",
-      "integrity": "sha512-8u0+fBGWolDshsFgPQJESkDa72da/EVwvL+II0trN2DR66wMwiQ9/CihaGfHdlLGFzbBZwMykFtxuwFdZqlKwg==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.5.0.tgz",
+      "integrity": "sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "@jridgewell/trace-mapping": "^0.3.15",
         "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.3",
+        "jest-haste-map": "^29.5.0",
         "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.4.3",
+        "jest-util": "^29.5.0",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
@@ -2125,9 +2125,9 @@
       }
     },
     "node_modules/@jest/transform/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -4955,15 +4955,15 @@
       }
     },
     "node_modules/babel-jest": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.4.3.tgz",
-      "integrity": "sha512-o45Wyn32svZE+LnMVWv/Z4x0SwtLbh4FyGcYtR20kIWd+rdrDZ9Fzq8Ml3MYLD+mZvEdzCjZsCnYZ2jpJyQ+Nw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.5.0.tgz",
+      "integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==",
       "dev": true,
       "dependencies": {
-        "@jest/transform": "^29.4.3",
+        "@jest/transform": "^29.5.0",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^29.4.3",
+        "babel-preset-jest": "^29.5.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "slash": "^3.0.0"
@@ -4992,9 +4992,9 @@
       }
     },
     "node_modules/babel-plugin-jest-hoist": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.4.3.tgz",
-      "integrity": "sha512-mB6q2q3oahKphy5V7CpnNqZOCkxxZ9aokf1eh82Dy3jQmg4xvM1tGrh5y6BQUJh4a3Pj9+eLfwvAZ7VNKg7H8Q==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
+      "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.3.3",
@@ -5030,12 +5030,12 @@
       }
     },
     "node_modules/babel-preset-jest": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.4.3.tgz",
-      "integrity": "sha512-gWx6COtSuma6n9bw+8/F+2PCXrIgxV/D1TJFnp6OyBK2cxPWg0K9p/sriNYeifKjpUkMViWQ09DSWtzJQRETsw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
+      "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
       "dev": true,
       "dependencies": {
-        "babel-plugin-jest-hoist": "^29.4.3",
+        "babel-plugin-jest-hoist": "^29.5.0",
         "babel-preset-current-node-syntax": "^1.0.0"
       },
       "engines": {
@@ -7492,16 +7492,16 @@
       "dev": true
     },
     "node_modules/expect": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.4.3.tgz",
-      "integrity": "sha512-uC05+Q7eXECFpgDrHdXA4k2rpMyStAYPItEDLyQDo5Ta7fVkJnNA/4zh/OIVkVVNZ1oOK1PipQoyNjuZ6sz6Dg==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.5.0.tgz",
+      "integrity": "sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==",
       "dev": true,
       "dependencies": {
-        "@jest/expect-utils": "^29.4.3",
+        "@jest/expect-utils": "^29.5.0",
         "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.4.3",
-        "jest-message-util": "^29.4.3",
-        "jest-util": "^29.4.3"
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -8942,15 +8942,15 @@
       }
     },
     "node_modules/jest": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.4.3.tgz",
-      "integrity": "sha512-XvK65feuEFGZT8OO0fB/QAQS+LGHvQpaadkH5p47/j3Ocqq3xf2pK9R+G0GzgfuhXVxEv76qCOOcMb5efLk6PA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.5.0.tgz",
+      "integrity": "sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/core": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "import-local": "^3.0.2",
-        "jest-cli": "^29.4.3"
+        "jest-cli": "^29.5.0"
       },
       "bin": {
         "jest": "bin/jest.js"
@@ -8968,9 +8968,9 @@
       }
     },
     "node_modules/jest-changed-files": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.4.3.tgz",
-      "integrity": "sha512-Vn5cLuWuwmi2GNNbokPOEcvrXGSGrqVnPEZV7rC6P7ck07Dyw9RFnvWglnupSh+hGys0ajGtw/bc2ZgweljQoQ==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
+      "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
       "dev": true,
       "dependencies": {
         "execa": "^5.0.0",
@@ -8981,28 +8981,29 @@
       }
     },
     "node_modules/jest-circus": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.4.3.tgz",
-      "integrity": "sha512-Vw/bVvcexmdJ7MLmgdT3ZjkJ3LKu8IlpefYokxiqoZy6OCQ2VAm6Vk3t/qHiAGUXbdbJKJWnc8gH3ypTbB/OBw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.5.0.tgz",
+      "integrity": "sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.4.3",
-        "@jest/expect": "^29.4.3",
-        "@jest/test-result": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/environment": "^29.5.0",
+        "@jest/expect": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^0.7.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.4.3",
-        "jest-matcher-utils": "^29.4.3",
-        "jest-message-util": "^29.4.3",
-        "jest-runtime": "^29.4.3",
-        "jest-snapshot": "^29.4.3",
-        "jest-util": "^29.4.3",
+        "jest-each": "^29.5.0",
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
         "p-limit": "^3.1.0",
-        "pretty-format": "^29.4.3",
+        "pretty-format": "^29.5.0",
+        "pure-rand": "^6.0.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -9011,9 +9012,9 @@
       }
     },
     "node_modules/jest-circus/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -9037,21 +9038,21 @@
       }
     },
     "node_modules/jest-cli": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.4.3.tgz",
-      "integrity": "sha512-PiiAPuFNfWWolCE6t3ZrDXQc6OsAuM3/tVW0u27UWc1KE+n/HSn5dSE6B2juqN7WP+PP0jAcnKtGmI4u8GMYCg==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.5.0.tgz",
+      "integrity": "sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^29.4.3",
-        "@jest/test-result": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/core": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^29.4.3",
-        "jest-util": "^29.4.3",
-        "jest-validate": "^29.4.3",
+        "jest-config": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
         "prompts": "^2.0.1",
         "yargs": "^17.3.1"
       },
@@ -9071,9 +9072,9 @@
       }
     },
     "node_modules/jest-cli/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -9097,31 +9098,31 @@
       }
     },
     "node_modules/jest-config": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.4.3.tgz",
-      "integrity": "sha512-eCIpqhGnIjdUCXGtLhz4gdDoxKSWXKjzNcc5r+0S1GKOp2fwOipx5mRcwa9GB/ArsxJ1jlj2lmlD9bZAsBxaWQ==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.5.0.tgz",
+      "integrity": "sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.4.3",
-        "@jest/types": "^29.4.3",
-        "babel-jest": "^29.4.3",
+        "@jest/test-sequencer": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "babel-jest": "^29.5.0",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.4.3",
-        "jest-environment-node": "^29.4.3",
+        "jest-circus": "^29.5.0",
+        "jest-environment-node": "^29.5.0",
         "jest-get-type": "^29.4.3",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.4.3",
-        "jest-runner": "^29.4.3",
-        "jest-util": "^29.4.3",
-        "jest-validate": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-runner": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
         "micromatch": "^4.0.4",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.4.3",
+        "pretty-format": "^29.5.0",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
@@ -9142,9 +9143,9 @@
       }
     },
     "node_modules/jest-config/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -9168,15 +9169,15 @@
       }
     },
     "node_modules/jest-diff": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.4.3.tgz",
-      "integrity": "sha512-YB+ocenx7FZ3T5O9lMVMeLYV4265socJKtkwgk/6YUz/VsEzYDkiMuMhWzZmxm3wDRQvayJu/PjkjjSkjoHsCA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.5.0.tgz",
+      "integrity": "sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.4.3",
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.4.3"
+        "pretty-format": "^29.5.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -9195,25 +9196,25 @@
       }
     },
     "node_modules/jest-each": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.4.3.tgz",
-      "integrity": "sha512-1ElHNAnKcbJb/b+L+7j0/w7bDvljw4gTv1wL9fYOczeJrbTbkMGQ5iQPFJ3eFQH19VPTx1IyfePdqSpePKss7Q==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.5.0.tgz",
+      "integrity": "sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^29.4.3",
-        "jest-util": "^29.4.3",
-        "pretty-format": "^29.4.3"
+        "jest-util": "^29.5.0",
+        "pretty-format": "^29.5.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-each/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -9237,26 +9238,26 @@
       }
     },
     "node_modules/jest-environment-node": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.4.3.tgz",
-      "integrity": "sha512-gAiEnSKF104fsGDXNkwk49jD/0N0Bqu2K9+aMQXA6avzsA9H3Fiv1PW2D+gzbOSR705bWd2wJZRFEFpV0tXISg==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.5.0.tgz",
+      "integrity": "sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.4.3",
-        "@jest/fake-timers": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/environment": "^29.5.0",
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
-        "jest-mock": "^29.4.3",
-        "jest-util": "^29.4.3"
+        "jest-mock": "^29.5.0",
+        "jest-util": "^29.5.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-environment-node/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -9289,20 +9290,20 @@
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.4.3.tgz",
-      "integrity": "sha512-eZIgAS8tvm5IZMtKlR8Y+feEOMfo2pSQkmNbufdbMzMSn9nitgGxF1waM/+LbryO3OkMcKS98SUb+j/cQxp/vQ==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.5.0.tgz",
+      "integrity": "sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "@types/graceful-fs": "^4.1.3",
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
         "graceful-fs": "^4.2.9",
         "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.4.3",
-        "jest-worker": "^29.4.3",
+        "jest-util": "^29.5.0",
+        "jest-worker": "^29.5.0",
         "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       },
@@ -9314,9 +9315,9 @@
       }
     },
     "node_modules/jest-haste-map/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -9340,46 +9341,46 @@
       }
     },
     "node_modules/jest-leak-detector": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.4.3.tgz",
-      "integrity": "sha512-9yw4VC1v2NspMMeV3daQ1yXPNxMgCzwq9BocCwYrRgXe4uaEJPAN0ZK37nFBhcy3cUwEVstFecFLaTHpF7NiGA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz",
+      "integrity": "sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==",
       "dev": true,
       "dependencies": {
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.4.3"
+        "pretty-format": "^29.5.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.4.3.tgz",
-      "integrity": "sha512-TTciiXEONycZ03h6R6pYiZlSkvYgT0l8aa49z/DLSGYjex4orMUcafuLXYyyEDWB1RKglq00jzwY00Ei7yFNVg==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz",
+      "integrity": "sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.4.3",
+        "jest-diff": "^29.5.0",
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.4.3"
+        "pretty-format": "^29.5.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-message-util": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.4.3.tgz",
-      "integrity": "sha512-1Y8Zd4ZCN7o/QnWdMmT76If8LuDv23Z1DRovBj/vcSFNlGCJGoO8D1nJDw1AdyAGUk0myDLFGN5RbNeJyCRGCw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.5.0.tgz",
+      "integrity": "sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.4.3",
+        "pretty-format": "^29.5.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -9388,9 +9389,9 @@
       }
     },
     "node_modules/jest-message-util/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -9414,23 +9415,23 @@
       }
     },
     "node_modules/jest-mock": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.4.3.tgz",
-      "integrity": "sha512-LjFgMg+xed9BdkPMyIJh+r3KeHt1klXPJYBULXVVAkbTaaKjPX1o1uVCAZADMEp/kOxGTwy/Ot8XbvgItOrHEg==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.5.0.tgz",
+      "integrity": "sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
-        "jest-util": "^29.4.3"
+        "jest-util": "^29.5.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-mock/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -9480,17 +9481,17 @@
       }
     },
     "node_modules/jest-resolve": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.4.3.tgz",
-      "integrity": "sha512-GPokE1tzguRyT7dkxBim4wSx6E45S3bOQ7ZdKEG+Qj0Oac9+6AwJPCk0TZh5Vu0xzeX4afpb+eDmgbmZFFwpOw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.5.0.tgz",
+      "integrity": "sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.3",
+        "jest-haste-map": "^29.5.0",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.4.3",
-        "jest-validate": "^29.4.3",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
         "resolve": "^1.20.0",
         "resolve.exports": "^2.0.0",
         "slash": "^3.0.0"
@@ -9500,43 +9501,43 @@
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.4.3.tgz",
-      "integrity": "sha512-uvKMZAQ3nmXLH7O8WAOhS5l0iWyT3WmnJBdmIHiV5tBbdaDZ1wqtNX04FONGoaFvSOSHBJxnwAVnSn1WHdGVaw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz",
+      "integrity": "sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==",
       "dev": true,
       "dependencies": {
         "jest-regex-util": "^29.4.3",
-        "jest-snapshot": "^29.4.3"
+        "jest-snapshot": "^29.5.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-runner": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.4.3.tgz",
-      "integrity": "sha512-GWPTEiGmtHZv1KKeWlTX9SIFuK19uLXlRQU43ceOQ2hIfA5yPEJC7AMkvFKpdCHx6pNEdOD+2+8zbniEi3v3gA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.5.0.tgz",
+      "integrity": "sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.4.3",
-        "@jest/environment": "^29.4.3",
-        "@jest/test-result": "^29.4.3",
-        "@jest/transform": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/console": "^29.5.0",
+        "@jest/environment": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
         "graceful-fs": "^4.2.9",
         "jest-docblock": "^29.4.3",
-        "jest-environment-node": "^29.4.3",
-        "jest-haste-map": "^29.4.3",
-        "jest-leak-detector": "^29.4.3",
-        "jest-message-util": "^29.4.3",
-        "jest-resolve": "^29.4.3",
-        "jest-runtime": "^29.4.3",
-        "jest-util": "^29.4.3",
-        "jest-watcher": "^29.4.3",
-        "jest-worker": "^29.4.3",
+        "jest-environment-node": "^29.5.0",
+        "jest-haste-map": "^29.5.0",
+        "jest-leak-detector": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-resolve": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-watcher": "^29.5.0",
+        "jest-worker": "^29.5.0",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
@@ -9545,9 +9546,9 @@
       }
     },
     "node_modules/jest-runner/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -9581,31 +9582,31 @@
       }
     },
     "node_modules/jest-runtime": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.4.3.tgz",
-      "integrity": "sha512-F5bHvxSH+LvLV24vVB3L8K467dt3y3dio6V3W89dUz9nzvTpqd/HcT9zfYKL2aZPvD63vQFgLvaUX/UpUhrP6Q==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.5.0.tgz",
+      "integrity": "sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.4.3",
-        "@jest/fake-timers": "^29.4.3",
-        "@jest/globals": "^29.4.3",
+        "@jest/environment": "^29.5.0",
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/globals": "^29.5.0",
         "@jest/source-map": "^29.4.3",
-        "@jest/test-result": "^29.4.3",
-        "@jest/transform": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.3",
-        "jest-message-util": "^29.4.3",
-        "jest-mock": "^29.4.3",
+        "jest-haste-map": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-mock": "^29.5.0",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.4.3",
-        "jest-snapshot": "^29.4.3",
-        "jest-util": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
@@ -9614,9 +9615,9 @@
       }
     },
     "node_modules/jest-runtime/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -9640,9 +9641,9 @@
       }
     },
     "node_modules/jest-snapshot": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.4.3.tgz",
-      "integrity": "sha512-NGlsqL0jLPDW91dz304QTM/SNO99lpcSYYAjNiX0Ou+sSGgkanKBcSjCfp/pqmiiO1nQaOyLp6XQddAzRcx3Xw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.5.0.tgz",
+      "integrity": "sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
@@ -9651,23 +9652,22 @@
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/traverse": "^7.7.2",
         "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.4.3",
-        "@jest/transform": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/expect-utils": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/babel__traverse": "^7.0.6",
         "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^29.4.3",
+        "expect": "^29.5.0",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.4.3",
+        "jest-diff": "^29.5.0",
         "jest-get-type": "^29.4.3",
-        "jest-haste-map": "^29.4.3",
-        "jest-matcher-utils": "^29.4.3",
-        "jest-message-util": "^29.4.3",
-        "jest-util": "^29.4.3",
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^29.4.3",
+        "pretty-format": "^29.5.0",
         "semver": "^7.3.5"
       },
       "engines": {
@@ -9675,9 +9675,9 @@
       }
     },
     "node_modules/jest-snapshot/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -9716,12 +9716,12 @@
       }
     },
     "node_modules/jest-util": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.4.3.tgz",
-      "integrity": "sha512-ToSGORAz4SSSoqxDSylWX8JzkOQR7zoBtNRsA7e+1WUX5F8jrOwaNpuh1YfJHJKDHXLHmObv5eOjejUd+/Ws+Q==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz",
+      "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
@@ -9733,9 +9733,9 @@
       }
     },
     "node_modules/jest-util/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -9759,26 +9759,26 @@
       }
     },
     "node_modules/jest-validate": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.4.3.tgz",
-      "integrity": "sha512-J3u5v7aPQoXPzaar6GndAVhdQcZr/3osWSgTeKg5v574I9ybX/dTyH0AJFb5XgXIB7faVhf+rS7t4p3lL9qFaw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.5.0.tgz",
+      "integrity": "sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^29.4.3",
         "leven": "^3.1.0",
-        "pretty-format": "^29.4.3"
+        "pretty-format": "^29.5.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-validate/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -9814,18 +9814,18 @@
       }
     },
     "node_modules/jest-watcher": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.4.3.tgz",
-      "integrity": "sha512-zwlXH3DN3iksoIZNk73etl1HzKyi5FuQdYLnkQKm5BW4n8HpoG59xSwpVdFrnh60iRRaRBGw0gcymIxjJENPcA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.5.0.tgz",
+      "integrity": "sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
-        "jest-util": "^29.4.3",
+        "jest-util": "^29.5.0",
         "string-length": "^4.0.1"
       },
       "engines": {
@@ -9833,9 +9833,9 @@
       }
     },
     "node_modules/jest-watcher/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -9859,13 +9859,13 @@
       }
     },
     "node_modules/jest-worker": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.4.3.tgz",
-      "integrity": "sha512-GLHN/GTAAMEy5BFdvpUfzr9Dr80zQqBrh0fz1mtRMe05hqP45+HfQltu7oTBfduD0UeZs09d+maFtFYAXFWvAA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
+      "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.4.3",
+        "jest-util": "^29.5.0",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -9889,9 +9889,9 @@
       }
     },
     "node_modules/jest/node_modules/@jest/types": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-      "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -12344,9 +12344,9 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.4.3.tgz",
-      "integrity": "sha512-cvpcHTc42lcsvOOAzd3XuNWTcvk1Jmnzqeu+WsOuiPmxUJTnkbAcFNsRKvEpBEUFVUgy/GTZLulZDcDEi+CIlA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.5.0.tgz",
+      "integrity": "sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
@@ -12490,6 +12490,22 @@
         "node": ">=6"
       }
     },
+    "node_modules/pure-rand": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.1.tgz",
+      "integrity": "sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ]
+    },
     "node_modules/querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -12759,9 +12775,9 @@
       "dev": true
     },
     "node_modules/resolve.exports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.0.tgz",
-      "integrity": "sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.1.tgz",
+      "integrity": "sha512-OEJWVeimw8mgQuj3HfkNl4KqRevH7lzeQNaWRPfx0PPse7Jk6ozcsG4FKVgtzDsC1KUF+YlTHh17NcgHOPykLw==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -15844,21 +15860,21 @@
       "dev": true
     },
     "@babel/core": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz",
-      "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==",
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.3.tgz",
+      "integrity": "sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==",
       "dev": true,
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.21.0",
+        "@babel/generator": "^7.21.3",
         "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-module-transforms": "^7.21.0",
+        "@babel/helper-module-transforms": "^7.21.2",
         "@babel/helpers": "^7.21.0",
-        "@babel/parser": "^7.21.0",
+        "@babel/parser": "^7.21.3",
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.0",
-        "@babel/types": "^7.21.0",
+        "@babel/traverse": "^7.21.3",
+        "@babel/types": "^7.21.3",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -15875,12 +15891,12 @@
       }
     },
     "@babel/generator": {
-      "version": "7.21.1",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz",
-      "integrity": "sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==",
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz",
+      "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.21.0",
+        "@babel/types": "^7.21.3",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -16086,9 +16102,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
-      "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
+      "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ=="
     },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
@@ -16228,27 +16244,27 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz",
-      "integrity": "sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==",
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz",
+      "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.21.1",
+        "@babel/generator": "^7.21.3",
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-function-name": "^7.21.0",
         "@babel/helper-hoist-variables": "^7.18.6",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.21.2",
-        "@babel/types": "^7.21.2",
+        "@babel/parser": "^7.21.3",
+        "@babel/types": "^7.21.3",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz",
-      "integrity": "sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==",
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz",
+      "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==",
       "dev": true,
       "requires": {
         "@babel/helper-string-parser": "^7.19.4",
@@ -16523,23 +16539,23 @@
       "dev": true
     },
     "@jest/console": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.4.3.tgz",
-      "integrity": "sha512-W/o/34+wQuXlgqlPYTansOSiBnuxrTv61dEVkA6HNmpcgHLUjfaUbdqt6oVvOzaawwo9IdW9QOtMgQ1ScSZC4A==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.5.0.tgz",
+      "integrity": "sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^29.4.3",
-        "jest-util": "^29.4.3",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
         "slash": "^3.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -16562,45 +16578,45 @@
       }
     },
     "@jest/core": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.4.3.tgz",
-      "integrity": "sha512-56QvBq60fS4SPZCuM7T+7scNrkGIe7Mr6PVIXUpu48ouvRaWOFqRPV91eifvFM0ay2HmfswXiGf97NGUN5KofQ==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.5.0.tgz",
+      "integrity": "sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.4.3",
-        "@jest/reporters": "^29.4.3",
-        "@jest/test-result": "^29.4.3",
-        "@jest/transform": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/console": "^29.5.0",
+        "@jest/reporters": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^29.4.3",
-        "jest-config": "^29.4.3",
-        "jest-haste-map": "^29.4.3",
-        "jest-message-util": "^29.4.3",
+        "jest-changed-files": "^29.5.0",
+        "jest-config": "^29.5.0",
+        "jest-haste-map": "^29.5.0",
+        "jest-message-util": "^29.5.0",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.4.3",
-        "jest-resolve-dependencies": "^29.4.3",
-        "jest-runner": "^29.4.3",
-        "jest-runtime": "^29.4.3",
-        "jest-snapshot": "^29.4.3",
-        "jest-util": "^29.4.3",
-        "jest-validate": "^29.4.3",
-        "jest-watcher": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-resolve-dependencies": "^29.5.0",
+        "jest-runner": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
+        "jest-watcher": "^29.5.0",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.4.3",
+        "pretty-format": "^29.5.0",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -16630,21 +16646,21 @@
       }
     },
     "@jest/environment": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.4.3.tgz",
-      "integrity": "sha512-dq5S6408IxIa+lr54zeqce+QgI+CJT4nmmA+1yzFgtcsGK8c/EyiUb9XQOgz3BMKrRDfKseeOaxj2eO8LlD3lA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.5.0.tgz",
+      "integrity": "sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
-        "jest-mock": "^29.4.3"
+        "jest-mock": "^29.5.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -16667,42 +16683,42 @@
       }
     },
     "@jest/expect": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.4.3.tgz",
-      "integrity": "sha512-iktRU/YsxEtumI9zsPctYUk7ptpC+AVLLk1Ax3AsA4g1C+8OOnKDkIQBDHtD5hA/+VtgMd5AWI5gNlcAlt2vxQ==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.5.0.tgz",
+      "integrity": "sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==",
       "dev": true,
       "requires": {
-        "expect": "^29.4.3",
-        "jest-snapshot": "^29.4.3"
+        "expect": "^29.5.0",
+        "jest-snapshot": "^29.5.0"
       }
     },
     "@jest/expect-utils": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.4.3.tgz",
-      "integrity": "sha512-/6JWbkxHOP8EoS8jeeTd9dTfc9Uawi+43oLKHfp6zzux3U2hqOOVnV3ai4RpDYHOccL6g+5nrxpoc8DmJxtXVQ==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.5.0.tgz",
+      "integrity": "sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==",
       "dev": true,
       "requires": {
         "jest-get-type": "^29.4.3"
       }
     },
     "@jest/fake-timers": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.4.3.tgz",
-      "integrity": "sha512-4Hote2MGcCTWSD2gwl0dwbCpBRHhE6olYEuTj8FMowdg3oQWNKr2YuxenPQYZ7+PfqPY1k98wKDU4Z+Hvd4Tiw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.5.0.tgz",
+      "integrity": "sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^29.4.3",
-        "jest-mock": "^29.4.3",
-        "jest-util": "^29.4.3"
+        "jest-message-util": "^29.5.0",
+        "jest-mock": "^29.5.0",
+        "jest-util": "^29.5.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -16725,21 +16741,21 @@
       }
     },
     "@jest/globals": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.4.3.tgz",
-      "integrity": "sha512-8BQ/5EzfOLG7AaMcDh7yFCbfRLtsc+09E1RQmRBI4D6QQk4m6NSK/MXo+3bJrBN0yU8A2/VIcqhvsOLFmziioA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.5.0.tgz",
+      "integrity": "sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.4.3",
-        "@jest/expect": "^29.4.3",
-        "@jest/types": "^29.4.3",
-        "jest-mock": "^29.4.3"
+        "@jest/environment": "^29.5.0",
+        "@jest/expect": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "jest-mock": "^29.5.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -16762,16 +16778,16 @@
       }
     },
     "@jest/reporters": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.4.3.tgz",
-      "integrity": "sha512-sr2I7BmOjJhyqj9ANC6CTLsL4emMoka7HkQpcoMRlhCbQJjz2zsRzw0BDPiPyEFDXAbxKgGFYuQZiSJ1Y6YoTg==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.5.0.tgz",
+      "integrity": "sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.4.3",
-        "@jest/test-result": "^29.4.3",
-        "@jest/transform": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/console": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@jridgewell/trace-mapping": "^0.3.15",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -16784,9 +16800,9 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.4.3",
-        "jest-util": "^29.4.3",
-        "jest-worker": "^29.4.3",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-worker": "^29.5.0",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -16794,9 +16810,9 @@
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -16839,21 +16855,21 @@
       }
     },
     "@jest/test-result": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.4.3.tgz",
-      "integrity": "sha512-Oi4u9NfBolMq9MASPwuWTlC5WvmNRwI4S8YrQg5R5Gi47DYlBe3sh7ILTqi/LGrK1XUE4XY9KZcQJTH1WJCLLA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.5.0.tgz",
+      "integrity": "sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/console": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -16876,34 +16892,34 @@
       }
     },
     "@jest/test-sequencer": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.4.3.tgz",
-      "integrity": "sha512-yi/t2nES4GB4G0mjLc0RInCq/cNr9dNwJxcGg8sslajua5Kb4kmozAc+qPLzplhBgfw1vLItbjyHzUN92UXicw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz",
+      "integrity": "sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^29.4.3",
+        "@jest/test-result": "^29.5.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.3",
+        "jest-haste-map": "^29.5.0",
         "slash": "^3.0.0"
       }
     },
     "@jest/transform": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.4.3.tgz",
-      "integrity": "sha512-8u0+fBGWolDshsFgPQJESkDa72da/EVwvL+II0trN2DR66wMwiQ9/CihaGfHdlLGFzbBZwMykFtxuwFdZqlKwg==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.5.0.tgz",
+      "integrity": "sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "@jridgewell/trace-mapping": "^0.3.15",
         "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.3",
+        "jest-haste-map": "^29.5.0",
         "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.4.3",
+        "jest-util": "^29.5.0",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
@@ -16911,9 +16927,9 @@
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -19202,15 +19218,15 @@
       }
     },
     "babel-jest": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.4.3.tgz",
-      "integrity": "sha512-o45Wyn32svZE+LnMVWv/Z4x0SwtLbh4FyGcYtR20kIWd+rdrDZ9Fzq8Ml3MYLD+mZvEdzCjZsCnYZ2jpJyQ+Nw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.5.0.tgz",
+      "integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^29.4.3",
+        "@jest/transform": "^29.5.0",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^29.4.3",
+        "babel-preset-jest": "^29.5.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "slash": "^3.0.0"
@@ -19230,9 +19246,9 @@
       }
     },
     "babel-plugin-jest-hoist": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.4.3.tgz",
-      "integrity": "sha512-mB6q2q3oahKphy5V7CpnNqZOCkxxZ9aokf1eh82Dy3jQmg4xvM1tGrh5y6BQUJh4a3Pj9+eLfwvAZ7VNKg7H8Q==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
+      "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.3.3",
@@ -19262,12 +19278,12 @@
       }
     },
     "babel-preset-jest": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.4.3.tgz",
-      "integrity": "sha512-gWx6COtSuma6n9bw+8/F+2PCXrIgxV/D1TJFnp6OyBK2cxPWg0K9p/sriNYeifKjpUkMViWQ09DSWtzJQRETsw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
+      "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
       "dev": true,
       "requires": {
-        "babel-plugin-jest-hoist": "^29.4.3",
+        "babel-plugin-jest-hoist": "^29.5.0",
         "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
@@ -21083,16 +21099,16 @@
       }
     },
     "expect": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.4.3.tgz",
-      "integrity": "sha512-uC05+Q7eXECFpgDrHdXA4k2rpMyStAYPItEDLyQDo5Ta7fVkJnNA/4zh/OIVkVVNZ1oOK1PipQoyNjuZ6sz6Dg==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.5.0.tgz",
+      "integrity": "sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==",
       "dev": true,
       "requires": {
-        "@jest/expect-utils": "^29.4.3",
+        "@jest/expect-utils": "^29.5.0",
         "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.4.3",
-        "jest-message-util": "^29.4.3",
-        "jest-util": "^29.4.3"
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0"
       }
     },
     "ext-list": {
@@ -22104,21 +22120,21 @@
       }
     },
     "jest": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.4.3.tgz",
-      "integrity": "sha512-XvK65feuEFGZT8OO0fB/QAQS+LGHvQpaadkH5p47/j3Ocqq3xf2pK9R+G0GzgfuhXVxEv76qCOOcMb5efLk6PA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.5.0.tgz",
+      "integrity": "sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==",
       "dev": true,
       "requires": {
-        "@jest/core": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/core": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "import-local": "^3.0.2",
-        "jest-cli": "^29.4.3"
+        "jest-cli": "^29.5.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22141,9 +22157,9 @@
       }
     },
     "jest-changed-files": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.4.3.tgz",
-      "integrity": "sha512-Vn5cLuWuwmi2GNNbokPOEcvrXGSGrqVnPEZV7rC6P7ck07Dyw9RFnvWglnupSh+hGys0ajGtw/bc2ZgweljQoQ==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
+      "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
       "dev": true,
       "requires": {
         "execa": "^5.0.0",
@@ -22151,36 +22167,37 @@
       }
     },
     "jest-circus": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.4.3.tgz",
-      "integrity": "sha512-Vw/bVvcexmdJ7MLmgdT3ZjkJ3LKu8IlpefYokxiqoZy6OCQ2VAm6Vk3t/qHiAGUXbdbJKJWnc8gH3ypTbB/OBw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.5.0.tgz",
+      "integrity": "sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.4.3",
-        "@jest/expect": "^29.4.3",
-        "@jest/test-result": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/environment": "^29.5.0",
+        "@jest/expect": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^0.7.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.4.3",
-        "jest-matcher-utils": "^29.4.3",
-        "jest-message-util": "^29.4.3",
-        "jest-runtime": "^29.4.3",
-        "jest-snapshot": "^29.4.3",
-        "jest-util": "^29.4.3",
+        "jest-each": "^29.5.0",
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
         "p-limit": "^3.1.0",
-        "pretty-format": "^29.4.3",
+        "pretty-format": "^29.5.0",
+        "pure-rand": "^6.0.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22203,29 +22220,29 @@
       }
     },
     "jest-cli": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.4.3.tgz",
-      "integrity": "sha512-PiiAPuFNfWWolCE6t3ZrDXQc6OsAuM3/tVW0u27UWc1KE+n/HSn5dSE6B2juqN7WP+PP0jAcnKtGmI4u8GMYCg==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.5.0.tgz",
+      "integrity": "sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==",
       "dev": true,
       "requires": {
-        "@jest/core": "^29.4.3",
-        "@jest/test-result": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/core": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^29.4.3",
-        "jest-util": "^29.4.3",
-        "jest-validate": "^29.4.3",
+        "jest-config": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
         "prompts": "^2.0.1",
         "yargs": "^17.3.1"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22248,39 +22265,39 @@
       }
     },
     "jest-config": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.4.3.tgz",
-      "integrity": "sha512-eCIpqhGnIjdUCXGtLhz4gdDoxKSWXKjzNcc5r+0S1GKOp2fwOipx5mRcwa9GB/ArsxJ1jlj2lmlD9bZAsBxaWQ==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.5.0.tgz",
+      "integrity": "sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.4.3",
-        "@jest/types": "^29.4.3",
-        "babel-jest": "^29.4.3",
+        "@jest/test-sequencer": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "babel-jest": "^29.5.0",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.4.3",
-        "jest-environment-node": "^29.4.3",
+        "jest-circus": "^29.5.0",
+        "jest-environment-node": "^29.5.0",
         "jest-get-type": "^29.4.3",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.4.3",
-        "jest-runner": "^29.4.3",
-        "jest-util": "^29.4.3",
-        "jest-validate": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-runner": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
         "micromatch": "^4.0.4",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.4.3",
+        "pretty-format": "^29.5.0",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22303,15 +22320,15 @@
       }
     },
     "jest-diff": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.4.3.tgz",
-      "integrity": "sha512-YB+ocenx7FZ3T5O9lMVMeLYV4265socJKtkwgk/6YUz/VsEzYDkiMuMhWzZmxm3wDRQvayJu/PjkjjSkjoHsCA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.5.0.tgz",
+      "integrity": "sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.4.3",
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.4.3"
+        "pretty-format": "^29.5.0"
       }
     },
     "jest-docblock": {
@@ -22324,22 +22341,22 @@
       }
     },
     "jest-each": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.4.3.tgz",
-      "integrity": "sha512-1ElHNAnKcbJb/b+L+7j0/w7bDvljw4gTv1wL9fYOczeJrbTbkMGQ5iQPFJ3eFQH19VPTx1IyfePdqSpePKss7Q==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.5.0.tgz",
+      "integrity": "sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^29.4.3",
-        "jest-util": "^29.4.3",
-        "pretty-format": "^29.4.3"
+        "jest-util": "^29.5.0",
+        "pretty-format": "^29.5.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22362,23 +22379,23 @@
       }
     },
     "jest-environment-node": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.4.3.tgz",
-      "integrity": "sha512-gAiEnSKF104fsGDXNkwk49jD/0N0Bqu2K9+aMQXA6avzsA9H3Fiv1PW2D+gzbOSR705bWd2wJZRFEFpV0tXISg==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.5.0.tgz",
+      "integrity": "sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.4.3",
-        "@jest/fake-timers": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/environment": "^29.5.0",
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
-        "jest-mock": "^29.4.3",
-        "jest-util": "^29.4.3"
+        "jest-mock": "^29.5.0",
+        "jest-util": "^29.5.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22407,12 +22424,12 @@
       "dev": true
     },
     "jest-haste-map": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.4.3.tgz",
-      "integrity": "sha512-eZIgAS8tvm5IZMtKlR8Y+feEOMfo2pSQkmNbufdbMzMSn9nitgGxF1waM/+LbryO3OkMcKS98SUb+j/cQxp/vQ==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.5.0.tgz",
+      "integrity": "sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "@types/graceful-fs": "^4.1.3",
         "@types/node": "*",
         "anymatch": "^3.0.3",
@@ -22420,16 +22437,16 @@
         "fsevents": "^2.3.2",
         "graceful-fs": "^4.2.9",
         "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.4.3",
-        "jest-worker": "^29.4.3",
+        "jest-util": "^29.5.0",
+        "jest-worker": "^29.5.0",
         "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22452,48 +22469,48 @@
       }
     },
     "jest-leak-detector": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.4.3.tgz",
-      "integrity": "sha512-9yw4VC1v2NspMMeV3daQ1yXPNxMgCzwq9BocCwYrRgXe4uaEJPAN0ZK37nFBhcy3cUwEVstFecFLaTHpF7NiGA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz",
+      "integrity": "sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==",
       "dev": true,
       "requires": {
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.4.3"
+        "pretty-format": "^29.5.0"
       }
     },
     "jest-matcher-utils": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.4.3.tgz",
-      "integrity": "sha512-TTciiXEONycZ03h6R6pYiZlSkvYgT0l8aa49z/DLSGYjex4orMUcafuLXYyyEDWB1RKglq00jzwY00Ei7yFNVg==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz",
+      "integrity": "sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.4.3",
+        "jest-diff": "^29.5.0",
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.4.3"
+        "pretty-format": "^29.5.0"
       }
     },
     "jest-message-util": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.4.3.tgz",
-      "integrity": "sha512-1Y8Zd4ZCN7o/QnWdMmT76If8LuDv23Z1DRovBj/vcSFNlGCJGoO8D1nJDw1AdyAGUk0myDLFGN5RbNeJyCRGCw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.5.0.tgz",
+      "integrity": "sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.4.3",
+        "pretty-format": "^29.5.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22516,20 +22533,20 @@
       }
     },
     "jest-mock": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.4.3.tgz",
-      "integrity": "sha512-LjFgMg+xed9BdkPMyIJh+r3KeHt1klXPJYBULXVVAkbTaaKjPX1o1uVCAZADMEp/kOxGTwy/Ot8XbvgItOrHEg==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.5.0.tgz",
+      "integrity": "sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
-        "jest-util": "^29.4.3"
+        "jest-util": "^29.5.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22565,65 +22582,65 @@
       "dev": true
     },
     "jest-resolve": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.4.3.tgz",
-      "integrity": "sha512-GPokE1tzguRyT7dkxBim4wSx6E45S3bOQ7ZdKEG+Qj0Oac9+6AwJPCk0TZh5Vu0xzeX4afpb+eDmgbmZFFwpOw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.5.0.tgz",
+      "integrity": "sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.3",
+        "jest-haste-map": "^29.5.0",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.4.3",
-        "jest-validate": "^29.4.3",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
         "resolve": "^1.20.0",
         "resolve.exports": "^2.0.0",
         "slash": "^3.0.0"
       }
     },
     "jest-resolve-dependencies": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.4.3.tgz",
-      "integrity": "sha512-uvKMZAQ3nmXLH7O8WAOhS5l0iWyT3WmnJBdmIHiV5tBbdaDZ1wqtNX04FONGoaFvSOSHBJxnwAVnSn1WHdGVaw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz",
+      "integrity": "sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==",
       "dev": true,
       "requires": {
         "jest-regex-util": "^29.4.3",
-        "jest-snapshot": "^29.4.3"
+        "jest-snapshot": "^29.5.0"
       }
     },
     "jest-runner": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.4.3.tgz",
-      "integrity": "sha512-GWPTEiGmtHZv1KKeWlTX9SIFuK19uLXlRQU43ceOQ2hIfA5yPEJC7AMkvFKpdCHx6pNEdOD+2+8zbniEi3v3gA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.5.0.tgz",
+      "integrity": "sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.4.3",
-        "@jest/environment": "^29.4.3",
-        "@jest/test-result": "^29.4.3",
-        "@jest/transform": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/console": "^29.5.0",
+        "@jest/environment": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
         "graceful-fs": "^4.2.9",
         "jest-docblock": "^29.4.3",
-        "jest-environment-node": "^29.4.3",
-        "jest-haste-map": "^29.4.3",
-        "jest-leak-detector": "^29.4.3",
-        "jest-message-util": "^29.4.3",
-        "jest-resolve": "^29.4.3",
-        "jest-runtime": "^29.4.3",
-        "jest-util": "^29.4.3",
-        "jest-watcher": "^29.4.3",
-        "jest-worker": "^29.4.3",
+        "jest-environment-node": "^29.5.0",
+        "jest-haste-map": "^29.5.0",
+        "jest-leak-detector": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-resolve": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-watcher": "^29.5.0",
+        "jest-worker": "^29.5.0",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22656,39 +22673,39 @@
       }
     },
     "jest-runtime": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.4.3.tgz",
-      "integrity": "sha512-F5bHvxSH+LvLV24vVB3L8K467dt3y3dio6V3W89dUz9nzvTpqd/HcT9zfYKL2aZPvD63vQFgLvaUX/UpUhrP6Q==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.5.0.tgz",
+      "integrity": "sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.4.3",
-        "@jest/fake-timers": "^29.4.3",
-        "@jest/globals": "^29.4.3",
+        "@jest/environment": "^29.5.0",
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/globals": "^29.5.0",
         "@jest/source-map": "^29.4.3",
-        "@jest/test-result": "^29.4.3",
-        "@jest/transform": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.3",
-        "jest-message-util": "^29.4.3",
-        "jest-mock": "^29.4.3",
+        "jest-haste-map": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-mock": "^29.5.0",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.4.3",
-        "jest-snapshot": "^29.4.3",
-        "jest-util": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22711,9 +22728,9 @@
       }
     },
     "jest-snapshot": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.4.3.tgz",
-      "integrity": "sha512-NGlsqL0jLPDW91dz304QTM/SNO99lpcSYYAjNiX0Ou+sSGgkanKBcSjCfp/pqmiiO1nQaOyLp6XQddAzRcx3Xw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.5.0.tgz",
+      "integrity": "sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
@@ -22722,30 +22739,29 @@
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/traverse": "^7.7.2",
         "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.4.3",
-        "@jest/transform": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/expect-utils": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/babel__traverse": "^7.0.6",
         "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^29.4.3",
+        "expect": "^29.5.0",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.4.3",
+        "jest-diff": "^29.5.0",
         "jest-get-type": "^29.4.3",
-        "jest-haste-map": "^29.4.3",
-        "jest-matcher-utils": "^29.4.3",
-        "jest-message-util": "^29.4.3",
-        "jest-util": "^29.4.3",
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^29.4.3",
+        "pretty-format": "^29.5.0",
         "semver": "^7.3.5"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22777,12 +22793,12 @@
       }
     },
     "jest-util": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.4.3.tgz",
-      "integrity": "sha512-ToSGORAz4SSSoqxDSylWX8JzkOQR7zoBtNRsA7e+1WUX5F8jrOwaNpuh1YfJHJKDHXLHmObv5eOjejUd+/Ws+Q==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz",
+      "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
@@ -22791,9 +22807,9 @@
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22816,23 +22832,23 @@
       }
     },
     "jest-validate": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.4.3.tgz",
-      "integrity": "sha512-J3u5v7aPQoXPzaar6GndAVhdQcZr/3osWSgTeKg5v574I9ybX/dTyH0AJFb5XgXIB7faVhf+rS7t4p3lL9qFaw==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.5.0.tgz",
+      "integrity": "sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.4.3",
+        "@jest/types": "^29.5.0",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^29.4.3",
         "leven": "^3.1.0",
-        "pretty-format": "^29.4.3"
+        "pretty-format": "^29.5.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22861,25 +22877,25 @@
       }
     },
     "jest-watcher": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.4.3.tgz",
-      "integrity": "sha512-zwlXH3DN3iksoIZNk73etl1HzKyi5FuQdYLnkQKm5BW4n8HpoG59xSwpVdFrnh60iRRaRBGw0gcymIxjJENPcA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.5.0.tgz",
+      "integrity": "sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^29.4.3",
-        "@jest/types": "^29.4.3",
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
-        "jest-util": "^29.4.3",
+        "jest-util": "^29.5.0",
         "string-length": "^4.0.1"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-          "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+          "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -22902,13 +22918,13 @@
       }
     },
     "jest-worker": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.4.3.tgz",
-      "integrity": "sha512-GLHN/GTAAMEy5BFdvpUfzr9Dr80zQqBrh0fz1mtRMe05hqP45+HfQltu7oTBfduD0UeZs09d+maFtFYAXFWvAA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
+      "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
       "dev": true,
       "requires": {
         "@types/node": "*",
-        "jest-util": "^29.4.3",
+        "jest-util": "^29.5.0",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -24546,9 +24562,9 @@
       }
     },
     "pretty-format": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.4.3.tgz",
-      "integrity": "sha512-cvpcHTc42lcsvOOAzd3XuNWTcvk1Jmnzqeu+WsOuiPmxUJTnkbAcFNsRKvEpBEUFVUgy/GTZLulZDcDEi+CIlA==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.5.0.tgz",
+      "integrity": "sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==",
       "dev": true,
       "requires": {
         "@jest/schemas": "^29.4.3",
@@ -24671,6 +24687,12 @@
       "version": "2.1.1",
       "dev": true
     },
+    "pure-rand": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.1.tgz",
+      "integrity": "sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg==",
+      "dev": true
+    },
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -24859,9 +24881,9 @@
       "dev": true
     },
     "resolve.exports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.0.tgz",
-      "integrity": "sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.1.tgz",
+      "integrity": "sha512-OEJWVeimw8mgQuj3HfkNl4KqRevH7lzeQNaWRPfx0PPse7Jk6ozcsG4FKVgtzDsC1KUF+YlTHh17NcgHOPykLw==",
       "dev": true
     },
     "responselike": {
@@ -25725,8 +25747,8 @@
         "fast-glob": "^3.2.12",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "jest": "^29.4.3",
-        "jest-diff": "^29.4.3",
+        "jest": "^29.5.0",
+        "jest-diff": "^29.5.0",
         "jiti": "^1.17.2",
         "lightningcss": "^1.18.0",
         "lilconfig": "^2.1.0",
@@ -25774,21 +25796,21 @@
           "dev": true
         },
         "@babel/core": {
-          "version": "7.21.0",
-          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz",
-          "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==",
+          "version": "7.21.3",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.3.tgz",
+          "integrity": "sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==",
           "dev": true,
           "requires": {
             "@ampproject/remapping": "^2.2.0",
             "@babel/code-frame": "^7.18.6",
-            "@babel/generator": "^7.21.0",
+            "@babel/generator": "^7.21.3",
             "@babel/helper-compilation-targets": "^7.20.7",
-            "@babel/helper-module-transforms": "^7.21.0",
+            "@babel/helper-module-transforms": "^7.21.2",
             "@babel/helpers": "^7.21.0",
-            "@babel/parser": "^7.21.0",
+            "@babel/parser": "^7.21.3",
             "@babel/template": "^7.20.7",
-            "@babel/traverse": "^7.21.0",
-            "@babel/types": "^7.21.0",
+            "@babel/traverse": "^7.21.3",
+            "@babel/types": "^7.21.3",
             "convert-source-map": "^1.7.0",
             "debug": "^4.1.0",
             "gensync": "^1.0.0-beta.2",
@@ -25805,12 +25827,12 @@
           }
         },
         "@babel/generator": {
-          "version": "7.21.1",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz",
-          "integrity": "sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==",
+          "version": "7.21.3",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz",
+          "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.21.0",
+            "@babel/types": "^7.21.3",
             "@jridgewell/gen-mapping": "^0.3.2",
             "@jridgewell/trace-mapping": "^0.3.17",
             "jsesc": "^2.5.1"
@@ -26016,9 +26038,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.21.2",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
-          "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="
+          "version": "7.21.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
+          "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ=="
         },
         "@babel/plugin-syntax-async-generators": {
           "version": "7.8.4",
@@ -26158,27 +26180,27 @@
           }
         },
         "@babel/traverse": {
-          "version": "7.21.2",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz",
-          "integrity": "sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==",
+          "version": "7.21.3",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz",
+          "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.18.6",
-            "@babel/generator": "^7.21.1",
+            "@babel/generator": "^7.21.3",
             "@babel/helper-environment-visitor": "^7.18.9",
             "@babel/helper-function-name": "^7.21.0",
             "@babel/helper-hoist-variables": "^7.18.6",
             "@babel/helper-split-export-declaration": "^7.18.6",
-            "@babel/parser": "^7.21.2",
-            "@babel/types": "^7.21.2",
+            "@babel/parser": "^7.21.3",
+            "@babel/types": "^7.21.3",
             "debug": "^4.1.0",
             "globals": "^11.1.0"
           }
         },
         "@babel/types": {
-          "version": "7.21.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz",
-          "integrity": "sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==",
+          "version": "7.21.3",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz",
+          "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==",
           "dev": true,
           "requires": {
             "@babel/helper-string-parser": "^7.19.4",
@@ -26453,23 +26475,23 @@
           "dev": true
         },
         "@jest/console": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.4.3.tgz",
-          "integrity": "sha512-W/o/34+wQuXlgqlPYTansOSiBnuxrTv61dEVkA6HNmpcgHLUjfaUbdqt6oVvOzaawwo9IdW9QOtMgQ1ScSZC4A==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.5.0.tgz",
+          "integrity": "sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==",
           "dev": true,
           "requires": {
-            "@jest/types": "^29.4.3",
+            "@jest/types": "^29.5.0",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "jest-message-util": "^29.4.3",
-            "jest-util": "^29.4.3",
+            "jest-message-util": "^29.5.0",
+            "jest-util": "^29.5.0",
             "slash": "^3.0.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -26492,45 +26514,45 @@
           }
         },
         "@jest/core": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.4.3.tgz",
-          "integrity": "sha512-56QvBq60fS4SPZCuM7T+7scNrkGIe7Mr6PVIXUpu48ouvRaWOFqRPV91eifvFM0ay2HmfswXiGf97NGUN5KofQ==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.5.0.tgz",
+          "integrity": "sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==",
           "dev": true,
           "requires": {
-            "@jest/console": "^29.4.3",
-            "@jest/reporters": "^29.4.3",
-            "@jest/test-result": "^29.4.3",
-            "@jest/transform": "^29.4.3",
-            "@jest/types": "^29.4.3",
+            "@jest/console": "^29.5.0",
+            "@jest/reporters": "^29.5.0",
+            "@jest/test-result": "^29.5.0",
+            "@jest/transform": "^29.5.0",
+            "@jest/types": "^29.5.0",
             "@types/node": "*",
             "ansi-escapes": "^4.2.1",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
             "exit": "^0.1.2",
             "graceful-fs": "^4.2.9",
-            "jest-changed-files": "^29.4.3",
-            "jest-config": "^29.4.3",
-            "jest-haste-map": "^29.4.3",
-            "jest-message-util": "^29.4.3",
+            "jest-changed-files": "^29.5.0",
+            "jest-config": "^29.5.0",
+            "jest-haste-map": "^29.5.0",
+            "jest-message-util": "^29.5.0",
             "jest-regex-util": "^29.4.3",
-            "jest-resolve": "^29.4.3",
-            "jest-resolve-dependencies": "^29.4.3",
-            "jest-runner": "^29.4.3",
-            "jest-runtime": "^29.4.3",
-            "jest-snapshot": "^29.4.3",
-            "jest-util": "^29.4.3",
-            "jest-validate": "^29.4.3",
-            "jest-watcher": "^29.4.3",
+            "jest-resolve": "^29.5.0",
+            "jest-resolve-dependencies": "^29.5.0",
+            "jest-runner": "^29.5.0",
+            "jest-runtime": "^29.5.0",
+            "jest-snapshot": "^29.5.0",
+            "jest-util": "^29.5.0",
+            "jest-validate": "^29.5.0",
+            "jest-watcher": "^29.5.0",
             "micromatch": "^4.0.4",
-            "pretty-format": "^29.4.3",
+            "pretty-format": "^29.5.0",
             "slash": "^3.0.0",
             "strip-ansi": "^6.0.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -26560,21 +26582,21 @@
           }
         },
         "@jest/environment": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.4.3.tgz",
-          "integrity": "sha512-dq5S6408IxIa+lr54zeqce+QgI+CJT4nmmA+1yzFgtcsGK8c/EyiUb9XQOgz3BMKrRDfKseeOaxj2eO8LlD3lA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.5.0.tgz",
+          "integrity": "sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==",
           "dev": true,
           "requires": {
-            "@jest/fake-timers": "^29.4.3",
-            "@jest/types": "^29.4.3",
+            "@jest/fake-timers": "^29.5.0",
+            "@jest/types": "^29.5.0",
             "@types/node": "*",
-            "jest-mock": "^29.4.3"
+            "jest-mock": "^29.5.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -26597,42 +26619,42 @@
           }
         },
         "@jest/expect": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.4.3.tgz",
-          "integrity": "sha512-iktRU/YsxEtumI9zsPctYUk7ptpC+AVLLk1Ax3AsA4g1C+8OOnKDkIQBDHtD5hA/+VtgMd5AWI5gNlcAlt2vxQ==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.5.0.tgz",
+          "integrity": "sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==",
           "dev": true,
           "requires": {
-            "expect": "^29.4.3",
-            "jest-snapshot": "^29.4.3"
+            "expect": "^29.5.0",
+            "jest-snapshot": "^29.5.0"
           }
         },
         "@jest/expect-utils": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.4.3.tgz",
-          "integrity": "sha512-/6JWbkxHOP8EoS8jeeTd9dTfc9Uawi+43oLKHfp6zzux3U2hqOOVnV3ai4RpDYHOccL6g+5nrxpoc8DmJxtXVQ==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.5.0.tgz",
+          "integrity": "sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==",
           "dev": true,
           "requires": {
             "jest-get-type": "^29.4.3"
           }
         },
         "@jest/fake-timers": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.4.3.tgz",
-          "integrity": "sha512-4Hote2MGcCTWSD2gwl0dwbCpBRHhE6olYEuTj8FMowdg3oQWNKr2YuxenPQYZ7+PfqPY1k98wKDU4Z+Hvd4Tiw==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.5.0.tgz",
+          "integrity": "sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==",
           "dev": true,
           "requires": {
-            "@jest/types": "^29.4.3",
+            "@jest/types": "^29.5.0",
             "@sinonjs/fake-timers": "^10.0.2",
             "@types/node": "*",
-            "jest-message-util": "^29.4.3",
-            "jest-mock": "^29.4.3",
-            "jest-util": "^29.4.3"
+            "jest-message-util": "^29.5.0",
+            "jest-mock": "^29.5.0",
+            "jest-util": "^29.5.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -26655,21 +26677,21 @@
           }
         },
         "@jest/globals": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.4.3.tgz",
-          "integrity": "sha512-8BQ/5EzfOLG7AaMcDh7yFCbfRLtsc+09E1RQmRBI4D6QQk4m6NSK/MXo+3bJrBN0yU8A2/VIcqhvsOLFmziioA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.5.0.tgz",
+          "integrity": "sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==",
           "dev": true,
           "requires": {
-            "@jest/environment": "^29.4.3",
-            "@jest/expect": "^29.4.3",
-            "@jest/types": "^29.4.3",
-            "jest-mock": "^29.4.3"
+            "@jest/environment": "^29.5.0",
+            "@jest/expect": "^29.5.0",
+            "@jest/types": "^29.5.0",
+            "jest-mock": "^29.5.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -26692,16 +26714,16 @@
           }
         },
         "@jest/reporters": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.4.3.tgz",
-          "integrity": "sha512-sr2I7BmOjJhyqj9ANC6CTLsL4emMoka7HkQpcoMRlhCbQJjz2zsRzw0BDPiPyEFDXAbxKgGFYuQZiSJ1Y6YoTg==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.5.0.tgz",
+          "integrity": "sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==",
           "dev": true,
           "requires": {
             "@bcoe/v8-coverage": "^0.2.3",
-            "@jest/console": "^29.4.3",
-            "@jest/test-result": "^29.4.3",
-            "@jest/transform": "^29.4.3",
-            "@jest/types": "^29.4.3",
+            "@jest/console": "^29.5.0",
+            "@jest/test-result": "^29.5.0",
+            "@jest/transform": "^29.5.0",
+            "@jest/types": "^29.5.0",
             "@jridgewell/trace-mapping": "^0.3.15",
             "@types/node": "*",
             "chalk": "^4.0.0",
@@ -26714,9 +26736,9 @@
             "istanbul-lib-report": "^3.0.0",
             "istanbul-lib-source-maps": "^4.0.0",
             "istanbul-reports": "^3.1.3",
-            "jest-message-util": "^29.4.3",
-            "jest-util": "^29.4.3",
-            "jest-worker": "^29.4.3",
+            "jest-message-util": "^29.5.0",
+            "jest-util": "^29.5.0",
+            "jest-worker": "^29.5.0",
             "slash": "^3.0.0",
             "string-length": "^4.0.1",
             "strip-ansi": "^6.0.0",
@@ -26724,9 +26746,9 @@
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -26769,21 +26791,21 @@
           }
         },
         "@jest/test-result": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.4.3.tgz",
-          "integrity": "sha512-Oi4u9NfBolMq9MASPwuWTlC5WvmNRwI4S8YrQg5R5Gi47DYlBe3sh7ILTqi/LGrK1XUE4XY9KZcQJTH1WJCLLA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.5.0.tgz",
+          "integrity": "sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==",
           "dev": true,
           "requires": {
-            "@jest/console": "^29.4.3",
-            "@jest/types": "^29.4.3",
+            "@jest/console": "^29.5.0",
+            "@jest/types": "^29.5.0",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "collect-v8-coverage": "^1.0.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -26806,34 +26828,34 @@
           }
         },
         "@jest/test-sequencer": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.4.3.tgz",
-          "integrity": "sha512-yi/t2nES4GB4G0mjLc0RInCq/cNr9dNwJxcGg8sslajua5Kb4kmozAc+qPLzplhBgfw1vLItbjyHzUN92UXicw==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz",
+          "integrity": "sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==",
           "dev": true,
           "requires": {
-            "@jest/test-result": "^29.4.3",
+            "@jest/test-result": "^29.5.0",
             "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^29.4.3",
+            "jest-haste-map": "^29.5.0",
             "slash": "^3.0.0"
           }
         },
         "@jest/transform": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.4.3.tgz",
-          "integrity": "sha512-8u0+fBGWolDshsFgPQJESkDa72da/EVwvL+II0trN2DR66wMwiQ9/CihaGfHdlLGFzbBZwMykFtxuwFdZqlKwg==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.5.0.tgz",
+          "integrity": "sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.11.6",
-            "@jest/types": "^29.4.3",
+            "@jest/types": "^29.5.0",
             "@jridgewell/trace-mapping": "^0.3.15",
             "babel-plugin-istanbul": "^6.1.1",
             "chalk": "^4.0.0",
             "convert-source-map": "^2.0.0",
             "fast-json-stable-stringify": "^2.1.0",
             "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^29.4.3",
+            "jest-haste-map": "^29.5.0",
             "jest-regex-util": "^29.4.3",
-            "jest-util": "^29.4.3",
+            "jest-util": "^29.5.0",
             "micromatch": "^4.0.4",
             "pirates": "^4.0.4",
             "slash": "^3.0.0",
@@ -26841,9 +26863,9 @@
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -29132,15 +29154,15 @@
           }
         },
         "babel-jest": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.4.3.tgz",
-          "integrity": "sha512-o45Wyn32svZE+LnMVWv/Z4x0SwtLbh4FyGcYtR20kIWd+rdrDZ9Fzq8Ml3MYLD+mZvEdzCjZsCnYZ2jpJyQ+Nw==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.5.0.tgz",
+          "integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==",
           "dev": true,
           "requires": {
-            "@jest/transform": "^29.4.3",
+            "@jest/transform": "^29.5.0",
             "@types/babel__core": "^7.1.14",
             "babel-plugin-istanbul": "^6.1.1",
-            "babel-preset-jest": "^29.4.3",
+            "babel-preset-jest": "^29.5.0",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.9",
             "slash": "^3.0.0"
@@ -29160,9 +29182,9 @@
           }
         },
         "babel-plugin-jest-hoist": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.4.3.tgz",
-          "integrity": "sha512-mB6q2q3oahKphy5V7CpnNqZOCkxxZ9aokf1eh82Dy3jQmg4xvM1tGrh5y6BQUJh4a3Pj9+eLfwvAZ7VNKg7H8Q==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
+          "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
           "dev": true,
           "requires": {
             "@babel/template": "^7.3.3",
@@ -29192,12 +29214,12 @@
           }
         },
         "babel-preset-jest": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.4.3.tgz",
-          "integrity": "sha512-gWx6COtSuma6n9bw+8/F+2PCXrIgxV/D1TJFnp6OyBK2cxPWg0K9p/sriNYeifKjpUkMViWQ09DSWtzJQRETsw==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
+          "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
           "dev": true,
           "requires": {
-            "babel-plugin-jest-hoist": "^29.4.3",
+            "babel-plugin-jest-hoist": "^29.5.0",
             "babel-preset-current-node-syntax": "^1.0.0"
           }
         },
@@ -31013,16 +31035,16 @@
           }
         },
         "expect": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/expect/-/expect-29.4.3.tgz",
-          "integrity": "sha512-uC05+Q7eXECFpgDrHdXA4k2rpMyStAYPItEDLyQDo5Ta7fVkJnNA/4zh/OIVkVVNZ1oOK1PipQoyNjuZ6sz6Dg==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/expect/-/expect-29.5.0.tgz",
+          "integrity": "sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==",
           "dev": true,
           "requires": {
-            "@jest/expect-utils": "^29.4.3",
+            "@jest/expect-utils": "^29.5.0",
             "jest-get-type": "^29.4.3",
-            "jest-matcher-utils": "^29.4.3",
-            "jest-message-util": "^29.4.3",
-            "jest-util": "^29.4.3"
+            "jest-matcher-utils": "^29.5.0",
+            "jest-message-util": "^29.5.0",
+            "jest-util": "^29.5.0"
           }
         },
         "ext-list": {
@@ -32034,21 +32056,21 @@
           }
         },
         "jest": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest/-/jest-29.4.3.tgz",
-          "integrity": "sha512-XvK65feuEFGZT8OO0fB/QAQS+LGHvQpaadkH5p47/j3Ocqq3xf2pK9R+G0GzgfuhXVxEv76qCOOcMb5efLk6PA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest/-/jest-29.5.0.tgz",
+          "integrity": "sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==",
           "dev": true,
           "requires": {
-            "@jest/core": "^29.4.3",
-            "@jest/types": "^29.4.3",
+            "@jest/core": "^29.5.0",
+            "@jest/types": "^29.5.0",
             "import-local": "^3.0.2",
-            "jest-cli": "^29.4.3"
+            "jest-cli": "^29.5.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32071,9 +32093,9 @@
           }
         },
         "jest-changed-files": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.4.3.tgz",
-          "integrity": "sha512-Vn5cLuWuwmi2GNNbokPOEcvrXGSGrqVnPEZV7rC6P7ck07Dyw9RFnvWglnupSh+hGys0ajGtw/bc2ZgweljQoQ==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
+          "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
           "dev": true,
           "requires": {
             "execa": "^5.0.0",
@@ -32081,36 +32103,37 @@
           }
         },
         "jest-circus": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.4.3.tgz",
-          "integrity": "sha512-Vw/bVvcexmdJ7MLmgdT3ZjkJ3LKu8IlpefYokxiqoZy6OCQ2VAm6Vk3t/qHiAGUXbdbJKJWnc8gH3ypTbB/OBw==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.5.0.tgz",
+          "integrity": "sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==",
           "dev": true,
           "requires": {
-            "@jest/environment": "^29.4.3",
-            "@jest/expect": "^29.4.3",
-            "@jest/test-result": "^29.4.3",
-            "@jest/types": "^29.4.3",
+            "@jest/environment": "^29.5.0",
+            "@jest/expect": "^29.5.0",
+            "@jest/test-result": "^29.5.0",
+            "@jest/types": "^29.5.0",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "co": "^4.6.0",
             "dedent": "^0.7.0",
             "is-generator-fn": "^2.0.0",
-            "jest-each": "^29.4.3",
-            "jest-matcher-utils": "^29.4.3",
-            "jest-message-util": "^29.4.3",
-            "jest-runtime": "^29.4.3",
-            "jest-snapshot": "^29.4.3",
-            "jest-util": "^29.4.3",
+            "jest-each": "^29.5.0",
+            "jest-matcher-utils": "^29.5.0",
+            "jest-message-util": "^29.5.0",
+            "jest-runtime": "^29.5.0",
+            "jest-snapshot": "^29.5.0",
+            "jest-util": "^29.5.0",
             "p-limit": "^3.1.0",
-            "pretty-format": "^29.4.3",
+            "pretty-format": "^29.5.0",
+            "pure-rand": "^6.0.0",
             "slash": "^3.0.0",
             "stack-utils": "^2.0.3"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32133,29 +32156,29 @@
           }
         },
         "jest-cli": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.4.3.tgz",
-          "integrity": "sha512-PiiAPuFNfWWolCE6t3ZrDXQc6OsAuM3/tVW0u27UWc1KE+n/HSn5dSE6B2juqN7WP+PP0jAcnKtGmI4u8GMYCg==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.5.0.tgz",
+          "integrity": "sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==",
           "dev": true,
           "requires": {
-            "@jest/core": "^29.4.3",
-            "@jest/test-result": "^29.4.3",
-            "@jest/types": "^29.4.3",
+            "@jest/core": "^29.5.0",
+            "@jest/test-result": "^29.5.0",
+            "@jest/types": "^29.5.0",
             "chalk": "^4.0.0",
             "exit": "^0.1.2",
             "graceful-fs": "^4.2.9",
             "import-local": "^3.0.2",
-            "jest-config": "^29.4.3",
-            "jest-util": "^29.4.3",
-            "jest-validate": "^29.4.3",
+            "jest-config": "^29.5.0",
+            "jest-util": "^29.5.0",
+            "jest-validate": "^29.5.0",
             "prompts": "^2.0.1",
             "yargs": "^17.3.1"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32178,39 +32201,39 @@
           }
         },
         "jest-config": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.4.3.tgz",
-          "integrity": "sha512-eCIpqhGnIjdUCXGtLhz4gdDoxKSWXKjzNcc5r+0S1GKOp2fwOipx5mRcwa9GB/ArsxJ1jlj2lmlD9bZAsBxaWQ==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.5.0.tgz",
+          "integrity": "sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.11.6",
-            "@jest/test-sequencer": "^29.4.3",
-            "@jest/types": "^29.4.3",
-            "babel-jest": "^29.4.3",
+            "@jest/test-sequencer": "^29.5.0",
+            "@jest/types": "^29.5.0",
+            "babel-jest": "^29.5.0",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
             "deepmerge": "^4.2.2",
             "glob": "^7.1.3",
             "graceful-fs": "^4.2.9",
-            "jest-circus": "^29.4.3",
-            "jest-environment-node": "^29.4.3",
+            "jest-circus": "^29.5.0",
+            "jest-environment-node": "^29.5.0",
             "jest-get-type": "^29.4.3",
             "jest-regex-util": "^29.4.3",
-            "jest-resolve": "^29.4.3",
-            "jest-runner": "^29.4.3",
-            "jest-util": "^29.4.3",
-            "jest-validate": "^29.4.3",
+            "jest-resolve": "^29.5.0",
+            "jest-runner": "^29.5.0",
+            "jest-util": "^29.5.0",
+            "jest-validate": "^29.5.0",
             "micromatch": "^4.0.4",
             "parse-json": "^5.2.0",
-            "pretty-format": "^29.4.3",
+            "pretty-format": "^29.5.0",
             "slash": "^3.0.0",
             "strip-json-comments": "^3.1.1"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32233,15 +32256,15 @@
           }
         },
         "jest-diff": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.4.3.tgz",
-          "integrity": "sha512-YB+ocenx7FZ3T5O9lMVMeLYV4265socJKtkwgk/6YUz/VsEzYDkiMuMhWzZmxm3wDRQvayJu/PjkjjSkjoHsCA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.5.0.tgz",
+          "integrity": "sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==",
           "dev": true,
           "requires": {
             "chalk": "^4.0.0",
             "diff-sequences": "^29.4.3",
             "jest-get-type": "^29.4.3",
-            "pretty-format": "^29.4.3"
+            "pretty-format": "^29.5.0"
           }
         },
         "jest-docblock": {
@@ -32254,22 +32277,22 @@
           }
         },
         "jest-each": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.4.3.tgz",
-          "integrity": "sha512-1ElHNAnKcbJb/b+L+7j0/w7bDvljw4gTv1wL9fYOczeJrbTbkMGQ5iQPFJ3eFQH19VPTx1IyfePdqSpePKss7Q==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.5.0.tgz",
+          "integrity": "sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^29.4.3",
+            "@jest/types": "^29.5.0",
             "chalk": "^4.0.0",
             "jest-get-type": "^29.4.3",
-            "jest-util": "^29.4.3",
-            "pretty-format": "^29.4.3"
+            "jest-util": "^29.5.0",
+            "pretty-format": "^29.5.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32292,23 +32315,23 @@
           }
         },
         "jest-environment-node": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.4.3.tgz",
-          "integrity": "sha512-gAiEnSKF104fsGDXNkwk49jD/0N0Bqu2K9+aMQXA6avzsA9H3Fiv1PW2D+gzbOSR705bWd2wJZRFEFpV0tXISg==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.5.0.tgz",
+          "integrity": "sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==",
           "dev": true,
           "requires": {
-            "@jest/environment": "^29.4.3",
-            "@jest/fake-timers": "^29.4.3",
-            "@jest/types": "^29.4.3",
+            "@jest/environment": "^29.5.0",
+            "@jest/fake-timers": "^29.5.0",
+            "@jest/types": "^29.5.0",
             "@types/node": "*",
-            "jest-mock": "^29.4.3",
-            "jest-util": "^29.4.3"
+            "jest-mock": "^29.5.0",
+            "jest-util": "^29.5.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32337,12 +32360,12 @@
           "dev": true
         },
         "jest-haste-map": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.4.3.tgz",
-          "integrity": "sha512-eZIgAS8tvm5IZMtKlR8Y+feEOMfo2pSQkmNbufdbMzMSn9nitgGxF1waM/+LbryO3OkMcKS98SUb+j/cQxp/vQ==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.5.0.tgz",
+          "integrity": "sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^29.4.3",
+            "@jest/types": "^29.5.0",
             "@types/graceful-fs": "^4.1.3",
             "@types/node": "*",
             "anymatch": "^3.0.3",
@@ -32350,16 +32373,16 @@
             "fsevents": "^2.3.2",
             "graceful-fs": "^4.2.9",
             "jest-regex-util": "^29.4.3",
-            "jest-util": "^29.4.3",
-            "jest-worker": "^29.4.3",
+            "jest-util": "^29.5.0",
+            "jest-worker": "^29.5.0",
             "micromatch": "^4.0.4",
             "walker": "^1.0.8"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32382,48 +32405,48 @@
           }
         },
         "jest-leak-detector": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.4.3.tgz",
-          "integrity": "sha512-9yw4VC1v2NspMMeV3daQ1yXPNxMgCzwq9BocCwYrRgXe4uaEJPAN0ZK37nFBhcy3cUwEVstFecFLaTHpF7NiGA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz",
+          "integrity": "sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==",
           "dev": true,
           "requires": {
             "jest-get-type": "^29.4.3",
-            "pretty-format": "^29.4.3"
+            "pretty-format": "^29.5.0"
           }
         },
         "jest-matcher-utils": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.4.3.tgz",
-          "integrity": "sha512-TTciiXEONycZ03h6R6pYiZlSkvYgT0l8aa49z/DLSGYjex4orMUcafuLXYyyEDWB1RKglq00jzwY00Ei7yFNVg==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz",
+          "integrity": "sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==",
           "dev": true,
           "requires": {
             "chalk": "^4.0.0",
-            "jest-diff": "^29.4.3",
+            "jest-diff": "^29.5.0",
             "jest-get-type": "^29.4.3",
-            "pretty-format": "^29.4.3"
+            "pretty-format": "^29.5.0"
           }
         },
         "jest-message-util": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.4.3.tgz",
-          "integrity": "sha512-1Y8Zd4ZCN7o/QnWdMmT76If8LuDv23Z1DRovBj/vcSFNlGCJGoO8D1nJDw1AdyAGUk0myDLFGN5RbNeJyCRGCw==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.5.0.tgz",
+          "integrity": "sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^29.4.3",
+            "@jest/types": "^29.5.0",
             "@types/stack-utils": "^2.0.0",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.9",
             "micromatch": "^4.0.4",
-            "pretty-format": "^29.4.3",
+            "pretty-format": "^29.5.0",
             "slash": "^3.0.0",
             "stack-utils": "^2.0.3"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32446,20 +32469,20 @@
           }
         },
         "jest-mock": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.4.3.tgz",
-          "integrity": "sha512-LjFgMg+xed9BdkPMyIJh+r3KeHt1klXPJYBULXVVAkbTaaKjPX1o1uVCAZADMEp/kOxGTwy/Ot8XbvgItOrHEg==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.5.0.tgz",
+          "integrity": "sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==",
           "dev": true,
           "requires": {
-            "@jest/types": "^29.4.3",
+            "@jest/types": "^29.5.0",
             "@types/node": "*",
-            "jest-util": "^29.4.3"
+            "jest-util": "^29.5.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32495,65 +32518,65 @@
           "dev": true
         },
         "jest-resolve": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.4.3.tgz",
-          "integrity": "sha512-GPokE1tzguRyT7dkxBim4wSx6E45S3bOQ7ZdKEG+Qj0Oac9+6AwJPCk0TZh5Vu0xzeX4afpb+eDmgbmZFFwpOw==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.5.0.tgz",
+          "integrity": "sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==",
           "dev": true,
           "requires": {
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^29.4.3",
+            "jest-haste-map": "^29.5.0",
             "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^29.4.3",
-            "jest-validate": "^29.4.3",
+            "jest-util": "^29.5.0",
+            "jest-validate": "^29.5.0",
             "resolve": "^1.20.0",
             "resolve.exports": "^2.0.0",
             "slash": "^3.0.0"
           }
         },
         "jest-resolve-dependencies": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.4.3.tgz",
-          "integrity": "sha512-uvKMZAQ3nmXLH7O8WAOhS5l0iWyT3WmnJBdmIHiV5tBbdaDZ1wqtNX04FONGoaFvSOSHBJxnwAVnSn1WHdGVaw==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz",
+          "integrity": "sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==",
           "dev": true,
           "requires": {
             "jest-regex-util": "^29.4.3",
-            "jest-snapshot": "^29.4.3"
+            "jest-snapshot": "^29.5.0"
           }
         },
         "jest-runner": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.4.3.tgz",
-          "integrity": "sha512-GWPTEiGmtHZv1KKeWlTX9SIFuK19uLXlRQU43ceOQ2hIfA5yPEJC7AMkvFKpdCHx6pNEdOD+2+8zbniEi3v3gA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.5.0.tgz",
+          "integrity": "sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==",
           "dev": true,
           "requires": {
-            "@jest/console": "^29.4.3",
-            "@jest/environment": "^29.4.3",
-            "@jest/test-result": "^29.4.3",
-            "@jest/transform": "^29.4.3",
-            "@jest/types": "^29.4.3",
+            "@jest/console": "^29.5.0",
+            "@jest/environment": "^29.5.0",
+            "@jest/test-result": "^29.5.0",
+            "@jest/transform": "^29.5.0",
+            "@jest/types": "^29.5.0",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "emittery": "^0.13.1",
             "graceful-fs": "^4.2.9",
             "jest-docblock": "^29.4.3",
-            "jest-environment-node": "^29.4.3",
-            "jest-haste-map": "^29.4.3",
-            "jest-leak-detector": "^29.4.3",
-            "jest-message-util": "^29.4.3",
-            "jest-resolve": "^29.4.3",
-            "jest-runtime": "^29.4.3",
-            "jest-util": "^29.4.3",
-            "jest-watcher": "^29.4.3",
-            "jest-worker": "^29.4.3",
+            "jest-environment-node": "^29.5.0",
+            "jest-haste-map": "^29.5.0",
+            "jest-leak-detector": "^29.5.0",
+            "jest-message-util": "^29.5.0",
+            "jest-resolve": "^29.5.0",
+            "jest-runtime": "^29.5.0",
+            "jest-util": "^29.5.0",
+            "jest-watcher": "^29.5.0",
+            "jest-worker": "^29.5.0",
             "p-limit": "^3.1.0",
             "source-map-support": "0.5.13"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32586,39 +32609,39 @@
           }
         },
         "jest-runtime": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.4.3.tgz",
-          "integrity": "sha512-F5bHvxSH+LvLV24vVB3L8K467dt3y3dio6V3W89dUz9nzvTpqd/HcT9zfYKL2aZPvD63vQFgLvaUX/UpUhrP6Q==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.5.0.tgz",
+          "integrity": "sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==",
           "dev": true,
           "requires": {
-            "@jest/environment": "^29.4.3",
-            "@jest/fake-timers": "^29.4.3",
-            "@jest/globals": "^29.4.3",
+            "@jest/environment": "^29.5.0",
+            "@jest/fake-timers": "^29.5.0",
+            "@jest/globals": "^29.5.0",
             "@jest/source-map": "^29.4.3",
-            "@jest/test-result": "^29.4.3",
-            "@jest/transform": "^29.4.3",
-            "@jest/types": "^29.4.3",
+            "@jest/test-result": "^29.5.0",
+            "@jest/transform": "^29.5.0",
+            "@jest/types": "^29.5.0",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "cjs-module-lexer": "^1.0.0",
             "collect-v8-coverage": "^1.0.0",
             "glob": "^7.1.3",
             "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^29.4.3",
-            "jest-message-util": "^29.4.3",
-            "jest-mock": "^29.4.3",
+            "jest-haste-map": "^29.5.0",
+            "jest-message-util": "^29.5.0",
+            "jest-mock": "^29.5.0",
             "jest-regex-util": "^29.4.3",
-            "jest-resolve": "^29.4.3",
-            "jest-snapshot": "^29.4.3",
-            "jest-util": "^29.4.3",
+            "jest-resolve": "^29.5.0",
+            "jest-snapshot": "^29.5.0",
+            "jest-util": "^29.5.0",
             "slash": "^3.0.0",
             "strip-bom": "^4.0.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32641,9 +32664,9 @@
           }
         },
         "jest-snapshot": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.4.3.tgz",
-          "integrity": "sha512-NGlsqL0jLPDW91dz304QTM/SNO99lpcSYYAjNiX0Ou+sSGgkanKBcSjCfp/pqmiiO1nQaOyLp6XQddAzRcx3Xw==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.5.0.tgz",
+          "integrity": "sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.11.6",
@@ -32652,30 +32675,29 @@
             "@babel/plugin-syntax-typescript": "^7.7.2",
             "@babel/traverse": "^7.7.2",
             "@babel/types": "^7.3.3",
-            "@jest/expect-utils": "^29.4.3",
-            "@jest/transform": "^29.4.3",
-            "@jest/types": "^29.4.3",
+            "@jest/expect-utils": "^29.5.0",
+            "@jest/transform": "^29.5.0",
+            "@jest/types": "^29.5.0",
             "@types/babel__traverse": "^7.0.6",
             "@types/prettier": "^2.1.5",
             "babel-preset-current-node-syntax": "^1.0.0",
             "chalk": "^4.0.0",
-            "expect": "^29.4.3",
+            "expect": "^29.5.0",
             "graceful-fs": "^4.2.9",
-            "jest-diff": "^29.4.3",
+            "jest-diff": "^29.5.0",
             "jest-get-type": "^29.4.3",
-            "jest-haste-map": "^29.4.3",
-            "jest-matcher-utils": "^29.4.3",
-            "jest-message-util": "^29.4.3",
-            "jest-util": "^29.4.3",
+            "jest-matcher-utils": "^29.5.0",
+            "jest-message-util": "^29.5.0",
+            "jest-util": "^29.5.0",
             "natural-compare": "^1.4.0",
-            "pretty-format": "^29.4.3",
+            "pretty-format": "^29.5.0",
             "semver": "^7.3.5"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32707,12 +32729,12 @@
           }
         },
         "jest-util": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.4.3.tgz",
-          "integrity": "sha512-ToSGORAz4SSSoqxDSylWX8JzkOQR7zoBtNRsA7e+1WUX5F8jrOwaNpuh1YfJHJKDHXLHmObv5eOjejUd+/Ws+Q==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz",
+          "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==",
           "dev": true,
           "requires": {
-            "@jest/types": "^29.4.3",
+            "@jest/types": "^29.5.0",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
@@ -32721,9 +32743,9 @@
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32746,23 +32768,23 @@
           }
         },
         "jest-validate": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.4.3.tgz",
-          "integrity": "sha512-J3u5v7aPQoXPzaar6GndAVhdQcZr/3osWSgTeKg5v574I9ybX/dTyH0AJFb5XgXIB7faVhf+rS7t4p3lL9qFaw==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.5.0.tgz",
+          "integrity": "sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==",
           "dev": true,
           "requires": {
-            "@jest/types": "^29.4.3",
+            "@jest/types": "^29.5.0",
             "camelcase": "^6.2.0",
             "chalk": "^4.0.0",
             "jest-get-type": "^29.4.3",
             "leven": "^3.1.0",
-            "pretty-format": "^29.4.3"
+            "pretty-format": "^29.5.0"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32791,25 +32813,25 @@
           }
         },
         "jest-watcher": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.4.3.tgz",
-          "integrity": "sha512-zwlXH3DN3iksoIZNk73etl1HzKyi5FuQdYLnkQKm5BW4n8HpoG59xSwpVdFrnh60iRRaRBGw0gcymIxjJENPcA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.5.0.tgz",
+          "integrity": "sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==",
           "dev": true,
           "requires": {
-            "@jest/test-result": "^29.4.3",
-            "@jest/types": "^29.4.3",
+            "@jest/test-result": "^29.5.0",
+            "@jest/types": "^29.5.0",
             "@types/node": "*",
             "ansi-escapes": "^4.2.1",
             "chalk": "^4.0.0",
             "emittery": "^0.13.1",
-            "jest-util": "^29.4.3",
+            "jest-util": "^29.5.0",
             "string-length": "^4.0.1"
           },
           "dependencies": {
             "@jest/types": {
-              "version": "29.4.3",
-              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.4.3.tgz",
-              "integrity": "sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==",
+              "version": "29.5.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+              "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
               "dev": true,
               "requires": {
                 "@jest/schemas": "^29.4.3",
@@ -32832,13 +32854,13 @@
           }
         },
         "jest-worker": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.4.3.tgz",
-          "integrity": "sha512-GLHN/GTAAMEy5BFdvpUfzr9Dr80zQqBrh0fz1mtRMe05hqP45+HfQltu7oTBfduD0UeZs09d+maFtFYAXFWvAA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
+          "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
           "dev": true,
           "requires": {
             "@types/node": "*",
-            "jest-util": "^29.4.3",
+            "jest-util": "^29.5.0",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           },
@@ -34476,9 +34498,9 @@
           }
         },
         "pretty-format": {
-          "version": "29.4.3",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.4.3.tgz",
-          "integrity": "sha512-cvpcHTc42lcsvOOAzd3XuNWTcvk1Jmnzqeu+WsOuiPmxUJTnkbAcFNsRKvEpBEUFVUgy/GTZLulZDcDEi+CIlA==",
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.5.0.tgz",
+          "integrity": "sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==",
           "dev": true,
           "requires": {
             "@jest/schemas": "^29.4.3",
@@ -34601,6 +34623,12 @@
           "version": "2.1.1",
           "dev": true
         },
+        "pure-rand": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.1.tgz",
+          "integrity": "sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg==",
+          "dev": true
+        },
         "querystring": {
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -34789,9 +34817,9 @@
           "dev": true
         },
         "resolve.exports": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.0.tgz",
-          "integrity": "sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.1.tgz",
+          "integrity": "sha512-OEJWVeimw8mgQuj3HfkNl4KqRevH7lzeQNaWRPfx0PPse7Jk6ozcsG4FKVgtzDsC1KUF+YlTHh17NcgHOPykLw==",
           "dev": true
         },
         "responselike": {
diff --git a/package.json b/package.json
index 110a92b925e0..50c37e145554 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "@swc/core": "1.3.35",
     "@swc/jest": "0.2.24",
     "@swc/register": "0.1.10",
-    "autoprefixer": "^10.4.13",
+    "autoprefixer": "^10.4.14",
     "concurrently": "^7.5.0",
     "cssnano": "^5.1.15",
     "esbuild": "^0.17.10",

From ab66c5afe3ec0b3547b9838a2a2bb0644a83fb12 Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Fri, 17 Mar 2023 14:45:10 +0100
Subject: [PATCH 51/84] add `toHaveBeenWarned` and `toHaveBeenWarnedWith`
 custom matchers

---
 jest/customMatchers.js | 74 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/jest/customMatchers.js b/jest/customMatchers.js
index 8c8d81e60ad4..9b1c6b6d060c 100644
--- a/jest/customMatchers.js
+++ b/jest/customMatchers.js
@@ -1,6 +1,18 @@
 const prettier = require('prettier')
 const { diff } = require('jest-diff')
 const lightningcss = require('lightningcss')
+const log = require('../src/util/log').default
+
+let warn
+
+beforeEach(() => {
+  warn = jest.spyOn(log, 'warn')
+  warn.mockImplementation(() => {})
+})
+
+afterEach(() => {
+  warn.mockRestore()
+})
 
 function formatPrettier(input) {
   return prettier.format(input, {
@@ -137,4 +149,66 @@ expect.extend({
 
     return { actual: received, message, pass }
   },
+  toHaveBeenWarned() {
+    let passed = warn.mock.calls.length > 0
+    if (passed) {
+      return {
+        pass: true,
+        message: () => {
+          return (
+            this.utils.matcherHint('toHaveBeenWarned') +
+            '\n\n' +
+            `Expected number of calls: >= ${this.utils.printExpected(1)}\n` +
+            `Received number of calls:    ${this.utils.printReceived(actualWarningKeys.length)}`
+          )
+        },
+      }
+    } else {
+      return {
+        pass: false,
+        message: () => {
+          return (
+            this.utils.matcherHint('toHaveBeenWarned') +
+            '\n\n' +
+            `Expected number of calls: >= ${this.utils.printExpected(1)}\n` +
+            `Received number of calls:    ${this.utils.printReceived(warn.mock.calls.length)}`
+          )
+        },
+      }
+    }
+  },
+  toHaveBeenWarnedWith(_received, expectedWarningKeys) {
+    let actualWarningKeys = warn.mock.calls.map((args) => args[0])
+
+    let passed = expectedWarningKeys.every((key) => actualWarningKeys.includes(key))
+    if (passed) {
+      return {
+        pass: true,
+        message: () => {
+          return (
+            this.utils.matcherHint('toHaveBeenWarnedWith') +
+            '\n\n' +
+            `Expected: not ${this.utils.printExpected(expectedWarningKeys)}\n` +
+            `Received: ${this.utils.printReceived(actualWarningKeys)}`
+          )
+        },
+      }
+    } else {
+      let diffString = diff(expectedWarningKeys, actualWarningKeys)
+
+      return {
+        pass: false,
+        message: () => {
+          return (
+            this.utils.matcherHint('toHaveBeenWarnedWith') +
+            '\n\n' +
+            (diffString && diffString.includes('- Expect')
+              ? `Difference:\n\n${diffString}`
+              : `Expected: ${this.utils.printExpected(expectedWarningKeys)}\n` +
+                `Received: ${this.utils.printReceived(actualWarningKeys)}`)
+          )
+        },
+      }
+    }
+  },
 })

From 8132de6660defa34936a698a24c72ff94c83874c Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Fri, 17 Mar 2023 14:48:21 +0100
Subject: [PATCH 52/84] refactor `log.warn` checks in tests

---
 tests/blocklist.test.js                 | 12 +-------
 tests/evaluateTailwindFunctions.test.js | 21 ++-----------
 tests/min-max-screen-variants.test.js   | 40 +++++++------------------
 tests/normalize-config.test.js          |  8 +----
 tests/warnings.test.js                  | 22 +++-----------
 5 files changed, 18 insertions(+), 85 deletions(-)

diff --git a/tests/blocklist.test.js b/tests/blocklist.test.js
index f5627d20c932..3642aa376e02 100644
--- a/tests/blocklist.test.js
+++ b/tests/blocklist.test.js
@@ -1,15 +1,6 @@
-import log from '../src/util/log'
 import { crosscheck, run, html, css } from './util/run'
 
 crosscheck(({ stable, oxide }) => {
-  let warn
-
-  beforeEach(() => {
-    warn = jest.spyOn(log, 'warn')
-  })
-
-  afterEach(() => warn.mockClear())
-
   it('can block classes matched literally', () => {
     let config = {
       content: [
@@ -102,8 +93,7 @@ crosscheck(({ stable, oxide }) => {
       }
     `)
 
-    expect(warn).toHaveBeenCalledTimes(1)
-    expect(warn.mock.calls.map((x) => x[0])).toEqual(['blocklist-invalid'])
+    expect().toHaveBeenWarnedWith(['blocklist-invalid'])
   })
 
   it('can block classes generated by the safelist', () => {
diff --git a/tests/evaluateTailwindFunctions.test.js b/tests/evaluateTailwindFunctions.test.js
index 5b41a70307c7..e4085e03e3b4 100644
--- a/tests/evaluateTailwindFunctions.test.js
+++ b/tests/evaluateTailwindFunctions.test.js
@@ -2,7 +2,6 @@ import fs from 'fs'
 import path from 'path'
 import postcss from 'postcss'
 import plugin from '../src/lib/evaluateTailwindFunctions'
-import log from '../src/util/log'
 import { crosscheck, run as runFull, html, css } from './util/run'
 
 function run(input, opts = {}) {
@@ -1348,14 +1347,6 @@ crosscheck(({ stable, oxide }) => {
     )
     afterEach(() => fs.promises.unlink(configPath))
 
-    let warn
-
-    beforeEach(() => {
-      warn = jest.spyOn(log, 'warn')
-    })
-
-    afterEach(() => warn.mockClear())
-
     oxide.test.todo('should not generate when theme fn doesnt resolve')
     stable.test('should not generate when theme fn doesnt resolve', async () => {
       await fs.promises.writeFile(
@@ -1378,11 +1369,7 @@ crosscheck(({ stable, oxide }) => {
       `)
 
       // 2. But we get a warning in the console
-      expect(warn).toHaveBeenCalledTimes(2)
-      expect(warn.mock.calls.map((x) => x[0])).toEqual([
-        'invalid-theme-key-in-class',
-        'invalid-theme-key-in-class',
-      ])
+      expect().toHaveBeenWarnedWith(['invalid-theme-key-in-class'])
 
       // 3. The second run should work fine because it's been removed from the class cache
       result = await runFull('@tailwind utilities', configPath)
@@ -1394,11 +1381,7 @@ crosscheck(({ stable, oxide }) => {
       `)
 
       // 4. But we've not received any further logs about it
-      expect(warn).toHaveBeenCalledTimes(2)
-      expect(warn.mock.calls.map((x) => x[0])).toEqual([
-        'invalid-theme-key-in-class',
-        'invalid-theme-key-in-class',
-      ])
+      expect().toHaveBeenWarnedWith(['invalid-theme-key-in-class'])
     })
   })
 })
diff --git a/tests/min-max-screen-variants.test.js b/tests/min-max-screen-variants.test.js
index f55789aa7154..a86c6f6cd201 100644
--- a/tests/min-max-screen-variants.test.js
+++ b/tests/min-max-screen-variants.test.js
@@ -1,17 +1,6 @@
-import log from '../src/util/log'
 import { crosscheck, run, html, css } from './util/run'
 
 crosscheck(() => {
-  let warn
-
-  beforeEach(() => {
-    warn = jest.spyOn(log, 'warn')
-  })
-
-  afterEach(() => {
-    warn.mockClear()
-  })
-
   let defaultScreens = {
     sm: '640px',
     md: '768px',
@@ -119,7 +108,7 @@ crosscheck(() => {
       }
     `)
 
-    expect(warn).toHaveBeenCalledTimes(0)
+    expect().not.toHaveBeenWarned()
   })
 
   it('works when using max variants screens config is empty and variants all use the same unit', () => {
@@ -318,8 +307,7 @@ crosscheck(() => {
       }
     `)
 
-    expect(warn).toHaveBeenCalledTimes(1)
-    expect(warn.mock.calls.map((x) => x[0])).toEqual(['complex-screen-config'])
+    expect().toHaveBeenWarnedWith(['complex-screen-config'])
   })
 
   it('warns when using min variants with simple configs containing mixed units', async () => {
@@ -365,8 +353,7 @@ crosscheck(() => {
       }
     `)
 
-    expect(warn).toHaveBeenCalledTimes(1)
-    expect(warn.mock.calls.map((x) => x[0])).toEqual(['mixed-screen-units'])
+    expect().toHaveBeenWarnedWith(['mixed-screen-units'])
   })
 
   it('warns when using min variants with mixed units (with screens config)', async () => {
@@ -412,8 +399,7 @@ crosscheck(() => {
       }
     `)
 
-    expect(warn).toHaveBeenCalledTimes(1)
-    expect(warn.mock.calls.map((x) => x[0])).toEqual(['minmax-have-mixed-units'])
+    expect().toHaveBeenWarnedWith(['minmax-have-mixed-units'])
   })
 
   it('warns when using min variants with mixed units (with no screens config)', async () => {
@@ -450,8 +436,7 @@ crosscheck(() => {
       }
     `)
 
-    expect(warn).toHaveBeenCalledTimes(1)
-    expect(warn.mock.calls.map((x) => x[0])).toEqual(['minmax-have-mixed-units'])
+    expect().toHaveBeenWarnedWith(['minmax-have-mixed-units'])
   })
 
   it('warns when using max variants with complex screen configs', async () => {
@@ -500,8 +485,7 @@ crosscheck(() => {
       }
     `)
 
-    expect(warn).toHaveBeenCalledTimes(1)
-    expect(warn.mock.calls.map((x) => x[0])).toEqual(['complex-screen-config'])
+    expect().toHaveBeenWarnedWith(['complex-screen-config'])
   })
 
   it('warns when using max variants with simple configs containing mixed units', async () => {
@@ -547,8 +531,7 @@ crosscheck(() => {
       }
     `)
 
-    expect(warn).toHaveBeenCalledTimes(1)
-    expect(warn.mock.calls.map((x) => x[0])).toEqual(['mixed-screen-units'])
+    expect().toHaveBeenWarnedWith(['mixed-screen-units'])
   })
 
   it('warns when using max variants with mixed units (with screens config)', async () => {
@@ -594,8 +577,7 @@ crosscheck(() => {
       }
     `)
 
-    expect(warn).toHaveBeenCalledTimes(1)
-    expect(warn.mock.calls.map((x) => x[0])).toEqual(['minmax-have-mixed-units'])
+    expect().toHaveBeenWarnedWith(['minmax-have-mixed-units'])
   })
 
   it('warns when using max variants with mixed units (with no screens config)', async () => {
@@ -632,8 +614,7 @@ crosscheck(() => {
       }
     `)
 
-    expect(warn).toHaveBeenCalledTimes(1)
-    expect(warn.mock.calls.map((x) => x[0])).toEqual(['minmax-have-mixed-units'])
+    expect().toHaveBeenWarnedWith(['minmax-have-mixed-units'])
   })
 
   it('warns when using min and max variants with mixed units (with no screens config)', async () => {
@@ -670,7 +651,6 @@ crosscheck(() => {
       }
     `)
 
-    expect(warn).toHaveBeenCalledTimes(1)
-    expect(warn.mock.calls.map((x) => x[0])).toEqual(['minmax-have-mixed-units'])
+    expect().toHaveBeenWarnedWith(['minmax-have-mixed-units'])
   })
 })
diff --git a/tests/normalize-config.test.js b/tests/normalize-config.test.js
index dff357a81977..a0b7a59bb950 100644
--- a/tests/normalize-config.test.js
+++ b/tests/normalize-config.test.js
@@ -1,6 +1,5 @@
 import { normalizeConfig } from '../src/util/normalizeConfig'
 import resolveConfig from '../src/public/resolve-config'
-import log from '../src/util/log'
 import { crosscheck, run, css } from './util/run'
 
 crosscheck(({ stable, oxide }) => {
@@ -128,8 +127,6 @@ crosscheck(({ stable, oxide }) => {
   })
 
   it('should warn when we detect invalid globs with incorrect brace expansion', () => {
-    let spy = jest.spyOn(log, 'warn')
-
     let config = {
       content: [
         './{example-folder}/**/*.{html,js}',
@@ -162,9 +159,6 @@ crosscheck(({ stable, oxide }) => {
       transform: {},
     })
 
-    // But a warning should happen
-    expect(spy).toHaveBeenCalledTimes(2)
-    expect(spy.mock.calls.map((x) => x[0])).toEqual(['invalid-glob-braces', 'invalid-glob-braces'])
-    spy.mockRestore()
+    expect().toHaveBeenWarnedWith(['invalid-glob-braces'])
   })
 })
diff --git a/tests/warnings.test.js b/tests/warnings.test.js
index d288a282a9d4..e3ea94fe552d 100644
--- a/tests/warnings.test.js
+++ b/tests/warnings.test.js
@@ -1,17 +1,6 @@
-import log from '../src/util/log'
 import { crosscheck, run, html, css } from './util/run'
 
 crosscheck(() => {
-  let warn
-
-  beforeEach(() => {
-    warn = jest.spyOn(log, 'warn')
-  })
-
-  afterEach(() => {
-    warn.mockClear()
-  })
-
   test('it warns when there is no content key', async () => {
     let config = {
       corePlugins: { preflight: false },
@@ -23,8 +12,7 @@ crosscheck(() => {
 
     await run(input, config)
 
-    expect(warn).toHaveBeenCalledTimes(1)
-    expect(warn.mock.calls.map((x) => x[0])).toEqual(['content-problems'])
+    expect().toHaveBeenWarnedWith(['content-problems'])
   })
 
   test('it warns when there is an empty content key', async () => {
@@ -39,8 +27,7 @@ crosscheck(() => {
 
     await run(input, config)
 
-    expect(warn).toHaveBeenCalledTimes(1)
-    expect(warn.mock.calls.map((x) => x[0])).toEqual(['content-problems'])
+    expect().toHaveBeenWarnedWith(['content-problems'])
   })
 
   test('it warns when there are no utilities generated', async () => {
@@ -55,8 +42,7 @@ crosscheck(() => {
 
     await run(input, config)
 
-    expect(warn).toHaveBeenCalledTimes(1)
-    expect(warn.mock.calls.map((x) => x[0])).toEqual(['content-problems'])
+    expect().toHaveBeenWarnedWith(['content-problems'])
   })
 
   it('warnings are not thrown when only variant utilities are generated', async () => {
@@ -71,6 +57,6 @@ crosscheck(() => {
 
     await run(input, config)
 
-    expect(warn).toHaveBeenCalledTimes(0)
+    expect().not.toHaveBeenWarned()
   })
 })

From acf94038261aa532d970cc13070cdcdb1b41bb0a Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Fri, 17 Mar 2023 16:22:16 +0100
Subject: [PATCH 53/84] transform files using `@swc/jest` (#10815)

---
 integrations/content-resolution/package.json | 6 +++++-
 integrations/parcel/package.json             | 6 +++++-
 integrations/postcss-cli/package.json        | 6 +++++-
 integrations/rollup-sass/package.json        | 6 +++++-
 integrations/rollup/package.json             | 6 +++++-
 integrations/tailwindcss-cli/package.json    | 6 +++++-
 integrations/vite/package.json               | 6 +++++-
 integrations/webpack-4/package.json          | 6 +++++-
 integrations/webpack-5/package.json          | 6 +++++-
 9 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/integrations/content-resolution/package.json b/integrations/content-resolution/package.json
index fa7bc4706532..2452c74eb00c 100644
--- a/integrations/content-resolution/package.json
+++ b/integrations/content-resolution/package.json
@@ -11,7 +11,11 @@
     "displayName": "Content Resolution",
     "setupFilesAfterEnv": [
       "<rootDir>/../../jest/customMatchers.js"
-    ]
+    ],
+    "transform": {
+      "\\.js$": "@swc/jest",
+      "\\.ts$": "@swc/jest"
+    }
   },
   "devDependencies": {
     "postcss": "^8.4.21",
diff --git a/integrations/parcel/package.json b/integrations/parcel/package.json
index 3e53eeedeb50..c61b3df001cd 100644
--- a/integrations/parcel/package.json
+++ b/integrations/parcel/package.json
@@ -12,7 +12,11 @@
     "displayName": "parcel",
     "setupFilesAfterEnv": [
       "<rootDir>/../../jest/customMatchers.js"
-    ]
+    ],
+    "transform": {
+      "\\.js$": "@swc/jest",
+      "\\.ts$": "@swc/jest"
+    }
   },
   "devDependencies": {
     "parcel": "^2.8.3"
diff --git a/integrations/postcss-cli/package.json b/integrations/postcss-cli/package.json
index 6a696eacb4da..1a0b8fe71612 100644
--- a/integrations/postcss-cli/package.json
+++ b/integrations/postcss-cli/package.json
@@ -11,7 +11,11 @@
     "displayName": "PostCSS CLI",
     "setupFilesAfterEnv": [
       "<rootDir>/../../jest/customMatchers.js"
-    ]
+    ],
+    "transform": {
+      "\\.js$": "@swc/jest",
+      "\\.ts$": "@swc/jest"
+    }
   },
   "devDependencies": {
     "postcss": "^8.4.21",
diff --git a/integrations/rollup-sass/package.json b/integrations/rollup-sass/package.json
index 813df77564c0..4bd8153d6609 100644
--- a/integrations/rollup-sass/package.json
+++ b/integrations/rollup-sass/package.json
@@ -11,7 +11,11 @@
     "displayName": "rollup.js",
     "setupFilesAfterEnv": [
       "<rootDir>/../../jest/customMatchers.js"
-    ]
+    ],
+    "transform": {
+      "\\.js$": "@swc/jest",
+      "\\.ts$": "@swc/jest"
+    }
   },
   "devDependencies": {
     "rollup": "^3.15.0",
diff --git a/integrations/rollup/package.json b/integrations/rollup/package.json
index 03eff7ec3642..2e31c34dc0e7 100644
--- a/integrations/rollup/package.json
+++ b/integrations/rollup/package.json
@@ -11,7 +11,11 @@
     "displayName": "rollup.js",
     "setupFilesAfterEnv": [
       "<rootDir>/../../jest/customMatchers.js"
-    ]
+    ],
+    "transform": {
+      "\\.js$": "@swc/jest",
+      "\\.ts$": "@swc/jest"
+    }
   },
   "devDependencies": {
     "rollup": "^3.15.0",
diff --git a/integrations/tailwindcss-cli/package.json b/integrations/tailwindcss-cli/package.json
index 65438dab4dc7..9fbe6b75ea20 100644
--- a/integrations/tailwindcss-cli/package.json
+++ b/integrations/tailwindcss-cli/package.json
@@ -14,6 +14,10 @@
     "displayName": "Tailwind CSS CLI",
     "setupFilesAfterEnv": [
       "<rootDir>/../../jest/customMatchers.js"
-    ]
+    ],
+    "transform": {
+      "\\.js$": "@swc/jest",
+      "\\.ts$": "@swc/jest"
+    }
   }
 }
diff --git a/integrations/vite/package.json b/integrations/vite/package.json
index a04c235964f3..5b4e91e7467e 100644
--- a/integrations/vite/package.json
+++ b/integrations/vite/package.json
@@ -13,7 +13,11 @@
     "displayName": "vite",
     "setupFilesAfterEnv": [
       "<rootDir>/../../jest/customMatchers.js"
-    ]
+    ],
+    "transform": {
+      "\\.js$": "@swc/jest",
+      "\\.ts$": "@swc/jest"
+    }
   },
   "devDependencies": {
     "isomorphic-fetch": "^3.0.0",
diff --git a/integrations/webpack-4/package.json b/integrations/webpack-4/package.json
index ce68cad74623..6bddf0bafaa2 100644
--- a/integrations/webpack-4/package.json
+++ b/integrations/webpack-4/package.json
@@ -14,7 +14,11 @@
     "displayName": "webpack 4",
     "setupFilesAfterEnv": [
       "<rootDir>/../../jest/customMatchers.js"
-    ]
+    ],
+    "transform": {
+      "\\.js$": "@swc/jest",
+      "\\.ts$": "@swc/jest"
+    }
   },
   "devDependencies": {
     "css-loader": "^5.2.7",
diff --git a/integrations/webpack-5/package.json b/integrations/webpack-5/package.json
index ed92fd9afe6e..713e7cbdfb9b 100644
--- a/integrations/webpack-5/package.json
+++ b/integrations/webpack-5/package.json
@@ -14,7 +14,11 @@
     "displayName": "webpack 5",
     "setupFilesAfterEnv": [
       "<rootDir>/../../jest/customMatchers.js"
-    ]
+    ],
+    "transform": {
+      "\\.js$": "@swc/jest",
+      "\\.ts$": "@swc/jest"
+    }
   },
   "devDependencies": {
     "css-loader": "^6.7.1",

From 6a2c58acf873cdef2f9b3fc24fcc740f77fa04b5 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Mon, 20 Mar 2023 06:22:11 +0000
Subject: [PATCH 54/84] Update @swc/core to version 1.3.41

---
 package-lock.json | 47 ++++++++++++++++++++++++++---------------------
 package.json      |  2 +-
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 28519e48b7ab..3e2bc9234d92 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -51,7 +51,7 @@
         "@swc/core": "1.3.35",
         "@swc/jest": "0.2.24",
         "@swc/register": "0.1.10",
-        "autoprefixer": "^10.4.13",
+        "autoprefixer": "^10.4.14",
         "concurrently": "^7.5.0",
         "cssnano": "^5.1.15",
         "esbuild": "^0.17.10",
@@ -4923,7 +4923,9 @@
       }
     },
     "node_modules/autoprefixer": {
-      "version": "10.4.13",
+      "version": "10.4.14",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
+      "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
       "dev": true,
       "funding": [
         {
@@ -4935,10 +4937,9 @@
           "url": "https://tidelift.com/funding/github/npm/autoprefixer"
         }
       ],
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.21.4",
-        "caniuse-lite": "^1.0.30001426",
+        "browserslist": "^4.21.5",
+        "caniuse-lite": "^1.0.30001464",
         "fraction.js": "^4.2.0",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
@@ -5699,9 +5700,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001450",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001450.tgz",
-      "integrity": "sha512-qMBmvmQmFXaSxexkjjfMvD5rnDL0+m+dUMZKoDYsGG8iZN29RuYh9eRoMvKsT6uMAWlyUUGDEQGJJYjzCIO9ew==",
+      "version": "1.0.30001468",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001468.tgz",
+      "integrity": "sha512-zgAo8D5kbOyUcRAgSmgyuvBkjrGk5CGYG5TYgFdpQv+ywcyEpo1LOWoG8YmoflGnh+V+UsNuKYedsoYs0hzV5A==",
       "funding": [
         {
           "type": "opencollective",
@@ -19206,11 +19207,13 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "10.4.13",
+      "version": "10.4.14",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
+      "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.21.4",
-        "caniuse-lite": "^1.0.30001426",
+        "browserslist": "^4.21.5",
+        "caniuse-lite": "^1.0.30001464",
         "fraction.js": "^4.2.0",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
@@ -19807,9 +19810,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001450",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001450.tgz",
-      "integrity": "sha512-qMBmvmQmFXaSxexkjjfMvD5rnDL0+m+dUMZKoDYsGG8iZN29RuYh9eRoMvKsT6uMAWlyUUGDEQGJJYjzCIO9ew=="
+      "version": "1.0.30001468",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001468.tgz",
+      "integrity": "sha512-zgAo8D5kbOyUcRAgSmgyuvBkjrGk5CGYG5TYgFdpQv+ywcyEpo1LOWoG8YmoflGnh+V+UsNuKYedsoYs0hzV5A=="
     },
     "chalk": {
       "version": "4.1.2",
@@ -25731,7 +25734,7 @@
         "@tailwindcss/integrations-webpack-5": "file:integrations/webpack-5",
         "@tailwindcss/oxide": "file:oxide/crates/node",
         "arg": "^5.0.2",
-        "autoprefixer": "^10.4.13",
+        "autoprefixer": "^10.4.14",
         "browserslist": "^4.21.5",
         "chokidar": "^3.5.3",
         "color-name": "^1.1.4",
@@ -29142,11 +29145,13 @@
           "dev": true
         },
         "autoprefixer": {
-          "version": "10.4.13",
+          "version": "10.4.14",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
+          "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
           "dev": true,
           "requires": {
-            "browserslist": "^4.21.4",
-            "caniuse-lite": "^1.0.30001426",
+            "browserslist": "^4.21.5",
+            "caniuse-lite": "^1.0.30001464",
             "fraction.js": "^4.2.0",
             "normalize-range": "^0.1.2",
             "picocolors": "^1.0.0",
@@ -29743,9 +29748,9 @@
           }
         },
         "caniuse-lite": {
-          "version": "1.0.30001450",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001450.tgz",
-          "integrity": "sha512-qMBmvmQmFXaSxexkjjfMvD5rnDL0+m+dUMZKoDYsGG8iZN29RuYh9eRoMvKsT6uMAWlyUUGDEQGJJYjzCIO9ew=="
+          "version": "1.0.30001468",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001468.tgz",
+          "integrity": "sha512-zgAo8D5kbOyUcRAgSmgyuvBkjrGk5CGYG5TYgFdpQv+ywcyEpo1LOWoG8YmoflGnh+V+UsNuKYedsoYs0hzV5A=="
         },
         "chalk": {
           "version": "4.1.2",
diff --git a/package.json b/package.json
index 50c37e145554..a24d599a6052 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
   ],
   "devDependencies": {
     "@swc/cli": "0.1.62",
-    "@swc/core": "1.3.35",
+    "@swc/core": "1.3.41",
     "@swc/jest": "0.2.24",
     "@swc/register": "0.1.10",
     "autoprefixer": "^10.4.14",

From e046a37dbc17f163b066cd34a559e7c8a276bd8b Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Mon, 20 Mar 2023 18:30:47 +0100
Subject: [PATCH 55/84] Improve bundle size by replacing `detective-typescript`
 (#10825)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* replace `detective-typescript` with our own implementation

We are not parsing the code but just trying to pluck out the
dependencies used via `import` and `require`.

* drop `detective-typescript`

* return a `Set` instead of an `Array`

* resolve rebuilds, but log errors in case they occur

This won't be the prettiest if it happens, but at least we are not
swallowing errors which should make bugs be easier to discover.

See previous commit for an example... 😅

Co-authored-by: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
Co-authored-by: Jordan Pittman <jordan@cryptica.me>
---
 package-lock.json                | 681 ++++++++-----------------------
 package-lock.stable.json         | 320 +--------------
 package.json                     |   1 -
 package.stable.json              |  16 +-
 src/cli/build/watching.js        |   4 +-
 src/lib/getModuleDependencies.js |  93 +++--
 6 files changed, 278 insertions(+), 837 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3e2bc9234d92..26296f5bb034 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,6 @@
         "browserslist": "^4.21.5",
         "chokidar": "^3.5.3",
         "color-name": "^1.1.4",
-        "detective-typescript": "^9.0.0",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
         "fast-glob": "^3.2.12",
@@ -48,7 +47,7 @@
       },
       "devDependencies": {
         "@swc/cli": "0.1.62",
-        "@swc/core": "1.3.35",
+        "@swc/core": "1.3.41",
         "@swc/jest": "0.2.24",
         "@swc/register": "0.1.10",
         "autoprefixer": "^10.4.14",
@@ -926,6 +925,7 @@
       "version": "7.21.3",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
       "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==",
+      "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -3723,9 +3723,9 @@
       }
     },
     "node_modules/@swc/core": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.35.tgz",
-      "integrity": "sha512-KmiBin0XSVzJhzX19zTiCqmLslZ40Cl7zqskJcTDeIrRhfgKdiAsxzYUanJgMJIRjYtl9Kcg1V/Ip2o2wL8v3w==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.41.tgz",
+      "integrity": "sha512-v6P2dfqJDpZ/7RXPvWge9oI6YgolDM0jtNhQZ2qdXrLBzaWQdDoBGBTJ8KN/nTgGhX3IkNvSB1fafXQ+nVnqAQ==",
       "dev": true,
       "hasInstallScript": true,
       "engines": {
@@ -3736,22 +3736,22 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.3.35",
-        "@swc/core-darwin-x64": "1.3.35",
-        "@swc/core-linux-arm-gnueabihf": "1.3.35",
-        "@swc/core-linux-arm64-gnu": "1.3.35",
-        "@swc/core-linux-arm64-musl": "1.3.35",
-        "@swc/core-linux-x64-gnu": "1.3.35",
-        "@swc/core-linux-x64-musl": "1.3.35",
-        "@swc/core-win32-arm64-msvc": "1.3.35",
-        "@swc/core-win32-ia32-msvc": "1.3.35",
-        "@swc/core-win32-x64-msvc": "1.3.35"
+        "@swc/core-darwin-arm64": "1.3.41",
+        "@swc/core-darwin-x64": "1.3.41",
+        "@swc/core-linux-arm-gnueabihf": "1.3.41",
+        "@swc/core-linux-arm64-gnu": "1.3.41",
+        "@swc/core-linux-arm64-musl": "1.3.41",
+        "@swc/core-linux-x64-gnu": "1.3.41",
+        "@swc/core-linux-x64-musl": "1.3.41",
+        "@swc/core-win32-arm64-msvc": "1.3.41",
+        "@swc/core-win32-ia32-msvc": "1.3.41",
+        "@swc/core-win32-x64-msvc": "1.3.41"
       }
     },
     "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.35.tgz",
-      "integrity": "sha512-zQUFkHx4gZpu0uo2IspvPnKsz8bsdXd5bC33xwjtoAI1cpLerDyqo4v2zIahEp+FdKZjyVsLHtfJiQiA1Qka3A==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.41.tgz",
+      "integrity": "sha512-D4fybODToO/BvuP35bionDUrSuTVVr8eW+mApr1unOqb3mfiqOrVv0VP2fpWNRYiA+xMq+oBCB6KcGpL60HKWQ==",
       "cpu": [
         "arm64"
       ],
@@ -3765,9 +3765,9 @@
       }
     },
     "node_modules/@swc/core-darwin-x64": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.35.tgz",
-      "integrity": "sha512-oOSkSGWtALovaw22lNevKD434OQTPf8X+dVPvPMrJXJpJ34dWDlFWpLntoc+arvKLNZ7LQmTuk8rR1hkrAY7cw==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.41.tgz",
+      "integrity": "sha512-0RoVyiPCnylf3TG77C3S86PRSmaq+SaYB4VDLJFz3qcEHz1pfP0LhyskhgX4wjQV1mveDzFEn1BVAuo0eOMwZA==",
       "cpu": [
         "x64"
       ],
@@ -3781,9 +3781,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.35.tgz",
-      "integrity": "sha512-Yie8k00O6O8BCATS/xeKStquV4OYSskUGRDXBQVDw1FrE23PHaSeHCgg4q6iNZjJzXCOJbaTCKnYoIDn9DMf7A==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.41.tgz",
+      "integrity": "sha512-mZW7GeY7Uw1nkKoWpx898ou20oCSt8MR+jAVuAhMjX+G4Zr0WWXYSigWNiRymhR6Q9KhyvoFpMckguSvYWmXsw==",
       "cpu": [
         "arm"
       ],
@@ -3797,9 +3797,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.35.tgz",
-      "integrity": "sha512-Zlv3WHa/4x2p51HSvjUWXHfSe1Gl2prqImUZJc8NZOlj75BFzVuR0auhQ+LbwvIQ3gaA1LODX9lyS9wXL3yjxA==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.41.tgz",
+      "integrity": "sha512-e91LGn+6KuLFw3sWk5swwGc/dP4tXs0mg3HrhjImRoofU02Bb9aHcj5zgrSO8ZByvDtm/Knn16h1ojxIMOFaxg==",
       "cpu": [
         "arm64"
       ],
@@ -3813,9 +3813,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.35.tgz",
-      "integrity": "sha512-u6tCYsrSyZ8U+4jLMA/O82veBfLy2aUpn51WxQaeH7wqZGy9TGSJXoO8vWxARQ6b72vjsnKDJHP4MD8hFwcctg==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.41.tgz",
+      "integrity": "sha512-Q7hmrniLWsQ7zjtImGcjx1tl5/Qxpel+fC+OXTnGvAyyoGssSftIBlXMnqVLteL78zhxIPAzi+gizWAe5RGqrA==",
       "cpu": [
         "arm64"
       ],
@@ -3829,9 +3829,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.35.tgz",
-      "integrity": "sha512-Dtxf2IbeH7XlNhP1Qt2/MvUPkpEbn7hhGfpSRs4ot8D3Vf5QEX4S/QtC1OsFWuciiYgHAT1Ybjt4xZic9DSkmA==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.41.tgz",
+      "integrity": "sha512-h4sv1sCfZQgRIwmykz8WPqVpbvHb13Qm3SsrbOudhAp2MuzpWzsgMP5hAEpdCP/nWreiCz3aoM6L8JeakRDq0g==",
       "cpu": [
         "x64"
       ],
@@ -3845,9 +3845,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.35.tgz",
-      "integrity": "sha512-4XavNJ60GprjpTiESCu5daJUnmErixPAqDitJSMu4TV32LNIE8G00S9pDLXinDTW1rgcGtQdq1NLkNRmwwovtg==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.41.tgz",
+      "integrity": "sha512-Z7c26i38378d0NT/dcz8qPSAXm41lqhNzykdhKhI+95mA9m4pskP18T/0I45rmyx1ywifypu+Ip+SXmKeVSPgQ==",
       "cpu": [
         "x64"
       ],
@@ -3861,9 +3861,9 @@
       }
     },
     "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.35.tgz",
-      "integrity": "sha512-dNGfKCUSX2M4qVyaS80Lyos0FkXyHRCvrdQ2Y4Hrg3FVokiuw3yY6fLohpUfQ5ws3n2A39dh7jGDeh34+l0sGA==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.41.tgz",
+      "integrity": "sha512-I0CYnPc+ZGc912YeN0TykIOf/Q7yJQHRwDuhewwD6RkbiSEaVfSux5pAmmdoKw2aGMSq+cwLmgPe9HYLRNz+4w==",
       "cpu": [
         "arm64"
       ],
@@ -3877,9 +3877,9 @@
       }
     },
     "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.35.tgz",
-      "integrity": "sha512-ChuPSrDR+JBf7S7dEKPicnG8A3bM0uWPsW2vG+V2wH4iNfNxKVemESHosmYVeEZXqMpomNMvLyeHep1rjRsc0Q==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.41.tgz",
+      "integrity": "sha512-EygN4CVDWF29/U2T5fXGfWyLvRbMd2hiUgkciAl7zHuyJ6nKl+kpodqV2A0Wd4sFtSNedU0gQEBEXEe7cqvmsA==",
       "cpu": [
         "ia32"
       ],
@@ -3893,9 +3893,9 @@
       }
     },
     "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.35.tgz",
-      "integrity": "sha512-/RvphT4WfuGfIK84Ha0dovdPrKB1bW/mc+dtdmhv2E3EGkNc5FoueNwYmXWRimxnU7X0X7IkcRhyKB4G5DeAmg==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.41.tgz",
+      "integrity": "sha512-Mfp8qD1hNwWWRy0ISdwQJu1g0UYoVTtuQlO0z3aGbXqL51ew9e56+8j3M1U9i95lXFyWkARgjDCcKkQi+WezyA==",
       "cpu": [
         "x64"
       ],
@@ -4191,101 +4191,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@typescript-eslint/types": {
-      "version": "5.54.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.1.tgz",
-      "integrity": "sha512-G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw==",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.54.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.1.tgz",
-      "integrity": "sha512-bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg==",
-      "dependencies": {
-        "@typescript-eslint/types": "5.54.1",
-        "@typescript-eslint/visitor-keys": "5.54.1",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.54.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.1.tgz",
-      "integrity": "sha512-q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg==",
-      "dependencies": {
-        "@typescript-eslint/types": "5.54.1",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -4895,14 +4800,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/ast-module-types": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-3.0.0.tgz",
-      "integrity": "sha512-CMxMCOCS+4D+DkOQfuZf+vLrSEmY/7xtORwdxs4wtcC1wVgvk2MqFFTwQCFhvWsI4KPU9lcWXPI8DgRiz+xetQ==",
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
     "node_modules/async-each": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
@@ -6557,6 +6454,7 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -6685,20 +6583,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/detective-typescript": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-9.0.0.tgz",
-      "integrity": "sha512-lR78AugfUSBojwlSRZBeEqQ1l8LI7rbxOl1qTUnGLcjZQDjZmrZCb7R46rK8U8B5WzFvJrxa7fEBA8FoD/n5fA==",
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "^5.13.0",
-        "ast-module-types": "^3.0.0",
-        "node-source-walk": "^5.0.0",
-        "typescript": "^4.5.5"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
-      }
-    },
     "node_modules/didyoumean": {
       "version": "1.2.2",
       "license": "Apache-2.0"
@@ -6733,6 +6617,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -7122,6 +7007,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
       "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
@@ -8532,6 +8418,7 @@
     },
     "node_modules/ignore": {
       "version": "5.2.4",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -10385,6 +10272,7 @@
     },
     "node_modules/lru-cache": {
       "version": "6.0.0",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
@@ -10740,6 +10628,7 @@
     },
     "node_modules/ms": {
       "version": "2.1.2",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/msgpackr": {
@@ -10940,17 +10829,6 @@
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
       "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="
     },
-    "node_modules/node-source-walk": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-5.0.0.tgz",
-      "integrity": "sha512-58APXoMXpmmU+oVBJFajhTCoD8d/OGtngnVAWzIo2A8yn0IXwBzvIVIsTzoie/SrA37u+1hnpNz2HMWx/VIqlw==",
-      "dependencies": {
-        "@babel/parser": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "license": "MIT",
@@ -11470,6 +11348,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -13191,6 +13070,7 @@
     },
     "node_modules/slash": {
       "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -14219,25 +14099,6 @@
       "dev": true,
       "license": "0BSD"
     },
-    "node_modules/tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-      }
-    },
-    "node_modules/tsutils/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
     "node_modules/tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -14366,18 +14227,6 @@
       "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
       "dev": true
     },
-    "node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
     "node_modules/union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -15760,6 +15609,7 @@
     },
     "node_modules/yallist": {
       "version": "4.0.0",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/yaml": {
@@ -16105,7 +15955,8 @@
     "@babel/parser": {
       "version": "7.21.3",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
-      "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ=="
+      "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==",
+      "dev": true
     },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
@@ -17971,90 +17822,90 @@
       }
     },
     "@swc/core": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.35.tgz",
-      "integrity": "sha512-KmiBin0XSVzJhzX19zTiCqmLslZ40Cl7zqskJcTDeIrRhfgKdiAsxzYUanJgMJIRjYtl9Kcg1V/Ip2o2wL8v3w==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.41.tgz",
+      "integrity": "sha512-v6P2dfqJDpZ/7RXPvWge9oI6YgolDM0jtNhQZ2qdXrLBzaWQdDoBGBTJ8KN/nTgGhX3IkNvSB1fafXQ+nVnqAQ==",
       "dev": true,
       "requires": {
-        "@swc/core-darwin-arm64": "1.3.35",
-        "@swc/core-darwin-x64": "1.3.35",
-        "@swc/core-linux-arm-gnueabihf": "1.3.35",
-        "@swc/core-linux-arm64-gnu": "1.3.35",
-        "@swc/core-linux-arm64-musl": "1.3.35",
-        "@swc/core-linux-x64-gnu": "1.3.35",
-        "@swc/core-linux-x64-musl": "1.3.35",
-        "@swc/core-win32-arm64-msvc": "1.3.35",
-        "@swc/core-win32-ia32-msvc": "1.3.35",
-        "@swc/core-win32-x64-msvc": "1.3.35"
+        "@swc/core-darwin-arm64": "1.3.41",
+        "@swc/core-darwin-x64": "1.3.41",
+        "@swc/core-linux-arm-gnueabihf": "1.3.41",
+        "@swc/core-linux-arm64-gnu": "1.3.41",
+        "@swc/core-linux-arm64-musl": "1.3.41",
+        "@swc/core-linux-x64-gnu": "1.3.41",
+        "@swc/core-linux-x64-musl": "1.3.41",
+        "@swc/core-win32-arm64-msvc": "1.3.41",
+        "@swc/core-win32-ia32-msvc": "1.3.41",
+        "@swc/core-win32-x64-msvc": "1.3.41"
       }
     },
     "@swc/core-darwin-arm64": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.35.tgz",
-      "integrity": "sha512-zQUFkHx4gZpu0uo2IspvPnKsz8bsdXd5bC33xwjtoAI1cpLerDyqo4v2zIahEp+FdKZjyVsLHtfJiQiA1Qka3A==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.41.tgz",
+      "integrity": "sha512-D4fybODToO/BvuP35bionDUrSuTVVr8eW+mApr1unOqb3mfiqOrVv0VP2fpWNRYiA+xMq+oBCB6KcGpL60HKWQ==",
       "dev": true,
       "optional": true
     },
     "@swc/core-darwin-x64": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.35.tgz",
-      "integrity": "sha512-oOSkSGWtALovaw22lNevKD434OQTPf8X+dVPvPMrJXJpJ34dWDlFWpLntoc+arvKLNZ7LQmTuk8rR1hkrAY7cw==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.41.tgz",
+      "integrity": "sha512-0RoVyiPCnylf3TG77C3S86PRSmaq+SaYB4VDLJFz3qcEHz1pfP0LhyskhgX4wjQV1mveDzFEn1BVAuo0eOMwZA==",
       "dev": true,
       "optional": true
     },
     "@swc/core-linux-arm-gnueabihf": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.35.tgz",
-      "integrity": "sha512-Yie8k00O6O8BCATS/xeKStquV4OYSskUGRDXBQVDw1FrE23PHaSeHCgg4q6iNZjJzXCOJbaTCKnYoIDn9DMf7A==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.41.tgz",
+      "integrity": "sha512-mZW7GeY7Uw1nkKoWpx898ou20oCSt8MR+jAVuAhMjX+G4Zr0WWXYSigWNiRymhR6Q9KhyvoFpMckguSvYWmXsw==",
       "dev": true,
       "optional": true
     },
     "@swc/core-linux-arm64-gnu": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.35.tgz",
-      "integrity": "sha512-Zlv3WHa/4x2p51HSvjUWXHfSe1Gl2prqImUZJc8NZOlj75BFzVuR0auhQ+LbwvIQ3gaA1LODX9lyS9wXL3yjxA==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.41.tgz",
+      "integrity": "sha512-e91LGn+6KuLFw3sWk5swwGc/dP4tXs0mg3HrhjImRoofU02Bb9aHcj5zgrSO8ZByvDtm/Knn16h1ojxIMOFaxg==",
       "dev": true,
       "optional": true
     },
     "@swc/core-linux-arm64-musl": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.35.tgz",
-      "integrity": "sha512-u6tCYsrSyZ8U+4jLMA/O82veBfLy2aUpn51WxQaeH7wqZGy9TGSJXoO8vWxARQ6b72vjsnKDJHP4MD8hFwcctg==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.41.tgz",
+      "integrity": "sha512-Q7hmrniLWsQ7zjtImGcjx1tl5/Qxpel+fC+OXTnGvAyyoGssSftIBlXMnqVLteL78zhxIPAzi+gizWAe5RGqrA==",
       "dev": true,
       "optional": true
     },
     "@swc/core-linux-x64-gnu": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.35.tgz",
-      "integrity": "sha512-Dtxf2IbeH7XlNhP1Qt2/MvUPkpEbn7hhGfpSRs4ot8D3Vf5QEX4S/QtC1OsFWuciiYgHAT1Ybjt4xZic9DSkmA==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.41.tgz",
+      "integrity": "sha512-h4sv1sCfZQgRIwmykz8WPqVpbvHb13Qm3SsrbOudhAp2MuzpWzsgMP5hAEpdCP/nWreiCz3aoM6L8JeakRDq0g==",
       "dev": true,
       "optional": true
     },
     "@swc/core-linux-x64-musl": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.35.tgz",
-      "integrity": "sha512-4XavNJ60GprjpTiESCu5daJUnmErixPAqDitJSMu4TV32LNIE8G00S9pDLXinDTW1rgcGtQdq1NLkNRmwwovtg==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.41.tgz",
+      "integrity": "sha512-Z7c26i38378d0NT/dcz8qPSAXm41lqhNzykdhKhI+95mA9m4pskP18T/0I45rmyx1ywifypu+Ip+SXmKeVSPgQ==",
       "dev": true,
       "optional": true
     },
     "@swc/core-win32-arm64-msvc": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.35.tgz",
-      "integrity": "sha512-dNGfKCUSX2M4qVyaS80Lyos0FkXyHRCvrdQ2Y4Hrg3FVokiuw3yY6fLohpUfQ5ws3n2A39dh7jGDeh34+l0sGA==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.41.tgz",
+      "integrity": "sha512-I0CYnPc+ZGc912YeN0TykIOf/Q7yJQHRwDuhewwD6RkbiSEaVfSux5pAmmdoKw2aGMSq+cwLmgPe9HYLRNz+4w==",
       "dev": true,
       "optional": true
     },
     "@swc/core-win32-ia32-msvc": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.35.tgz",
-      "integrity": "sha512-ChuPSrDR+JBf7S7dEKPicnG8A3bM0uWPsW2vG+V2wH4iNfNxKVemESHosmYVeEZXqMpomNMvLyeHep1rjRsc0Q==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.41.tgz",
+      "integrity": "sha512-EygN4CVDWF29/U2T5fXGfWyLvRbMd2hiUgkciAl7zHuyJ6nKl+kpodqV2A0Wd4sFtSNedU0gQEBEXEe7cqvmsA==",
       "dev": true,
       "optional": true
     },
     "@swc/core-win32-x64-msvc": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.35.tgz",
-      "integrity": "sha512-/RvphT4WfuGfIK84Ha0dovdPrKB1bW/mc+dtdmhv2E3EGkNc5FoueNwYmXWRimxnU7X0X7IkcRhyKB4G5DeAmg==",
+      "version": "1.3.41",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.41.tgz",
+      "integrity": "sha512-Mfp8qD1hNwWWRy0ISdwQJu1g0UYoVTtuQlO0z3aGbXqL51ew9e56+8j3M1U9i95lXFyWkARgjDCcKkQi+WezyA==",
       "dev": true,
       "optional": true
     },
@@ -18615,62 +18466,6 @@
       "version": "20.2.1",
       "dev": true
     },
-    "@typescript-eslint/types": {
-      "version": "5.54.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.1.tgz",
-      "integrity": "sha512-G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw=="
-    },
-    "@typescript-eslint/typescript-estree": {
-      "version": "5.54.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.1.tgz",
-      "integrity": "sha512-bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg==",
-      "requires": {
-        "@typescript-eslint/types": "5.54.1",
-        "@typescript-eslint/visitor-keys": "5.54.1",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "array-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-          "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
-        },
-        "globby": {
-          "version": "11.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-          "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-          "requires": {
-            "array-union": "^2.1.0",
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.2.9",
-            "ignore": "^5.2.0",
-            "merge2": "^1.4.1",
-            "slash": "^3.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "@typescript-eslint/visitor-keys": {
-      "version": "5.54.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.1.tgz",
-      "integrity": "sha512-q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg==",
-      "requires": {
-        "@typescript-eslint/types": "5.54.1",
-        "eslint-visitor-keys": "^3.3.0"
-      }
-    },
     "@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -19188,11 +18983,6 @@
       "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
       "dev": true
     },
-    "ast-module-types": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-3.0.0.tgz",
-      "integrity": "sha512-CMxMCOCS+4D+DkOQfuZf+vLrSEmY/7xtORwdxs4wtcC1wVgvk2MqFFTwQCFhvWsI4KPU9lcWXPI8DgRiz+xetQ=="
-    },
     "async-each": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
@@ -20432,6 +20222,7 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
@@ -20516,17 +20307,6 @@
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "dev": true
     },
-    "detective-typescript": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-9.0.0.tgz",
-      "integrity": "sha512-lR78AugfUSBojwlSRZBeEqQ1l8LI7rbxOl1qTUnGLcjZQDjZmrZCb7R46rK8U8B5WzFvJrxa7fEBA8FoD/n5fA==",
-      "requires": {
-        "@typescript-eslint/typescript-estree": "^5.13.0",
-        "ast-module-types": "^3.0.0",
-        "node-source-walk": "^5.0.0",
-        "typescript": "^4.5.5"
-      }
-    },
     "didyoumean": {
       "version": "1.2.2"
     },
@@ -20559,6 +20339,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
       "requires": {
         "path-type": "^4.0.0"
       }
@@ -20877,7 +20658,8 @@
     "eslint-visitor-keys": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true
     },
     "espree": {
       "version": "9.5.0",
@@ -21831,7 +21613,8 @@
       "dev": true
     },
     "ignore": {
-      "version": "5.2.4"
+      "version": "5.2.4",
+      "dev": true
     },
     "immutable": {
       "version": "4.2.2",
@@ -23231,6 +23014,7 @@
     },
     "lru-cache": {
       "version": "6.0.0",
+      "dev": true,
       "requires": {
         "yallist": "^4.0.0"
       }
@@ -23498,7 +23282,8 @@
       }
     },
     "ms": {
-      "version": "2.1.2"
+      "version": "2.1.2",
+      "dev": true
     },
     "msgpackr": {
       "version": "1.8.2",
@@ -23662,14 +23447,6 @@
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
       "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="
     },
-    "node-source-walk": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-5.0.0.tgz",
-      "integrity": "sha512-58APXoMXpmmU+oVBJFajhTCoD8d/OGtngnVAWzIo2A8yn0IXwBzvIVIsTzoie/SrA37u+1hnpNz2HMWx/VIqlw==",
-      "requires": {
-        "@babel/parser": "^7.0.0"
-      }
-    },
     "normalize-path": {
       "version": "3.0.0"
     },
@@ -24037,7 +23814,8 @@
     "path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true
     },
     "pbkdf2": {
       "version": "3.1.2",
@@ -25184,7 +24962,8 @@
       "dev": true
     },
     "slash": {
-      "version": "3.0.0"
+      "version": "3.0.0",
+      "dev": true
     },
     "snapdragon": {
       "version": "0.8.2",
@@ -25720,7 +25499,7 @@
       "version": "file:",
       "requires": {
         "@swc/cli": "0.1.62",
-        "@swc/core": "1.3.35",
+        "@swc/core": "1.3.41",
         "@swc/jest": "0.2.24",
         "@swc/register": "0.1.10",
         "@tailwindcss/integrations-content-resolution": "file:integrations/content-resolution",
@@ -25740,7 +25519,6 @@
         "color-name": "^1.1.4",
         "concurrently": "^7.5.0",
         "cssnano": "^5.1.15",
-        "detective-typescript": "^9.0.0",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
         "esbuild": "^0.17.10",
@@ -26043,7 +25821,8 @@
         "@babel/parser": {
           "version": "7.21.3",
           "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
-          "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ=="
+          "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==",
+          "dev": true
         },
         "@babel/plugin-syntax-async-generators": {
           "version": "7.8.4",
@@ -27909,90 +27688,90 @@
           }
         },
         "@swc/core": {
-          "version": "1.3.35",
-          "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.35.tgz",
-          "integrity": "sha512-KmiBin0XSVzJhzX19zTiCqmLslZ40Cl7zqskJcTDeIrRhfgKdiAsxzYUanJgMJIRjYtl9Kcg1V/Ip2o2wL8v3w==",
+          "version": "1.3.41",
+          "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.41.tgz",
+          "integrity": "sha512-v6P2dfqJDpZ/7RXPvWge9oI6YgolDM0jtNhQZ2qdXrLBzaWQdDoBGBTJ8KN/nTgGhX3IkNvSB1fafXQ+nVnqAQ==",
           "dev": true,
           "requires": {
-            "@swc/core-darwin-arm64": "1.3.35",
-            "@swc/core-darwin-x64": "1.3.35",
-            "@swc/core-linux-arm-gnueabihf": "1.3.35",
-            "@swc/core-linux-arm64-gnu": "1.3.35",
-            "@swc/core-linux-arm64-musl": "1.3.35",
-            "@swc/core-linux-x64-gnu": "1.3.35",
-            "@swc/core-linux-x64-musl": "1.3.35",
-            "@swc/core-win32-arm64-msvc": "1.3.35",
-            "@swc/core-win32-ia32-msvc": "1.3.35",
-            "@swc/core-win32-x64-msvc": "1.3.35"
+            "@swc/core-darwin-arm64": "1.3.41",
+            "@swc/core-darwin-x64": "1.3.41",
+            "@swc/core-linux-arm-gnueabihf": "1.3.41",
+            "@swc/core-linux-arm64-gnu": "1.3.41",
+            "@swc/core-linux-arm64-musl": "1.3.41",
+            "@swc/core-linux-x64-gnu": "1.3.41",
+            "@swc/core-linux-x64-musl": "1.3.41",
+            "@swc/core-win32-arm64-msvc": "1.3.41",
+            "@swc/core-win32-ia32-msvc": "1.3.41",
+            "@swc/core-win32-x64-msvc": "1.3.41"
           }
         },
         "@swc/core-darwin-arm64": {
-          "version": "1.3.35",
-          "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.35.tgz",
-          "integrity": "sha512-zQUFkHx4gZpu0uo2IspvPnKsz8bsdXd5bC33xwjtoAI1cpLerDyqo4v2zIahEp+FdKZjyVsLHtfJiQiA1Qka3A==",
+          "version": "1.3.41",
+          "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.41.tgz",
+          "integrity": "sha512-D4fybODToO/BvuP35bionDUrSuTVVr8eW+mApr1unOqb3mfiqOrVv0VP2fpWNRYiA+xMq+oBCB6KcGpL60HKWQ==",
           "dev": true,
           "optional": true
         },
         "@swc/core-darwin-x64": {
-          "version": "1.3.35",
-          "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.35.tgz",
-          "integrity": "sha512-oOSkSGWtALovaw22lNevKD434OQTPf8X+dVPvPMrJXJpJ34dWDlFWpLntoc+arvKLNZ7LQmTuk8rR1hkrAY7cw==",
+          "version": "1.3.41",
+          "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.41.tgz",
+          "integrity": "sha512-0RoVyiPCnylf3TG77C3S86PRSmaq+SaYB4VDLJFz3qcEHz1pfP0LhyskhgX4wjQV1mveDzFEn1BVAuo0eOMwZA==",
           "dev": true,
           "optional": true
         },
         "@swc/core-linux-arm-gnueabihf": {
-          "version": "1.3.35",
-          "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.35.tgz",
-          "integrity": "sha512-Yie8k00O6O8BCATS/xeKStquV4OYSskUGRDXBQVDw1FrE23PHaSeHCgg4q6iNZjJzXCOJbaTCKnYoIDn9DMf7A==",
+          "version": "1.3.41",
+          "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.41.tgz",
+          "integrity": "sha512-mZW7GeY7Uw1nkKoWpx898ou20oCSt8MR+jAVuAhMjX+G4Zr0WWXYSigWNiRymhR6Q9KhyvoFpMckguSvYWmXsw==",
           "dev": true,
           "optional": true
         },
         "@swc/core-linux-arm64-gnu": {
-          "version": "1.3.35",
-          "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.35.tgz",
-          "integrity": "sha512-Zlv3WHa/4x2p51HSvjUWXHfSe1Gl2prqImUZJc8NZOlj75BFzVuR0auhQ+LbwvIQ3gaA1LODX9lyS9wXL3yjxA==",
+          "version": "1.3.41",
+          "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.41.tgz",
+          "integrity": "sha512-e91LGn+6KuLFw3sWk5swwGc/dP4tXs0mg3HrhjImRoofU02Bb9aHcj5zgrSO8ZByvDtm/Knn16h1ojxIMOFaxg==",
           "dev": true,
           "optional": true
         },
         "@swc/core-linux-arm64-musl": {
-          "version": "1.3.35",
-          "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.35.tgz",
-          "integrity": "sha512-u6tCYsrSyZ8U+4jLMA/O82veBfLy2aUpn51WxQaeH7wqZGy9TGSJXoO8vWxARQ6b72vjsnKDJHP4MD8hFwcctg==",
+          "version": "1.3.41",
+          "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.41.tgz",
+          "integrity": "sha512-Q7hmrniLWsQ7zjtImGcjx1tl5/Qxpel+fC+OXTnGvAyyoGssSftIBlXMnqVLteL78zhxIPAzi+gizWAe5RGqrA==",
           "dev": true,
           "optional": true
         },
         "@swc/core-linux-x64-gnu": {
-          "version": "1.3.35",
-          "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.35.tgz",
-          "integrity": "sha512-Dtxf2IbeH7XlNhP1Qt2/MvUPkpEbn7hhGfpSRs4ot8D3Vf5QEX4S/QtC1OsFWuciiYgHAT1Ybjt4xZic9DSkmA==",
+          "version": "1.3.41",
+          "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.41.tgz",
+          "integrity": "sha512-h4sv1sCfZQgRIwmykz8WPqVpbvHb13Qm3SsrbOudhAp2MuzpWzsgMP5hAEpdCP/nWreiCz3aoM6L8JeakRDq0g==",
           "dev": true,
           "optional": true
         },
         "@swc/core-linux-x64-musl": {
-          "version": "1.3.35",
-          "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.35.tgz",
-          "integrity": "sha512-4XavNJ60GprjpTiESCu5daJUnmErixPAqDitJSMu4TV32LNIE8G00S9pDLXinDTW1rgcGtQdq1NLkNRmwwovtg==",
+          "version": "1.3.41",
+          "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.41.tgz",
+          "integrity": "sha512-Z7c26i38378d0NT/dcz8qPSAXm41lqhNzykdhKhI+95mA9m4pskP18T/0I45rmyx1ywifypu+Ip+SXmKeVSPgQ==",
           "dev": true,
           "optional": true
         },
         "@swc/core-win32-arm64-msvc": {
-          "version": "1.3.35",
-          "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.35.tgz",
-          "integrity": "sha512-dNGfKCUSX2M4qVyaS80Lyos0FkXyHRCvrdQ2Y4Hrg3FVokiuw3yY6fLohpUfQ5ws3n2A39dh7jGDeh34+l0sGA==",
+          "version": "1.3.41",
+          "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.41.tgz",
+          "integrity": "sha512-I0CYnPc+ZGc912YeN0TykIOf/Q7yJQHRwDuhewwD6RkbiSEaVfSux5pAmmdoKw2aGMSq+cwLmgPe9HYLRNz+4w==",
           "dev": true,
           "optional": true
         },
         "@swc/core-win32-ia32-msvc": {
-          "version": "1.3.35",
-          "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.35.tgz",
-          "integrity": "sha512-ChuPSrDR+JBf7S7dEKPicnG8A3bM0uWPsW2vG+V2wH4iNfNxKVemESHosmYVeEZXqMpomNMvLyeHep1rjRsc0Q==",
+          "version": "1.3.41",
+          "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.41.tgz",
+          "integrity": "sha512-EygN4CVDWF29/U2T5fXGfWyLvRbMd2hiUgkciAl7zHuyJ6nKl+kpodqV2A0Wd4sFtSNedU0gQEBEXEe7cqvmsA==",
           "dev": true,
           "optional": true
         },
         "@swc/core-win32-x64-msvc": {
-          "version": "1.3.35",
-          "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.35.tgz",
-          "integrity": "sha512-/RvphT4WfuGfIK84Ha0dovdPrKB1bW/mc+dtdmhv2E3EGkNc5FoueNwYmXWRimxnU7X0X7IkcRhyKB4G5DeAmg==",
+          "version": "1.3.41",
+          "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.41.tgz",
+          "integrity": "sha512-Mfp8qD1hNwWWRy0ISdwQJu1g0UYoVTtuQlO0z3aGbXqL51ew9e56+8j3M1U9i95lXFyWkARgjDCcKkQi+WezyA==",
           "dev": true,
           "optional": true
         },
@@ -28553,62 +28332,6 @@
           "version": "20.2.1",
           "dev": true
         },
-        "@typescript-eslint/types": {
-          "version": "5.54.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.1.tgz",
-          "integrity": "sha512-G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw=="
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "5.54.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.1.tgz",
-          "integrity": "sha512-bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg==",
-          "requires": {
-            "@typescript-eslint/types": "5.54.1",
-            "@typescript-eslint/visitor-keys": "5.54.1",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.3.7",
-            "tsutils": "^3.21.0"
-          },
-          "dependencies": {
-            "array-union": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-              "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
-            },
-            "globby": {
-              "version": "11.1.0",
-              "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-              "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-              "requires": {
-                "array-union": "^2.1.0",
-                "dir-glob": "^3.0.1",
-                "fast-glob": "^3.2.9",
-                "ignore": "^5.2.0",
-                "merge2": "^1.4.1",
-                "slash": "^3.0.0"
-              }
-            },
-            "semver": {
-              "version": "7.3.8",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-              "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-              "requires": {
-                "lru-cache": "^6.0.0"
-              }
-            }
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.54.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.1.tgz",
-          "integrity": "sha512-q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg==",
-          "requires": {
-            "@typescript-eslint/types": "5.54.1",
-            "eslint-visitor-keys": "^3.3.0"
-          }
-        },
         "@webassemblyjs/ast": {
           "version": "1.11.1",
           "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -29126,11 +28849,6 @@
           "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
           "dev": true
         },
-        "ast-module-types": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-3.0.0.tgz",
-          "integrity": "sha512-CMxMCOCS+4D+DkOQfuZf+vLrSEmY/7xtORwdxs4wtcC1wVgvk2MqFFTwQCFhvWsI4KPU9lcWXPI8DgRiz+xetQ=="
-        },
         "async-each": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
@@ -30370,6 +30088,7 @@
           "version": "4.3.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
           "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
           "requires": {
             "ms": "2.1.2"
           }
@@ -30454,17 +30173,6 @@
           "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
           "dev": true
         },
-        "detective-typescript": {
-          "version": "9.0.0",
-          "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-9.0.0.tgz",
-          "integrity": "sha512-lR78AugfUSBojwlSRZBeEqQ1l8LI7rbxOl1qTUnGLcjZQDjZmrZCb7R46rK8U8B5WzFvJrxa7fEBA8FoD/n5fA==",
-          "requires": {
-            "@typescript-eslint/typescript-estree": "^5.13.0",
-            "ast-module-types": "^3.0.0",
-            "node-source-walk": "^5.0.0",
-            "typescript": "^4.5.5"
-          }
-        },
         "didyoumean": {
           "version": "1.2.2"
         },
@@ -30497,6 +30205,7 @@
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
           "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+          "dev": true,
           "requires": {
             "path-type": "^4.0.0"
           }
@@ -30815,7 +30524,8 @@
         "eslint-visitor-keys": {
           "version": "3.3.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="
+          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+          "dev": true
         },
         "espree": {
           "version": "9.5.0",
@@ -31769,7 +31479,8 @@
           "dev": true
         },
         "ignore": {
-          "version": "5.2.4"
+          "version": "5.2.4",
+          "dev": true
         },
         "immutable": {
           "version": "4.2.2",
@@ -33169,6 +32880,7 @@
         },
         "lru-cache": {
           "version": "6.0.0",
+          "dev": true,
           "requires": {
             "yallist": "^4.0.0"
           }
@@ -33436,7 +33148,8 @@
           }
         },
         "ms": {
-          "version": "2.1.2"
+          "version": "2.1.2",
+          "dev": true
         },
         "msgpackr": {
           "version": "1.8.2",
@@ -33600,14 +33313,6 @@
           "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
           "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="
         },
-        "node-source-walk": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-5.0.0.tgz",
-          "integrity": "sha512-58APXoMXpmmU+oVBJFajhTCoD8d/OGtngnVAWzIo2A8yn0IXwBzvIVIsTzoie/SrA37u+1hnpNz2HMWx/VIqlw==",
-          "requires": {
-            "@babel/parser": "^7.0.0"
-          }
-        },
         "normalize-path": {
           "version": "3.0.0"
         },
@@ -33975,7 +33680,8 @@
         "path-type": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
+          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+          "dev": true
         },
         "pbkdf2": {
           "version": "3.1.2",
@@ -35122,7 +34828,8 @@
           "dev": true
         },
         "slash": {
-          "version": "3.0.0"
+          "version": "3.0.0",
+          "dev": true
         },
         "snapdragon": {
           "version": "0.8.2",
@@ -35915,21 +35622,6 @@
           "version": "2.4.1",
           "dev": true
         },
-        "tsutils": {
-          "version": "3.21.0",
-          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-          "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-          "requires": {
-            "tslib": "^1.8.1"
-          },
-          "dependencies": {
-            "tslib": {
-              "version": "1.14.1",
-              "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-              "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-            }
-          }
-        },
         "tty-browserify": {
           "version": "0.0.0",
           "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -36008,11 +35700,6 @@
           "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
           "dev": true
         },
-        "typescript": {
-          "version": "4.9.5",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-          "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="
-        },
         "union-value": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -36975,7 +36662,8 @@
           "dev": true
         },
         "yallist": {
-          "version": "4.0.0"
+          "version": "4.0.0",
+          "dev": true
         },
         "yaml": {
           "version": "1.10.2"
@@ -37264,21 +36952,6 @@
       "version": "2.4.1",
       "dev": true
     },
-    "tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "requires": {
-        "tslib": "^1.8.1"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        }
-      }
-    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -37357,11 +37030,6 @@
       "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
       "dev": true
     },
-    "typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="
-    },
     "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -38324,7 +37992,8 @@
       "dev": true
     },
     "yallist": {
-      "version": "4.0.0"
+      "version": "4.0.0",
+      "dev": true
     },
     "yaml": {
       "version": "1.10.2"
diff --git a/package-lock.stable.json b/package-lock.stable.json
index 0561cd3a167d..f330fa59a0ce 100644
--- a/package-lock.stable.json
+++ b/package-lock.stable.json
@@ -12,7 +12,6 @@
         "arg": "^5.0.2",
         "chokidar": "^3.5.3",
         "color-name": "^1.1.4",
-        "detective-typescript": "^9.0.0",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
         "fast-glob": "^3.2.12",
@@ -454,6 +453,7 @@
     },
     "node_modules/@babel/parser": {
       "version": "7.18.9",
+      "dev": true,
       "license": "MIT",
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -2048,74 +2048,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@typescript-eslint/types": {
-      "version": "5.55.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.55.0.tgz",
-      "integrity": "sha512-M4iRh4AG1ChrOL6Y+mETEKGeDnT7Sparn6fhZ5LtVJF1909D5O4uqK+C5NPbLmpfZ0XIIxCdwzKiijpZUOvOug==",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.55.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.55.0.tgz",
-      "integrity": "sha512-I7X4A9ovA8gdpWMpr7b1BN9eEbvlEtWhQvpxp/yogt48fy9Lj3iE3ild/1H3jKBBIYj5YYJmS2+9ystVhC7eaQ==",
-      "dependencies": {
-        "@typescript-eslint/types": "5.55.0",
-        "@typescript-eslint/visitor-keys": "5.55.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.55.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.55.0.tgz",
-      "integrity": "sha512-q2dlHHwWgirKh1D3acnuApXG+VNXpEY5/AwRxDVuEQpxWaB0jCDe0jFMVMALJ3ebSfuOVE8/rMS+9ZOYGg1GWw==",
-      "dependencies": {
-        "@typescript-eslint/types": "5.55.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/acorn": {
       "version": "7.4.1",
       "dev": true,
@@ -2265,22 +2197,6 @@
         "sprintf-js": "~1.0.2"
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ast-module-types": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-3.0.0.tgz",
-      "integrity": "sha512-CMxMCOCS+4D+DkOQfuZf+vLrSEmY/7xtORwdxs4wtcC1wVgvk2MqFFTwQCFhvWsI4KPU9lcWXPI8DgRiz+xetQ==",
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
     "node_modules/autoprefixer": {
       "version": "10.4.13",
       "dev": true,
@@ -3375,6 +3291,7 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -3604,20 +3521,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/detective-typescript": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-9.0.0.tgz",
-      "integrity": "sha512-lR78AugfUSBojwlSRZBeEqQ1l8LI7rbxOl1qTUnGLcjZQDjZmrZCb7R46rK8U8B5WzFvJrxa7fEBA8FoD/n5fA==",
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "^5.13.0",
-        "ast-module-types": "^3.0.0",
-        "node-source-walk": "^5.0.0",
-        "typescript": "^4.5.5"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
-      }
-    },
     "node_modules/didyoumean": {
       "version": "1.2.2",
       "license": "Apache-2.0"
@@ -3630,17 +3533,6 @@
         "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/dlv": {
       "version": "1.1.3",
       "license": "MIT"
@@ -4007,6 +3899,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
       "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
@@ -4515,25 +4408,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/got": {
       "version": "8.3.2",
       "dev": true,
@@ -4663,6 +4537,7 @@
     },
     "node_modules/ignore": {
       "version": "5.2.4",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -6228,6 +6103,7 @@
     },
     "node_modules/lru-cache": {
       "version": "6.0.0",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
@@ -6359,6 +6235,7 @@
     },
     "node_modules/ms": {
       "version": "2.1.2",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/mz": {
@@ -6401,17 +6278,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/node-source-walk": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-5.0.0.tgz",
-      "integrity": "sha512-58APXoMXpmmU+oVBJFajhTCoD8d/OGtngnVAWzIo2A8yn0IXwBzvIVIsTzoie/SrA37u+1hnpNz2HMWx/VIqlw==",
-      "dependencies": {
-        "@babel/parser": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "license": "MIT",
@@ -6709,14 +6575,6 @@
       "version": "1.0.7",
       "license": "MIT"
     },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/pend": {
       "version": "1.2.0",
       "dev": true,
@@ -7667,6 +7525,7 @@
     },
     "node_modules/slash": {
       "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -8100,25 +7959,6 @@
       "dev": true,
       "license": "0BSD"
     },
-    "node_modules/tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-      }
-    },
-    "node_modules/tsutils/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "dev": true,
@@ -8245,18 +8085,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
     "node_modules/unbzip2-stream": {
       "version": "1.4.3",
       "dev": true,
@@ -8415,6 +8243,7 @@
     },
     "node_modules/yallist": {
       "version": "4.0.0",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/yaml": {
@@ -8707,7 +8536,8 @@
       }
     },
     "@babel/parser": {
-      "version": "7.18.9"
+      "version": "7.18.9",
+      "dev": true
     },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
@@ -9710,44 +9540,6 @@
       "version": "20.2.1",
       "dev": true
     },
-    "@typescript-eslint/types": {
-      "version": "5.55.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.55.0.tgz",
-      "integrity": "sha512-M4iRh4AG1ChrOL6Y+mETEKGeDnT7Sparn6fhZ5LtVJF1909D5O4uqK+C5NPbLmpfZ0XIIxCdwzKiijpZUOvOug=="
-    },
-    "@typescript-eslint/typescript-estree": {
-      "version": "5.55.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.55.0.tgz",
-      "integrity": "sha512-I7X4A9ovA8gdpWMpr7b1BN9eEbvlEtWhQvpxp/yogt48fy9Lj3iE3ild/1H3jKBBIYj5YYJmS2+9ystVhC7eaQ==",
-      "requires": {
-        "@typescript-eslint/types": "5.55.0",
-        "@typescript-eslint/visitor-keys": "5.55.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "@typescript-eslint/visitor-keys": {
-      "version": "5.55.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.55.0.tgz",
-      "integrity": "sha512-q2dlHHwWgirKh1D3acnuApXG+VNXpEY5/AwRxDVuEQpxWaB0jCDe0jFMVMALJ3ebSfuOVE8/rMS+9ZOYGg1GWw==",
-      "requires": {
-        "@typescript-eslint/types": "5.55.0",
-        "eslint-visitor-keys": "^3.3.0"
-      }
-    },
     "acorn": {
       "version": "7.4.1",
       "dev": true,
@@ -9833,16 +9625,6 @@
         "sprintf-js": "~1.0.2"
       }
     },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
-    },
-    "ast-module-types": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-3.0.0.tgz",
-      "integrity": "sha512-CMxMCOCS+4D+DkOQfuZf+vLrSEmY/7xtORwdxs4wtcC1wVgvk2MqFFTwQCFhvWsI4KPU9lcWXPI8DgRiz+xetQ=="
-    },
     "autoprefixer": {
       "version": "10.4.13",
       "dev": true,
@@ -10528,6 +10310,7 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
@@ -10677,17 +10460,6 @@
       "version": "3.1.0",
       "dev": true
     },
-    "detective-typescript": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-9.0.0.tgz",
-      "integrity": "sha512-lR78AugfUSBojwlSRZBeEqQ1l8LI7rbxOl1qTUnGLcjZQDjZmrZCb7R46rK8U8B5WzFvJrxa7fEBA8FoD/n5fA==",
-      "requires": {
-        "@typescript-eslint/typescript-estree": "^5.13.0",
-        "ast-module-types": "^3.0.0",
-        "node-source-walk": "^5.0.0",
-        "typescript": "^4.5.5"
-      }
-    },
     "didyoumean": {
       "version": "1.2.2"
     },
@@ -10695,14 +10467,6 @@
       "version": "28.1.1",
       "dev": true
     },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
     "dlv": {
       "version": "1.1.3"
     },
@@ -10983,7 +10747,8 @@
     "eslint-visitor-keys": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true
     },
     "espree": {
       "version": "9.4.1",
@@ -11257,19 +11022,6 @@
       "version": "11.12.0",
       "dev": true
     },
-    "globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "requires": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      }
-    },
     "got": {
       "version": "8.3.2",
       "dev": true,
@@ -11349,7 +11101,8 @@
       "dev": true
     },
     "ignore": {
-      "version": "5.2.4"
+      "version": "5.2.4",
+      "dev": true
     },
     "import-fresh": {
       "version": "3.3.0",
@@ -12412,6 +12165,7 @@
     },
     "lru-cache": {
       "version": "6.0.0",
+      "dev": true,
       "requires": {
         "yallist": "^4.0.0"
       }
@@ -12490,7 +12244,8 @@
       }
     },
     "ms": {
-      "version": "2.1.2"
+      "version": "2.1.2",
+      "dev": true
     },
     "mz": {
       "version": "2.7.0",
@@ -12521,14 +12276,6 @@
       "version": "2.0.6",
       "dev": true
     },
-    "node-source-walk": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-5.0.0.tgz",
-      "integrity": "sha512-58APXoMXpmmU+oVBJFajhTCoD8d/OGtngnVAWzIo2A8yn0IXwBzvIVIsTzoie/SrA37u+1hnpNz2HMWx/VIqlw==",
-      "requires": {
-        "@babel/parser": "^7.0.0"
-      }
-    },
     "normalize-path": {
       "version": "3.0.0"
     },
@@ -12703,11 +12450,6 @@
     "path-parse": {
       "version": "1.0.7"
     },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
-    },
     "pend": {
       "version": "1.2.0",
       "dev": true
@@ -13216,7 +12958,8 @@
       "dev": true
     },
     "slash": {
-      "version": "3.0.0"
+      "version": "3.0.0",
+      "dev": true
     },
     "sort-keys": {
       "version": "1.1.2",
@@ -13500,21 +13243,6 @@
       "version": "2.4.1",
       "dev": true
     },
-    "tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "requires": {
-        "tslib": "^1.8.1"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        }
-      }
-    },
     "tunnel-agent": {
       "version": "0.6.0",
       "dev": true,
@@ -13586,11 +13314,6 @@
       "version": "0.20.2",
       "dev": true
     },
-    "typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="
-    },
     "unbzip2-stream": {
       "version": "1.4.3",
       "dev": true,
@@ -13684,7 +13407,8 @@
       "dev": true
     },
     "yallist": {
-      "version": "4.0.0"
+      "version": "4.0.0",
+      "dev": true
     },
     "yaml": {
       "version": "1.10.2"
diff --git a/package.json b/package.json
index a24d599a6052..c4b6480339ac 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,6 @@
     "browserslist": "^4.21.5",
     "chokidar": "^3.5.3",
     "color-name": "^1.1.4",
-    "detective-typescript": "^9.0.0",
     "didyoumean": "^1.2.2",
     "dlv": "^1.1.3",
     "fast-glob": "^3.2.12",
diff --git a/package.stable.json b/package.stable.json
index 1e56317d9082..da68f44b3d13 100644
--- a/package.stable.json
+++ b/package.stable.json
@@ -73,7 +73,6 @@
     "arg": "^5.0.2",
     "chokidar": "^3.5.3",
     "color-name": "^1.1.4",
-    "detective-typescript": "^9.0.0",
     "didyoumean": "^1.2.2",
     "dlv": "^1.1.3",
     "fast-glob": "^3.2.12",
@@ -96,17 +95,26 @@
     "resolve": "^1.22.1",
     "sucrase": "^3.29.0"
   },
-  "browserslist": ["> 1%", "not edge <= 18", "not ie 11", "not op_mini all"],
+  "browserslist": [
+    "> 1%",
+    "not edge <= 18",
+    "not ie 11",
+    "not op_mini all"
+  ],
   "jest": {
     "testTimeout": 30000,
-    "setupFilesAfterEnv": ["<rootDir>/jest/customMatchers.js"],
+    "setupFilesAfterEnv": [
+      "<rootDir>/jest/customMatchers.js"
+    ],
     "testPathIgnorePatterns": [
       "/node_modules/",
       "/integrations/",
       "/standalone-cli/",
       "\\.test\\.skip\\.js$"
     ],
-    "transformIgnorePatterns": ["node_modules/(?!lightningcss)"],
+    "transformIgnorePatterns": [
+      "node_modules/(?!lightningcss)"
+    ],
     "transform": {
       "\\.js$": "@swc/jest",
       "\\.ts$": "@swc/jest"
diff --git a/src/cli/build/watching.js b/src/cli/build/watching.js
index 7a3724348f50..e69cd9f8598c 100644
--- a/src/cli/build/watching.js
+++ b/src/cli/build/watching.js
@@ -89,7 +89,9 @@ export function createWatcher(args, { state, rebuild }) {
     // Resolve the promise even when the rebuild fails
     return rebuild(changes).then(
       () => {},
-      () => {}
+      (e) => {
+        console.error(e.toString())
+      }
     )
   }
 
diff --git a/src/lib/getModuleDependencies.js b/src/lib/getModuleDependencies.js
index c8192bc69adc..7e96985edcf7 100644
--- a/src/lib/getModuleDependencies.js
+++ b/src/lib/getModuleDependencies.js
@@ -1,40 +1,79 @@
 import fs from 'fs'
 import path from 'path'
-import resolve from 'resolve'
-import detective from 'detective-typescript'
 
-function createModule(file) {
-  let source = fs.readFileSync(file, 'utf-8')
-  return { file, requires: detective(source, { mixedImports: true }) }
-}
-
-function* _getModuleDependencies(entryFile) {
-  yield entryFile
+let jsExtensions = ['.js', '.cjs', '.mjs']
 
-  let mod = createModule(entryFile)
+// Given the current file `a.ts`, we want to make sure that when importing `b` that we resolve
+// `b.ts` before `b.js`
+//
+// E.g.:
+//
+// a.ts
+//   b // .ts
+//   c // .ts
+// a.js
+//   b // .js or .ts
 
-  let ext = path.extname(entryFile)
-  let isTypeScript = ext === '.ts' || ext === '.cts' || ext === '.mts'
-  let extensions = [...(isTypeScript ? ['.ts', '.cts', '.mts'] : []), '.js', '.cjs', '.mjs']
+let jsResolutionOrder = ['', '.js', '.cjs', '.mjs', '.ts', '.cts', '.mts', '.jsx', '.tsx']
+let tsResolutionOrder = ['', '.ts', '.cts', '.mts', '.tsx', '.js', '.cjs', '.mjs', '.jsx']
 
-  // Iterate over the modules, even when new
-  // ones are being added
-  for (let dep of mod.requires) {
-    // Only track local modules, not node_modules
-    if (!dep.startsWith('./') && !dep.startsWith('../')) {
-      continue
+function resolveWithExtension(file, extensions) {
+  // Try to find `./a.ts`, `./a.ts`, ... from `./a`
+  for (let ext of extensions) {
+    let full = `${file}${ext}`
+    if (fs.existsSync(full) && fs.statSync(full).isFile()) {
+      return full
     }
+  }
 
-    try {
-      let basedir = path.dirname(mod.file)
-      let depPath = resolve.sync(dep, { basedir, extensions })
-      yield* _getModuleDependencies(depPath)
-    } catch (_err) {
-      // eslint-disable-next-line no-empty
+  // Try to find `./a/index.js` from `./a`
+  for (let ext of extensions) {
+    let full = `${file}/index${ext}`
+    if (fs.existsSync(full)) {
+      return full
     }
   }
+
+  return null
+}
+
+function* _getModuleDependencies(filename, base, seen) {
+  let ext = path.extname(filename)
+
+  // Try to find the file
+  let absoluteFile = resolveWithExtension(
+    path.resolve(base, filename),
+    jsExtensions.includes(ext) ? jsResolutionOrder : tsResolutionOrder
+  )
+  if (absoluteFile === null) return // File doesn't exist
+
+  // Prevent infinite loops when there are circular dependencies
+  if (seen.has(absoluteFile)) return // Already seen
+  seen.add(absoluteFile)
+
+  // Mark the file as a dependency
+  yield absoluteFile
+
+  // Resolve new base for new imports/requires
+  base = path.dirname(absoluteFile)
+
+  let contents = fs.readFileSync(absoluteFile, 'utf-8')
+
+  // Find imports/requires
+  for (let match of [
+    ...contents.matchAll(/import[\s\S]*?['"](.{3,}?)['"]/gi),
+    ...contents.matchAll(/import[\s\S]*from[\s\S]*?['"](.{3,}?)['"]/gi),
+    ...contents.matchAll(/require\(['"`](.{3,})['"`]\)/gi),
+  ]) {
+    // Bail out if it's not a relative file
+    if (!match[1].startsWith('.')) continue
+
+    yield* _getModuleDependencies(match[1], base, seen)
+  }
 }
 
-export default function getModuleDependencies(entryFile) {
-  return new Set(_getModuleDependencies(entryFile))
+export default function getModuleDependencies(absoluteFilePath) {
+  return new Set(
+    _getModuleDependencies(absoluteFilePath, path.dirname(absoluteFilePath), new Set())
+  )
 }

From 439fdadb3abe9da865181f73422a19dc868cae95 Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Mon, 20 Mar 2023 19:02:52 +0100
Subject: [PATCH 56/84] ensure we look at the `extension` from the "parent"
 file

If you have a file `./a.js`, and you import `./b`, then `./b` should be
resolved based on the `./a.js` extension and use the
`jsResolutionOrder`.
---
 src/lib/getModuleDependencies.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/lib/getModuleDependencies.js b/src/lib/getModuleDependencies.js
index 7e96985edcf7..43b39193f5da 100644
--- a/src/lib/getModuleDependencies.js
+++ b/src/lib/getModuleDependencies.js
@@ -37,9 +37,7 @@ function resolveWithExtension(file, extensions) {
   return null
 }
 
-function* _getModuleDependencies(filename, base, seen) {
-  let ext = path.extname(filename)
-
+function* _getModuleDependencies(filename, base, seen, ext = path.extname(filename)) {
   // Try to find the file
   let absoluteFile = resolveWithExtension(
     path.resolve(base, filename),
@@ -56,6 +54,7 @@ function* _getModuleDependencies(filename, base, seen) {
 
   // Resolve new base for new imports/requires
   base = path.dirname(absoluteFile)
+  ext = path.extname(absoluteFile)
 
   let contents = fs.readFileSync(absoluteFile, 'utf-8')
 
@@ -68,7 +67,7 @@ function* _getModuleDependencies(filename, base, seen) {
     // Bail out if it's not a relative file
     if (!match[1].startsWith('.')) continue
 
-    yield* _getModuleDependencies(match[1], base, seen)
+    yield* _getModuleDependencies(match[1], base, seen, ext)
   }
 }
 

From 69d29c9218f593793a1f57e27ebe61a06ece8e9b Mon Sep 17 00:00:00 2001
From: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
Date: Mon, 20 Mar 2023 14:34:31 -0400
Subject: [PATCH 57/84] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be254901c24c..950c0e500eaa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
 - Add `content-normal` and `content-stretch` utilities ([#10645](https://github.com/tailwindlabs/tailwindcss/pull/10645))
 - Add `line-clamp` utilities from `@tailwindcss/line-clamp` to core ([#10768](https://github.com/tailwindlabs/tailwindcss/pull/10768))
-- Enable ESM and TS based config files ([#10785](https://github.com/tailwindlabs/tailwindcss/pull/10785))
+- Support ESM and TypeScript config files ([#10785](https://github.com/tailwindlabs/tailwindcss/pull/10785))
 
 ### Fixed
 

From bac5ecf0040aa9a788d1b22d706506146ee831ff Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Mon, 20 Mar 2023 14:40:35 -0400
Subject: [PATCH 58/84] Add `list-style-image` support (#10817)

* add `listStyle` instead of `listStyleType`

Co-authored-by: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
Co-authored-by: Jordan Pittman <jordan@cryptica.me>

* add `listStyleType` related deprecation warnings

* Implement list-style-image as separate plugin

* Remove unused code, update tests

* Always generate `list-none`, don't pull it from theme

* Gracefully handle missing listStyleType configuration

* Just use `list-image-*` fuck it

* Update changelog

---------

Co-authored-by: Robin Malfait <malfait.robin@gmail.com>
Co-authored-by: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
Co-authored-by: Jordan Pittman <jordan@cryptica.me>
Co-authored-by: Peter Neupauer <peter@neupauer.sk>
---
 CHANGELOG.md                          | 1 +
 src/corePlugins.js                    | 2 +-
 stubs/config.full.js                  | 3 +++
 tests/arbitrary-values.oxide.test.css | 6 ++++++
 tests/arbitrary-values.test.css       | 6 ++++++
 tests/arbitrary-values.test.html      | 2 ++
 tests/basic-usage.oxide.test.css      | 3 +++
 tests/basic-usage.test.css            | 3 +++
 tests/basic-usage.test.js             | 1 +
 9 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 950c0e500eaa..41ddd9bbf099 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `content-normal` and `content-stretch` utilities ([#10645](https://github.com/tailwindlabs/tailwindcss/pull/10645))
 - Add `line-clamp` utilities from `@tailwindcss/line-clamp` to core ([#10768](https://github.com/tailwindlabs/tailwindcss/pull/10768))
 - Support ESM and TypeScript config files ([#10785](https://github.com/tailwindlabs/tailwindcss/pull/10785))
+- Add `list-style-image` utilities ([#10817](https://github.com/tailwindlabs/tailwindcss/pull/10817))
 
 ### Fixed
 
diff --git a/src/corePlugins.js b/src/corePlugins.js
index 147bd8b0119b..d27364857f19 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -1093,8 +1093,8 @@ export let corePlugins = {
       '.list-outside': { 'list-style-position': 'outside' },
     })
   },
-
   listStyleType: createUtilityPlugin('listStyleType', [['list', ['listStyleType']]]),
+  listStyleImage: createUtilityPlugin('listStyleImage', [['list-image', ['listStyleImage']]]),
 
   appearance: ({ addUtilities }) => {
     addUtilities({
diff --git a/stubs/config.full.js b/stubs/config.full.js
index d2c9526390fe..d3637bc9fad3 100644
--- a/stubs/config.full.js
+++ b/stubs/config.full.js
@@ -577,6 +577,9 @@ module.exports = {
       disc: 'disc',
       decimal: 'decimal',
     },
+    listStyleImage: {
+      none: 'none',
+    },
     margin: ({ theme }) => ({
       auto: 'auto',
       ...theme('spacing'),
diff --git a/tests/arbitrary-values.oxide.test.css b/tests/arbitrary-values.oxide.test.css
index 411056bb6c4e..4f3056ea9f21 100644
--- a/tests/arbitrary-values.oxide.test.css
+++ b/tests/arbitrary-values.oxide.test.css
@@ -411,6 +411,12 @@
 .list-\[var\(--value\)\] {
   list-style-type: var(--value);
 }
+.list-image-\[url\(\.\/my-image\.png\)\] {
+  list-style-image: url("./my-image.png");
+}
+.list-image-\[var\(--value\)\] {
+  list-style-image: var(--value);
+}
 .columns-\[20\] {
   columns: 20;
 }
diff --git a/tests/arbitrary-values.test.css b/tests/arbitrary-values.test.css
index a20e619b53f3..e1c624e2b876 100644
--- a/tests/arbitrary-values.test.css
+++ b/tests/arbitrary-values.test.css
@@ -411,6 +411,12 @@
 .list-\[var\(--value\)\] {
   list-style-type: var(--value);
 }
+.list-image-\[url\(\.\/my-image\.png\)\] {
+  list-style-image: url("./my-image.png");
+}
+.list-image-\[var\(--value\)\] {
+  list-style-image: var(--value);
+}
 .columns-\[20\] {
   columns: 20;
 }
diff --git a/tests/arbitrary-values.test.html b/tests/arbitrary-values.test.html
index 047dae8ca9d3..7e65dbf45968 100644
--- a/tests/arbitrary-values.test.html
+++ b/tests/arbitrary-values.test.html
@@ -125,6 +125,8 @@
 
 <div class="list-['\1f44d']"></div>
 <div class="list-[var(--value)]"></div>
+<div class="list-image-[url(./my-image.png)]"></div>
+<div class="list-image-[var(--value)]"></div>
 
 <div class="columns-[20] columns-[var(--columns)]"></div>
 
diff --git a/tests/basic-usage.oxide.test.css b/tests/basic-usage.oxide.test.css
index ac91e67e81f9..c5117b917944 100644
--- a/tests/basic-usage.oxide.test.css
+++ b/tests/basic-usage.oxide.test.css
@@ -408,6 +408,9 @@
 .list-disc {
   list-style-type: disc;
 }
+.list-image-none {
+  list-style-image: none;
+}
 .appearance-none {
   appearance: none;
 }
diff --git a/tests/basic-usage.test.css b/tests/basic-usage.test.css
index 0e39ff9e01ac..55bdc2b3b9ab 100644
--- a/tests/basic-usage.test.css
+++ b/tests/basic-usage.test.css
@@ -408,6 +408,9 @@
 .list-disc {
   list-style-type: disc;
 }
+.list-image-none {
+  list-style-image: none;
+}
 .appearance-none {
   appearance: none;
 }
diff --git a/tests/basic-usage.test.js b/tests/basic-usage.test.js
index 90d480380fce..53c2a4418393 100644
--- a/tests/basic-usage.test.js
+++ b/tests/basic-usage.test.js
@@ -89,6 +89,7 @@ crosscheck(({ stable, oxide }) => {
             <div class="leading-relaxed leading-5"></div>
             <div class="list-inside"></div>
             <div class="list-disc"></div>
+            <div class="list-image-none"></div>
             <div class="m-4 my-2 mx-auto mt-0 mr-1 mb-3 ml-4"></div>
             <div class="max-h-screen"></div>
             <div class="max-w-full"></div>

From 4d2d870addbc9e3d4938777aba5ffe54634c1d0d Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Tue, 21 Mar 2023 09:46:19 +0000
Subject: [PATCH 59/84] Update rollup to version 3.20.0

---
 integrations/rollup-sass/package.json |  2 +-
 integrations/rollup/package.json      |  2 +-
 package-lock.json                     | 30 +++++++++++++--------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/integrations/rollup-sass/package.json b/integrations/rollup-sass/package.json
index 4bd8153d6609..5ea635d854c5 100644
--- a/integrations/rollup-sass/package.json
+++ b/integrations/rollup-sass/package.json
@@ -18,7 +18,7 @@
     }
   },
   "devDependencies": {
-    "rollup": "^3.15.0",
+    "rollup": "^3.20.0",
     "rollup-plugin-postcss": "^4.0.2",
     "sass": "^1.58.3"
   }
diff --git a/integrations/rollup/package.json b/integrations/rollup/package.json
index 2e31c34dc0e7..e8a076e5322c 100644
--- a/integrations/rollup/package.json
+++ b/integrations/rollup/package.json
@@ -18,7 +18,7 @@
     }
   },
   "devDependencies": {
-    "rollup": "^3.15.0",
+    "rollup": "^3.20.0",
     "rollup-plugin-postcss": "^4.0.2"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 26296f5bb034..59b0e58127af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -98,7 +98,7 @@
       "name": "@tailwindcss/integrations-rollup",
       "version": "0.0.0",
       "devDependencies": {
-        "rollup": "^3.15.0",
+        "rollup": "3.20.0",
         "rollup-plugin-postcss": "^4.0.2"
       }
     },
@@ -106,7 +106,7 @@
       "name": "@tailwindcss/integrations-rollup-sass",
       "version": "0.0.0",
       "devDependencies": {
-        "rollup": "^3.15.0",
+        "rollup": "3.20.0",
         "rollup-plugin-postcss": "^4.0.2",
         "sass": "^1.58.3"
       }
@@ -12763,9 +12763,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "3.15.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.15.0.tgz",
-      "integrity": "sha512-F9hrCAhnp5/zx/7HYmftvsNBkMfLfk/dXUh73hPSM2E3CRgap65orDNJbLetoiUFwSAk6iHPLvBrZ5iHYvzqsg==",
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.20.0.tgz",
+      "integrity": "sha512-YsIfrk80NqUDrxrjWPXUa7PWvAfegZEXHuPsEZg58fGCdjL1I9C1i/NaG+L+27kxxwkrG/QEDEQc8s/ynXWWGQ==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -17971,14 +17971,14 @@
     "@tailwindcss/integrations-rollup": {
       "version": "file:integrations/rollup",
       "requires": {
-        "rollup": "^3.15.0",
+        "rollup": "3.20.0",
         "rollup-plugin-postcss": "^4.0.2"
       }
     },
     "@tailwindcss/integrations-rollup-sass": {
       "version": "file:integrations/rollup-sass",
       "requires": {
-        "rollup": "^3.15.0",
+        "rollup": "3.20.0",
         "rollup-plugin-postcss": "^4.0.2",
         "sass": "^1.58.3"
       }
@@ -24737,9 +24737,9 @@
       }
     },
     "rollup": {
-      "version": "3.15.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.15.0.tgz",
-      "integrity": "sha512-F9hrCAhnp5/zx/7HYmftvsNBkMfLfk/dXUh73hPSM2E3CRgap65orDNJbLetoiUFwSAk6iHPLvBrZ5iHYvzqsg==",
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.20.0.tgz",
+      "integrity": "sha512-YsIfrk80NqUDrxrjWPXUa7PWvAfegZEXHuPsEZg58fGCdjL1I9C1i/NaG+L+27kxxwkrG/QEDEQc8s/ynXWWGQ==",
       "dev": true,
       "requires": {
         "fsevents": "~2.3.2"
@@ -27837,14 +27837,14 @@
         "@tailwindcss/integrations-rollup": {
           "version": "file:integrations/rollup",
           "requires": {
-            "rollup": "^3.15.0",
+            "rollup": "3.20.0",
             "rollup-plugin-postcss": "^4.0.2"
           }
         },
         "@tailwindcss/integrations-rollup-sass": {
           "version": "file:integrations/rollup-sass",
           "requires": {
-            "rollup": "^3.15.0",
+            "rollup": "3.20.0",
             "rollup-plugin-postcss": "^4.0.2",
             "sass": "^1.58.3"
           }
@@ -34603,9 +34603,9 @@
           }
         },
         "rollup": {
-          "version": "3.15.0",
-          "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.15.0.tgz",
-          "integrity": "sha512-F9hrCAhnp5/zx/7HYmftvsNBkMfLfk/dXUh73hPSM2E3CRgap65orDNJbLetoiUFwSAk6iHPLvBrZ5iHYvzqsg==",
+          "version": "3.20.0",
+          "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.20.0.tgz",
+          "integrity": "sha512-YsIfrk80NqUDrxrjWPXUa7PWvAfegZEXHuPsEZg58fGCdjL1I9C1i/NaG+L+27kxxwkrG/QEDEQc8s/ynXWWGQ==",
           "dev": true,
           "requires": {
             "fsevents": "~2.3.2"

From e4482c7596880093950f6e112c419704fc233e42 Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Tue, 21 Mar 2023 15:31:41 +0100
Subject: [PATCH 60/84] ensure stacking `dark` and `rtl` variants with pseudo
 elements works as expected

---
 tests/variants.test.js | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/tests/variants.test.js b/tests/variants.test.js
index b17e669f7876..da62419d4c18 100644
--- a/tests/variants.test.js
+++ b/tests/variants.test.js
@@ -1134,7 +1134,7 @@ crosscheck(({ stable, oxide }) => {
       darkMode: 'class',
       content: [
         {
-          raw: html` <div class="dark:rtl:italic" /> `,
+          raw: html`<div class="dark:rtl:italic" />`,
         },
       ],
       corePlugins: { preflight: false },
@@ -1152,4 +1152,28 @@ crosscheck(({ stable, oxide }) => {
       }
     `)
   })
+
+  test('stacking dark and rtl variants with pseudo elements', async () => {
+    let config = {
+      darkMode: 'class',
+      content: [
+        {
+          raw: html`<div class="dark:rtl:placeholder:italic" />`,
+        },
+      ],
+      corePlugins: { preflight: false },
+    }
+
+    let input = css`
+      @tailwind utilities;
+    `
+
+    let result = await run(input, config)
+
+    expect(result.css).toMatchFormattedCss(css`
+      :is(.dark :is([dir='rtl'] .dark\:rtl\:placeholder\:italic))::placeholder {
+        font-style: italic;
+      }
+    `)
+  })
 })

From 266f0292ba391b3645855300c7c9506c6de4f007 Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Tue, 21 Mar 2023 12:50:44 -0400
Subject: [PATCH 61/84] Use `:is` to make important selector option insensitive
 to DOM order (#10835)

* Use `:is` to make important selector option insensitive to DOM order

* WIP

* add `applyImportantSelector` helper

* use new `applyImportantSelector`

* update tests

* remove unnecessary slice adjustment

Not 100% sure.

* update changelog

---------

Co-authored-by: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
Co-authored-by: Robin Malfait <malfait.robin@gmail.com>
---
 CHANGELOG.md                                |  1 +
 src/lib/expandApplyAtRules.js               |  3 +-
 src/lib/generateRules.js                    |  3 +-
 src/util/applyImportantSelector.js          | 19 +++++++
 tests/apply.test.js                         |  4 +-
 tests/experimental.test.js                  |  6 +--
 tests/format-variant-selector.test.js       |  2 +
 tests/important-selector.test.js            | 58 ++++++++++++++++++---
 tests/util/apply-important-selector.test.js | 24 +++++++++
 9 files changed, 105 insertions(+), 15 deletions(-)
 create mode 100644 src/util/applyImportantSelector.js
 create mode 100644 tests/util/apply-important-selector.test.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41ddd9bbf099..13c37104d86a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `line-clamp` utilities from `@tailwindcss/line-clamp` to core ([#10768](https://github.com/tailwindlabs/tailwindcss/pull/10768))
 - Support ESM and TypeScript config files ([#10785](https://github.com/tailwindlabs/tailwindcss/pull/10785))
 - Add `list-style-image` utilities ([#10817](https://github.com/tailwindlabs/tailwindcss/pull/10817))
+- Use `:is` to make important selector option insensitive to DOM order ([#10835](https://github.com/tailwindlabs/tailwindcss/pull/10835))
 
 ### Fixed
 
diff --git a/src/lib/expandApplyAtRules.js b/src/lib/expandApplyAtRules.js
index 8ca50fb99ae9..cdcd0b5688c9 100644
--- a/src/lib/expandApplyAtRules.js
+++ b/src/lib/expandApplyAtRules.js
@@ -3,6 +3,7 @@ import parser from 'postcss-selector-parser'
 
 import { resolveMatches } from './generateRules'
 import escapeClassName from '../util/escapeClassName'
+import { applyImportantSelector } from '../util/applyImportantSelector'
 
 /** @typedef {Map<string, [any, import('postcss').Rule[]]>} ApplyCache */
 
@@ -555,7 +556,7 @@ function processApply(root, context, localCache) {
 
             // And then re-add it if it was removed
             if (importantSelector && parentSelector !== parent.selector) {
-              rule.selector = `${importantSelector} ${rule.selector}`
+              rule.selector = applyImportantSelector(rule.selector, importantSelector)
             }
 
             rule.walkDecls((d) => {
diff --git a/src/lib/generateRules.js b/src/lib/generateRules.js
index 0306893ad3ef..60da2323fc94 100644
--- a/src/lib/generateRules.js
+++ b/src/lib/generateRules.js
@@ -17,6 +17,7 @@ import { isValidVariantFormatString, parseVariant } from './setupContextUtils'
 import isValidArbitraryValue from '../util/isSyntacticallyValidPropertyValue'
 import { splitAtTopLevelOnly } from '../util/splitAtTopLevelOnly.js'
 import { flagEnabled } from '../featureFlags'
+import { applyImportantSelector } from '../util/applyImportantSelector'
 
 let classNameParser = selectorParser((selectors) => {
   return selectors.first.filter(({ type }) => type === 'class').pop().value
@@ -868,7 +869,7 @@ function getImportantStrategy(important) {
       }
 
       rule.selectors = rule.selectors.map((selector) => {
-        return `${important} ${selector}`
+        return applyImportantSelector(selector, important)
       })
     }
   }
diff --git a/src/util/applyImportantSelector.js b/src/util/applyImportantSelector.js
new file mode 100644
index 000000000000..69de63325c79
--- /dev/null
+++ b/src/util/applyImportantSelector.js
@@ -0,0 +1,19 @@
+import { splitAtTopLevelOnly } from './splitAtTopLevelOnly'
+
+export function applyImportantSelector(selector, important) {
+  let matches = /^(.*?)(:before|:after|::[\w-]+)(\)*)$/g.exec(selector)
+  if (!matches) return `${important} ${wrapWithIs(selector)}`
+
+  let [, before, pseudo, brackets] = matches
+  return `${important} ${wrapWithIs(before + brackets)}${pseudo}`
+}
+
+function wrapWithIs(selector) {
+  let parts = splitAtTopLevelOnly(selector, ' ')
+
+  if (parts.length === 1 && parts[0].startsWith(':is(') && parts[0].endsWith(')')) {
+    return selector
+  }
+
+  return `:is(${selector})`
+}
diff --git a/tests/apply.test.js b/tests/apply.test.js
index 14b84550a8a8..f7fab7d70938 100644
--- a/tests/apply.test.js
+++ b/tests/apply.test.js
@@ -2120,10 +2120,10 @@ crosscheck(({ stable, oxide }) => {
     let result = await run(input, config)
 
     expect(result.css).toMatchFormattedCss(css`
-      #myselector .custom-utility {
+      #myselector :is(.custom-utility) {
         font-weight: 400;
       }
-      #myselector .group:hover .custom-utility {
+      #myselector :is(.group:hover .custom-utility) {
         text-decoration-line: underline;
       }
     `)
diff --git a/tests/experimental.test.js b/tests/experimental.test.js
index 5fb57d10c893..3497783f9c00 100644
--- a/tests/experimental.test.js
+++ b/tests/experimental.test.js
@@ -176,15 +176,15 @@ crosscheck(() => {
           --tw-shadow: 0 0 #0000;
           --tw-shadow-colored: 0 0 #0000;
         }
-        #app .resize {
+        #app :is(.resize) {
           resize: both;
         }
-        #app .divide-y > :not([hidden]) ~ :not([hidden]) {
+        #app :is(.divide-y > :not([hidden]) ~ :not([hidden])) {
           --tw-divide-y-reverse: 0;
           border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
           border-bottom-width: calc(1px * var(--tw-divide-y-reverse));
         }
-        #app .shadow {
+        #app :is(.shadow) {
           --tw-shadow: 0 1px 3px 0 #0000001a, 0 1px 2px -1px #0000001a;
           --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color),
             0 1px 2px -1px var(--tw-shadow-color);
diff --git a/tests/format-variant-selector.test.js b/tests/format-variant-selector.test.js
index b752a1cab406..e8318dab4a76 100644
--- a/tests/format-variant-selector.test.js
+++ b/tests/format-variant-selector.test.js
@@ -348,6 +348,8 @@ crosscheck(() => {
       ${'.parent::before &:hover'}                             | ${'.parent &:hover::before'}
       ${':where(&::before) :is(h1, h2, h3, h4)'}               | ${':where(&) :is(h1, h2, h3, h4)::before'}
       ${':where(&::file-selector-button) :is(h1, h2, h3, h4)'} | ${':where(&::file-selector-button) :is(h1, h2, h3, h4)'}
+      ${'#app :is(.dark &::before)'}                           | ${'#app :is(.dark &)::before'}
+      ${'#app :is(:is(.dark &)::before)'}                      | ${'#app :is(:is(.dark &))::before'}
     `('should translate "$before" into "$after"', ({ before, after }) => {
       let result = finalizeSelector('.a', [{ format: before, isArbitraryVariant: false }], {
         candidate: 'a',
diff --git a/tests/important-selector.test.js b/tests/important-selector.test.js
index 044037be1114..5c6515e43086 100644
--- a/tests/important-selector.test.js
+++ b/tests/important-selector.test.js
@@ -1,6 +1,6 @@
 import { crosscheck, run, html, css, defaults } from './util/run'
 
-crosscheck(() => {
+crosscheck(({ stable, oxide }) => {
   test('important selector', () => {
     let config = {
       important: '#app',
@@ -20,6 +20,7 @@ crosscheck(() => {
             <div class="dark:focus:text-left"></div>
             <div class="group-hover:focus-within:text-left"></div>
             <div class="rtl:active:text-center"></div>
+            <div class="dark:before:underline"></div>
           `,
         },
       ],
@@ -122,35 +123,76 @@ crosscheck(() => {
             transform: rotate(360deg);
           }
         }
-        #app .animate-spin {
+        #app :is(.animate-spin) {
           animation: 1s linear infinite spin;
         }
-        #app .font-bold {
+        #app :is(.font-bold) {
           font-weight: 700;
         }
         .custom-util {
           button: no;
         }
-        #app .group:hover .group-hover\:focus-within\:text-left:focus-within {
+        #app :is(.group:hover .group-hover\:focus-within\:text-left:focus-within) {
           text-align: left;
         }
-        #app :is([dir='rtl'] .rtl\:active\:text-center:active) {
+        #app :is(:is([dir='rtl'] .rtl\:active\:text-center:active)) {
           text-align: center;
         }
         @media (prefers-reduced-motion: no-preference) {
-          #app .motion-safe\:hover\:text-center:hover {
+          #app :is(.motion-safe\:hover\:text-center:hover) {
             text-align: center;
           }
         }
-        #app :is(.dark .dark\:focus\:text-left:focus) {
+        #app :is(.dark .dark\:before\:underline):before {
+          content: var(--tw-content);
+          text-decoration-line: underline;
+        }
+        #app :is(:is(.dark .dark\:focus\:text-left:focus)) {
           text-align: left;
         }
         @media (min-width: 768px) {
-          #app .md\:hover\:text-right:hover {
+          #app :is(.md\:hover\:text-right:hover) {
             text-align: right;
           }
         }
       `)
     })
   })
+
+  test('pseudo-elements are appended after the `:is()`', () => {
+    let config = {
+      important: '#app',
+      darkMode: 'class',
+      content: [
+        {
+          raw: html` <div class="dark:before:bg-black"></div> `,
+        },
+      ],
+      corePlugins: { preflight: false },
+    }
+
+    let input = css`
+      @tailwind base;
+      @tailwind components;
+      @tailwind utilities;
+    `
+
+    return run(input, config).then((result) => {
+      stable.expect(result.css).toMatchFormattedCss(css`
+        ${defaults}
+        #app :is(.dark .dark\:before\:bg-black)::before {
+          content: var(--tw-content);
+          --tw-bg-opacity: 1;
+          background-color: rgb(0 0 0 / var(--tw-bg-opacity));
+        }
+      `)
+      oxide.expect(result.css).toMatchFormattedCss(css`
+        ${defaults}
+        #app :is(.dark .dark\:before\:bg-black)::before {
+          content: var(--tw-content);
+          background-color: #000;
+        }
+      `)
+    })
+  })
 })
diff --git a/tests/util/apply-important-selector.test.js b/tests/util/apply-important-selector.test.js
new file mode 100644
index 000000000000..0ec22792fe96
--- /dev/null
+++ b/tests/util/apply-important-selector.test.js
@@ -0,0 +1,24 @@
+import { crosscheck } from '../util/run'
+import { applyImportantSelector } from '../../src/util/applyImportantSelector'
+
+crosscheck(() => {
+  it.each`
+    before                                        | after
+    ${'.foo'}                                     | ${'#app :is(.foo)'}
+    ${'.foo .bar'}                                | ${'#app :is(.foo .bar)'}
+    ${'.foo:hover'}                               | ${'#app :is(.foo:hover)'}
+    ${'.foo .bar:hover'}                          | ${'#app :is(.foo .bar:hover)'}
+    ${'.foo::before'}                             | ${'#app :is(.foo)::before'}
+    ${'.foo::before'}                             | ${'#app :is(.foo)::before'}
+    ${'.foo::file-selector-button'}               | ${'#app :is(.foo)::file-selector-button'}
+    ${'.foo::-webkit-progress-bar'}               | ${'#app :is(.foo)::-webkit-progress-bar'}
+    ${'.foo:hover::before'}                       | ${'#app :is(.foo:hover)::before'}
+    ${':is(.dark :is([dir="rtl"] .foo::before))'} | ${'#app :is(.dark :is([dir="rtl"] .foo))::before'}
+    ${':is(.dark .foo) .bar'}                     | ${'#app :is(:is(.dark .foo) .bar)'}
+    ${':is(.foo) :is(.bar)'}                      | ${'#app :is(:is(.foo) :is(.bar))'}
+    ${':is(.foo)::before'}                        | ${'#app :is(.foo)::before'}
+    ${'.foo:before'}                              | ${'#app :is(.foo):before'}
+  `('should generate "$after" from "$before"', ({ before, after }) => {
+    expect(applyImportantSelector(before, '#app')).toEqual(after)
+  })
+})

From eadd6e5de93e3011cd786c3aba1991364d7c80ea Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Tue, 21 Mar 2023 22:42:27 +0000
Subject: [PATCH 62/84] Update sass to version 1.59.3

---
 integrations/rollup-sass/package.json |  2 +-
 package-lock.json                     | 36 +++++++++++++--------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/integrations/rollup-sass/package.json b/integrations/rollup-sass/package.json
index 5ea635d854c5..bbe4f40fb730 100644
--- a/integrations/rollup-sass/package.json
+++ b/integrations/rollup-sass/package.json
@@ -20,6 +20,6 @@
   "devDependencies": {
     "rollup": "^3.20.0",
     "rollup-plugin-postcss": "^4.0.2",
-    "sass": "^1.58.3"
+    "sass": "^1.59.3"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 59b0e58127af..de8136c2f5b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -98,7 +98,7 @@
       "name": "@tailwindcss/integrations-rollup",
       "version": "0.0.0",
       "devDependencies": {
-        "rollup": "3.20.0",
+        "rollup": "^3.20.0",
         "rollup-plugin-postcss": "^4.0.2"
       }
     },
@@ -106,9 +106,9 @@
       "name": "@tailwindcss/integrations-rollup-sass",
       "version": "0.0.0",
       "devDependencies": {
-        "rollup": "3.20.0",
+        "rollup": "^3.20.0",
         "rollup-plugin-postcss": "^4.0.2",
-        "sass": "^1.58.3"
+        "sass": "1.59.3"
       }
     },
     "integrations/tailwindcss-cli": {
@@ -12891,9 +12891,9 @@
       "dev": true
     },
     "node_modules/sass": {
-      "version": "1.58.3",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.3.tgz",
-      "integrity": "sha512-Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A==",
+      "version": "1.59.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.59.3.tgz",
+      "integrity": "sha512-QCq98N3hX1jfTCoUAsF3eyGuXLsY7BCnCEg9qAact94Yc21npG2/mVOqoDvE0fCbWDqiM4WlcJQla0gWG2YlxQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -17971,16 +17971,16 @@
     "@tailwindcss/integrations-rollup": {
       "version": "file:integrations/rollup",
       "requires": {
-        "rollup": "3.20.0",
+        "rollup": "^3.20.0",
         "rollup-plugin-postcss": "^4.0.2"
       }
     },
     "@tailwindcss/integrations-rollup-sass": {
       "version": "file:integrations/rollup-sass",
       "requires": {
-        "rollup": "3.20.0",
+        "rollup": "^3.20.0",
         "rollup-plugin-postcss": "^4.0.2",
-        "sass": "^1.58.3"
+        "sass": "1.59.3"
       }
     },
     "@tailwindcss/integrations-tailwindcss-cli": {
@@ -24831,9 +24831,9 @@
       "dev": true
     },
     "sass": {
-      "version": "1.58.3",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.3.tgz",
-      "integrity": "sha512-Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A==",
+      "version": "1.59.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.59.3.tgz",
+      "integrity": "sha512-QCq98N3hX1jfTCoUAsF3eyGuXLsY7BCnCEg9qAact94Yc21npG2/mVOqoDvE0fCbWDqiM4WlcJQla0gWG2YlxQ==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -27837,16 +27837,16 @@
         "@tailwindcss/integrations-rollup": {
           "version": "file:integrations/rollup",
           "requires": {
-            "rollup": "3.20.0",
+            "rollup": "^3.20.0",
             "rollup-plugin-postcss": "^4.0.2"
           }
         },
         "@tailwindcss/integrations-rollup-sass": {
           "version": "file:integrations/rollup-sass",
           "requires": {
-            "rollup": "3.20.0",
+            "rollup": "^3.20.0",
             "rollup-plugin-postcss": "^4.0.2",
-            "sass": "^1.58.3"
+            "sass": "1.59.3"
           }
         },
         "@tailwindcss/integrations-tailwindcss-cli": {
@@ -34697,9 +34697,9 @@
           "dev": true
         },
         "sass": {
-          "version": "1.58.3",
-          "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.3.tgz",
-          "integrity": "sha512-Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A==",
+          "version": "1.59.3",
+          "resolved": "https://registry.npmjs.org/sass/-/sass-1.59.3.tgz",
+          "integrity": "sha512-QCq98N3hX1jfTCoUAsF3eyGuXLsY7BCnCEg9qAact94Yc21npG2/mVOqoDvE0fCbWDqiM4WlcJQla0gWG2YlxQ==",
           "dev": true,
           "requires": {
             "chokidar": ">=3.0.0 <4.0.0",

From f1473f53bb9e90b02f319cb1c88093406f10c990 Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Thu, 23 Mar 2023 15:03:56 -0400
Subject: [PATCH 63/84] Remove blocklisted classes from autocomplete (#10844)

* Remove blocklisted classes from autocomplete

* Update changelog

* Don't unnecessary loop over classes

Co-authored-by: Robin Malfait <malfait.robin@gmail.com>
---
 CHANGELOG.md                 |  1 +
 src/lib/setupContextUtils.js |  5 +++++
 tests/getClassList.test.js   | 12 ++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13c37104d86a..b06102bc1006 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Disallow multiple selectors in arbitrary variants ([#10655](https://github.com/tailwindlabs/tailwindcss/pull/10655))
 - Sort class lists deterministically for Prettier plugin ([#10672](https://github.com/tailwindlabs/tailwindcss/pull/10672))
 - Ensure CLI builds have a non-zero exit code on failure ([#10703](https://github.com/tailwindlabs/tailwindcss/pull/10703))
+- Remove blocklisted classes from autocomplete ([#10844](https://github.com/tailwindlabs/tailwindcss/pull/10844))
 
 ### Changed
 
diff --git a/src/lib/setupContextUtils.js b/src/lib/setupContextUtils.js
index 0749da68dbdc..e17ba43c1096 100644
--- a/src/lib/setupContextUtils.js
+++ b/src/lib/setupContextUtils.js
@@ -1007,6 +1007,11 @@ function registerPlugins(plugins, context) {
       }
     }
 
+    // Exclude utilities that are known non-classes (e.g. from the blocklist)
+    if (context.notClassCache.size > 0) {
+      output = output.filter((cls) => !context.notClassCache.has(cls))
+    }
+
     return output
   }
 
diff --git a/tests/getClassList.test.js b/tests/getClassList.test.js
index 671a767ecfe5..06e8dd345538 100644
--- a/tests/getClassList.test.js
+++ b/tests/getClassList.test.js
@@ -191,6 +191,18 @@ crosscheck(() => {
     expect(classes).not.toContain('bg-red-500/50')
   })
 
+  it('should not generate utilities that are present in the blocklist', () => {
+    let config = {
+      blocklist: ['font-bold'],
+    }
+
+    let context = createContext(resolveConfig(config))
+    let classes = context.getClassList()
+
+    expect(classes).toContain('font-normal')
+    expect(classes).not.toContain('font-bold')
+  })
+
   it('should not generate utilities that are set to undefined or null to so that they are removed', () => {
     let config = {
       theme: {

From 1d505e9c8c256f4d35ea416d8b3294774671c74f Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Thu, 23 Mar 2023 15:18:49 -0400
Subject: [PATCH 64/84] Revert "Remove blocklisted classes from autocomplete
 (#10844)"

This reverts commit f1473f53bb9e90b02f319cb1c88093406f10c990.
---
 CHANGELOG.md                 |  1 -
 src/lib/setupContextUtils.js |  5 -----
 tests/getClassList.test.js   | 12 ------------
 3 files changed, 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b06102bc1006..13c37104d86a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,7 +29,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Disallow multiple selectors in arbitrary variants ([#10655](https://github.com/tailwindlabs/tailwindcss/pull/10655))
 - Sort class lists deterministically for Prettier plugin ([#10672](https://github.com/tailwindlabs/tailwindcss/pull/10672))
 - Ensure CLI builds have a non-zero exit code on failure ([#10703](https://github.com/tailwindlabs/tailwindcss/pull/10703))
-- Remove blocklisted classes from autocomplete ([#10844](https://github.com/tailwindlabs/tailwindcss/pull/10844))
 
 ### Changed
 
diff --git a/src/lib/setupContextUtils.js b/src/lib/setupContextUtils.js
index e17ba43c1096..0749da68dbdc 100644
--- a/src/lib/setupContextUtils.js
+++ b/src/lib/setupContextUtils.js
@@ -1007,11 +1007,6 @@ function registerPlugins(plugins, context) {
       }
     }
 
-    // Exclude utilities that are known non-classes (e.g. from the blocklist)
-    if (context.notClassCache.size > 0) {
-      output = output.filter((cls) => !context.notClassCache.has(cls))
-    }
-
     return output
   }
 
diff --git a/tests/getClassList.test.js b/tests/getClassList.test.js
index 06e8dd345538..671a767ecfe5 100644
--- a/tests/getClassList.test.js
+++ b/tests/getClassList.test.js
@@ -191,18 +191,6 @@ crosscheck(() => {
     expect(classes).not.toContain('bg-red-500/50')
   })
 
-  it('should not generate utilities that are present in the blocklist', () => {
-    let config = {
-      blocklist: ['font-bold'],
-    }
-
-    let context = createContext(resolveConfig(config))
-    let classes = context.getClassList()
-
-    expect(classes).toContain('font-normal')
-    expect(classes).not.toContain('font-bold')
-  })
-
   it('should not generate utilities that are set to undefined or null to so that they are removed', () => {
     let config = {
       theme: {

From 4b44daf3b5307627834c8039900f420f558c5adb Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Fri, 24 Mar 2023 06:43:14 +0000
Subject: [PATCH 65/84] Update esbuild to version 0.17.12

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index de8136c2f5b1..b51add6de878 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -108,7 +108,7 @@
       "devDependencies": {
         "rollup": "^3.20.0",
         "rollup-plugin-postcss": "^4.0.2",
-        "sass": "1.59.3"
+        "sass": "^1.59.3"
       }
     },
     "integrations/tailwindcss-cli": {
@@ -17980,7 +17980,7 @@
       "requires": {
         "rollup": "^3.20.0",
         "rollup-plugin-postcss": "^4.0.2",
-        "sass": "1.59.3"
+        "sass": "^1.59.3"
       }
     },
     "@tailwindcss/integrations-tailwindcss-cli": {
@@ -27846,7 +27846,7 @@
           "requires": {
             "rollup": "^3.20.0",
             "rollup-plugin-postcss": "^4.0.2",
-            "sass": "1.59.3"
+            "sass": "^1.59.3"
           }
         },
         "@tailwindcss/integrations-tailwindcss-cli": {
diff --git a/package.json b/package.json
index c4b6480339ac..ac5daf1d47bc 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "autoprefixer": "^10.4.14",
     "concurrently": "^7.5.0",
     "cssnano": "^5.1.15",
-    "esbuild": "^0.17.10",
+    "esbuild": "^0.17.12",
     "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-prettier": "^4.2.1",

From 6138d69c1b1ca21d1ff1eb44e506a3e8b3d61c51 Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Fri, 24 Mar 2023 09:58:06 -0400
Subject: [PATCH 66/84] Warn when `@tailwindcss/line-clamp` plugin is being
 used (#10862)

* Warn if line-clamp plugin is installed

* Replace line-clamp in standalone CLI

* Update import

* Remove line-clamp plugin if found

* update lockfiles

* Update changelog
---
 CHANGELOG.md                     |   1 +
 src/util/normalizeConfig.js      |  17 +++++
 standalone-cli/package-lock.json | 119 +++++++++++++++----------------
 standalone-cli/package.json      |   1 -
 standalone-cli/standalone.js     |   8 ++-
 5 files changed, 84 insertions(+), 62 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13c37104d86a..110ff147a25f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Mark `rtl` and `ltr` variants as stable and remove warnings ([#10764](https://github.com/tailwindlabs/tailwindcss/pull/10764))
 - Use `inset` instead of `top`, `right`, `bottom`, and `left` properties ([#10765](https://github.com/tailwindlabs/tailwindcss/pull/10765))
 - Make `dark` and `rtl`/`ltr` variants insensitive to DOM order ([#10766](https://github.com/tailwindlabs/tailwindcss/pull/10766))
+- Warn when `@tailwindcss/line-clamp` plugin is being used ([#10862](https://github.com/tailwindlabs/tailwindcss/pull/10862))
 
 ## [3.2.7] - 2023-02-16
 
diff --git a/src/util/normalizeConfig.js b/src/util/normalizeConfig.js
index 7e1a592decda..5486d9932776 100644
--- a/src/util/normalizeConfig.js
+++ b/src/util/normalizeConfig.js
@@ -297,5 +297,22 @@ export function normalizeConfig(config) {
     }
   }
 
+  // Warn if the line-clamp plugin is installed
+  if (config.plugins.length > 0) {
+    let plugin
+    try {
+      plugin = require('@tailwindcss/line-clamp')
+    } catch {}
+
+    if (plugin && config.plugins.includes(plugin)) {
+      log.warn('line-clamp-in-core', [
+        `The @tailwindcs/line-clamp plugin is now part of Tailwind CSS v3.3`,
+        `Remove it from your config to silence this warning`,
+      ])
+
+      config.plugins = config.plugins.filter((p) => p !== plugin)
+    }
+  }
+
   return config
 }
diff --git a/standalone-cli/package-lock.json b/standalone-cli/package-lock.json
index e2012c86ee46..0cf3daabf72d 100644
--- a/standalone-cli/package-lock.json
+++ b/standalone-cli/package-lock.json
@@ -14,7 +14,6 @@
         "@tailwindcss/aspect-ratio": "^0.4.0",
         "@tailwindcss/container-queries": "^0.1.0",
         "@tailwindcss/forms": "^0.5.2",
-        "@tailwindcss/line-clamp": "^0.4.0",
         "@tailwindcss/typography": "^0.5.4",
         "fs-extra": "^10.1.0",
         "jest": "^27.2.5",
@@ -25,57 +24,67 @@
       }
     },
     "..": {
-      "version": "3.2.4",
+      "version": "3.2.7",
       "dev": true,
       "license": "MIT",
+      "workspaces": [
+        "integrations/*",
+        "oxide/crates/node"
+      ],
       "dependencies": {
+        "@tailwindcss/oxide": "file:oxide/crates/node",
         "arg": "^5.0.2",
+        "browserslist": "^4.21.5",
         "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.12",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "lilconfig": "^2.0.6",
+        "jiti": "^1.17.2",
+        "lightningcss": "^1.18.0",
+        "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.18",
+        "postcss": "^8.4.21",
         "postcss-import": "^14.1.0",
-        "postcss-js": "^4.0.0",
+        "postcss-js": "^4.0.1",
         "postcss-load-config": "^3.1.4",
-        "postcss-nested": "6.0.0",
-        "postcss-selector-parser": "^6.0.10",
+        "postcss-nested": "6.0.1",
+        "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
         "quick-lru": "^5.1.1",
-        "resolve": "^1.22.1"
+        "resolve": "^1.22.1",
+        "sucrase": "^3.29.0"
       },
       "bin": {
         "tailwind": "lib/cli.js",
         "tailwindcss": "lib/cli.js"
       },
       "devDependencies": {
-        "@swc/cli": "^0.1.57",
-        "@swc/core": "^1.3.11",
-        "@swc/jest": "^0.2.23",
-        "@swc/register": "^0.1.10",
-        "autoprefixer": "^10.4.13",
-        "cssnano": "^5.1.14",
-        "esbuild": "^0.15.12",
-        "eslint": "^8.26.0",
-        "eslint-config-prettier": "^8.5.0",
+        "@swc/cli": "0.1.62",
+        "@swc/core": "1.3.41",
+        "@swc/jest": "0.2.24",
+        "@swc/register": "0.1.10",
+        "autoprefixer": "^10.4.14",
+        "concurrently": "^7.5.0",
+        "cssnano": "^5.1.15",
+        "esbuild": "^0.17.10",
+        "eslint": "^8.35.0",
+        "eslint-config-prettier": "^8.7.0",
         "eslint-plugin-prettier": "^4.2.1",
-        "jest": "^28.1.3",
-        "jest-diff": "^28.1.3",
-        "prettier": "^2.7.1",
-        "rimraf": "^3.0.0",
-        "source-map-js": "^1.0.2"
+        "jest": "^29.5.0",
+        "jest-diff": "^29.5.0",
+        "prettier": "^2.8.4",
+        "rimraf": "^4.4.0",
+        "source-map-js": "^1.0.2",
+        "turbo": "^1.8.3"
       },
       "engines": {
-        "node": ">=12.13.0"
+        "node": ">=16.0.0"
       },
       "peerDependencies": {
         "postcss": "^8.0.9"
@@ -1029,15 +1038,6 @@
         "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1"
       }
     },
-    "node_modules/@tailwindcss/line-clamp": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.4.0.tgz",
-      "integrity": "sha512-HQZo6gfx1D0+DU3nWlNLD5iA6Ef4JAXh0LeD8lOGrJwEDBwwJNKQza6WoXhhY1uQrxOuU8ROxV7CqiQV4CoiLw==",
-      "dev": true,
-      "peerDependencies": {
-        "tailwindcss": ">=2.0.0 || >=3.0.0 || >=3.0.0-alpha.1"
-      }
-    },
     "node_modules/@tailwindcss/typography": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.4.tgz",
@@ -6617,13 +6617,6 @@
         "mini-svg-data-uri": "^1.2.3"
       }
     },
-    "@tailwindcss/line-clamp": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.4.0.tgz",
-      "integrity": "sha512-HQZo6gfx1D0+DU3nWlNLD5iA6Ef4JAXh0LeD8lOGrJwEDBwwJNKQza6WoXhhY1uQrxOuU8ROxV7CqiQV4CoiLw==",
-      "dev": true,
-      "requires": {}
-    },
     "@tailwindcss/typography": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.4.tgz",
@@ -9856,44 +9849,50 @@
     "tailwindcss": {
       "version": "file:..",
       "requires": {
-        "@swc/cli": "^0.1.57",
-        "@swc/core": "^1.3.11",
-        "@swc/jest": "^0.2.23",
-        "@swc/register": "^0.1.10",
+        "@swc/cli": "0.1.62",
+        "@swc/core": "1.3.41",
+        "@swc/jest": "0.2.24",
+        "@swc/register": "0.1.10",
+        "@tailwindcss/oxide": "file:oxide/crates/node",
         "arg": "^5.0.2",
-        "autoprefixer": "^10.4.13",
+        "autoprefixer": "^10.4.14",
+        "browserslist": "^4.21.5",
         "chokidar": "^3.5.3",
         "color-name": "^1.1.4",
-        "cssnano": "^5.1.14",
-        "detective": "^5.2.1",
+        "concurrently": "^7.5.0",
+        "cssnano": "^5.1.15",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
-        "esbuild": "^0.15.12",
-        "eslint": "^8.26.0",
-        "eslint-config-prettier": "^8.5.0",
+        "esbuild": "^0.17.10",
+        "eslint": "^8.35.0",
+        "eslint-config-prettier": "^8.7.0",
         "eslint-plugin-prettier": "^4.2.1",
         "fast-glob": "^3.2.12",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "jest": "^28.1.3",
-        "jest-diff": "^28.1.3",
-        "lilconfig": "^2.0.6",
+        "jest": "^29.5.0",
+        "jest-diff": "^29.5.0",
+        "jiti": "^1.17.2",
+        "lightningcss": "^1.18.0",
+        "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.18",
+        "postcss": "^8.4.21",
         "postcss-import": "^14.1.0",
-        "postcss-js": "^4.0.0",
+        "postcss-js": "^4.0.1",
         "postcss-load-config": "^3.1.4",
-        "postcss-nested": "6.0.0",
-        "postcss-selector-parser": "^6.0.10",
+        "postcss-nested": "6.0.1",
+        "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
-        "prettier": "^2.7.1",
+        "prettier": "^2.8.4",
         "quick-lru": "^5.1.1",
         "resolve": "^1.22.1",
-        "rimraf": "^3.0.0",
-        "source-map-js": "^1.0.2"
+        "rimraf": "^4.4.0",
+        "source-map-js": "^1.0.2",
+        "sucrase": "^3.29.0",
+        "turbo": "^1.8.3"
       }
     },
     "tar-fs": {
diff --git a/standalone-cli/package.json b/standalone-cli/package.json
index d1b0309a16bb..c3591d4a28a8 100644
--- a/standalone-cli/package.json
+++ b/standalone-cli/package.json
@@ -12,7 +12,6 @@
     "@tailwindcss/aspect-ratio": "^0.4.0",
     "@tailwindcss/container-queries": "^0.1.0",
     "@tailwindcss/forms": "^0.5.2",
-    "@tailwindcss/line-clamp": "^0.4.0",
     "@tailwindcss/typography": "^0.5.4",
     "fs-extra": "^10.1.0",
     "jest": "^27.2.5",
diff --git a/standalone-cli/standalone.js b/standalone-cli/standalone.js
index a9e2343748a5..56950474af31 100644
--- a/standalone-cli/standalone.js
+++ b/standalone-cli/standalone.js
@@ -1,5 +1,6 @@
 let Module = require('module')
 let origRequire = Module.prototype.require
+let log = require('tailwindcss/lib/util/log').default
 
 let localModules = {
   'tailwindcss/colors': require('tailwindcss/colors'),
@@ -11,7 +12,12 @@ let localModules = {
   '@tailwindcss/aspect-ratio': require('@tailwindcss/aspect-ratio'),
   '@tailwindcss/container-queries': require('@tailwindcss/container-queries'),
   '@tailwindcss/forms': require('@tailwindcss/forms'),
-  '@tailwindcss/line-clamp': require('@tailwindcss/line-clamp'),
+  '@tailwindcss/line-clamp': () => {
+    log.warn('line-clamp-in-core', [
+      `The @tailwindcs/line-clamp plugin is now part of Tailwind CSS v3.3`,
+      `Remove it from your config to silence this warning`,
+    ])
+  },
   '@tailwindcss/typography': require('@tailwindcss/typography'),
 
   // These are present to allow them to be specified in the PostCSS config file

From 6ed3ba365da6c1058e98c5e09b3f6b2d47aada82 Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Fri, 24 Mar 2023 10:44:18 -0400
Subject: [PATCH 67/84] Update warning message

---
 src/util/normalizeConfig.js  | 4 ++--
 standalone-cli/standalone.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/util/normalizeConfig.js b/src/util/normalizeConfig.js
index 5486d9932776..1c8c93db1c5d 100644
--- a/src/util/normalizeConfig.js
+++ b/src/util/normalizeConfig.js
@@ -306,8 +306,8 @@ export function normalizeConfig(config) {
 
     if (plugin && config.plugins.includes(plugin)) {
       log.warn('line-clamp-in-core', [
-        `The @tailwindcs/line-clamp plugin is now part of Tailwind CSS v3.3`,
-        `Remove it from your config to silence this warning`,
+        'As of Tailwind CSS v3.3, the `@tailwindcss/line-clamp` plugin is now included by default.',
+        'Remove it from the `plugins` array in your configuration to eliminate this warning.',
       ])
 
       config.plugins = config.plugins.filter((p) => p !== plugin)
diff --git a/standalone-cli/standalone.js b/standalone-cli/standalone.js
index 56950474af31..28ddf69a960d 100644
--- a/standalone-cli/standalone.js
+++ b/standalone-cli/standalone.js
@@ -14,8 +14,8 @@ let localModules = {
   '@tailwindcss/forms': require('@tailwindcss/forms'),
   '@tailwindcss/line-clamp': () => {
     log.warn('line-clamp-in-core', [
-      `The @tailwindcs/line-clamp plugin is now part of Tailwind CSS v3.3`,
-      `Remove it from your config to silence this warning`,
+      'As of Tailwind CSS v3.3, the `@tailwindcss/line-clamp` plugin is now included by default.',
+      'Remove it from the `plugins` array in your configuration to eliminate this warning.',
     ])
   },
   '@tailwindcss/typography': require('@tailwindcss/typography'),

From 47b8289abaf74a30b99051c6a9298e223c3a9f47 Mon Sep 17 00:00:00 2001
From: Brandon McConnell <brandon@dreamthinkbuild.com>
Date: Fri, 24 Mar 2023 08:30:37 -0700
Subject: [PATCH 68/84] Add support for `white-space: break-spaces` (#10729)

---
 src/corePlugins.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/corePlugins.js b/src/corePlugins.js
index d27364857f19..ecb198eb9706 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -1495,6 +1495,7 @@ export let corePlugins = {
       '.whitespace-pre': { 'white-space': 'pre' },
       '.whitespace-pre-line': { 'white-space': 'pre-line' },
       '.whitespace-pre-wrap': { 'white-space': 'pre-wrap' },
+      '.whitespace-break-spaces': { 'white-space': 'break-spaces' },
     })
   },
 

From 3c4cfb527252aeece3a72deeec0e963ec26a8328 Mon Sep 17 00:00:00 2001
From: Jonathan Reinink <jonathan@reinink.ca>
Date: Fri, 24 Mar 2023 11:32:12 -0400
Subject: [PATCH 69/84] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 110ff147a25f..3fd0e18136c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Support ESM and TypeScript config files ([#10785](https://github.com/tailwindlabs/tailwindcss/pull/10785))
 - Add `list-style-image` utilities ([#10817](https://github.com/tailwindlabs/tailwindcss/pull/10817))
 - Use `:is` to make important selector option insensitive to DOM order ([#10835](https://github.com/tailwindlabs/tailwindcss/pull/10835))
+- Add `whitespace-break-spaces` utility ([#10729](https://github.com/tailwindlabs/tailwindcss/pull/10729))
 
 ### Fixed
 

From c26e77cb6f9430921f0bb151f039f32a42bfda2f Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Mon, 27 Mar 2023 12:32:16 +0200
Subject: [PATCH 70/84] sync package-lock.json

---
 package-lock.json | 558 +++++++++++++++++++++++-----------------------
 1 file changed, 279 insertions(+), 279 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b51add6de878..b5f18df8a8be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -53,7 +53,7 @@
         "autoprefixer": "^10.4.14",
         "concurrently": "^7.5.0",
         "cssnano": "^5.1.15",
-        "esbuild": "^0.17.10",
+        "esbuild": "^0.17.12",
         "eslint": "^8.35.0",
         "eslint-config-prettier": "^8.7.0",
         "eslint-plugin-prettier": "^4.2.1",
@@ -1175,9 +1175,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.10.tgz",
-      "integrity": "sha512-7YEBfZ5lSem9Tqpsz+tjbdsEshlO9j/REJrfv4DXgKTt1+/MHqGwbtlyxQuaSlMeUZLxUKBaX8wdzlTfHkmnLw==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.14.tgz",
+      "integrity": "sha512-0CnlwnjDU8cks0yJLXfkaU/uoLyRf9VZJs4p1PskBr2AlAHeEsFEwJEo0of/Z3g+ilw5mpyDwThlxzNEIxOE4g==",
       "cpu": [
         "arm"
       ],
@@ -1191,9 +1191,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.10.tgz",
-      "integrity": "sha512-ht1P9CmvrPF5yKDtyC+z43RczVs4rrHpRqrmIuoSvSdn44Fs1n6DGlpZKdK6rM83pFLbVaSUwle8IN+TPmkv7g==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.14.tgz",
+      "integrity": "sha512-eLOpPO1RvtsP71afiFTvS7tVFShJBCT0txiv/xjFBo5a7R7Gjw7X0IgIaFoLKhqXYAXhahoXm7qAmRXhY4guJg==",
       "cpu": [
         "arm64"
       ],
@@ -1207,9 +1207,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.10.tgz",
-      "integrity": "sha512-CYzrm+hTiY5QICji64aJ/xKdN70IK8XZ6iiyq0tZkd3tfnwwSWTYH1t3m6zyaaBxkuj40kxgMyj1km/NqdjQZA==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.14.tgz",
+      "integrity": "sha512-nrfQYWBfLGfSGLvRVlt6xi63B5IbfHm3tZCdu/82zuFPQ7zez4XjmRtF/wIRYbJQ/DsZrxJdEvYFE67avYXyng==",
       "cpu": [
         "x64"
       ],
@@ -1223,9 +1223,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.10.tgz",
-      "integrity": "sha512-3HaGIowI+nMZlopqyW6+jxYr01KvNaLB5znXfbyyjuo4lE0VZfvFGcguIJapQeQMS4cX/NEispwOekJt3gr5Dg==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.14.tgz",
+      "integrity": "sha512-eoSjEuDsU1ROwgBH/c+fZzuSyJUVXQTOIN9xuLs9dE/9HbV/A5IqdXHU1p2OfIMwBwOYJ9SFVGGldxeRCUJFyw==",
       "cpu": [
         "arm64"
       ],
@@ -1239,9 +1239,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.10.tgz",
-      "integrity": "sha512-J4MJzGchuCRG5n+B4EHpAMoJmBeAE1L3wGYDIN5oWNqX0tEr7VKOzw0ymSwpoeSpdCa030lagGUfnfhS7OvzrQ==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.14.tgz",
+      "integrity": "sha512-zN0U8RWfrDttdFNkHqFYZtOH8hdi22z0pFm0aIJPsNC4QQZv7je8DWCX5iA4Zx6tRhS0CCc0XC2m7wKsbWEo5g==",
       "cpu": [
         "x64"
       ],
@@ -1255,9 +1255,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.10.tgz",
-      "integrity": "sha512-ZkX40Z7qCbugeK4U5/gbzna/UQkM9d9LNV+Fro8r7HA7sRof5Rwxc46SsqeMvB5ZaR0b1/ITQ/8Y1NmV2F0fXQ==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.14.tgz",
+      "integrity": "sha512-z0VcD4ibeZWVQCW1O7szaLxGsx54gcCnajEJMdYoYjLiq4g1jrP2lMq6pk71dbS5+7op/L2Aod+erw+EUr28/A==",
       "cpu": [
         "arm64"
       ],
@@ -1271,9 +1271,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.10.tgz",
-      "integrity": "sha512-0m0YX1IWSLG9hWh7tZa3kdAugFbZFFx9XrvfpaCMMvrswSTvUZypp0NFKriUurHpBA3xsHVE9Qb/0u2Bbi/otg==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.14.tgz",
+      "integrity": "sha512-hd9mPcxfTgJlolrPlcXkQk9BMwNBvNBsVaUe5eNUqXut6weDQH8whcNaKNF2RO8NbpT6GY8rHOK2A9y++s+ehw==",
       "cpu": [
         "x64"
       ],
@@ -1287,9 +1287,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.10.tgz",
-      "integrity": "sha512-whRdrrl0X+9D6o5f0sTZtDM9s86Xt4wk1bf7ltx6iQqrIIOH+sre1yjpcCdrVXntQPCNw/G+XqsD4HuxeS+2QA==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.14.tgz",
+      "integrity": "sha512-BNTl+wSJ1omsH8s3TkQmIIIQHwvwJrU9u1ggb9XU2KTVM4TmthRIVyxSp2qxROJHhZuW/r8fht46/QE8hU8Qvg==",
       "cpu": [
         "arm"
       ],
@@ -1303,9 +1303,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.10.tgz",
-      "integrity": "sha512-g1EZJR1/c+MmCgVwpdZdKi4QAJ8DCLP5uTgLWSAVd9wlqk9GMscaNMEViG3aE1wS+cNMzXXgdWiW/VX4J+5nTA==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.14.tgz",
+      "integrity": "sha512-FhAMNYOq3Iblcj9i+K0l1Fp/MHt+zBeRu/Qkf0LtrcFu3T45jcwB6A1iMsemQ42vR3GBhjNZJZTaCe3VFPbn9g==",
       "cpu": [
         "arm64"
       ],
@@ -1319,9 +1319,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.10.tgz",
-      "integrity": "sha512-1vKYCjfv/bEwxngHERp7huYfJ4jJzldfxyfaF7hc3216xiDA62xbXJfRlradiMhGZbdNLj2WA1YwYFzs9IWNPw==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.14.tgz",
+      "integrity": "sha512-91OK/lQ5y2v7AsmnFT+0EyxdPTNhov3y2CWMdizyMfxSxRqHazXdzgBKtlmkU2KYIc+9ZK3Vwp2KyXogEATYxQ==",
       "cpu": [
         "ia32"
       ],
@@ -1335,9 +1335,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.10.tgz",
-      "integrity": "sha512-mvwAr75q3Fgc/qz3K6sya3gBmJIYZCgcJ0s7XshpoqIAIBszzfXsqhpRrRdVFAyV1G9VUjj7VopL2HnAS8aHFA==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.14.tgz",
+      "integrity": "sha512-vp15H+5NR6hubNgMluqqKza85HcGJgq7t6rMH7O3Y6ApiOWPkvW2AJfNojUQimfTp6OUrACUXfR4hmpcENXoMQ==",
       "cpu": [
         "loong64"
       ],
@@ -1351,9 +1351,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.10.tgz",
-      "integrity": "sha512-XilKPgM2u1zR1YuvCsFQWl9Fc35BqSqktooumOY2zj7CSn5czJn279j9TE1JEqSqz88izJo7yE4x3LSf7oxHzg==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.14.tgz",
+      "integrity": "sha512-90TOdFV7N+fgi6c2+GO9ochEkmm9kBAKnuD5e08GQMgMINOdOFHuYLPQ91RYVrnWwQ5683sJKuLi9l4SsbJ7Hg==",
       "cpu": [
         "mips64el"
       ],
@@ -1367,9 +1367,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.10.tgz",
-      "integrity": "sha512-kM4Rmh9l670SwjlGkIe7pYWezk8uxKHX4Lnn5jBZYBNlWpKMBCVfpAgAJqp5doLobhzF3l64VZVrmGeZ8+uKmQ==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.14.tgz",
+      "integrity": "sha512-NnBGeoqKkTugpBOBZZoktQQ1Yqb7aHKmHxsw43NddPB2YWLAlpb7THZIzsRsTr0Xw3nqiPxbA1H31ZMOG+VVPQ==",
       "cpu": [
         "ppc64"
       ],
@@ -1383,9 +1383,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.10.tgz",
-      "integrity": "sha512-r1m9ZMNJBtOvYYGQVXKy+WvWd0BPvSxMsVq8Hp4GzdMBQvfZRvRr5TtX/1RdN6Va8JMVQGpxqde3O+e8+khNJQ==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.14.tgz",
+      "integrity": "sha512-0qdlKScLXA8MGVy21JUKvMzCYWovctuP8KKqhtE5A6IVPq4onxXhSuhwDd2g5sRCzNDlDjitc5sX31BzDoL5Fw==",
       "cpu": [
         "riscv64"
       ],
@@ -1399,9 +1399,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.10.tgz",
-      "integrity": "sha512-LsY7QvOLPw9WRJ+fU5pNB3qrSfA00u32ND5JVDrn/xG5hIQo3kvTxSlWFRP0NJ0+n6HmhPGG0Q4jtQsb6PFoyg==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.14.tgz",
+      "integrity": "sha512-Hdm2Jo1yaaOro4v3+6/zJk6ygCqIZuSDJHdHaf8nVH/tfOuoEX5Riv03Ka15LmQBYJObUTNS1UdyoMk0WUn9Ww==",
       "cpu": [
         "s390x"
       ],
@@ -1415,9 +1415,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.10.tgz",
-      "integrity": "sha512-zJUfJLebCYzBdIz/Z9vqwFjIA7iSlLCFvVi7glMgnu2MK7XYigwsonXshy9wP9S7szF+nmwrelNaP3WGanstEg==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.14.tgz",
+      "integrity": "sha512-8KHF17OstlK4DuzeF/KmSgzrTWQrkWj5boluiiq7kvJCiQVzUrmSkaBvcLB2UgHpKENO2i6BthPkmUhNDaJsVw==",
       "cpu": [
         "x64"
       ],
@@ -1431,9 +1431,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.10.tgz",
-      "integrity": "sha512-lOMkailn4Ok9Vbp/q7uJfgicpDTbZFlXlnKT2DqC8uBijmm5oGtXAJy2ZZVo5hX7IOVXikV9LpCMj2U8cTguWA==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.14.tgz",
+      "integrity": "sha512-nVwpqvb3yyXztxIT2+VsxJhB5GCgzPdk1n0HHSnchRAcxqKO6ghXwHhJnr0j/B+5FSyEqSxF4q03rbA2fKXtUQ==",
       "cpu": [
         "x64"
       ],
@@ -1447,9 +1447,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.10.tgz",
-      "integrity": "sha512-/VE0Kx6y7eekqZ+ZLU4AjMlB80ov9tEz4H067Y0STwnGOYL8CsNg4J+cCmBznk1tMpxMoUOf0AbWlb1d2Pkbig==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.14.tgz",
+      "integrity": "sha512-1RZ7uQQ9zcy/GSAJL1xPdN7NDdOOtNEGiJalg/MOzeakZeTrgH/DoCkbq7TaPDiPhWqnDF+4bnydxRqQD7il6g==",
       "cpu": [
         "x64"
       ],
@@ -1463,9 +1463,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.10.tgz",
-      "integrity": "sha512-ERNO0838OUm8HfUjjsEs71cLjLMu/xt6bhOlxcJ0/1MG3hNqCmbWaS+w/8nFLa0DDjbwZQuGKVtCUJliLmbVgg==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.14.tgz",
+      "integrity": "sha512-nqMjDsFwv7vp7msrwWRysnM38Sd44PKmW8EzV01YzDBTcTWUpczQg6mGao9VLicXSgW/iookNK6AxeogNVNDZA==",
       "cpu": [
         "x64"
       ],
@@ -1479,9 +1479,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.10.tgz",
-      "integrity": "sha512-fXv+L+Bw2AeK+XJHwDAQ9m3NRlNemG6Z6ijLwJAAVdu4cyoFbBWbEtyZzDeL+rpG2lWI51cXeMt70HA8g2MqIg==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.14.tgz",
+      "integrity": "sha512-xrD0mccTKRBBIotrITV7WVQAwNJ5+1va6L0H9zN92v2yEdjfAN7864cUaZwJS7JPEs53bDTzKFbfqVlG2HhyKQ==",
       "cpu": [
         "arm64"
       ],
@@ -1495,9 +1495,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.10.tgz",
-      "integrity": "sha512-3s+HADrOdCdGOi5lnh5DMQEzgbsFsd4w57L/eLKKjMnN0CN4AIEP0DCP3F3N14xnxh3ruNc32A0Na9zYe1Z/AQ==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.14.tgz",
+      "integrity": "sha512-nXpkz9bbJrLLyUTYtRotSS3t5b+FOuljg8LgLdINWFs3FfqZMtbnBCZFUmBzQPyxqU87F8Av+3Nco/M3hEcu1w==",
       "cpu": [
         "ia32"
       ],
@@ -1511,9 +1511,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.10.tgz",
-      "integrity": "sha512-oP+zFUjYNaMNmjTwlFtWep85hvwUu19cZklB3QsBOcZSs6y7hmH4LNCJ7075bsqzYaNvZFXJlAVaQ2ApITDXtw==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.14.tgz",
+      "integrity": "sha512-gPQmsi2DKTaEgG14hc3CHXHp62k8g6qr0Pas+I4lUxRMugGSATh/Bi8Dgusoz9IQ0IfdrvLpco6kujEIBoaogA==",
       "cpu": [
         "x64"
       ],
@@ -6848,9 +6848,9 @@
       "dev": true
     },
     "node_modules/esbuild": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.10.tgz",
-      "integrity": "sha512-n7V3v29IuZy5qgxx25TKJrEm0FHghAlS6QweUcyIgh/U0zYmQcvogWROitrTyZId1mHSkuhhuyEXtI9OXioq7A==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.14.tgz",
+      "integrity": "sha512-vOO5XhmVj/1XQR9NQ1UPq6qvMYL7QFJU57J5fKBKBKxp17uDt5PgxFDb4A2nEiXhr1qQs4x0F5+66hVVw4ruNw==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -6860,28 +6860,28 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/android-arm": "0.17.10",
-        "@esbuild/android-arm64": "0.17.10",
-        "@esbuild/android-x64": "0.17.10",
-        "@esbuild/darwin-arm64": "0.17.10",
-        "@esbuild/darwin-x64": "0.17.10",
-        "@esbuild/freebsd-arm64": "0.17.10",
-        "@esbuild/freebsd-x64": "0.17.10",
-        "@esbuild/linux-arm": "0.17.10",
-        "@esbuild/linux-arm64": "0.17.10",
-        "@esbuild/linux-ia32": "0.17.10",
-        "@esbuild/linux-loong64": "0.17.10",
-        "@esbuild/linux-mips64el": "0.17.10",
-        "@esbuild/linux-ppc64": "0.17.10",
-        "@esbuild/linux-riscv64": "0.17.10",
-        "@esbuild/linux-s390x": "0.17.10",
-        "@esbuild/linux-x64": "0.17.10",
-        "@esbuild/netbsd-x64": "0.17.10",
-        "@esbuild/openbsd-x64": "0.17.10",
-        "@esbuild/sunos-x64": "0.17.10",
-        "@esbuild/win32-arm64": "0.17.10",
-        "@esbuild/win32-ia32": "0.17.10",
-        "@esbuild/win32-x64": "0.17.10"
+        "@esbuild/android-arm": "0.17.14",
+        "@esbuild/android-arm64": "0.17.14",
+        "@esbuild/android-x64": "0.17.14",
+        "@esbuild/darwin-arm64": "0.17.14",
+        "@esbuild/darwin-x64": "0.17.14",
+        "@esbuild/freebsd-arm64": "0.17.14",
+        "@esbuild/freebsd-x64": "0.17.14",
+        "@esbuild/linux-arm": "0.17.14",
+        "@esbuild/linux-arm64": "0.17.14",
+        "@esbuild/linux-ia32": "0.17.14",
+        "@esbuild/linux-loong64": "0.17.14",
+        "@esbuild/linux-mips64el": "0.17.14",
+        "@esbuild/linux-ppc64": "0.17.14",
+        "@esbuild/linux-riscv64": "0.17.14",
+        "@esbuild/linux-s390x": "0.17.14",
+        "@esbuild/linux-x64": "0.17.14",
+        "@esbuild/netbsd-x64": "0.17.14",
+        "@esbuild/openbsd-x64": "0.17.14",
+        "@esbuild/sunos-x64": "0.17.14",
+        "@esbuild/win32-arm64": "0.17.14",
+        "@esbuild/win32-ia32": "0.17.14",
+        "@esbuild/win32-x64": "0.17.14"
       }
     },
     "node_modules/escalade": {
@@ -16137,156 +16137,156 @@
       "dev": true
     },
     "@esbuild/android-arm": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.10.tgz",
-      "integrity": "sha512-7YEBfZ5lSem9Tqpsz+tjbdsEshlO9j/REJrfv4DXgKTt1+/MHqGwbtlyxQuaSlMeUZLxUKBaX8wdzlTfHkmnLw==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.14.tgz",
+      "integrity": "sha512-0CnlwnjDU8cks0yJLXfkaU/uoLyRf9VZJs4p1PskBr2AlAHeEsFEwJEo0of/Z3g+ilw5mpyDwThlxzNEIxOE4g==",
       "dev": true,
       "optional": true
     },
     "@esbuild/android-arm64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.10.tgz",
-      "integrity": "sha512-ht1P9CmvrPF5yKDtyC+z43RczVs4rrHpRqrmIuoSvSdn44Fs1n6DGlpZKdK6rM83pFLbVaSUwle8IN+TPmkv7g==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.14.tgz",
+      "integrity": "sha512-eLOpPO1RvtsP71afiFTvS7tVFShJBCT0txiv/xjFBo5a7R7Gjw7X0IgIaFoLKhqXYAXhahoXm7qAmRXhY4guJg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/android-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.10.tgz",
-      "integrity": "sha512-CYzrm+hTiY5QICji64aJ/xKdN70IK8XZ6iiyq0tZkd3tfnwwSWTYH1t3m6zyaaBxkuj40kxgMyj1km/NqdjQZA==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.14.tgz",
+      "integrity": "sha512-nrfQYWBfLGfSGLvRVlt6xi63B5IbfHm3tZCdu/82zuFPQ7zez4XjmRtF/wIRYbJQ/DsZrxJdEvYFE67avYXyng==",
       "dev": true,
       "optional": true
     },
     "@esbuild/darwin-arm64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.10.tgz",
-      "integrity": "sha512-3HaGIowI+nMZlopqyW6+jxYr01KvNaLB5znXfbyyjuo4lE0VZfvFGcguIJapQeQMS4cX/NEispwOekJt3gr5Dg==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.14.tgz",
+      "integrity": "sha512-eoSjEuDsU1ROwgBH/c+fZzuSyJUVXQTOIN9xuLs9dE/9HbV/A5IqdXHU1p2OfIMwBwOYJ9SFVGGldxeRCUJFyw==",
       "dev": true,
       "optional": true
     },
     "@esbuild/darwin-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.10.tgz",
-      "integrity": "sha512-J4MJzGchuCRG5n+B4EHpAMoJmBeAE1L3wGYDIN5oWNqX0tEr7VKOzw0ymSwpoeSpdCa030lagGUfnfhS7OvzrQ==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.14.tgz",
+      "integrity": "sha512-zN0U8RWfrDttdFNkHqFYZtOH8hdi22z0pFm0aIJPsNC4QQZv7je8DWCX5iA4Zx6tRhS0CCc0XC2m7wKsbWEo5g==",
       "dev": true,
       "optional": true
     },
     "@esbuild/freebsd-arm64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.10.tgz",
-      "integrity": "sha512-ZkX40Z7qCbugeK4U5/gbzna/UQkM9d9LNV+Fro8r7HA7sRof5Rwxc46SsqeMvB5ZaR0b1/ITQ/8Y1NmV2F0fXQ==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.14.tgz",
+      "integrity": "sha512-z0VcD4ibeZWVQCW1O7szaLxGsx54gcCnajEJMdYoYjLiq4g1jrP2lMq6pk71dbS5+7op/L2Aod+erw+EUr28/A==",
       "dev": true,
       "optional": true
     },
     "@esbuild/freebsd-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.10.tgz",
-      "integrity": "sha512-0m0YX1IWSLG9hWh7tZa3kdAugFbZFFx9XrvfpaCMMvrswSTvUZypp0NFKriUurHpBA3xsHVE9Qb/0u2Bbi/otg==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.14.tgz",
+      "integrity": "sha512-hd9mPcxfTgJlolrPlcXkQk9BMwNBvNBsVaUe5eNUqXut6weDQH8whcNaKNF2RO8NbpT6GY8rHOK2A9y++s+ehw==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-arm": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.10.tgz",
-      "integrity": "sha512-whRdrrl0X+9D6o5f0sTZtDM9s86Xt4wk1bf7ltx6iQqrIIOH+sre1yjpcCdrVXntQPCNw/G+XqsD4HuxeS+2QA==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.14.tgz",
+      "integrity": "sha512-BNTl+wSJ1omsH8s3TkQmIIIQHwvwJrU9u1ggb9XU2KTVM4TmthRIVyxSp2qxROJHhZuW/r8fht46/QE8hU8Qvg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-arm64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.10.tgz",
-      "integrity": "sha512-g1EZJR1/c+MmCgVwpdZdKi4QAJ8DCLP5uTgLWSAVd9wlqk9GMscaNMEViG3aE1wS+cNMzXXgdWiW/VX4J+5nTA==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.14.tgz",
+      "integrity": "sha512-FhAMNYOq3Iblcj9i+K0l1Fp/MHt+zBeRu/Qkf0LtrcFu3T45jcwB6A1iMsemQ42vR3GBhjNZJZTaCe3VFPbn9g==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-ia32": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.10.tgz",
-      "integrity": "sha512-1vKYCjfv/bEwxngHERp7huYfJ4jJzldfxyfaF7hc3216xiDA62xbXJfRlradiMhGZbdNLj2WA1YwYFzs9IWNPw==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.14.tgz",
+      "integrity": "sha512-91OK/lQ5y2v7AsmnFT+0EyxdPTNhov3y2CWMdizyMfxSxRqHazXdzgBKtlmkU2KYIc+9ZK3Vwp2KyXogEATYxQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-loong64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.10.tgz",
-      "integrity": "sha512-mvwAr75q3Fgc/qz3K6sya3gBmJIYZCgcJ0s7XshpoqIAIBszzfXsqhpRrRdVFAyV1G9VUjj7VopL2HnAS8aHFA==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.14.tgz",
+      "integrity": "sha512-vp15H+5NR6hubNgMluqqKza85HcGJgq7t6rMH7O3Y6ApiOWPkvW2AJfNojUQimfTp6OUrACUXfR4hmpcENXoMQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-mips64el": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.10.tgz",
-      "integrity": "sha512-XilKPgM2u1zR1YuvCsFQWl9Fc35BqSqktooumOY2zj7CSn5czJn279j9TE1JEqSqz88izJo7yE4x3LSf7oxHzg==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.14.tgz",
+      "integrity": "sha512-90TOdFV7N+fgi6c2+GO9ochEkmm9kBAKnuD5e08GQMgMINOdOFHuYLPQ91RYVrnWwQ5683sJKuLi9l4SsbJ7Hg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-ppc64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.10.tgz",
-      "integrity": "sha512-kM4Rmh9l670SwjlGkIe7pYWezk8uxKHX4Lnn5jBZYBNlWpKMBCVfpAgAJqp5doLobhzF3l64VZVrmGeZ8+uKmQ==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.14.tgz",
+      "integrity": "sha512-NnBGeoqKkTugpBOBZZoktQQ1Yqb7aHKmHxsw43NddPB2YWLAlpb7THZIzsRsTr0Xw3nqiPxbA1H31ZMOG+VVPQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-riscv64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.10.tgz",
-      "integrity": "sha512-r1m9ZMNJBtOvYYGQVXKy+WvWd0BPvSxMsVq8Hp4GzdMBQvfZRvRr5TtX/1RdN6Va8JMVQGpxqde3O+e8+khNJQ==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.14.tgz",
+      "integrity": "sha512-0qdlKScLXA8MGVy21JUKvMzCYWovctuP8KKqhtE5A6IVPq4onxXhSuhwDd2g5sRCzNDlDjitc5sX31BzDoL5Fw==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-s390x": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.10.tgz",
-      "integrity": "sha512-LsY7QvOLPw9WRJ+fU5pNB3qrSfA00u32ND5JVDrn/xG5hIQo3kvTxSlWFRP0NJ0+n6HmhPGG0Q4jtQsb6PFoyg==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.14.tgz",
+      "integrity": "sha512-Hdm2Jo1yaaOro4v3+6/zJk6ygCqIZuSDJHdHaf8nVH/tfOuoEX5Riv03Ka15LmQBYJObUTNS1UdyoMk0WUn9Ww==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.10.tgz",
-      "integrity": "sha512-zJUfJLebCYzBdIz/Z9vqwFjIA7iSlLCFvVi7glMgnu2MK7XYigwsonXshy9wP9S7szF+nmwrelNaP3WGanstEg==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.14.tgz",
+      "integrity": "sha512-8KHF17OstlK4DuzeF/KmSgzrTWQrkWj5boluiiq7kvJCiQVzUrmSkaBvcLB2UgHpKENO2i6BthPkmUhNDaJsVw==",
       "dev": true,
       "optional": true
     },
     "@esbuild/netbsd-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.10.tgz",
-      "integrity": "sha512-lOMkailn4Ok9Vbp/q7uJfgicpDTbZFlXlnKT2DqC8uBijmm5oGtXAJy2ZZVo5hX7IOVXikV9LpCMj2U8cTguWA==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.14.tgz",
+      "integrity": "sha512-nVwpqvb3yyXztxIT2+VsxJhB5GCgzPdk1n0HHSnchRAcxqKO6ghXwHhJnr0j/B+5FSyEqSxF4q03rbA2fKXtUQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/openbsd-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.10.tgz",
-      "integrity": "sha512-/VE0Kx6y7eekqZ+ZLU4AjMlB80ov9tEz4H067Y0STwnGOYL8CsNg4J+cCmBznk1tMpxMoUOf0AbWlb1d2Pkbig==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.14.tgz",
+      "integrity": "sha512-1RZ7uQQ9zcy/GSAJL1xPdN7NDdOOtNEGiJalg/MOzeakZeTrgH/DoCkbq7TaPDiPhWqnDF+4bnydxRqQD7il6g==",
       "dev": true,
       "optional": true
     },
     "@esbuild/sunos-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.10.tgz",
-      "integrity": "sha512-ERNO0838OUm8HfUjjsEs71cLjLMu/xt6bhOlxcJ0/1MG3hNqCmbWaS+w/8nFLa0DDjbwZQuGKVtCUJliLmbVgg==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.14.tgz",
+      "integrity": "sha512-nqMjDsFwv7vp7msrwWRysnM38Sd44PKmW8EzV01YzDBTcTWUpczQg6mGao9VLicXSgW/iookNK6AxeogNVNDZA==",
       "dev": true,
       "optional": true
     },
     "@esbuild/win32-arm64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.10.tgz",
-      "integrity": "sha512-fXv+L+Bw2AeK+XJHwDAQ9m3NRlNemG6Z6ijLwJAAVdu4cyoFbBWbEtyZzDeL+rpG2lWI51cXeMt70HA8g2MqIg==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.14.tgz",
+      "integrity": "sha512-xrD0mccTKRBBIotrITV7WVQAwNJ5+1va6L0H9zN92v2yEdjfAN7864cUaZwJS7JPEs53bDTzKFbfqVlG2HhyKQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/win32-ia32": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.10.tgz",
-      "integrity": "sha512-3s+HADrOdCdGOi5lnh5DMQEzgbsFsd4w57L/eLKKjMnN0CN4AIEP0DCP3F3N14xnxh3ruNc32A0Na9zYe1Z/AQ==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.14.tgz",
+      "integrity": "sha512-nXpkz9bbJrLLyUTYtRotSS3t5b+FOuljg8LgLdINWFs3FfqZMtbnBCZFUmBzQPyxqU87F8Av+3Nco/M3hEcu1w==",
       "dev": true,
       "optional": true
     },
     "@esbuild/win32-x64": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.10.tgz",
-      "integrity": "sha512-oP+zFUjYNaMNmjTwlFtWep85hvwUu19cZklB3QsBOcZSs6y7hmH4LNCJ7075bsqzYaNvZFXJlAVaQ2ApITDXtw==",
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.14.tgz",
+      "integrity": "sha512-gPQmsi2DKTaEgG14hc3CHXHp62k8g6qr0Pas+I4lUxRMugGSATh/Bi8Dgusoz9IQ0IfdrvLpco6kujEIBoaogA==",
       "dev": true,
       "optional": true
     },
@@ -20507,33 +20507,33 @@
       "dev": true
     },
     "esbuild": {
-      "version": "0.17.10",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.10.tgz",
-      "integrity": "sha512-n7V3v29IuZy5qgxx25TKJrEm0FHghAlS6QweUcyIgh/U0zYmQcvogWROitrTyZId1mHSkuhhuyEXtI9OXioq7A==",
-      "dev": true,
-      "requires": {
-        "@esbuild/android-arm": "0.17.10",
-        "@esbuild/android-arm64": "0.17.10",
-        "@esbuild/android-x64": "0.17.10",
-        "@esbuild/darwin-arm64": "0.17.10",
-        "@esbuild/darwin-x64": "0.17.10",
-        "@esbuild/freebsd-arm64": "0.17.10",
-        "@esbuild/freebsd-x64": "0.17.10",
-        "@esbuild/linux-arm": "0.17.10",
-        "@esbuild/linux-arm64": "0.17.10",
-        "@esbuild/linux-ia32": "0.17.10",
-        "@esbuild/linux-loong64": "0.17.10",
-        "@esbuild/linux-mips64el": "0.17.10",
-        "@esbuild/linux-ppc64": "0.17.10",
-        "@esbuild/linux-riscv64": "0.17.10",
-        "@esbuild/linux-s390x": "0.17.10",
-        "@esbuild/linux-x64": "0.17.10",
-        "@esbuild/netbsd-x64": "0.17.10",
-        "@esbuild/openbsd-x64": "0.17.10",
-        "@esbuild/sunos-x64": "0.17.10",
-        "@esbuild/win32-arm64": "0.17.10",
-        "@esbuild/win32-ia32": "0.17.10",
-        "@esbuild/win32-x64": "0.17.10"
+      "version": "0.17.14",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.14.tgz",
+      "integrity": "sha512-vOO5XhmVj/1XQR9NQ1UPq6qvMYL7QFJU57J5fKBKBKxp17uDt5PgxFDb4A2nEiXhr1qQs4x0F5+66hVVw4ruNw==",
+      "dev": true,
+      "requires": {
+        "@esbuild/android-arm": "0.17.14",
+        "@esbuild/android-arm64": "0.17.14",
+        "@esbuild/android-x64": "0.17.14",
+        "@esbuild/darwin-arm64": "0.17.14",
+        "@esbuild/darwin-x64": "0.17.14",
+        "@esbuild/freebsd-arm64": "0.17.14",
+        "@esbuild/freebsd-x64": "0.17.14",
+        "@esbuild/linux-arm": "0.17.14",
+        "@esbuild/linux-arm64": "0.17.14",
+        "@esbuild/linux-ia32": "0.17.14",
+        "@esbuild/linux-loong64": "0.17.14",
+        "@esbuild/linux-mips64el": "0.17.14",
+        "@esbuild/linux-ppc64": "0.17.14",
+        "@esbuild/linux-riscv64": "0.17.14",
+        "@esbuild/linux-s390x": "0.17.14",
+        "@esbuild/linux-x64": "0.17.14",
+        "@esbuild/netbsd-x64": "0.17.14",
+        "@esbuild/openbsd-x64": "0.17.14",
+        "@esbuild/sunos-x64": "0.17.14",
+        "@esbuild/win32-arm64": "0.17.14",
+        "@esbuild/win32-ia32": "0.17.14",
+        "@esbuild/win32-x64": "0.17.14"
       }
     },
     "escalade": {
@@ -25521,7 +25521,7 @@
         "cssnano": "^5.1.15",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
-        "esbuild": "^0.17.10",
+        "esbuild": "^0.17.12",
         "eslint": "^8.35.0",
         "eslint-config-prettier": "^8.7.0",
         "eslint-plugin-prettier": "^4.2.1",
@@ -26003,156 +26003,156 @@
           "dev": true
         },
         "@esbuild/android-arm": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.10.tgz",
-          "integrity": "sha512-7YEBfZ5lSem9Tqpsz+tjbdsEshlO9j/REJrfv4DXgKTt1+/MHqGwbtlyxQuaSlMeUZLxUKBaX8wdzlTfHkmnLw==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.14.tgz",
+          "integrity": "sha512-0CnlwnjDU8cks0yJLXfkaU/uoLyRf9VZJs4p1PskBr2AlAHeEsFEwJEo0of/Z3g+ilw5mpyDwThlxzNEIxOE4g==",
           "dev": true,
           "optional": true
         },
         "@esbuild/android-arm64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.10.tgz",
-          "integrity": "sha512-ht1P9CmvrPF5yKDtyC+z43RczVs4rrHpRqrmIuoSvSdn44Fs1n6DGlpZKdK6rM83pFLbVaSUwle8IN+TPmkv7g==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.14.tgz",
+          "integrity": "sha512-eLOpPO1RvtsP71afiFTvS7tVFShJBCT0txiv/xjFBo5a7R7Gjw7X0IgIaFoLKhqXYAXhahoXm7qAmRXhY4guJg==",
           "dev": true,
           "optional": true
         },
         "@esbuild/android-x64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.10.tgz",
-          "integrity": "sha512-CYzrm+hTiY5QICji64aJ/xKdN70IK8XZ6iiyq0tZkd3tfnwwSWTYH1t3m6zyaaBxkuj40kxgMyj1km/NqdjQZA==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.14.tgz",
+          "integrity": "sha512-nrfQYWBfLGfSGLvRVlt6xi63B5IbfHm3tZCdu/82zuFPQ7zez4XjmRtF/wIRYbJQ/DsZrxJdEvYFE67avYXyng==",
           "dev": true,
           "optional": true
         },
         "@esbuild/darwin-arm64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.10.tgz",
-          "integrity": "sha512-3HaGIowI+nMZlopqyW6+jxYr01KvNaLB5znXfbyyjuo4lE0VZfvFGcguIJapQeQMS4cX/NEispwOekJt3gr5Dg==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.14.tgz",
+          "integrity": "sha512-eoSjEuDsU1ROwgBH/c+fZzuSyJUVXQTOIN9xuLs9dE/9HbV/A5IqdXHU1p2OfIMwBwOYJ9SFVGGldxeRCUJFyw==",
           "dev": true,
           "optional": true
         },
         "@esbuild/darwin-x64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.10.tgz",
-          "integrity": "sha512-J4MJzGchuCRG5n+B4EHpAMoJmBeAE1L3wGYDIN5oWNqX0tEr7VKOzw0ymSwpoeSpdCa030lagGUfnfhS7OvzrQ==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.14.tgz",
+          "integrity": "sha512-zN0U8RWfrDttdFNkHqFYZtOH8hdi22z0pFm0aIJPsNC4QQZv7je8DWCX5iA4Zx6tRhS0CCc0XC2m7wKsbWEo5g==",
           "dev": true,
           "optional": true
         },
         "@esbuild/freebsd-arm64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.10.tgz",
-          "integrity": "sha512-ZkX40Z7qCbugeK4U5/gbzna/UQkM9d9LNV+Fro8r7HA7sRof5Rwxc46SsqeMvB5ZaR0b1/ITQ/8Y1NmV2F0fXQ==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.14.tgz",
+          "integrity": "sha512-z0VcD4ibeZWVQCW1O7szaLxGsx54gcCnajEJMdYoYjLiq4g1jrP2lMq6pk71dbS5+7op/L2Aod+erw+EUr28/A==",
           "dev": true,
           "optional": true
         },
         "@esbuild/freebsd-x64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.10.tgz",
-          "integrity": "sha512-0m0YX1IWSLG9hWh7tZa3kdAugFbZFFx9XrvfpaCMMvrswSTvUZypp0NFKriUurHpBA3xsHVE9Qb/0u2Bbi/otg==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.14.tgz",
+          "integrity": "sha512-hd9mPcxfTgJlolrPlcXkQk9BMwNBvNBsVaUe5eNUqXut6weDQH8whcNaKNF2RO8NbpT6GY8rHOK2A9y++s+ehw==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-arm": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.10.tgz",
-          "integrity": "sha512-whRdrrl0X+9D6o5f0sTZtDM9s86Xt4wk1bf7ltx6iQqrIIOH+sre1yjpcCdrVXntQPCNw/G+XqsD4HuxeS+2QA==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.14.tgz",
+          "integrity": "sha512-BNTl+wSJ1omsH8s3TkQmIIIQHwvwJrU9u1ggb9XU2KTVM4TmthRIVyxSp2qxROJHhZuW/r8fht46/QE8hU8Qvg==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-arm64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.10.tgz",
-          "integrity": "sha512-g1EZJR1/c+MmCgVwpdZdKi4QAJ8DCLP5uTgLWSAVd9wlqk9GMscaNMEViG3aE1wS+cNMzXXgdWiW/VX4J+5nTA==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.14.tgz",
+          "integrity": "sha512-FhAMNYOq3Iblcj9i+K0l1Fp/MHt+zBeRu/Qkf0LtrcFu3T45jcwB6A1iMsemQ42vR3GBhjNZJZTaCe3VFPbn9g==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-ia32": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.10.tgz",
-          "integrity": "sha512-1vKYCjfv/bEwxngHERp7huYfJ4jJzldfxyfaF7hc3216xiDA62xbXJfRlradiMhGZbdNLj2WA1YwYFzs9IWNPw==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.14.tgz",
+          "integrity": "sha512-91OK/lQ5y2v7AsmnFT+0EyxdPTNhov3y2CWMdizyMfxSxRqHazXdzgBKtlmkU2KYIc+9ZK3Vwp2KyXogEATYxQ==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-loong64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.10.tgz",
-          "integrity": "sha512-mvwAr75q3Fgc/qz3K6sya3gBmJIYZCgcJ0s7XshpoqIAIBszzfXsqhpRrRdVFAyV1G9VUjj7VopL2HnAS8aHFA==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.14.tgz",
+          "integrity": "sha512-vp15H+5NR6hubNgMluqqKza85HcGJgq7t6rMH7O3Y6ApiOWPkvW2AJfNojUQimfTp6OUrACUXfR4hmpcENXoMQ==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-mips64el": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.10.tgz",
-          "integrity": "sha512-XilKPgM2u1zR1YuvCsFQWl9Fc35BqSqktooumOY2zj7CSn5czJn279j9TE1JEqSqz88izJo7yE4x3LSf7oxHzg==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.14.tgz",
+          "integrity": "sha512-90TOdFV7N+fgi6c2+GO9ochEkmm9kBAKnuD5e08GQMgMINOdOFHuYLPQ91RYVrnWwQ5683sJKuLi9l4SsbJ7Hg==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-ppc64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.10.tgz",
-          "integrity": "sha512-kM4Rmh9l670SwjlGkIe7pYWezk8uxKHX4Lnn5jBZYBNlWpKMBCVfpAgAJqp5doLobhzF3l64VZVrmGeZ8+uKmQ==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.14.tgz",
+          "integrity": "sha512-NnBGeoqKkTugpBOBZZoktQQ1Yqb7aHKmHxsw43NddPB2YWLAlpb7THZIzsRsTr0Xw3nqiPxbA1H31ZMOG+VVPQ==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-riscv64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.10.tgz",
-          "integrity": "sha512-r1m9ZMNJBtOvYYGQVXKy+WvWd0BPvSxMsVq8Hp4GzdMBQvfZRvRr5TtX/1RdN6Va8JMVQGpxqde3O+e8+khNJQ==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.14.tgz",
+          "integrity": "sha512-0qdlKScLXA8MGVy21JUKvMzCYWovctuP8KKqhtE5A6IVPq4onxXhSuhwDd2g5sRCzNDlDjitc5sX31BzDoL5Fw==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-s390x": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.10.tgz",
-          "integrity": "sha512-LsY7QvOLPw9WRJ+fU5pNB3qrSfA00u32ND5JVDrn/xG5hIQo3kvTxSlWFRP0NJ0+n6HmhPGG0Q4jtQsb6PFoyg==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.14.tgz",
+          "integrity": "sha512-Hdm2Jo1yaaOro4v3+6/zJk6ygCqIZuSDJHdHaf8nVH/tfOuoEX5Riv03Ka15LmQBYJObUTNS1UdyoMk0WUn9Ww==",
           "dev": true,
           "optional": true
         },
         "@esbuild/linux-x64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.10.tgz",
-          "integrity": "sha512-zJUfJLebCYzBdIz/Z9vqwFjIA7iSlLCFvVi7glMgnu2MK7XYigwsonXshy9wP9S7szF+nmwrelNaP3WGanstEg==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.14.tgz",
+          "integrity": "sha512-8KHF17OstlK4DuzeF/KmSgzrTWQrkWj5boluiiq7kvJCiQVzUrmSkaBvcLB2UgHpKENO2i6BthPkmUhNDaJsVw==",
           "dev": true,
           "optional": true
         },
         "@esbuild/netbsd-x64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.10.tgz",
-          "integrity": "sha512-lOMkailn4Ok9Vbp/q7uJfgicpDTbZFlXlnKT2DqC8uBijmm5oGtXAJy2ZZVo5hX7IOVXikV9LpCMj2U8cTguWA==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.14.tgz",
+          "integrity": "sha512-nVwpqvb3yyXztxIT2+VsxJhB5GCgzPdk1n0HHSnchRAcxqKO6ghXwHhJnr0j/B+5FSyEqSxF4q03rbA2fKXtUQ==",
           "dev": true,
           "optional": true
         },
         "@esbuild/openbsd-x64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.10.tgz",
-          "integrity": "sha512-/VE0Kx6y7eekqZ+ZLU4AjMlB80ov9tEz4H067Y0STwnGOYL8CsNg4J+cCmBznk1tMpxMoUOf0AbWlb1d2Pkbig==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.14.tgz",
+          "integrity": "sha512-1RZ7uQQ9zcy/GSAJL1xPdN7NDdOOtNEGiJalg/MOzeakZeTrgH/DoCkbq7TaPDiPhWqnDF+4bnydxRqQD7il6g==",
           "dev": true,
           "optional": true
         },
         "@esbuild/sunos-x64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.10.tgz",
-          "integrity": "sha512-ERNO0838OUm8HfUjjsEs71cLjLMu/xt6bhOlxcJ0/1MG3hNqCmbWaS+w/8nFLa0DDjbwZQuGKVtCUJliLmbVgg==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.14.tgz",
+          "integrity": "sha512-nqMjDsFwv7vp7msrwWRysnM38Sd44PKmW8EzV01YzDBTcTWUpczQg6mGao9VLicXSgW/iookNK6AxeogNVNDZA==",
           "dev": true,
           "optional": true
         },
         "@esbuild/win32-arm64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.10.tgz",
-          "integrity": "sha512-fXv+L+Bw2AeK+XJHwDAQ9m3NRlNemG6Z6ijLwJAAVdu4cyoFbBWbEtyZzDeL+rpG2lWI51cXeMt70HA8g2MqIg==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.14.tgz",
+          "integrity": "sha512-xrD0mccTKRBBIotrITV7WVQAwNJ5+1va6L0H9zN92v2yEdjfAN7864cUaZwJS7JPEs53bDTzKFbfqVlG2HhyKQ==",
           "dev": true,
           "optional": true
         },
         "@esbuild/win32-ia32": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.10.tgz",
-          "integrity": "sha512-3s+HADrOdCdGOi5lnh5DMQEzgbsFsd4w57L/eLKKjMnN0CN4AIEP0DCP3F3N14xnxh3ruNc32A0Na9zYe1Z/AQ==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.14.tgz",
+          "integrity": "sha512-nXpkz9bbJrLLyUTYtRotSS3t5b+FOuljg8LgLdINWFs3FfqZMtbnBCZFUmBzQPyxqU87F8Av+3Nco/M3hEcu1w==",
           "dev": true,
           "optional": true
         },
         "@esbuild/win32-x64": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.10.tgz",
-          "integrity": "sha512-oP+zFUjYNaMNmjTwlFtWep85hvwUu19cZklB3QsBOcZSs6y7hmH4LNCJ7075bsqzYaNvZFXJlAVaQ2ApITDXtw==",
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.14.tgz",
+          "integrity": "sha512-gPQmsi2DKTaEgG14hc3CHXHp62k8g6qr0Pas+I4lUxRMugGSATh/Bi8Dgusoz9IQ0IfdrvLpco6kujEIBoaogA==",
           "dev": true,
           "optional": true
         },
@@ -30373,33 +30373,33 @@
           "dev": true
         },
         "esbuild": {
-          "version": "0.17.10",
-          "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.10.tgz",
-          "integrity": "sha512-n7V3v29IuZy5qgxx25TKJrEm0FHghAlS6QweUcyIgh/U0zYmQcvogWROitrTyZId1mHSkuhhuyEXtI9OXioq7A==",
-          "dev": true,
-          "requires": {
-            "@esbuild/android-arm": "0.17.10",
-            "@esbuild/android-arm64": "0.17.10",
-            "@esbuild/android-x64": "0.17.10",
-            "@esbuild/darwin-arm64": "0.17.10",
-            "@esbuild/darwin-x64": "0.17.10",
-            "@esbuild/freebsd-arm64": "0.17.10",
-            "@esbuild/freebsd-x64": "0.17.10",
-            "@esbuild/linux-arm": "0.17.10",
-            "@esbuild/linux-arm64": "0.17.10",
-            "@esbuild/linux-ia32": "0.17.10",
-            "@esbuild/linux-loong64": "0.17.10",
-            "@esbuild/linux-mips64el": "0.17.10",
-            "@esbuild/linux-ppc64": "0.17.10",
-            "@esbuild/linux-riscv64": "0.17.10",
-            "@esbuild/linux-s390x": "0.17.10",
-            "@esbuild/linux-x64": "0.17.10",
-            "@esbuild/netbsd-x64": "0.17.10",
-            "@esbuild/openbsd-x64": "0.17.10",
-            "@esbuild/sunos-x64": "0.17.10",
-            "@esbuild/win32-arm64": "0.17.10",
-            "@esbuild/win32-ia32": "0.17.10",
-            "@esbuild/win32-x64": "0.17.10"
+          "version": "0.17.14",
+          "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.14.tgz",
+          "integrity": "sha512-vOO5XhmVj/1XQR9NQ1UPq6qvMYL7QFJU57J5fKBKBKxp17uDt5PgxFDb4A2nEiXhr1qQs4x0F5+66hVVw4ruNw==",
+          "dev": true,
+          "requires": {
+            "@esbuild/android-arm": "0.17.14",
+            "@esbuild/android-arm64": "0.17.14",
+            "@esbuild/android-x64": "0.17.14",
+            "@esbuild/darwin-arm64": "0.17.14",
+            "@esbuild/darwin-x64": "0.17.14",
+            "@esbuild/freebsd-arm64": "0.17.14",
+            "@esbuild/freebsd-x64": "0.17.14",
+            "@esbuild/linux-arm": "0.17.14",
+            "@esbuild/linux-arm64": "0.17.14",
+            "@esbuild/linux-ia32": "0.17.14",
+            "@esbuild/linux-loong64": "0.17.14",
+            "@esbuild/linux-mips64el": "0.17.14",
+            "@esbuild/linux-ppc64": "0.17.14",
+            "@esbuild/linux-riscv64": "0.17.14",
+            "@esbuild/linux-s390x": "0.17.14",
+            "@esbuild/linux-x64": "0.17.14",
+            "@esbuild/netbsd-x64": "0.17.14",
+            "@esbuild/openbsd-x64": "0.17.14",
+            "@esbuild/sunos-x64": "0.17.14",
+            "@esbuild/win32-arm64": "0.17.14",
+            "@esbuild/win32-ia32": "0.17.14",
+            "@esbuild/win32-x64": "0.17.14"
           }
         },
         "escalade": {

From b2f132ec3389f03b2dea876ba0e87e01262b78cc Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Fri, 24 Mar 2023 16:24:59 +0100
Subject: [PATCH 71/84] prepare for v3.3 release

---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fd0e18136c2..7bb84d1bc789 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `delay-0` and `duration-0` by default ([#10294](https://github.com/tailwindlabs/tailwindcss/pull/10294))
 - Add logical properties support for inline direction ([#10166](https://github.com/tailwindlabs/tailwindcss/pull/10166))
 - Add `hyphens` utilities ([#10071](https://github.com/tailwindlabs/tailwindcss/pull/10071))
-- [Oxide] Use `lightningcss` for nesting and vendor prefixes in PostCSS plugin ([#10399](https://github.com/tailwindlabs/tailwindcss/pull/10399))
 - Add support for configuring default `font-variation-settings` for a `font-family` ([#10034](https://github.com/tailwindlabs/tailwindcss/pull/10034), [#10515](https://github.com/tailwindlabs/tailwindcss/pull/10515))
 - Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
 - Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
@@ -33,8 +32,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- [Oxide] Disable color opacity plugins by default in the `oxide` engine ([#10618](https://github.com/tailwindlabs/tailwindcss/pull/10618))
-- [Oxide] Enable relative content paths for the `oxide` engine ([#10621](https://github.com/tailwindlabs/tailwindcss/pull/10621))
 - Mark `rtl` and `ltr` variants as stable and remove warnings ([#10764](https://github.com/tailwindlabs/tailwindcss/pull/10764))
 - Use `inset` instead of `top`, `right`, `bottom`, and `left` properties ([#10765](https://github.com/tailwindlabs/tailwindcss/pull/10765))
 - Make `dark` and `rtl`/`ltr` variants insensitive to DOM order ([#10766](https://github.com/tailwindlabs/tailwindcss/pull/10766))

From 71035b7bbebbe99d91a9c3d437b499f6548c9e8e Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Mon, 27 Mar 2023 14:56:03 +0000
Subject: [PATCH 72/84] Update vite to version 4.2.1

---
 integrations/vite/package.json |   2 +-
 package-lock.json              | 797 +--------------------------------
 2 files changed, 19 insertions(+), 780 deletions(-)

diff --git a/integrations/vite/package.json b/integrations/vite/package.json
index 5b4e91e7467e..4a818dac6bdf 100644
--- a/integrations/vite/package.json
+++ b/integrations/vite/package.json
@@ -21,6 +21,6 @@
   },
   "devDependencies": {
     "isomorphic-fetch": "^3.0.0",
-    "vite": "^4.1.4"
+    "vite": "^4.2.1"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index b5f18df8a8be..b3efa5ba24ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -123,7 +123,7 @@
       "version": "0.0.0",
       "devDependencies": {
         "isomorphic-fetch": "^3.0.0",
-        "vite": "^4.1.4"
+        "vite": "4.2.1"
       }
     },
     "integrations/webpack-4": {
@@ -14456,15 +14456,15 @@
       "dev": true
     },
     "node_modules/vite": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.1.4.tgz",
-      "integrity": "sha512-3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.2.1.tgz",
+      "integrity": "sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==",
       "dev": true,
       "dependencies": {
-        "esbuild": "^0.16.14",
+        "esbuild": "^0.17.5",
         "postcss": "^8.4.21",
         "resolve": "^1.22.1",
-        "rollup": "^3.10.0"
+        "rollup": "^3.18.0"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -14504,395 +14504,6 @@
         }
       }
     },
-    "node_modules/vite/node_modules/@esbuild/android-arm": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz",
-      "integrity": "sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-arm64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz",
-      "integrity": "sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-x64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz",
-      "integrity": "sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz",
-      "integrity": "sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/darwin-x64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz",
-      "integrity": "sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz",
-      "integrity": "sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz",
-      "integrity": "sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-arm": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz",
-      "integrity": "sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-arm64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz",
-      "integrity": "sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-ia32": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz",
-      "integrity": "sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz",
-      "integrity": "sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz",
-      "integrity": "sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz",
-      "integrity": "sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz",
-      "integrity": "sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-s390x": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz",
-      "integrity": "sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-x64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz",
-      "integrity": "sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz",
-      "integrity": "sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz",
-      "integrity": "sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/sunos-x64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz",
-      "integrity": "sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-arm64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz",
-      "integrity": "sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-ia32": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz",
-      "integrity": "sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-x64": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz",
-      "integrity": "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/esbuild": {
-      "version": "0.16.17",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz",
-      "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/android-arm": "0.16.17",
-        "@esbuild/android-arm64": "0.16.17",
-        "@esbuild/android-x64": "0.16.17",
-        "@esbuild/darwin-arm64": "0.16.17",
-        "@esbuild/darwin-x64": "0.16.17",
-        "@esbuild/freebsd-arm64": "0.16.17",
-        "@esbuild/freebsd-x64": "0.16.17",
-        "@esbuild/linux-arm": "0.16.17",
-        "@esbuild/linux-arm64": "0.16.17",
-        "@esbuild/linux-ia32": "0.16.17",
-        "@esbuild/linux-loong64": "0.16.17",
-        "@esbuild/linux-mips64el": "0.16.17",
-        "@esbuild/linux-ppc64": "0.16.17",
-        "@esbuild/linux-riscv64": "0.16.17",
-        "@esbuild/linux-s390x": "0.16.17",
-        "@esbuild/linux-x64": "0.16.17",
-        "@esbuild/netbsd-x64": "0.16.17",
-        "@esbuild/openbsd-x64": "0.16.17",
-        "@esbuild/sunos-x64": "0.16.17",
-        "@esbuild/win32-arm64": "0.16.17",
-        "@esbuild/win32-ia32": "0.16.17",
-        "@esbuild/win32-x64": "0.16.17"
-      }
-    },
     "node_modules/vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
@@ -17993,7 +17604,7 @@
       "version": "file:integrations/vite",
       "requires": {
         "isomorphic-fetch": "^3.0.0",
-        "vite": "^4.1.4"
+        "vite": "4.2.1"
       }
     },
     "@tailwindcss/integrations-webpack-4": {
@@ -27859,7 +27470,7 @@
           "version": "file:integrations/vite",
           "requires": {
             "isomorphic-fetch": "^3.0.0",
-            "vite": "^4.1.4"
+            "vite": "4.2.1"
           }
         },
         "@tailwindcss/integrations-webpack-4": {
@@ -35887,202 +35498,16 @@
           }
         },
         "vite": {
-          "version": "4.1.4",
-          "resolved": "https://registry.npmjs.org/vite/-/vite-4.1.4.tgz",
-          "integrity": "sha512-3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg==",
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/vite/-/vite-4.2.1.tgz",
+          "integrity": "sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==",
           "dev": true,
           "requires": {
-            "esbuild": "^0.16.14",
+            "esbuild": "^0.17.5",
             "fsevents": "~2.3.2",
             "postcss": "^8.4.21",
             "resolve": "^1.22.1",
-            "rollup": "^3.10.0"
-          },
-          "dependencies": {
-            "@esbuild/android-arm": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz",
-              "integrity": "sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/android-arm64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz",
-              "integrity": "sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/android-x64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz",
-              "integrity": "sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/darwin-arm64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz",
-              "integrity": "sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/darwin-x64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz",
-              "integrity": "sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/freebsd-arm64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz",
-              "integrity": "sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/freebsd-x64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz",
-              "integrity": "sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/linux-arm": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz",
-              "integrity": "sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/linux-arm64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz",
-              "integrity": "sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/linux-ia32": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz",
-              "integrity": "sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/linux-loong64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz",
-              "integrity": "sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/linux-mips64el": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz",
-              "integrity": "sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/linux-ppc64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz",
-              "integrity": "sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/linux-riscv64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz",
-              "integrity": "sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/linux-s390x": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz",
-              "integrity": "sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/linux-x64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz",
-              "integrity": "sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/netbsd-x64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz",
-              "integrity": "sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/openbsd-x64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz",
-              "integrity": "sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/sunos-x64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz",
-              "integrity": "sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/win32-arm64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz",
-              "integrity": "sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/win32-ia32": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz",
-              "integrity": "sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==",
-              "dev": true,
-              "optional": true
-            },
-            "@esbuild/win32-x64": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz",
-              "integrity": "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==",
-              "dev": true,
-              "optional": true
-            },
-            "esbuild": {
-              "version": "0.16.17",
-              "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz",
-              "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==",
-              "dev": true,
-              "requires": {
-                "@esbuild/android-arm": "0.16.17",
-                "@esbuild/android-arm64": "0.16.17",
-                "@esbuild/android-x64": "0.16.17",
-                "@esbuild/darwin-arm64": "0.16.17",
-                "@esbuild/darwin-x64": "0.16.17",
-                "@esbuild/freebsd-arm64": "0.16.17",
-                "@esbuild/freebsd-x64": "0.16.17",
-                "@esbuild/linux-arm": "0.16.17",
-                "@esbuild/linux-arm64": "0.16.17",
-                "@esbuild/linux-ia32": "0.16.17",
-                "@esbuild/linux-loong64": "0.16.17",
-                "@esbuild/linux-mips64el": "0.16.17",
-                "@esbuild/linux-ppc64": "0.16.17",
-                "@esbuild/linux-riscv64": "0.16.17",
-                "@esbuild/linux-s390x": "0.16.17",
-                "@esbuild/linux-x64": "0.16.17",
-                "@esbuild/netbsd-x64": "0.16.17",
-                "@esbuild/openbsd-x64": "0.16.17",
-                "@esbuild/sunos-x64": "0.16.17",
-                "@esbuild/win32-arm64": "0.16.17",
-                "@esbuild/win32-ia32": "0.16.17",
-                "@esbuild/win32-x64": "0.16.17"
-              }
-            }
+            "rollup": "^3.18.0"
           }
         },
         "vm-browserify": {
@@ -37217,202 +36642,16 @@
       }
     },
     "vite": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.1.4.tgz",
-      "integrity": "sha512-3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.2.1.tgz",
+      "integrity": "sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==",
       "dev": true,
       "requires": {
-        "esbuild": "^0.16.14",
+        "esbuild": "^0.17.5",
         "fsevents": "~2.3.2",
         "postcss": "^8.4.21",
         "resolve": "^1.22.1",
-        "rollup": "^3.10.0"
-      },
-      "dependencies": {
-        "@esbuild/android-arm": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz",
-          "integrity": "sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/android-arm64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz",
-          "integrity": "sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/android-x64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz",
-          "integrity": "sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/darwin-arm64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz",
-          "integrity": "sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/darwin-x64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz",
-          "integrity": "sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/freebsd-arm64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz",
-          "integrity": "sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/freebsd-x64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz",
-          "integrity": "sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/linux-arm": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz",
-          "integrity": "sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/linux-arm64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz",
-          "integrity": "sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/linux-ia32": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz",
-          "integrity": "sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/linux-loong64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz",
-          "integrity": "sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/linux-mips64el": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz",
-          "integrity": "sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/linux-ppc64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz",
-          "integrity": "sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/linux-riscv64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz",
-          "integrity": "sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/linux-s390x": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz",
-          "integrity": "sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/linux-x64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz",
-          "integrity": "sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/netbsd-x64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz",
-          "integrity": "sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/openbsd-x64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz",
-          "integrity": "sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/sunos-x64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz",
-          "integrity": "sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/win32-arm64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz",
-          "integrity": "sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/win32-ia32": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz",
-          "integrity": "sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==",
-          "dev": true,
-          "optional": true
-        },
-        "@esbuild/win32-x64": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz",
-          "integrity": "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==",
-          "dev": true,
-          "optional": true
-        },
-        "esbuild": {
-          "version": "0.16.17",
-          "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz",
-          "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==",
-          "dev": true,
-          "requires": {
-            "@esbuild/android-arm": "0.16.17",
-            "@esbuild/android-arm64": "0.16.17",
-            "@esbuild/android-x64": "0.16.17",
-            "@esbuild/darwin-arm64": "0.16.17",
-            "@esbuild/darwin-x64": "0.16.17",
-            "@esbuild/freebsd-arm64": "0.16.17",
-            "@esbuild/freebsd-x64": "0.16.17",
-            "@esbuild/linux-arm": "0.16.17",
-            "@esbuild/linux-arm64": "0.16.17",
-            "@esbuild/linux-ia32": "0.16.17",
-            "@esbuild/linux-loong64": "0.16.17",
-            "@esbuild/linux-mips64el": "0.16.17",
-            "@esbuild/linux-ppc64": "0.16.17",
-            "@esbuild/linux-riscv64": "0.16.17",
-            "@esbuild/linux-s390x": "0.16.17",
-            "@esbuild/linux-x64": "0.16.17",
-            "@esbuild/netbsd-x64": "0.16.17",
-            "@esbuild/openbsd-x64": "0.16.17",
-            "@esbuild/sunos-x64": "0.16.17",
-            "@esbuild/win32-arm64": "0.16.17",
-            "@esbuild/win32-ia32": "0.16.17",
-            "@esbuild/win32-x64": "0.16.17"
-          }
-        }
+        "rollup": "^3.18.0"
       }
     },
     "vm-browserify": {

From 5b77b4257453843299e7cccdbd625aa469deb38b Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Mon, 27 Mar 2023 18:56:14 +0200
Subject: [PATCH 73/84] Reset all properties when using `line-clamp-none`
 (#10876)

* reset other properties on `line-clamp-none`

* update CHANGELOG
---
 CHANGELOG.md               |  2 +-
 src/corePlugins.js         |  7 ++++++-
 tests/kitchen-sink.test.js | 10 ++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7bb84d1bc789..0e8e81ee99db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
 - Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
 - Add `content-normal` and `content-stretch` utilities ([#10645](https://github.com/tailwindlabs/tailwindcss/pull/10645))
-- Add `line-clamp` utilities from `@tailwindcss/line-clamp` to core ([#10768](https://github.com/tailwindlabs/tailwindcss/pull/10768))
+- Add `line-clamp` utilities from `@tailwindcss/line-clamp` to core ([#10768](https://github.com/tailwindlabs/tailwindcss/pull/10768), [#10876](https://github.com/tailwindlabs/tailwindcss/pull/10876))
 - Support ESM and TypeScript config files ([#10785](https://github.com/tailwindlabs/tailwindcss/pull/10785))
 - Add `list-style-image` utilities ([#10817](https://github.com/tailwindlabs/tailwindcss/pull/10817))
 - Use `:is` to make important selector option insensitive to DOM order ([#10835](https://github.com/tailwindlabs/tailwindcss/pull/10835))
diff --git a/src/corePlugins.js b/src/corePlugins.js
index ecb198eb9706..aacca3ab0af1 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -717,7 +717,12 @@ export let corePlugins = {
     )
 
     addUtilities({
-      '.line-clamp-none': { '-webkit-line-clamp': 'unset' },
+      '.line-clamp-none': {
+        overflow: 'visible',
+        display: 'block',
+        '-webkit-box-orient': 'horizontal',
+        '-webkit-line-clamp': 'none',
+      },
     })
   },
 
diff --git a/tests/kitchen-sink.test.js b/tests/kitchen-sink.test.js
index a1425b2d75a3..f5e30b4bbff7 100644
--- a/tests/kitchen-sink.test.js
+++ b/tests/kitchen-sink.test.js
@@ -454,7 +454,10 @@ crosscheck(({ stable, oxide }) => {
           overflow: hidden;
         }
         .line-clamp-none {
-          -webkit-line-clamp: unset;
+          -webkit-line-clamp: none;
+          -webkit-box-orient: horizontal;
+          display: block;
+          overflow: visible;
         }
         .scale-50 {
           --tw-scale-x: 0.5;
@@ -1019,7 +1022,10 @@ crosscheck(({ stable, oxide }) => {
           overflow: hidden;
         }
         .line-clamp-none {
-          -webkit-line-clamp: unset;
+          -webkit-line-clamp: none;
+          -webkit-box-orient: horizontal;
+          display: block;
+          overflow: visible;
         }
         .scale-50 {
           --tw-scale-x: 0.5;

From 8e85a865da12906f594928bf1da48224c20ade9a Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Mon, 27 Mar 2023 19:09:06 +0200
Subject: [PATCH 74/84] Ensure module dependencies for value `null`, is an
 empty `Set` (#10877)

* ensure we have no dependencies when `absoluteFilePath` is `null`

This happens in the CLI where we don't have a guaranteed `path` for the
config file. This can happen in practice if you use:

```console
npx tailwindcss --content ./index.html -o ./output.css
```

... and if you don't have a `tailwind.config.{js,ts,cjs,...}` in the
current directory.

* update changelog
---
 CHANGELOG.md                     | 1 +
 src/lib/getModuleDependencies.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e8e81ee99db..62e9d5265a09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Disallow multiple selectors in arbitrary variants ([#10655](https://github.com/tailwindlabs/tailwindcss/pull/10655))
 - Sort class lists deterministically for Prettier plugin ([#10672](https://github.com/tailwindlabs/tailwindcss/pull/10672))
 - Ensure CLI builds have a non-zero exit code on failure ([#10703](https://github.com/tailwindlabs/tailwindcss/pull/10703))
+- Ensure module dependencies for value `null`, is an empty `Set` ([#10877](https://github.com/tailwindlabs/tailwindcss/pull/10877))
 
 ### Changed
 
diff --git a/src/lib/getModuleDependencies.js b/src/lib/getModuleDependencies.js
index 43b39193f5da..bd27022f29c7 100644
--- a/src/lib/getModuleDependencies.js
+++ b/src/lib/getModuleDependencies.js
@@ -72,6 +72,7 @@ function* _getModuleDependencies(filename, base, seen, ext = path.extname(filena
 }
 
 export default function getModuleDependencies(absoluteFilePath) {
+  if (absoluteFilePath === null) return new Set()
   return new Set(
     _getModuleDependencies(absoluteFilePath, path.dirname(absoluteFilePath), new Set())
   )

From 55aa4035f5ffd01021a5f94bb92685dc0170e7f1 Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Mon, 27 Mar 2023 19:41:20 +0200
Subject: [PATCH 75/84] Fix format assumption when resolving module
 dependencies (#10878)

* fix assumption when resolving dependencies

When resolving dependencies given a path, we are only interested
relative files from the current file. We are not interested in the
dependencies that are listed in your `package.json` and thus in your
`node_modules` folder.

We made the assumption that your imports have at least 3 characters.
This sort of makes sense because there will be a `.`, then the OS
separator like `/` and than a file name. E.g.: `./a` is the minimal
amount of characters.

This makes sense for `import` statements, but in the case of `require`,
it is totally valid to write `require('.')`. This will require the
current `index.{js,ts,mjs,cjs,...}` in the current directory.

Before this change, having a `require('.')` wouldn't crash, but the
dependency would not be marked as a module dependencies and therefore we
won't listen for file changes for that dependency.

* update changelog
---
 CHANGELOG.md                     | 1 +
 src/lib/getModuleDependencies.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62e9d5265a09..0a00a241213c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Sort class lists deterministically for Prettier plugin ([#10672](https://github.com/tailwindlabs/tailwindcss/pull/10672))
 - Ensure CLI builds have a non-zero exit code on failure ([#10703](https://github.com/tailwindlabs/tailwindcss/pull/10703))
 - Ensure module dependencies for value `null`, is an empty `Set` ([#10877](https://github.com/tailwindlabs/tailwindcss/pull/10877))
+- Fix format assumption when resolving module dependencies ([#10878](https://github.com/tailwindlabs/tailwindcss/pull/10878))
 
 ### Changed
 
diff --git a/src/lib/getModuleDependencies.js b/src/lib/getModuleDependencies.js
index bd27022f29c7..e6a38a89d21f 100644
--- a/src/lib/getModuleDependencies.js
+++ b/src/lib/getModuleDependencies.js
@@ -62,7 +62,7 @@ function* _getModuleDependencies(filename, base, seen, ext = path.extname(filena
   for (let match of [
     ...contents.matchAll(/import[\s\S]*?['"](.{3,}?)['"]/gi),
     ...contents.matchAll(/import[\s\S]*from[\s\S]*?['"](.{3,}?)['"]/gi),
-    ...contents.matchAll(/require\(['"`](.{3,})['"`]\)/gi),
+    ...contents.matchAll(/require\(['"`](.+)['"`]\)/gi),
   ]) {
     // Bail out if it's not a relative file
     if (!match[1].startsWith('.')) continue

From fb796cd2ecc6dcb2d67a219131c2be96b9aee229 Mon Sep 17 00:00:00 2001
From: Jonathan Reinink <jonathan@reinink.ca>
Date: Mon, 27 Mar 2023 14:47:13 -0400
Subject: [PATCH 76/84] Extend default color palette with new 950 shades
 (#10879)

* Add 950 colors

* Update changelog
---
 CHANGELOG.md         |  1 +
 src/public/colors.js | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a00a241213c..a276df5d56ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `list-style-image` utilities ([#10817](https://github.com/tailwindlabs/tailwindcss/pull/10817))
 - Use `:is` to make important selector option insensitive to DOM order ([#10835](https://github.com/tailwindlabs/tailwindcss/pull/10835))
 - Add `whitespace-break-spaces` utility ([#10729](https://github.com/tailwindlabs/tailwindcss/pull/10729))
+- Extend default color palette with new 950 shades ([#10879](https://github.com/tailwindlabs/tailwindcss/pull/10879))
 
 ### Fixed
 
diff --git a/src/public/colors.js b/src/public/colors.js
index 92fef5444d2e..0764bfa96b63 100644
--- a/src/public/colors.js
+++ b/src/public/colors.js
@@ -24,6 +24,7 @@ export default {
     700: '#334155',
     800: '#1e293b',
     900: '#0f172a',
+    950: '#020617',
   },
   gray: {
     50: '#f9fafb',
@@ -36,6 +37,7 @@ export default {
     700: '#374151',
     800: '#1f2937',
     900: '#111827',
+    950: '#030712',
   },
   zinc: {
     50: '#fafafa',
@@ -48,6 +50,7 @@ export default {
     700: '#3f3f46',
     800: '#27272a',
     900: '#18181b',
+    950: '#09090b',
   },
   neutral: {
     50: '#fafafa',
@@ -60,6 +63,7 @@ export default {
     700: '#404040',
     800: '#262626',
     900: '#171717',
+    950: '#0a0a0a',
   },
   stone: {
     50: '#fafaf9',
@@ -72,6 +76,7 @@ export default {
     700: '#44403c',
     800: '#292524',
     900: '#1c1917',
+    950: '#0c0a09',
   },
   red: {
     50: '#fef2f2',
@@ -84,6 +89,7 @@ export default {
     700: '#b91c1c',
     800: '#991b1b',
     900: '#7f1d1d',
+    950: '#450a0a',
   },
   orange: {
     50: '#fff7ed',
@@ -96,6 +102,7 @@ export default {
     700: '#c2410c',
     800: '#9a3412',
     900: '#7c2d12',
+    950: '#431407',
   },
   amber: {
     50: '#fffbeb',
@@ -108,6 +115,7 @@ export default {
     700: '#b45309',
     800: '#92400e',
     900: '#78350f',
+    950: '#451a03',
   },
   yellow: {
     50: '#fefce8',
@@ -120,6 +128,7 @@ export default {
     700: '#a16207',
     800: '#854d0e',
     900: '#713f12',
+    950: '#422006',
   },
   lime: {
     50: '#f7fee7',
@@ -132,6 +141,7 @@ export default {
     700: '#4d7c0f',
     800: '#3f6212',
     900: '#365314',
+    950: '#1a2e05',
   },
   green: {
     50: '#f0fdf4',
@@ -144,6 +154,7 @@ export default {
     700: '#15803d',
     800: '#166534',
     900: '#14532d',
+    950: '#052e16',
   },
   emerald: {
     50: '#ecfdf5',
@@ -156,6 +167,7 @@ export default {
     700: '#047857',
     800: '#065f46',
     900: '#064e3b',
+    950: '#022c22',
   },
   teal: {
     50: '#f0fdfa',
@@ -168,6 +180,7 @@ export default {
     700: '#0f766e',
     800: '#115e59',
     900: '#134e4a',
+    950: '#042f2e',
   },
   cyan: {
     50: '#ecfeff',
@@ -180,6 +193,7 @@ export default {
     700: '#0e7490',
     800: '#155e75',
     900: '#164e63',
+    950: '#083344',
   },
   sky: {
     50: '#f0f9ff',
@@ -192,6 +206,7 @@ export default {
     700: '#0369a1',
     800: '#075985',
     900: '#0c4a6e',
+    950: '#082f49',
   },
   blue: {
     50: '#eff6ff',
@@ -204,6 +219,7 @@ export default {
     700: '#1d4ed8',
     800: '#1e40af',
     900: '#1e3a8a',
+    950: '#172554',
   },
   indigo: {
     50: '#eef2ff',
@@ -216,6 +232,7 @@ export default {
     700: '#4338ca',
     800: '#3730a3',
     900: '#312e81',
+    950: '#1e1b4b',
   },
   violet: {
     50: '#f5f3ff',
@@ -228,6 +245,7 @@ export default {
     700: '#6d28d9',
     800: '#5b21b6',
     900: '#4c1d95',
+    950: '#2e1065',
   },
   purple: {
     50: '#faf5ff',
@@ -240,6 +258,7 @@ export default {
     700: '#7e22ce',
     800: '#6b21a8',
     900: '#581c87',
+    950: '#3b0764',
   },
   fuchsia: {
     50: '#fdf4ff',
@@ -252,6 +271,7 @@ export default {
     700: '#a21caf',
     800: '#86198f',
     900: '#701a75',
+    950: '#4a044e',
   },
   pink: {
     50: '#fdf2f8',
@@ -264,6 +284,7 @@ export default {
     700: '#be185d',
     800: '#9d174d',
     900: '#831843',
+    950: '#500724',
   },
   rose: {
     50: '#fff1f2',
@@ -276,6 +297,7 @@ export default {
     700: '#be123c',
     800: '#9f1239',
     900: '#881337',
+    950: '#4c0519',
   },
   get lightBlue() {
     warn({ version: 'v2.2', from: 'lightBlue', to: 'sky' })

From b039e7129d42caadffddf67c2cf8fdb1467bfbf2 Mon Sep 17 00:00:00 2001
From: Jonathan Reinink <jonathan@reinink.ca>
Date: Mon, 27 Mar 2023 14:58:57 -0400
Subject: [PATCH 77/84] Clean up changelog

---
 CHANGELOG.md | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a276df5d56ba..32ab90376ad6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,25 +9,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Support ESM and TypeScript config files ([#10785](https://github.com/tailwindlabs/tailwindcss/pull/10785))
+- Extend default color palette with new 950 shades ([#10879](https://github.com/tailwindlabs/tailwindcss/pull/10879))
 - Add `line-height` modifier support to `font-size` utilities ([#9875](https://github.com/tailwindlabs/tailwindcss/pull/9875))
-- Support using variables as arbitrary values without `var(...)` ([#9880](https://github.com/tailwindlabs/tailwindcss/pull/9880), [#9962](https://github.com/tailwindlabs/tailwindcss/pull/9962))
-- Add `delay-0` and `duration-0` by default ([#10294](https://github.com/tailwindlabs/tailwindcss/pull/10294))
+- Add support for using variables as arbitrary values without `var(...)` ([#9880](https://github.com/tailwindlabs/tailwindcss/pull/9880), [#9962](https://github.com/tailwindlabs/tailwindcss/pull/9962))
 - Add logical properties support for inline direction ([#10166](https://github.com/tailwindlabs/tailwindcss/pull/10166))
 - Add `hyphens` utilities ([#10071](https://github.com/tailwindlabs/tailwindcss/pull/10071))
-- Add support for configuring default `font-variation-settings` for a `font-family` ([#10034](https://github.com/tailwindlabs/tailwindcss/pull/10034), [#10515](https://github.com/tailwindlabs/tailwindcss/pull/10515))
+- Add `list-style-image` utilities ([#10817](https://github.com/tailwindlabs/tailwindcss/pull/10817))
 - Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
+- Add `line-clamp` utilities from `@tailwindcss/line-clamp` to core ([#10768](https://github.com/tailwindlabs/tailwindcss/pull/10768), [#10876](https://github.com/tailwindlabs/tailwindcss/pull/10876), [#10862](https://github.com/tailwindlabs/tailwindcss/pull/10862))
+- Add `delay-0` and `duration-0` by default ([#10294](https://github.com/tailwindlabs/tailwindcss/pull/10294))
 - Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
 - Add `content-normal` and `content-stretch` utilities ([#10645](https://github.com/tailwindlabs/tailwindcss/pull/10645))
-- Add `line-clamp` utilities from `@tailwindcss/line-clamp` to core ([#10768](https://github.com/tailwindlabs/tailwindcss/pull/10768), [#10876](https://github.com/tailwindlabs/tailwindcss/pull/10876))
-- Support ESM and TypeScript config files ([#10785](https://github.com/tailwindlabs/tailwindcss/pull/10785))
-- Add `list-style-image` utilities ([#10817](https://github.com/tailwindlabs/tailwindcss/pull/10817))
-- Use `:is` to make important selector option insensitive to DOM order ([#10835](https://github.com/tailwindlabs/tailwindcss/pull/10835))
 - Add `whitespace-break-spaces` utility ([#10729](https://github.com/tailwindlabs/tailwindcss/pull/10729))
-- Extend default color palette with new 950 shades ([#10879](https://github.com/tailwindlabs/tailwindcss/pull/10879))
+- Add support for configuring default `font-variation-settings` for a `font-family` ([#10034](https://github.com/tailwindlabs/tailwindcss/pull/10034), [#10515](https://github.com/tailwindlabs/tailwindcss/pull/10515))
 
 ### Fixed
 
-- Disallow multiple selectors in arbitrary variants ([#10655](https://github.com/tailwindlabs/tailwindcss/pull/10655))
+- Disallow using multiple selectors in arbitrary variants ([#10655](https://github.com/tailwindlabs/tailwindcss/pull/10655))
 - Sort class lists deterministically for Prettier plugin ([#10672](https://github.com/tailwindlabs/tailwindcss/pull/10672))
 - Ensure CLI builds have a non-zero exit code on failure ([#10703](https://github.com/tailwindlabs/tailwindcss/pull/10703))
 - Ensure module dependencies for value `null`, is an empty `Set` ([#10877](https://github.com/tailwindlabs/tailwindcss/pull/10877))
@@ -38,7 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Mark `rtl` and `ltr` variants as stable and remove warnings ([#10764](https://github.com/tailwindlabs/tailwindcss/pull/10764))
 - Use `inset` instead of `top`, `right`, `bottom`, and `left` properties ([#10765](https://github.com/tailwindlabs/tailwindcss/pull/10765))
 - Make `dark` and `rtl`/`ltr` variants insensitive to DOM order ([#10766](https://github.com/tailwindlabs/tailwindcss/pull/10766))
-- Warn when `@tailwindcss/line-clamp` plugin is being used ([#10862](https://github.com/tailwindlabs/tailwindcss/pull/10862))
+- Use `:is` to make important selector option insensitive to DOM order ([#10835](https://github.com/tailwindlabs/tailwindcss/pull/10835))
 
 ## [3.2.7] - 2023-02-16
 

From 0475ca9820a33050edd89b6067fe5f75c4115a49 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Mon, 27 Mar 2023 19:11:40 +0000
Subject: [PATCH 78/84] Update eslint-config-prettier to version 8.8.0

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b3efa5ba24ab..d0d60c6fb86a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -123,7 +123,7 @@
       "version": "0.0.0",
       "devDependencies": {
         "isomorphic-fetch": "^3.0.0",
-        "vite": "4.2.1"
+        "vite": "^4.2.1"
       }
     },
     "integrations/webpack-4": {
@@ -17604,7 +17604,7 @@
       "version": "file:integrations/vite",
       "requires": {
         "isomorphic-fetch": "^3.0.0",
-        "vite": "4.2.1"
+        "vite": "^4.2.1"
       }
     },
     "@tailwindcss/integrations-webpack-4": {
@@ -27470,7 +27470,7 @@
           "version": "file:integrations/vite",
           "requires": {
             "isomorphic-fetch": "^3.0.0",
-            "vite": "4.2.1"
+            "vite": "^4.2.1"
           }
         },
         "@tailwindcss/integrations-webpack-4": {
diff --git a/package.json b/package.json
index ac5daf1d47bc..718f7ac83e35 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "cssnano": "^5.1.15",
     "esbuild": "^0.17.12",
     "eslint": "^8.35.0",
-    "eslint-config-prettier": "^8.7.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^29.5.0",
     "jest-diff": "^29.5.0",

From 7e91ea91a028ce5ddd2a707675240663fbfb9804 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Tue, 28 Mar 2023 08:30:47 +0000
Subject: [PATCH 79/84] Update sucrase to version 3.31.0

---
 package-lock.json | 22 +++++++++++-----------
 package.json      |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d0d60c6fb86a..ad9cf347c520 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -55,7 +55,7 @@
         "cssnano": "^5.1.15",
         "esbuild": "^0.17.12",
         "eslint": "^8.35.0",
-        "eslint-config-prettier": "^8.7.0",
+        "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-prettier": "^4.2.1",
         "jest": "^29.5.0",
         "jest-diff": "^29.5.0",
@@ -6960,9 +6960,9 @@
       }
     },
     "node_modules/eslint-config-prettier": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.7.0.tgz",
-      "integrity": "sha512-HHVXLSlVUhMSmyW4ZzEuvjpwqamgmlfkutD53cYXLikh4pt/modINRcCIApJ84czDxM4GZInwUrromsDdTImTA==",
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz",
+      "integrity": "sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==",
       "dev": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
@@ -20245,9 +20245,9 @@
       }
     },
     "eslint-config-prettier": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.7.0.tgz",
-      "integrity": "sha512-HHVXLSlVUhMSmyW4ZzEuvjpwqamgmlfkutD53cYXLikh4pt/modINRcCIApJ84czDxM4GZInwUrromsDdTImTA==",
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz",
+      "integrity": "sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==",
       "dev": true,
       "requires": {}
     },
@@ -25134,7 +25134,7 @@
         "dlv": "^1.1.3",
         "esbuild": "^0.17.12",
         "eslint": "^8.35.0",
-        "eslint-config-prettier": "^8.7.0",
+        "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-prettier": "^4.2.1",
         "fast-glob": "^3.2.12",
         "glob-parent": "^6.0.2",
@@ -30111,9 +30111,9 @@
           }
         },
         "eslint-config-prettier": {
-          "version": "8.7.0",
-          "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.7.0.tgz",
-          "integrity": "sha512-HHVXLSlVUhMSmyW4ZzEuvjpwqamgmlfkutD53cYXLikh4pt/modINRcCIApJ84czDxM4GZInwUrromsDdTImTA==",
+          "version": "8.8.0",
+          "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz",
+          "integrity": "sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==",
           "dev": true,
           "requires": {}
         },
diff --git a/package.json b/package.json
index 718f7ac83e35..6794cfbf175a 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "postcss-value-parser": "^4.2.0",
     "quick-lru": "^5.1.1",
     "resolve": "^1.22.1",
-    "sucrase": "^3.29.0"
+    "sucrase": "^3.31.0"
   },
   "browserslist": [
     "> 1%",

From 94608fbd9e23594e22ac9ed9dc79f387e95b0c3a Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Tue, 28 Mar 2023 09:12:59 +0000
Subject: [PATCH 80/84] Update prettier to version 2.8.7

---
 package-lock.json | 22 +++++++++++-----------
 package.json      |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ad9cf347c520..45027db1aa1f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39,7 +39,7 @@
         "postcss-value-parser": "^4.2.0",
         "quick-lru": "^5.1.1",
         "resolve": "^1.22.1",
-        "sucrase": "^3.29.0"
+        "sucrase": "^3.31.0"
       },
       "bin": {
         "tailwind": "lib/cli.js",
@@ -13695,9 +13695,9 @@
       }
     },
     "node_modules/sucrase": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.29.0.tgz",
-      "integrity": "sha512-bZPAuGA5SdFHuzqIhTAqt9fvNEo9rESqXIG3oiKdF8K4UmkQxC4KlNL3lVyAErXp+mPvUqZ5l13qx6TrDIGf3A==",
+      "version": "3.31.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.31.0.tgz",
+      "integrity": "sha512-6QsHnkqyVEzYcaiHsOKkzOtOgdJcb8i54x6AV2hDwyZcY9ZyykGZVw6L/YN98xC0evwTP6utsWWrKRaa8QlfEQ==",
       "dependencies": {
         "commander": "^4.0.0",
         "glob": "7.1.6",
@@ -25064,9 +25064,9 @@
       }
     },
     "sucrase": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.29.0.tgz",
-      "integrity": "sha512-bZPAuGA5SdFHuzqIhTAqt9fvNEo9rESqXIG3oiKdF8K4UmkQxC4KlNL3lVyAErXp+mPvUqZ5l13qx6TrDIGf3A==",
+      "version": "3.31.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.31.0.tgz",
+      "integrity": "sha512-6QsHnkqyVEzYcaiHsOKkzOtOgdJcb8i54x6AV2hDwyZcY9ZyykGZVw6L/YN98xC0evwTP6utsWWrKRaa8QlfEQ==",
       "requires": {
         "commander": "^4.0.0",
         "glob": "7.1.6",
@@ -25160,7 +25160,7 @@
         "resolve": "^1.22.1",
         "rimraf": "^4.4.0",
         "source-map-js": "^1.0.2",
-        "sucrase": "^3.29.0",
+        "sucrase": "^3.31.0",
         "turbo": "^1.8.3"
       },
       "dependencies": {
@@ -34930,9 +34930,9 @@
           }
         },
         "sucrase": {
-          "version": "3.29.0",
-          "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.29.0.tgz",
-          "integrity": "sha512-bZPAuGA5SdFHuzqIhTAqt9fvNEo9rESqXIG3oiKdF8K4UmkQxC4KlNL3lVyAErXp+mPvUqZ5l13qx6TrDIGf3A==",
+          "version": "3.31.0",
+          "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.31.0.tgz",
+          "integrity": "sha512-6QsHnkqyVEzYcaiHsOKkzOtOgdJcb8i54x6AV2hDwyZcY9ZyykGZVw6L/YN98xC0evwTP6utsWWrKRaa8QlfEQ==",
           "requires": {
             "commander": "^4.0.0",
             "glob": "7.1.6",
diff --git a/package.json b/package.json
index 6794cfbf175a..1005312befac 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^29.5.0",
     "jest-diff": "^29.5.0",
-    "prettier": "^2.8.4",
+    "prettier": "^2.8.7",
     "rimraf": "^4.4.0",
     "source-map-js": "^1.0.2",
     "turbo": "^1.8.3"

From e96071a0e438f4c1c1480406f2e65a306cdc9cad Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Tue, 28 Mar 2023 12:41:24 +0000
Subject: [PATCH 81/84] Update @napi-rs/cli to version 2.15.2

---
 oxide/crates/node/package.json |  2 +-
 package-lock.json              | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/oxide/crates/node/package.json b/oxide/crates/node/package.json
index f2d9dce31e06..f9841b69f648 100644
--- a/oxide/crates/node/package.json
+++ b/oxide/crates/node/package.json
@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@napi-rs/cli": "^2.14.8"
+    "@napi-rs/cli": "^2.15.2"
   },
   "engines": {
     "node": ">= 10"
diff --git a/package-lock.json b/package-lock.json
index 45027db1aa1f..1cf6c33fbc4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -59,7 +59,7 @@
         "eslint-plugin-prettier": "^4.2.1",
         "jest": "^29.5.0",
         "jest-diff": "^29.5.0",
-        "prettier": "^2.8.4",
+        "prettier": "^2.8.7",
         "rimraf": "^4.4.0",
         "source-map-js": "^1.0.2",
         "turbo": "^1.8.3"
@@ -12198,9 +12198,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
-      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
+      "version": "2.8.7",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz",
+      "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==",
       "dev": true,
       "bin": {
         "prettier": "bin-prettier.js"
@@ -23941,9 +23941,9 @@
       }
     },
     "prettier": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
-      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
+      "version": "2.8.7",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz",
+      "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==",
       "dev": true
     },
     "prettier-linter-helpers": {
@@ -25155,7 +25155,7 @@
         "postcss-nested": "6.0.1",
         "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
-        "prettier": "^2.8.4",
+        "prettier": "^2.8.7",
         "quick-lru": "^5.1.1",
         "resolve": "^1.22.1",
         "rimraf": "^4.4.0",
@@ -33807,9 +33807,9 @@
           }
         },
         "prettier": {
-          "version": "2.8.4",
-          "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
-          "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
+          "version": "2.8.7",
+          "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz",
+          "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==",
           "dev": true
         },
         "prettier-linter-helpers": {

From 0bfee99ed3143419de58fb9a5ae3b5e534ea22b3 Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Tue, 28 Mar 2023 15:20:47 +0200
Subject: [PATCH 82/84] sync package-lock.json

---
 package-lock.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1cf6c33fbc4e..c8e6c90f7f8b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2438,9 +2438,9 @@
       ]
     },
     "node_modules/@napi-rs/cli": {
-      "version": "2.14.8",
-      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.8.tgz",
-      "integrity": "sha512-IvA3s8BqohMdUbOkFn7+23u1dhIJZCkA8Xps7DD4SLdCMbcbUF6MUuKiqxuqmVHBFTaxU25sU56WdX3efqGgPw==",
+      "version": "2.15.2",
+      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.15.2.tgz",
+      "integrity": "sha512-80tBCtCnEhAmFtB9oPM0FL74uW7fAmtpeqjvERH7Q1z/aZzCAs/iNfE7U3ehpwg9Q07Ob2Eh/+1guyCdX/p24w==",
       "dev": true,
       "bin": {
         "napi": "scripts/index.js"
@@ -15279,7 +15279,7 @@
       "version": "0.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@napi-rs/cli": "^2.14.8"
+        "@napi-rs/cli": "^2.15.2"
       },
       "engines": {
         "node": ">= 10"
@@ -16607,9 +16607,9 @@
       "optional": true
     },
     "@napi-rs/cli": {
-      "version": "2.14.8",
-      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.8.tgz",
-      "integrity": "sha512-IvA3s8BqohMdUbOkFn7+23u1dhIJZCkA8Xps7DD4SLdCMbcbUF6MUuKiqxuqmVHBFTaxU25sU56WdX3efqGgPw==",
+      "version": "2.15.2",
+      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.15.2.tgz",
+      "integrity": "sha512-80tBCtCnEhAmFtB9oPM0FL74uW7fAmtpeqjvERH7Q1z/aZzCAs/iNfE7U3ehpwg9Q07Ob2Eh/+1guyCdX/p24w==",
       "dev": true
     },
     "@nodelib/fs.scandir": {
@@ -17886,7 +17886,7 @@
     "@tailwindcss/oxide": {
       "version": "file:oxide/crates/node",
       "requires": {
-        "@napi-rs/cli": "^2.14.8",
+        "@napi-rs/cli": "^2.15.2",
         "@tailwindcss/oxide-darwin-arm64": "0.0.0",
         "@tailwindcss/oxide-darwin-x64": "0.0.0",
         "@tailwindcss/oxide-freebsd-x64": "0.0.0",
@@ -26473,9 +26473,9 @@
           "optional": true
         },
         "@napi-rs/cli": {
-          "version": "2.14.8",
-          "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.14.8.tgz",
-          "integrity": "sha512-IvA3s8BqohMdUbOkFn7+23u1dhIJZCkA8Xps7DD4SLdCMbcbUF6MUuKiqxuqmVHBFTaxU25sU56WdX3efqGgPw==",
+          "version": "2.15.2",
+          "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.15.2.tgz",
+          "integrity": "sha512-80tBCtCnEhAmFtB9oPM0FL74uW7fAmtpeqjvERH7Q1z/aZzCAs/iNfE7U3ehpwg9Q07Ob2Eh/+1guyCdX/p24w==",
           "dev": true
         },
         "@nodelib/fs.scandir": {
@@ -27752,7 +27752,7 @@
         "@tailwindcss/oxide": {
           "version": "file:oxide/crates/node",
           "requires": {
-            "@napi-rs/cli": "^2.14.8",
+            "@napi-rs/cli": "^2.15.2",
             "@tailwindcss/oxide-darwin-arm64": "0.0.0",
             "@tailwindcss/oxide-darwin-x64": "0.0.0",
             "@tailwindcss/oxide-freebsd-x64": "0.0.0",

From 51157717dad2000faf2eee0949299707eb15b23b Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Tue, 28 Mar 2023 15:38:30 +0200
Subject: [PATCH 83/84] Add gradient color stop position utilities (#10886)

* add gradient color stop positions

* update tests to include gradient position color stop reset values

* add dedicated color stop position tests

* use `%` sign in the name of the uility

* update changelog

* ensure `length` values and css variables work
---
 CHANGELOG.md                             |   1 +
 oxide/crates/core/src/parser.rs          |  25 ++--
 src/corePlugins.js                       |  62 ++++++++-
 stubs/config.full.js                     |  23 ++++
 tests/any-type.test.js                   |  42 +++---
 tests/arbitrary-values.oxide.test.css    |  32 +++--
 tests/arbitrary-values.test.css          |  32 +++--
 tests/basic-usage.oxide.test.css         |  16 ++-
 tests/basic-usage.test.css               |  16 ++-
 tests/color-opacity-modifiers.test.js    |   6 +-
 tests/kitchen-sink.test.js               |  12 +-
 tests/plugins/gradientColorStops.test.js | 155 ++++++++++++++++++++---
 tests/raw-content.oxide.test.css         |  16 ++-
 tests/raw-content.test.css               |  16 ++-
 14 files changed, 359 insertions(+), 95 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32ab90376ad6..c12fe53ecae9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `content-normal` and `content-stretch` utilities ([#10645](https://github.com/tailwindlabs/tailwindcss/pull/10645))
 - Add `whitespace-break-spaces` utility ([#10729](https://github.com/tailwindlabs/tailwindcss/pull/10729))
 - Add support for configuring default `font-variation-settings` for a `font-family` ([#10034](https://github.com/tailwindlabs/tailwindcss/pull/10034), [#10515](https://github.com/tailwindlabs/tailwindcss/pull/10515))
+- Add gradient color stop position utilities ([#10886](https://github.com/tailwindlabs/tailwindcss/pull/10886))
 
 ### Fixed
 
diff --git a/oxide/crates/core/src/parser.rs b/oxide/crates/core/src/parser.rs
index 4bba1f947583..16831afffd41 100644
--- a/oxide/crates/core/src/parser.rs
+++ b/oxide/crates/core/src/parser.rs
@@ -43,14 +43,14 @@ impl<'a> Extractor<'a> {
 
     #[cfg(test)]
     pub fn unique_ord(input: &'a [u8], opts: ExtractorOptions) -> Vec<&'a [u8]> {
-      // This is an inefficient way to get an ordered, unique
-      // list as a Vec but it is only meant for testing.
-      let mut candidates = Self::all(input, opts);
-      let mut unique_list = FxHashSet::default();
-      unique_list.reserve(candidates.len());
-      candidates.retain(|c| unique_list.insert(*c));
+        // This is an inefficient way to get an ordered, unique
+        // list as a Vec but it is only meant for testing.
+        let mut candidates = Self::all(input, opts);
+        let mut unique_list = FxHashSet::default();
+        unique_list.reserve(candidates.len());
+        candidates.retain(|c| unique_list.insert(*c));
 
-      candidates
+        candidates
     }
 }
 
@@ -319,7 +319,16 @@ impl<'a> Extractor<'a> {
 
             // Allowed characters in the candidate itself
             // None of these can come after a closing bracket `]`
-            b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9' | b'-' | b'_' | b'(' | b')' | b'!' | b'@'
+            b'a'..=b'z'
+            | b'A'..=b'Z'
+            | b'0'..=b'9'
+            | b'-'
+            | b'_'
+            | b'('
+            | b')'
+            | b'!'
+            | b'@'
+            | b'%'
                 if prev != b']' =>
             {
                 /* TODO: The `b'@'` is necessary for custom separators like _@, maybe we can handle this in a better way... */
diff --git a/src/corePlugins.js b/src/corePlugins.js
index aacca3ab0af1..2c3b99283a5a 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -1756,40 +1756,92 @@ export let corePlugins = {
         type: ['color', 'any'],
       }
 
+      let positionOptions = {
+        values: theme('gradientColorStopPositions'),
+        type: ['length', 'percentage'],
+      }
+
       matchUtilities(
         {
           from: (value) => {
             let transparentToValue = transparentTo(value)
 
             return {
-              '--tw-gradient-from': toColorValue(value, 'from'),
-              '--tw-gradient-to': transparentToValue,
+              '--tw-gradient-from': `${toColorValue(
+                value,
+                'from'
+              )} var(--tw-gradient-from-position)`,
+              '--tw-gradient-from-position': ' ',
+              '--tw-gradient-to': `${transparentToValue}  var(--tw-gradient-from-position)`,
+              '--tw-gradient-to-position': ' ',
               '--tw-gradient-stops': `var(--tw-gradient-from), var(--tw-gradient-to)`,
             }
           },
         },
         options
       )
+
+      matchUtilities(
+        {
+          from: (value) => {
+            return {
+              '--tw-gradient-from-position': value,
+            }
+          },
+        },
+        positionOptions
+      )
+
       matchUtilities(
         {
           via: (value) => {
             let transparentToValue = transparentTo(value)
 
             return {
-              '--tw-gradient-to': transparentToValue,
+              '--tw-gradient-via-position': ' ',
+              '--tw-gradient-to': `${transparentToValue}  var(--tw-gradient-to-position)`,
+              '--tw-gradient-to-position': ' ',
               '--tw-gradient-stops': `var(--tw-gradient-from), ${toColorValue(
                 value,
                 'via'
-              )}, var(--tw-gradient-to)`,
+              )} var(--tw-gradient-via-position), var(--tw-gradient-to)`,
             }
           },
         },
         options
       )
+
       matchUtilities(
-        { to: (value) => ({ '--tw-gradient-to': toColorValue(value, 'to') }) },
+        {
+          via: (value) => {
+            return {
+              '--tw-gradient-via-position': value,
+            }
+          },
+        },
+        positionOptions
+      )
+
+      matchUtilities(
+        {
+          to: (value) => ({
+            '--tw-gradient-to': `${toColorValue(value, 'to')} var(--tw-gradient-to-position)`,
+            '--tw-gradient-to-position': ' ',
+          }),
+        },
         options
       )
+
+      matchUtilities(
+        {
+          to: (value) => {
+            return {
+              '--tw-gradient-to-position': value,
+            }
+          },
+        },
+        positionOptions
+      )
     }
   })(),
 
diff --git a/stubs/config.full.js b/stubs/config.full.js
index d3637bc9fad3..c32ccd3a0ea2 100644
--- a/stubs/config.full.js
+++ b/stubs/config.full.js
@@ -355,6 +355,29 @@ module.exports = {
     },
     gap: ({ theme }) => theme('spacing'),
     gradientColorStops: ({ theme }) => theme('colors'),
+    gradientColorStopPositions: {
+      '0%': '0%',
+      '5%': '5%',
+      '10%': '10%',
+      '15%': '15%',
+      '20%': '20%',
+      '25%': '25%',
+      '30%': '30%',
+      '35%': '35%',
+      '40%': '40%',
+      '45%': '45%',
+      '50%': '50%',
+      '55%': '55%',
+      '60%': '60%',
+      '65%': '65%',
+      '70%': '70%',
+      '75%': '75%',
+      '80%': '80%',
+      '85%': '85%',
+      '90%': '90%',
+      '95%': '95%',
+      '100%': '100%',
+    },
     grayscale: {
       0: '0',
       DEFAULT: '100%',
diff --git a/tests/any-type.test.js b/tests/any-type.test.js
index 17b670386bbf..11b92c8977bc 100644
--- a/tests/any-type.test.js
+++ b/tests/any-type.test.js
@@ -185,7 +185,7 @@ crosscheck(({ stable, oxide }) => {
     `
 
     return run(input, config).then((result) => {
-      let oxideExpected = css`
+      oxide.expect(result.css).toMatchFormattedCss(css`
         .inset-\[var\(--any-value\)\] {
           inset: var(--any-value);
         }
@@ -499,16 +499,22 @@ crosscheck(({ stable, oxide }) => {
           background-color: var(--any-value);
         }
         .from-\[var\(--any-value\)\] {
-          --tw-gradient-from: var(--any-value);
-          --tw-gradient-to: #fff0;
+          --tw-gradient-from: var(--any-value) var(--tw-gradient-from-position);
+          --tw-gradient-from-position: ;
+          --tw-gradient-to: #fff0 var(--tw-gradient-from-position);
+          --tw-gradient-to-position: ;
           --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
         }
         .via-\[var\(--any-value\)\] {
-          --tw-gradient-to: #fff0;
-          --tw-gradient-stops: var(--tw-gradient-from), var(--any-value), var(--tw-gradient-to);
+          --tw-gradient-via-position: ;
+          --tw-gradient-to: #fff0 var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
+          --tw-gradient-stops: var(--tw-gradient-from),
+            var(--any-value) var(--tw-gradient-via-position), var(--tw-gradient-to);
         }
         .to-\[var\(--any-value\)\] {
-          --tw-gradient-to: var(--any-value);
+          --tw-gradient-to: var(--any-value) var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
         }
         .fill-\[var\(--any-value\)\] {
           fill: var(--any-value);
@@ -732,8 +738,8 @@ crosscheck(({ stable, oxide }) => {
           --tw-content: var(--any-value);
           content: var(--tw-content);
         }
-      `
-      let stableExpected = css`
+      `)
+      stable.expect(result.css).toMatchFormattedCss(css`
         .inset-\[var\(--any-value\)\] {
           inset: var(--any-value);
         }
@@ -1056,16 +1062,22 @@ crosscheck(({ stable, oxide }) => {
           --tw-bg-opacity: var(--any-value);
         }
         .from-\[var\(--any-value\)\] {
-          --tw-gradient-from: var(--any-value);
-          --tw-gradient-to: #fff0;
+          --tw-gradient-from: var(--any-value) var(--tw-gradient-from-position);
+          --tw-gradient-from-position: ;
+          --tw-gradient-to: #fff0 var(--tw-gradient-from-position);
+          --tw-gradient-to-position: ;
           --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
         }
         .via-\[var\(--any-value\)\] {
-          --tw-gradient-to: #fff0;
-          --tw-gradient-stops: var(--tw-gradient-from), var(--any-value), var(--tw-gradient-to);
+          --tw-gradient-via-position: ;
+          --tw-gradient-to: #fff0 var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
+          --tw-gradient-stops: var(--tw-gradient-from),
+            var(--any-value) var(--tw-gradient-via-position), var(--tw-gradient-to);
         }
         .to-\[var\(--any-value\)\] {
-          --tw-gradient-to: var(--any-value);
+          --tw-gradient-to: var(--any-value) var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
         }
         .fill-\[var\(--any-value\)\] {
           fill: var(--any-value);
@@ -1298,9 +1310,7 @@ crosscheck(({ stable, oxide }) => {
           --tw-content: var(--any-value);
           content: var(--tw-content);
         }
-      `
-      oxide.expect(result.css).toMatchFormattedCss(oxideExpected)
-      stable.expect(result.css).toMatchFormattedCss(stableExpected)
+      `)
     })
   })
   test.todo('rewrite the any test to be easier to understand or break it up into multiple tests')
diff --git a/tests/arbitrary-values.oxide.test.css b/tests/arbitrary-values.oxide.test.css
index 4f3056ea9f21..fbf433b61a49 100644
--- a/tests/arbitrary-values.oxide.test.css
+++ b/tests/arbitrary-values.oxide.test.css
@@ -659,28 +659,40 @@
   background-image: var(--url);
 }
 .from-\[\#da5b66\] {
-  --tw-gradient-from: #da5b66;
-  --tw-gradient-to: #da5b6600;
+  --tw-gradient-from: #da5b66 var(--tw-gradient-from-position);
+  --tw-gradient-from-position: ;
+  --tw-gradient-to: #da5b6600 var(--tw-gradient-from-position);
+  --tw-gradient-to-position: ;
   --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
 }
 .from-\[var\(--color\)\] {
-  --tw-gradient-from: var(--color);
-  --tw-gradient-to: #fff0;
+  --tw-gradient-from: var(--color) var(--tw-gradient-from-position);
+  --tw-gradient-from-position: ;
+  --tw-gradient-to: #fff0 var(--tw-gradient-from-position);
+  --tw-gradient-to-position: ;
   --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
 }
 .via-\[\#da5b66\] {
-  --tw-gradient-to: #da5b6600;
-  --tw-gradient-stops: var(--tw-gradient-from), #da5b66, var(--tw-gradient-to);
+  --tw-gradient-via-position: ;
+  --tw-gradient-to: #da5b6600 var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
+  --tw-gradient-stops: var(--tw-gradient-from), #da5b66 var(--tw-gradient-via-position),
+    var(--tw-gradient-to);
 }
 .via-\[var\(--color\)\] {
-  --tw-gradient-to: #fff0;
-  --tw-gradient-stops: var(--tw-gradient-from), var(--color), var(--tw-gradient-to);
+  --tw-gradient-via-position: ;
+  --tw-gradient-to: #fff0 var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
+  --tw-gradient-stops: var(--tw-gradient-from), var(--color) var(--tw-gradient-via-position),
+    var(--tw-gradient-to);
 }
 .to-\[\#da5b66\] {
-  --tw-gradient-to: #da5b66;
+  --tw-gradient-to: #da5b66 var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
 }
 .to-\[var\(--color\)\] {
-  --tw-gradient-to: var(--color);
+  --tw-gradient-to: var(--color) var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
 }
 .bg-\[length\:200px_100px\] {
   background-size: 200px 100px;
diff --git a/tests/arbitrary-values.test.css b/tests/arbitrary-values.test.css
index e1c624e2b876..927431210ab7 100644
--- a/tests/arbitrary-values.test.css
+++ b/tests/arbitrary-values.test.css
@@ -688,28 +688,40 @@
   background-image: var(--url);
 }
 .from-\[\#da5b66\] {
-  --tw-gradient-from: #da5b66;
-  --tw-gradient-to: #da5b6600;
+  --tw-gradient-from: #da5b66 var(--tw-gradient-from-position);
+  --tw-gradient-from-position: ;
+  --tw-gradient-to: #da5b6600 var(--tw-gradient-from-position);
+  --tw-gradient-to-position: ;
   --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
 }
 .from-\[var\(--color\)\] {
-  --tw-gradient-from: var(--color);
-  --tw-gradient-to: #fff0;
+  --tw-gradient-from: var(--color) var(--tw-gradient-from-position);
+  --tw-gradient-from-position: ;
+  --tw-gradient-to: #fff0 var(--tw-gradient-from-position);
+  --tw-gradient-to-position: ;
   --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
 }
 .via-\[\#da5b66\] {
-  --tw-gradient-to: #da5b6600;
-  --tw-gradient-stops: var(--tw-gradient-from), #da5b66, var(--tw-gradient-to);
+  --tw-gradient-via-position: ;
+  --tw-gradient-to: #da5b6600 var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
+  --tw-gradient-stops: var(--tw-gradient-from), #da5b66 var(--tw-gradient-via-position),
+    var(--tw-gradient-to);
 }
 .via-\[var\(--color\)\] {
-  --tw-gradient-to: #fff0;
-  --tw-gradient-stops: var(--tw-gradient-from), var(--color), var(--tw-gradient-to);
+  --tw-gradient-via-position: ;
+  --tw-gradient-to: #fff0 var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
+  --tw-gradient-stops: var(--tw-gradient-from), var(--color) var(--tw-gradient-via-position),
+    var(--tw-gradient-to);
 }
 .to-\[\#da5b66\] {
-  --tw-gradient-to: #da5b66;
+  --tw-gradient-to: #da5b66 var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
 }
 .to-\[var\(--color\)\] {
-  --tw-gradient-to: var(--color);
+  --tw-gradient-to: var(--color) var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
 }
 .bg-\[length\:200px_100px\] {
   background-size: 200px 100px;
diff --git a/tests/basic-usage.oxide.test.css b/tests/basic-usage.oxide.test.css
index c5117b917944..e3207ab31885 100644
--- a/tests/basic-usage.oxide.test.css
+++ b/tests/basic-usage.oxide.test.css
@@ -607,16 +607,22 @@
   background-image: linear-gradient(to right, var(--tw-gradient-stops));
 }
 .from-red-300 {
-  --tw-gradient-from: #fca5a5;
-  --tw-gradient-to: #fca5a500;
+  --tw-gradient-from: #fca5a5 var(--tw-gradient-from-position);
+  --tw-gradient-from-position: ;
+  --tw-gradient-to: #fca5a500 var(--tw-gradient-from-position);
+  --tw-gradient-to-position: ;
   --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
 }
 .via-purple-200 {
-  --tw-gradient-to: #e9d5ff00;
-  --tw-gradient-stops: var(--tw-gradient-from), #e9d5ff, var(--tw-gradient-to);
+  --tw-gradient-via-position: ;
+  --tw-gradient-to: #e9d5ff00 var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
+  --tw-gradient-stops: var(--tw-gradient-from), #e9d5ff var(--tw-gradient-via-position),
+    var(--tw-gradient-to);
 }
 .to-blue-400 {
-  --tw-gradient-to: #60a5fa;
+  --tw-gradient-to: #60a5fa var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
 }
 .decoration-slice {
   -webkit-box-decoration-break: slice;
diff --git a/tests/basic-usage.test.css b/tests/basic-usage.test.css
index 55bdc2b3b9ab..aa4897913424 100644
--- a/tests/basic-usage.test.css
+++ b/tests/basic-usage.test.css
@@ -625,16 +625,22 @@
   background-image: linear-gradient(to right, var(--tw-gradient-stops));
 }
 .from-red-300 {
-  --tw-gradient-from: #fca5a5;
-  --tw-gradient-to: #fca5a500;
+  --tw-gradient-from: #fca5a5 var(--tw-gradient-from-position);
+  --tw-gradient-from-position: ;
+  --tw-gradient-to: #fca5a500 var(--tw-gradient-from-position);
+  --tw-gradient-to-position: ;
   --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
 }
 .via-purple-200 {
-  --tw-gradient-to: #e9d5ff00;
-  --tw-gradient-stops: var(--tw-gradient-from), #e9d5ff, var(--tw-gradient-to);
+  --tw-gradient-via-position: ;
+  --tw-gradient-to: #e9d5ff00 var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
+  --tw-gradient-stops: var(--tw-gradient-from), #e9d5ff var(--tw-gradient-via-position),
+    var(--tw-gradient-to);
 }
 .to-blue-400 {
-  --tw-gradient-to: #60a5fa;
+  --tw-gradient-to: #60a5fa var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
 }
 .decoration-slice {
   -webkit-box-decoration-break: slice;
diff --git a/tests/color-opacity-modifiers.test.js b/tests/color-opacity-modifiers.test.js
index e7d285740714..c517644df503 100644
--- a/tests/color-opacity-modifiers.test.js
+++ b/tests/color-opacity-modifiers.test.js
@@ -172,8 +172,10 @@ crosscheck(({ stable, oxide }) => {
     return run('@tailwind utilities', config).then((result) => {
       expect(result.css).toMatchFormattedCss(css`
         .from-red-500\/50 {
-          --tw-gradient-from: #ef444480;
-          --tw-gradient-to: #ef444400;
+          --tw-gradient-from: #ef444480 var(--tw-gradient-from-position);
+          --tw-gradient-from-position: ;
+          --tw-gradient-to: #ef444400 var(--tw-gradient-from-position);
+          --tw-gradient-to-position: ;
           --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
         }
         .fill-red-500\/25 {
diff --git a/tests/kitchen-sink.test.js b/tests/kitchen-sink.test.js
index f5e30b4bbff7..4b43a6b0db42 100644
--- a/tests/kitchen-sink.test.js
+++ b/tests/kitchen-sink.test.js
@@ -527,8 +527,10 @@ crosscheck(({ stable, oxide }) => {
           background-image: url('/images/homepage-1.jpg');
         }
         .from-foo {
-          --tw-gradient-from: #bada55;
-          --tw-gradient-to: #bada5500;
+          --tw-gradient-from: #bada55 var(--tw-gradient-from-position);
+          --tw-gradient-from-position: ;
+          --tw-gradient-to: #bada5500 var(--tw-gradient-from-position);
+          --tw-gradient-to-position: ;
           --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
         }
         .px-1 {
@@ -1087,8 +1089,10 @@ crosscheck(({ stable, oxide }) => {
           background-image: url('/images/homepage-1.jpg');
         }
         .from-foo {
-          --tw-gradient-from: #bada55;
-          --tw-gradient-to: #bada5500;
+          --tw-gradient-from: #bada55 var(--tw-gradient-from-position);
+          --tw-gradient-from-position: ;
+          --tw-gradient-to: #bada5500 var(--tw-gradient-from-position);
+          --tw-gradient-to-position: ;
           --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
         }
         .px-1 {
diff --git a/tests/plugins/gradientColorStops.test.js b/tests/plugins/gradientColorStops.test.js
index 6a26e2e33901..bf8e73cdb764 100644
--- a/tests/plugins/gradientColorStops.test.js
+++ b/tests/plugins/gradientColorStops.test.js
@@ -34,28 +34,40 @@ crosscheck(({ stable, oxide }) => {
     return run('@tailwind utilities', config).then((result) => {
       stable.expect(result.css).toMatchFormattedCss(css`
         .from-primary {
-          --tw-gradient-from: #1f1f1f;
-          --tw-gradient-to: #1f1f1f00;
+          --tw-gradient-from: #1f1f1f var(--tw-gradient-from-position);
+          --tw-gradient-from-position: ;
+          --tw-gradient-to: #1f1f1f00 var(--tw-gradient-from-position);
+          --tw-gradient-to-position: ;
           --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
         }
         .from-secondary {
-          --tw-gradient-from: #bf5540;
-          --tw-gradient-to: #bf554000;
+          --tw-gradient-from: #bf5540 var(--tw-gradient-from-position);
+          --tw-gradient-from-position: ;
+          --tw-gradient-to: #bf554000 var(--tw-gradient-from-position);
+          --tw-gradient-to-position: ;
           --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
         }
         .via-primary {
-          --tw-gradient-to: #1f1f1f00;
-          --tw-gradient-stops: var(--tw-gradient-from), #1f1f1f, var(--tw-gradient-to);
+          --tw-gradient-via-position: ;
+          --tw-gradient-to: #1f1f1f00 var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
+          --tw-gradient-stops: var(--tw-gradient-from), #1f1f1f var(--tw-gradient-via-position),
+            var(--tw-gradient-to);
         }
         .via-secondary {
-          --tw-gradient-to: #bf554000;
-          --tw-gradient-stops: var(--tw-gradient-from), #bf5540, var(--tw-gradient-to);
+          --tw-gradient-via-position: ;
+          --tw-gradient-to: #bf554000 var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
+          --tw-gradient-stops: var(--tw-gradient-from), #bf5540 var(--tw-gradient-via-position),
+            var(--tw-gradient-to);
         }
         .to-primary {
-          --tw-gradient-to: #1f1f1f;
+          --tw-gradient-to: #1f1f1f var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
         }
         .to-secondary {
-          --tw-gradient-to: #bf5540;
+          --tw-gradient-to: #bf5540 var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
         }
         .text-primary {
           --tw-text-opacity: 1;
@@ -71,28 +83,40 @@ crosscheck(({ stable, oxide }) => {
       `)
       oxide.expect(result.css).toMatchFormattedCss(css`
         .from-primary {
-          --tw-gradient-from: #1f1f1f;
-          --tw-gradient-to: #1f1f1f00;
+          --tw-gradient-from: #1f1f1f var(--tw-gradient-from-position);
+          --tw-gradient-from-position: ;
+          --tw-gradient-to: #1f1f1f00 var(--tw-gradient-from-position);
+          --tw-gradient-to-position: ;
           --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
         }
         .from-secondary {
-          --tw-gradient-from: #bf5540;
-          --tw-gradient-to: #bf554000;
+          --tw-gradient-from: #bf5540 var(--tw-gradient-from-position);
+          --tw-gradient-from-position: ;
+          --tw-gradient-to: #bf554000 var(--tw-gradient-from-position);
+          --tw-gradient-to-position: ;
           --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
         }
         .via-primary {
-          --tw-gradient-to: #1f1f1f00;
-          --tw-gradient-stops: var(--tw-gradient-from), #1f1f1f, var(--tw-gradient-to);
+          --tw-gradient-via-position: ;
+          --tw-gradient-to: #1f1f1f00 var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
+          --tw-gradient-stops: var(--tw-gradient-from), #1f1f1f var(--tw-gradient-via-position),
+            var(--tw-gradient-to);
         }
         .via-secondary {
-          --tw-gradient-to: #bf554000;
-          --tw-gradient-stops: var(--tw-gradient-from), #bf5540, var(--tw-gradient-to);
+          --tw-gradient-via-position: ;
+          --tw-gradient-to: #bf554000 var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
+          --tw-gradient-stops: var(--tw-gradient-from), #bf5540 var(--tw-gradient-via-position),
+            var(--tw-gradient-to);
         }
         .to-primary {
-          --tw-gradient-to: #1f1f1f;
+          --tw-gradient-to: #1f1f1f var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
         }
         .to-secondary {
-          --tw-gradient-to: #bf5540;
+          --tw-gradient-to: #bf5540 var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
         }
         .text-primary {
           color: #1f1f1f;
@@ -103,4 +127,95 @@ crosscheck(({ stable, oxide }) => {
       `)
     })
   })
+
+  test('gradient color stop position', () => {
+    let config = {
+      content: [
+        {
+          raw: html`
+            <div>
+              <div
+                class="bg-gradient-to-r from-red-500 from-50 via-pink-500 via-75 to-violet-400 to-80"
+              ></div>
+              <div class="from-10% from-[11%] from-[12px] from-[--from-value]"></div>
+              <div class="via-20% via-[12%] via-[123px] via-[--via-value]"></div>
+              <div class="to-30% to-[13%] to-[14px] to-[--to-value]"></div>
+            </div>
+          `,
+        },
+      ],
+      theme: {},
+    }
+
+    return run('@tailwind utilities', config).then((result) => {
+      expect(result.css).toMatchFormattedCss(css`
+        .bg-gradient-to-r {
+          background-image: linear-gradient(to right, var(--tw-gradient-stops));
+        }
+        .from-\[--from-value\] {
+          --tw-gradient-from: var(--from-value) var(--tw-gradient-from-position);
+          --tw-gradient-from-position: ;
+          --tw-gradient-to: #fff0 var(--tw-gradient-from-position);
+          --tw-gradient-to-position: ;
+          --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
+        }
+        .from-red-500 {
+          --tw-gradient-from: #ef4444 var(--tw-gradient-from-position);
+          --tw-gradient-from-position: ;
+          --tw-gradient-to: #ef444400 var(--tw-gradient-from-position);
+          --tw-gradient-to-position: ;
+          --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
+        }
+        .from-10\% {
+          --tw-gradient-from-position: 10%;
+        }
+        .from-\[11\%\] {
+          --tw-gradient-from-position: 11%;
+        }
+        .from-\[12px\] {
+          --tw-gradient-from-position: 12px;
+        }
+        .via-\[--via-value\] {
+          --tw-gradient-via-position: ;
+          --tw-gradient-to: #fff0 var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
+          --tw-gradient-stops: var(--tw-gradient-from),
+            var(--via-value) var(--tw-gradient-via-position), var(--tw-gradient-to);
+        }
+        .via-pink-500 {
+          --tw-gradient-via-position: ;
+          --tw-gradient-to: #ec489900 var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
+          --tw-gradient-stops: var(--tw-gradient-from), #ec4899 var(--tw-gradient-via-position),
+            var(--tw-gradient-to);
+        }
+        .via-20\% {
+          --tw-gradient-via-position: 20%;
+        }
+        .via-\[12\%\] {
+          --tw-gradient-via-position: 12%;
+        }
+        .via-\[123px\] {
+          --tw-gradient-via-position: 123px;
+        }
+        .to-\[--to-value\] {
+          --tw-gradient-to: var(--to-value) var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
+        }
+        .to-violet-400 {
+          --tw-gradient-to: #a78bfa var(--tw-gradient-to-position);
+          --tw-gradient-to-position: ;
+        }
+        .to-30\% {
+          --tw-gradient-to-position: 30%;
+        }
+        .to-\[13\%\] {
+          --tw-gradient-to-position: 13%;
+        }
+        .to-\[14px\] {
+          --tw-gradient-to-position: 14px;
+        }
+      `)
+    })
+  })
 })
diff --git a/tests/raw-content.oxide.test.css b/tests/raw-content.oxide.test.css
index f50f95e878cb..b34e47930a08 100644
--- a/tests/raw-content.oxide.test.css
+++ b/tests/raw-content.oxide.test.css
@@ -423,16 +423,22 @@
   background-image: linear-gradient(to right, var(--tw-gradient-stops));
 }
 .from-red-300 {
-  --tw-gradient-from: #fca5a5;
-  --tw-gradient-to: #fca5a500;
+  --tw-gradient-from: #fca5a5 var(--tw-gradient-from-position);
+  --tw-gradient-from-position: ;
+  --tw-gradient-to: #fca5a500 var(--tw-gradient-from-position);
+  --tw-gradient-to-position: ;
   --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
 }
 .via-purple-200 {
-  --tw-gradient-to: #e9d5ff00;
-  --tw-gradient-stops: var(--tw-gradient-from), #e9d5ff, var(--tw-gradient-to);
+  --tw-gradient-via-position: ;
+  --tw-gradient-to: #e9d5ff00 var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
+  --tw-gradient-stops: var(--tw-gradient-from), #e9d5ff var(--tw-gradient-via-position),
+    var(--tw-gradient-to);
 }
 .to-blue-400 {
-  --tw-gradient-to: #60a5fa;
+  --tw-gradient-to: #60a5fa var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
 }
 .decoration-slice {
   -webkit-box-decoration-break: slice;
diff --git a/tests/raw-content.test.css b/tests/raw-content.test.css
index 2978955898d8..5bee46672539 100644
--- a/tests/raw-content.test.css
+++ b/tests/raw-content.test.css
@@ -435,16 +435,22 @@
   background-image: linear-gradient(to right, var(--tw-gradient-stops));
 }
 .from-red-300 {
-  --tw-gradient-from: #fca5a5;
-  --tw-gradient-to: #fca5a500;
+  --tw-gradient-from: #fca5a5 var(--tw-gradient-from-position);
+  --tw-gradient-from-position: ;
+  --tw-gradient-to: #fca5a500 var(--tw-gradient-from-position);
+  --tw-gradient-to-position: ;
   --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
 }
 .via-purple-200 {
-  --tw-gradient-to: #e9d5ff00;
-  --tw-gradient-stops: var(--tw-gradient-from), #e9d5ff, var(--tw-gradient-to);
+  --tw-gradient-via-position: ;
+  --tw-gradient-to: #e9d5ff00 var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
+  --tw-gradient-stops: var(--tw-gradient-from), #e9d5ff var(--tw-gradient-via-position),
+    var(--tw-gradient-to);
 }
 .to-blue-400 {
-  --tw-gradient-to: #60a5fa;
+  --tw-gradient-to: #60a5fa var(--tw-gradient-to-position);
+  --tw-gradient-to-position: ;
 }
 .decoration-slice {
   -webkit-box-decoration-break: slice;

From 3809127a2ce7e8173611ae40c7a260bb56e6342f Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Mon, 27 Mar 2023 21:06:58 +0200
Subject: [PATCH 84/84] 3.3.0

---
 CHANGELOG.md             |  11 +-
 package-lock.json        |   4 +-
 package-lock.stable.json | 380 ++++++++++-----------------------------
 package.json             |   2 +-
 package.stable.json      |  17 +-
 5 files changed, 111 insertions(+), 303 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c12fe53ecae9..879ed210eea2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Nothing yet!
+
+## [3.3.0] - 2023-03-27
+
 ### Added
 
 - Support ESM and TypeScript config files ([#10785](https://github.com/tailwindlabs/tailwindcss/pull/10785))
@@ -15,15 +19,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add support for using variables as arbitrary values without `var(...)` ([#9880](https://github.com/tailwindlabs/tailwindcss/pull/9880), [#9962](https://github.com/tailwindlabs/tailwindcss/pull/9962))
 - Add logical properties support for inline direction ([#10166](https://github.com/tailwindlabs/tailwindcss/pull/10166))
 - Add `hyphens` utilities ([#10071](https://github.com/tailwindlabs/tailwindcss/pull/10071))
+- Add `from-{position}`, `via-{position}` and `to-{position}` utilities ([#10886](https://github.com/tailwindlabs/tailwindcss/pull/10886))
 - Add `list-style-image` utilities ([#10817](https://github.com/tailwindlabs/tailwindcss/pull/10817))
 - Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
 - Add `line-clamp` utilities from `@tailwindcss/line-clamp` to core ([#10768](https://github.com/tailwindlabs/tailwindcss/pull/10768), [#10876](https://github.com/tailwindlabs/tailwindcss/pull/10876), [#10862](https://github.com/tailwindlabs/tailwindcss/pull/10862))
-- Add `delay-0` and `duration-0` by default ([#10294](https://github.com/tailwindlabs/tailwindcss/pull/10294))
+- Add `delay-0` and `duration-0` utilities ([#10294](https://github.com/tailwindlabs/tailwindcss/pull/10294))
 - Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
 - Add `content-normal` and `content-stretch` utilities ([#10645](https://github.com/tailwindlabs/tailwindcss/pull/10645))
 - Add `whitespace-break-spaces` utility ([#10729](https://github.com/tailwindlabs/tailwindcss/pull/10729))
 - Add support for configuring default `font-variation-settings` for a `font-family` ([#10034](https://github.com/tailwindlabs/tailwindcss/pull/10034), [#10515](https://github.com/tailwindlabs/tailwindcss/pull/10515))
-- Add gradient color stop position utilities ([#10886](https://github.com/tailwindlabs/tailwindcss/pull/10886))
 
 ### Fixed
 
@@ -2207,7 +2211,8 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.7...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.0...HEAD
+[3.3.0]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.7...v3.3.0
 [3.2.7]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.6...v3.2.7
 [3.2.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.5...v3.2.6
 [3.2.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.4...v3.2.5
diff --git a/package-lock.json b/package-lock.json
index c8e6c90f7f8b..ed1615e6b1a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "tailwindcss",
-  "version": "3.2.7",
+  "version": "3.3.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tailwindcss",
-      "version": "3.2.7",
+      "version": "3.3.0",
       "license": "MIT",
       "workspaces": [
         "integrations/*",
diff --git a/package-lock.stable.json b/package-lock.stable.json
index f330fa59a0ce..1c419c1855ac 100644
--- a/package-lock.stable.json
+++ b/package-lock.stable.json
@@ -1,12 +1,12 @@
 {
   "name": "tailwindcss",
-  "version": "3.2.7",
+  "version": "3.3.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tailwindcss",
-      "version": "3.2.7",
+      "version": "3.3.0",
       "license": "MIT",
       "dependencies": {
         "arg": "^5.0.2",
@@ -665,14 +665,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.10.tgz",
       "integrity": "sha512-RmJjQTRrO6VwUWDrzTBLmV4OJZTarYsiepLGlF2rYTVB701hSorPywPGvP6d8HCuuRibyXa5JX4s3jN2kHEtjQ==",
-      "cpu": [
-        "arm"
-      ],
+      "cpu": ["arm"],
       "dev": true,
       "optional": true,
-      "os": [
-        "android"
-      ],
+      "os": ["android"],
       "engines": {
         "node": ">=12"
       }
@@ -681,14 +677,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.10.tgz",
       "integrity": "sha512-47Y+NwVKTldTlDhSgJHZ/RpvBQMUDG7eKihqaF/u6g7s0ZPz4J1vy8A3rwnnUOF2CuDn7w7Gj/QcMoWz3U3SJw==",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "android"
-      ],
+      "os": ["android"],
       "engines": {
         "node": ">=12"
       }
@@ -697,29 +689,21 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.10.tgz",
       "integrity": "sha512-C4PfnrBMcuAcOurQzpF1tTtZz94IXO5JmICJJ3NFJRHbXXsQUg9RFG45KvydKqtFfBaFLCHpduUkUfXwIvGnRg==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "android"
-      ],
+      "os": ["android"],
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
       "version": "0.16.10",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "license": "MIT",
       "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "os": ["darwin"],
       "engines": {
         "node": ">=12"
       }
@@ -728,14 +712,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.10.tgz",
       "integrity": "sha512-OXt7ijoLuy+AjDSKQWu+KdDFMBbdeaL6wtgMKtDUXKWHiAMKHan5+R1QAG6HD4+K0nnOvEJXKHeA9QhXNAjOTQ==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "os": ["darwin"],
       "engines": {
         "node": ">=12"
       }
@@ -744,14 +724,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.10.tgz",
       "integrity": "sha512-shSQX/3GHuspE3Uxtq5kcFG/zqC+VuMnJkqV7LczO41cIe6CQaXHD3QdMLA4ziRq/m0vZo7JdterlgbmgNIAlQ==",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "freebsd"
-      ],
+      "os": ["freebsd"],
       "engines": {
         "node": ">=12"
       }
@@ -760,14 +736,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.10.tgz",
       "integrity": "sha512-5YVc1zdeaJGASijZmTzSO4h6uKzsQGG3pkjI6fuXvolhm3hVRhZwnHJkforaZLmzvNv5Tb7a3QL2FAVmrgySIA==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "freebsd"
-      ],
+      "os": ["freebsd"],
       "engines": {
         "node": ">=12"
       }
@@ -776,14 +748,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.10.tgz",
       "integrity": "sha512-c360287ZWI2miBnvIj23bPyVctgzeMT2kQKR+x94pVqIN44h3GF8VMEs1SFPH1UgyDr3yBbx3vowDS1SVhyVhA==",
-      "cpu": [
-        "arm"
-      ],
+      "cpu": ["arm"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">=12"
       }
@@ -792,14 +760,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.10.tgz",
       "integrity": "sha512-2aqeNVxIaRfPcIaMZIFoblLh588sWyCbmj1HHCCs9WmeNWm+EIN0SmvsmPvTa/TsNZFKnxTcvkX2eszTcCqIrA==",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">=12"
       }
@@ -808,14 +772,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.10.tgz",
       "integrity": "sha512-sqMIEWeyrLGU7J5RB5fTkLRIFwsgsQ7ieWXlDLEmC2HblPYGb3AucD7inw2OrKFpRPKsec1l+lssiM3+NV5aOw==",
-      "cpu": [
-        "ia32"
-      ],
+      "cpu": ["ia32"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">=12"
       }
@@ -824,14 +784,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.10.tgz",
       "integrity": "sha512-FN8mZOH7531iPHM0kaFhAOqqNHoAb6r/YHW2ZIxNi0a85UBi2DO4Vuyn7t1p4UN8a4LoAnLOT1PqNgHkgBJgbA==",
-      "cpu": [
-        "mips64el"
-      ],
+      "cpu": ["mips64el"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">=12"
       }
@@ -840,14 +796,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.10.tgz",
       "integrity": "sha512-Dg9RiqdvHOAWnOKIOTsIx8dFX9EDlY2IbPEY7YFzchrCiTZmMkD7jWA9UdZbNUygPjdmQBVPRCrLydReFlX9yg==",
-      "cpu": [
-        "ppc64"
-      ],
+      "cpu": ["ppc64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">=12"
       }
@@ -856,14 +808,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.10.tgz",
       "integrity": "sha512-XMqtpjwzbmlar0BJIxmzu/RZ7EWlfVfH68Vadrva0Wj5UKOdKvqskuev2jY2oPV3aoQUyXwnMbMrFmloO2GfAw==",
-      "cpu": [
-        "riscv64"
-      ],
+      "cpu": ["riscv64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">=12"
       }
@@ -872,14 +820,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.10.tgz",
       "integrity": "sha512-fu7XtnoeRNFMx8DjK3gPWpFBDM2u5ba+FYwg27SjMJwKvJr4bDyKz5c+FLXLUSSAkMAt/UL+cUbEbra+rYtUgw==",
-      "cpu": [
-        "s390x"
-      ],
+      "cpu": ["s390x"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">=12"
       }
@@ -888,14 +832,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.10.tgz",
       "integrity": "sha512-61lcjVC/RldNNMUzQQdyCWjCxp9YLEQgIxErxU9XluX7juBdGKb0pvddS0vPNuCvotRbzijZ1pzII+26haWzbA==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">=12"
       }
@@ -904,14 +844,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.10.tgz",
       "integrity": "sha512-JeZXCX3viSA9j4HqSoygjssdqYdfHd6yCFWyfSekLbz4Ef+D2EjvsN02ZQPwYl5a5gg/ehdHgegHhlfOFP0HCA==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "netbsd"
-      ],
+      "os": ["netbsd"],
       "engines": {
         "node": ">=12"
       }
@@ -920,14 +856,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.10.tgz",
       "integrity": "sha512-3qpxQKuEVIIg8SebpXsp82OBrqjPV/OwNWmG+TnZDr3VGyChNnGMHccC1xkbxCHDQNnnXjxhMQNyHmdFJbmbRA==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "openbsd"
-      ],
+      "os": ["openbsd"],
       "engines": {
         "node": ">=12"
       }
@@ -936,14 +868,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.10.tgz",
       "integrity": "sha512-z+q0xZ+et/7etz7WoMyXTHZ1rB8PMSNp/FOqURLJLOPb3GWJ2aj4oCqFCjPwEbW1rsT7JPpxeH/DwGAWk/I1Bg==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "sunos"
-      ],
+      "os": ["sunos"],
       "engines": {
         "node": ">=12"
       }
@@ -952,14 +880,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.10.tgz",
       "integrity": "sha512-+YYu5sbQ9npkNT9Dec+tn1F/kjg6SMgr6bfi/6FpXYZvCRfu2YFPZGb+3x8K30s8eRxFpoG4sGhiSUkr1xbHEw==",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "win32"
-      ],
+      "os": ["win32"],
       "engines": {
         "node": ">=12"
       }
@@ -968,14 +892,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.10.tgz",
       "integrity": "sha512-Aw7Fupk7XNehR1ftHGYwUteyJ2q+em/aE+fVU3YMTBN2V5A7Z4aVCSV+SvCp9HIIHZavPFBpbdP3VfjQpdf6Xg==",
-      "cpu": [
-        "ia32"
-      ],
+      "cpu": ["ia32"],
       "dev": true,
       "optional": true,
-      "os": [
-        "win32"
-      ],
+      "os": ["win32"],
       "engines": {
         "node": ">=12"
       }
@@ -984,14 +904,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.10.tgz",
       "integrity": "sha512-qddWullt3sC1EIpfHvCRBq3H4g3L86DZpD6n8k2XFjFVyp01D++uNbN1hT/JRsHxTbyyemZcpwL5aRlJwc/zFw==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "win32"
-      ],
+      "os": ["win32"],
       "engines": {
         "node": ">=12"
       }
@@ -1756,15 +1672,11 @@
     },
     "node_modules/@swc/core-darwin-arm64": {
       "version": "1.3.24",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "license": "Apache-2.0 AND MIT",
       "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "os": ["darwin"],
       "engines": {
         "node": ">=10"
       }
@@ -1773,14 +1685,10 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.24.tgz",
       "integrity": "sha512-px+5vkGtgPH0m3FkkTBHynlRdS5rRz+lK+wiXIuBZFJSySWFl6RkKbvwkD+sf0MpazQlqwlv/rTOGJBw6oDffg==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "os": ["darwin"],
       "engines": {
         "node": ">=10"
       }
@@ -1789,14 +1697,10 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.24.tgz",
       "integrity": "sha512-jLs8ZOdTV4UW4J12E143QJ4mOMONQtqgAnuhBbRuWFzQ3ny1dfoC3P1jNWAJ2Xi59XdxAIXn0PggPNH4Kh34kw==",
-      "cpu": [
-        "arm"
-      ],
+      "cpu": ["arm"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">=10"
       }
@@ -1805,14 +1709,10 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.24.tgz",
       "integrity": "sha512-A/v0h70BekrwGpp1DlzIFGcHQ3QQ2PexXcnnuIBZeMc9gNmHlcZmg3EcwAnaUDiokhNuSUFA/wV94yk1OqmSkw==",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">=10"
       }
@@ -1821,14 +1721,10 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.24.tgz",
       "integrity": "sha512-pbc9eArWPTiMrbpS/pJo0IiQNAKAQBcBIDjWBGP1tcw2iDXYLw4bruwz9kI/VjakbshWb8MoE4T5ClkeuULvSw==",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">=10"
       }
@@ -1837,14 +1733,10 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.24.tgz",
       "integrity": "sha512-pP5pOLlY1xd352qo7rTlpVPUI9/9VhOd4b3Lk+LzfZDq9bTL2NDlGfyrPiwa5DGHMSzrugH56K2J68eutkxYVA==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">=10"
       }
@@ -1853,14 +1745,10 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.24.tgz",
       "integrity": "sha512-phNbP7zGp+Wcyxq1Qxlpe5KkxO7WLT2kVQUC7aDFGlVdCr+xdXsfH1MzheHtnr0kqTVQX1aiM8XXXHfFxR0oNA==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">=10"
       }
@@ -1869,14 +1757,10 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.24.tgz",
       "integrity": "sha512-qhbiJTWAOqyR+K9xnGmCkOWSz2EmWpDBstEJCEOTc6FZiEdbiTscDmqTcMbCKaTHGu8t+6erVA4t65/Eg6uWPA==",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "win32"
-      ],
+      "os": ["win32"],
       "engines": {
         "node": ">=10"
       }
@@ -1885,14 +1769,10 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.24.tgz",
       "integrity": "sha512-JfghIlscE4Rz+Lc08lSoDh+R0cWxrISed5biogFfE6vZqhaDnw3E5Qshqw7O3pIaiq8L2u1nmzuyP581ZmpbRA==",
-      "cpu": [
-        "ia32"
-      ],
+      "cpu": ["ia32"],
       "dev": true,
       "optional": true,
-      "os": [
-        "win32"
-      ],
+      "os": ["win32"],
       "engines": {
         "node": ">=10"
       }
@@ -1901,14 +1781,10 @@
       "version": "1.3.24",
       "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.24.tgz",
       "integrity": "sha512-3AmJRr0hwciwDBbzUNqaftvppzS8v9X/iv/Wl7YaVLBVpPfQvaZzfqLycvNMGLZb5vIKXR/u58txg3dRBGsJtw==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "win32"
-      ],
+      "os": ["win32"],
       "engines": {
         "node": ">=10"
       }
@@ -3738,14 +3614,10 @@
       "version": "0.16.10",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.10.tgz",
       "integrity": "sha512-O7Pd5hLEtTg37NC73pfhUOGTjx/+aXu5YoSq3ahCxcN7Bcr2F47mv+kG5t840thnsEzrv0oB70+LJu3gUgchvg==",
-      "cpu": [
-        "loong64"
-      ],
+      "cpu": ["loong64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">=12"
       }
@@ -4315,9 +4187,7 @@
       "version": "2.3.2",
       "license": "MIT",
       "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "os": ["darwin"],
       "engines": {
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
@@ -5890,14 +5760,10 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.18.0.tgz",
       "integrity": "sha512-OqjydwtiNPgdH1ByIjA1YzqvDG/OMR6L3LPN6wRl1729LB0y4Mik7L06kmZaTb+pvUHr+NmDd2KCwnlrQ4zO3w==",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "os": ["darwin"],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -5910,14 +5776,10 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.18.0.tgz",
       "integrity": "sha512-mNiuPHj89/JHZmJMp+5H8EZSt6EL5DZRWJ31O6k3DrLLnRIQjXuXdDdN8kP7LoIkeWI5xvyD60CsReJm+YWYAw==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "os": ["darwin"],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -5930,14 +5792,10 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.18.0.tgz",
       "integrity": "sha512-S+25JjI6601HiAVoTDXW6SqH+E94a+FHA7WQqseyNHunOgVWKcAkNEc2LJvVxgwTq6z41sDIb9/M3Z9wa9lk4A==",
-      "cpu": [
-        "arm"
-      ],
+      "cpu": ["arm"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -5950,14 +5808,10 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.18.0.tgz",
       "integrity": "sha512-JSqh4+21dCgBecIQUet35dtE4PhhSEMyqe3y0ZNQrAJQ5kyUPSQHiw81WXnPJcOSTTpG0TyMLiC8K//+BsFGQA==",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -5970,14 +5824,10 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.18.0.tgz",
       "integrity": "sha512-2FWHa8iUhShnZnqhn2wfIcK5adJat9hAAaX7etNsoXJymlliDIOFuBQEsba2KBAZSM4QqfQtvRdR7m8i0I7ybQ==",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -5990,14 +5840,10 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.18.0.tgz",
       "integrity": "sha512-plCPGQJtDZHcLVKVRLnQVF2XRsIC32WvuJhQ7fJ7F6BV98b/VZX0OlX05qUaOESD9dCDHjYSfxsgcvOKgCWh7A==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -6010,14 +5856,10 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.18.0.tgz",
       "integrity": "sha512-na+BGtVU6fpZvOHKhnlA0XHeibkT3/46nj6vLluG3kzdJYoBKU6dIl7DSOk++8jv4ybZyFJ0aOFMMSc8g2h58A==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ],
+      "os": ["linux"],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -6030,14 +5872,10 @@
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.18.0.tgz",
       "integrity": "sha512-5qeAH4RMNy2yMNEl7e5TI6upt/7xD2ZpHWH4RkT8iJ7/6POS5mjHbXWUO9Q1hhDhqkdzGa76uAdMzEouIeCyNw==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "win32"
-      ],
+      "os": ["win32"],
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -7992,79 +7830,55 @@
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.6.3.tgz",
       "integrity": "sha512-QmDIX0Yh1wYQl0bUS0gGWwNxpJwrzZU2GIAYt3aOKoirWA2ecnyb3R6ludcS1znfNV2MfunP+l8E3ncxUHwtjA==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "darwin"
-      ]
+      "os": ["darwin"]
     },
     "node_modules/turbo-darwin-arm64": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.6.3.tgz",
       "integrity": "sha512-75DXhFpwE7CinBbtxTxH08EcWrxYSPFow3NaeFwsG8aymkWXF+U2aukYHJA6I12n9/dGqf7yRXzkF0S/9UtdyQ==",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "darwin"
-      ]
+      "os": ["darwin"]
     },
     "node_modules/turbo-linux-64": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.6.3.tgz",
       "integrity": "sha512-O9uc6J0yoRPWdPg9THRQi69K6E2iZ98cRHNvus05lZbcPzZTxJYkYGb5iagCmCW/pq6fL4T4oLWAd6evg2LGQA==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ]
+      "os": ["linux"]
     },
     "node_modules/turbo-linux-arm64": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.6.3.tgz",
       "integrity": "sha512-dCy667qqEtZIhulsRTe8hhWQNCJO0i20uHXv7KjLHuFZGCeMbWxB8rsneRoY+blf8+QNqGuXQJxak7ayjHLxiA==",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "linux"
-      ]
+      "os": ["linux"]
     },
     "node_modules/turbo-windows-64": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.6.3.tgz",
       "integrity": "sha512-lKRqwL3mrVF09b9KySSaOwetehmGknV9EcQTF7d2dxngGYYX1WXoQLjFP9YYH8ZV07oPm+RUOAKSCQuDuMNhiA==",
-      "cpu": [
-        "x64"
-      ],
+      "cpu": ["x64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "win32"
-      ]
+      "os": ["win32"]
     },
     "node_modules/turbo-windows-arm64": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.6.3.tgz",
       "integrity": "sha512-BXY1sDPEA1DgPwuENvDCD8B7Hb0toscjus941WpL8CVd10hg9pk/MWn9CNgwDO5Q9ks0mw+liDv2EMnleEjeNA==",
-      "cpu": [
-        "arm64"
-      ],
+      "cpu": ["arm64"],
       "dev": true,
       "optional": true,
-      "os": [
-        "win32"
-      ]
+      "os": ["win32"]
     },
     "node_modules/type-detect": {
       "version": "4.0.8",
@@ -8303,9 +8117,7 @@
       "version": "0.1.0",
       "extraneous": true,
       "license": "MIT",
-      "workspaces": [
-        "node"
-      ]
+      "workspaces": ["node"]
     },
     "oxide-node-api-shim": {
       "name": "@tailwindcss/oxide-shim",
diff --git a/package.json b/package.json
index 1005312befac..e2093e183061 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.2.7",
+  "version": "3.3.0",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
diff --git a/package.stable.json b/package.stable.json
index da68f44b3d13..26cca2eea1f4 100644
--- a/package.stable.json
+++ b/package.stable.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.2.7",
+  "version": "3.3.0",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -95,26 +95,17 @@
     "resolve": "^1.22.1",
     "sucrase": "^3.29.0"
   },
-  "browserslist": [
-    "> 1%",
-    "not edge <= 18",
-    "not ie 11",
-    "not op_mini all"
-  ],
+  "browserslist": ["> 1%", "not edge <= 18", "not ie 11", "not op_mini all"],
   "jest": {
     "testTimeout": 30000,
-    "setupFilesAfterEnv": [
-      "<rootDir>/jest/customMatchers.js"
-    ],
+    "setupFilesAfterEnv": ["<rootDir>/jest/customMatchers.js"],
     "testPathIgnorePatterns": [
       "/node_modules/",
       "/integrations/",
       "/standalone-cli/",
       "\\.test\\.skip\\.js$"
     ],
-    "transformIgnorePatterns": [
-      "node_modules/(?!lightningcss)"
-    ],
+    "transformIgnorePatterns": ["node_modules/(?!lightningcss)"],
     "transform": {
       "\\.js$": "@swc/jest",
       "\\.ts$": "@swc/jest"