diff --git a/bench/nested-deps/bench.mjs b/bench/nested-deps/bench.mjs
index b25eba322db0..d8ad44c23d85 100644
--- a/bench/nested-deps/bench.mjs
+++ b/bench/nested-deps/bench.mjs
@@ -110,7 +110,7 @@ function runNextCommandDev(argv, opts = {}) {
     function handleStdout(data) {
       const message = data.toString()
       const bootupMarkers = {
-        dev: /compiled successfully/i,
+        dev: /compiled .*successfully/i,
         start: /started server/i,
       }
       if (
diff --git a/docs/basic-features/script.md b/docs/basic-features/script.md
index 8ae5a8036e1b..49041234fcba 100644
--- a/docs/basic-features/script.md
+++ b/docs/basic-features/script.md
@@ -7,6 +7,7 @@ description: Next.js helps you optimize loading third-party scripts with the bui
 <details>
   <summary><b>Examples</b></summary>
   <ul>
+    <li><a href="https://github.com/vercel/next.js/tree/canary/examples/script-component">Script Component</a></li>
     <li><a href="https://github.com/vercel/next.js/tree/canary/examples/with-google-tag-manager">Google Tag Manager</a></li>
     <li><a href="https://github.com/vercel/next.js/tree/canary/examples/with-google-analytics">Google Analytics</a></li>
     <li><a href="https://github.com/vercel/next.js/tree/canary/examples/with-facebook-pixel">Facebook Pixel</a></li>
diff --git a/examples/remove-console/.gitignore b/examples/remove-console/.gitignore
new file mode 100644
index 000000000000..1437c53f70bc
--- /dev/null
+++ b/examples/remove-console/.gitignore
@@ -0,0 +1,34 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# vercel
+.vercel
diff --git a/examples/remove-console/README.md b/examples/remove-console/README.md
new file mode 100644
index 000000000000..aeb9c98a281f
--- /dev/null
+++ b/examples/remove-console/README.md
@@ -0,0 +1,27 @@
+# Remove Console Example
+
+This example shows how to use the `removeConsole` config option to remove all `console.*` calls.
+
+## Preview
+
+Preview the example live on [StackBlitz](http://stackblitz.com/):
+
+[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/vercel/next.js/tree/canary/examples/remove-console)
+
+## Deploy your own
+
+Deploy the example using [Vercel](https://vercel.com?utm_source=github&utm_medium=readme&utm_campaign=next-example):
+
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/git/external?repository-url=https://github.com/vercel/next.js/tree/canary/examples/remove-console&project-name=remove-console&repository-name=remove-console)
+
+## How to use
+
+Execute [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app) with [npm](https://docs.npmjs.com/cli/init) or [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) to bootstrap the example:
+
+```bash
+npx create-next-app --example remove-console remove-console-app
+# or
+yarn create next-app --example remove-console remove-console-app
+```
+
+Deploy it to the cloud with [Vercel](https://vercel.com/new?utm_source=github&utm_medium=readme&utm_campaign=next-example) ([Documentation](https://nextjs.org/docs/deployment)).
diff --git a/examples/remove-console/next.config.js b/examples/remove-console/next.config.js
new file mode 100644
index 000000000000..afad83efd0b7
--- /dev/null
+++ b/examples/remove-console/next.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+  experimental: {
+    removeConsole: {
+      exclude: ['error'],
+    },
+    // Uncomment this to suppress all logs.
+    // removeConsole: true,
+  },
+}
diff --git a/examples/remove-console/package.json b/examples/remove-console/package.json
new file mode 100644
index 000000000000..f9170ae254fa
--- /dev/null
+++ b/examples/remove-console/package.json
@@ -0,0 +1,13 @@
+{
+  "private": true,
+  "scripts": {
+    "dev": "next dev",
+    "build": "next build",
+    "start": "next start"
+  },
+  "dependencies": {
+    "next": "latest",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
+  }
+}
diff --git a/examples/remove-console/pages/index.js b/examples/remove-console/pages/index.js
new file mode 100644
index 000000000000..802d5c9f9ae5
--- /dev/null
+++ b/examples/remove-console/pages/index.js
@@ -0,0 +1,10 @@
+const Index = () => (
+  <div>
+    <p>The console should be empty.</p>
+  </div>
+)
+
+console.log('log from index.js')
+console.error('error log from index.js')
+
+export default Index
diff --git a/examples/script-component/.gitignore b/examples/script-component/.gitignore
new file mode 100644
index 000000000000..1437c53f70bc
--- /dev/null
+++ b/examples/script-component/.gitignore
@@ -0,0 +1,34 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# vercel
+.vercel
diff --git a/examples/script-component/README.md b/examples/script-component/README.md
new file mode 100644
index 000000000000..2fe22d477e90
--- /dev/null
+++ b/examples/script-component/README.md
@@ -0,0 +1,33 @@
+# Script component
+
+This example shows different strategies that can be used for the [`next/script` component](https://nextjs.org/docs/basic-features/script):
+
+- [Loading Polyfills](./pages/polyfill.js)
+- [Lazy loading](./pages/lazy.js)
+- [Executing code after loading](./pages/onload.js)
+- [Inline scripts](./pages/inline.js)
+- [Forwarding attributes](./pages/attributes.js)
+
+## Preview
+
+Preview the example live on [StackBlitz](http://stackblitz.com/):
+
+[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/vercel/next.js/tree/canary/examples/script-component)
+
+## Deploy your own
+
+Deploy the example using [Vercel](https://vercel.com?utm_source=github&utm_medium=readme&utm_campaign=next-example):
+
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/git/external?repository-url=https://github.com/vercel/next.js/tree/canary/examples/script-component&project-name=script-component&repository-name=script-component)
+
+## How to use
+
+Execute [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app) with [npm](https://docs.npmjs.com/cli/init) or [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) to bootstrap the example:
+
+```bash
+npx create-next-app --example script-component script-component-app
+# or
+yarn create next-app --example script-component script-component-app
+```
+
+Deploy it to the cloud with [Vercel](https://vercel.com/new?utm_source=github&utm_medium=readme&utm_campaign=next-example) ([Documentation](https://nextjs.org/docs/deployment)).
diff --git a/examples/script-component/package.json b/examples/script-component/package.json
new file mode 100644
index 000000000000..349de02f4d84
--- /dev/null
+++ b/examples/script-component/package.json
@@ -0,0 +1,13 @@
+{
+  "private": true,
+  "scripts": {
+    "dev": "next",
+    "build": "next build",
+    "start": "next start"
+  },
+  "dependencies": {
+    "next": "latest",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
+  }
+}
diff --git a/examples/script-component/pages/_app.js b/examples/script-component/pages/_app.js
new file mode 100644
index 000000000000..ce819248ccdb
--- /dev/null
+++ b/examples/script-component/pages/_app.js
@@ -0,0 +1,20 @@
+import Link from 'next/link'
+
+import '../styles/global.css'
+
+const MyApp = ({ Component, pageProps, router }) => {
+  const pathname = router.pathname
+
+  return (
+    <>
+      <Component {...pageProps} />
+      {pathname !== '/' && (
+        <Link href="/">
+          <a>See all examples</a>
+        </Link>
+      )}
+    </>
+  )
+}
+
+export default MyApp
diff --git a/examples/script-component/pages/attributes.js b/examples/script-component/pages/attributes.js
new file mode 100644
index 000000000000..5c7260e9ff9c
--- /dev/null
+++ b/examples/script-component/pages/attributes.js
@@ -0,0 +1,22 @@
+import Script from 'next/script'
+
+export default function Inline() {
+  return (
+    <>
+      {/* Attributes are forwarded */}
+      <Script
+        src="https://www.google-analytics.com/analytics.js"
+        id="analytics"
+        nonce="XUENAJFW"
+        data-test="analytics"
+      />
+
+      <main>
+        <h1>Forwarded attributes</h1>
+        <h5>
+          Open devtools and check that attributes has been forwarded correctly.
+        </h5>
+      </main>
+    </>
+  )
+}
diff --git a/examples/script-component/pages/index.js b/examples/script-component/pages/index.js
new file mode 100644
index 000000000000..ad3dc2890886
--- /dev/null
+++ b/examples/script-component/pages/index.js
@@ -0,0 +1,36 @@
+import Link from 'next/link'
+
+export default function Index() {
+  return (
+    <main>
+      <h1>Script component examples</h1>
+      <ul>
+        <li>
+          <Link href="/polyfill">
+            <a>Polyfill</a>
+          </Link>
+        </li>
+        <li>
+          <Link href="/lazy">
+            <a>Lazy Loading</a>
+          </Link>
+        </li>
+        <li>
+          <Link href="/onload">
+            <a>Executing code after loading</a>
+          </Link>
+        </li>
+        <li>
+          <Link href="/inline">
+            <a>Inline scripts</a>
+          </Link>
+        </li>
+        <li>
+          <Link href="/attributes">
+            <a>Forwarding attributes</a>
+          </Link>
+        </li>
+      </ul>
+    </main>
+  )
+}
diff --git a/examples/script-component/pages/inline.js b/examples/script-component/pages/inline.js
new file mode 100644
index 000000000000..3626f1c6c838
--- /dev/null
+++ b/examples/script-component/pages/inline.js
@@ -0,0 +1,29 @@
+import Script from 'next/script'
+
+export default function Inline() {
+  return (
+    <>
+      {/* Execute arbitrary code */}
+      <Script id="show-banner" strategy="lazyOnload">
+        {`document.getElementById('banner').classList.remove('hidden')`}
+      </Script>
+
+      {/* Or */}
+
+      {/* <Script
+        id="show-banner"
+        dangerouslySetInnerHTML={{
+          __html: `document.getElementById('banner').classList.remove('hidden')`
+        }}
+      /> */}
+
+      <main>
+        <h1>Inline scripts</h1>
+        <h5 id="banner" className="hidden">
+          This is initially hidden but its being shown because the `Script`
+          component removed the `hidden` class.
+        </h5>
+      </main>
+    </>
+  )
+}
diff --git a/examples/script-component/pages/lazy.js b/examples/script-component/pages/lazy.js
new file mode 100644
index 000000000000..326637752ebd
--- /dev/null
+++ b/examples/script-component/pages/lazy.js
@@ -0,0 +1,42 @@
+import { useCallback, useEffect, useState } from 'react'
+import Script from 'next/script'
+
+export default function Lazyload() {
+  const [log, setLog] = useState([])
+
+  const addLog = useCallback(
+    (text) => {
+      setLog((log) => log.concat({ time: new Date(), text }))
+    },
+    [setLog]
+  )
+
+  useEffect(() => {
+    addLog(`Page loaded window.FB is undefined`)
+  }, [addLog])
+
+  return (
+    <>
+      {/* We lazy load the FB SDK */}
+      <Script
+        src="https://connect.facebook.net/en_US/sdk.js"
+        strategy="lazyOnload"
+        onLoad={() =>
+          addLog(`script loaded correctly, window.FB has been populated`)
+        }
+      />
+
+      <main>
+        <h1>Lazy Loading FB sdk</h1>
+        <h5>You can check `window.FB` on browser console</h5>
+        <ul>
+          {log.map(({ time, text }) => (
+            <li key={+time}>
+              {time.toISOString()}: {text}
+            </li>
+          ))}
+        </ul>
+      </main>
+    </>
+  )
+}
diff --git a/examples/script-component/pages/onload.js b/examples/script-component/pages/onload.js
new file mode 100644
index 000000000000..1a0d24f8701e
--- /dev/null
+++ b/examples/script-component/pages/onload.js
@@ -0,0 +1,46 @@
+import { useMemo, useState } from 'react'
+import Script from 'next/script'
+
+export default function Onload() {
+  const [stripe, setStripe] = useState(null)
+  const methods = useMemo(
+    () =>
+      stripe
+        ? Object.entries(stripe.stripe).filter(
+            ([_key, value]) => typeof value === 'function'
+          )
+        : [],
+    [stripe]
+  )
+
+  function handleLoad() {
+    const stripe = window.Stripe('pk_test_1234')
+
+    console.log('Stripe loaded: ', stripe)
+
+    setStripe({ stripe })
+  }
+
+  return (
+    <>
+      {/* We load Stripe sdk */}
+      <Script
+        id="stripe-js"
+        src="https://js.stripe.com/v3/"
+        onLoad={handleLoad}
+      />
+
+      <main>
+        <h1>Executing code after loading</h1>
+        <div>
+          <p>Stripe methods: </p>
+          <ul>
+            {methods.map(([method]) => (
+              <li key={method}>{method}</li>
+            ))}
+          </ul>
+        </div>
+      </main>
+    </>
+  )
+}
diff --git a/examples/script-component/pages/polyfill.js b/examples/script-component/pages/polyfill.js
new file mode 100644
index 000000000000..25b326721a39
--- /dev/null
+++ b/examples/script-component/pages/polyfill.js
@@ -0,0 +1,48 @@
+import { useEffect, useRef, useState } from 'react'
+import Script from 'next/script'
+
+import s from '../styles/polyfill.module.css'
+
+export default function Polyfill() {
+  const ref = useRef()
+  const [lastIntersection, setIntersection] = useState(new Date())
+
+  useEffect(() => {
+    const observer = new IntersectionObserver(
+      (intersections) => {
+        const isIntersecting = intersections[0]?.isIntersecting
+
+        if (isIntersecting) {
+          setIntersection(new Date())
+        }
+      },
+      {
+        rootMargin: '45px',
+      }
+    )
+
+    observer.observe(ref.current)
+
+    return () => observer.disconnect()
+  }, [])
+
+  return (
+    <>
+      {/* We ensure that intersection observer is available by polyfilling it */}
+      <Script
+        src="https://polyfill.io/v3/polyfill.min.js?features=IntersectionObserverEntry%2CIntersectionObserver"
+        strategy="beforeInteractive"
+      />
+
+      <main className={s.container}>
+        <h1>IntersectionObserver Polyfill</h1>
+        <h5>Scroll down to see when was the last intersection</h5>
+        <section className={s.section}>
+          <span ref={ref}>
+            Last intersection at {lastIntersection.toTimeString()}
+          </span>
+        </section>
+      </main>
+    </>
+  )
+}
diff --git a/examples/script-component/styles/global.css b/examples/script-component/styles/global.css
new file mode 100644
index 000000000000..e9cceadf211c
--- /dev/null
+++ b/examples/script-component/styles/global.css
@@ -0,0 +1,8 @@
+* {
+  font-family: sans-serif;
+  box-sizing: border-box;
+}
+
+.hidden {
+  display: none;
+}
diff --git a/examples/script-component/styles/polyfill.module.css b/examples/script-component/styles/polyfill.module.css
new file mode 100644
index 000000000000..a0c97a89c6bf
--- /dev/null
+++ b/examples/script-component/styles/polyfill.module.css
@@ -0,0 +1,6 @@
+.section {
+  height: 400vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
diff --git a/packages/create-next-app/create-app.ts b/packages/create-next-app/create-app.ts
index 524bf611b151..9a45635a619c 100644
--- a/packages/create-next-app/create-app.ts
+++ b/packages/create-next-app/create-app.ts
@@ -229,7 +229,7 @@ export async function createApp({
     /**
      * Default devDependencies.
      */
-    const devDependencies = ['eslint@7', 'eslint-config-next']
+    const devDependencies = ['eslint', 'eslint-config-next']
     /**
      * TypeScript projects will have type definitions and other devDependencies.
      */
diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
index 22c43d55f8c0..5a912f2dbca9 100644
--- a/packages/eslint-config-next/package.json
+++ b/packages/eslint-config-next/package.json
@@ -10,17 +10,17 @@
   },
   "dependencies": {
     "@next/eslint-plugin-next": "12.0.4",
-    "@rushstack/eslint-patch": "^1.0.6",
-    "@typescript-eslint/parser": "^4.20.0",
+    "@rushstack/eslint-patch": "^1.0.8",
+    "@typescript-eslint/parser": "^5.0.0",
     "eslint-import-resolver-node": "^0.3.4",
     "eslint-import-resolver-typescript": "^2.4.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-react": "^7.23.1",
-    "eslint-plugin-react-hooks": "^4.2.0"
+    "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
+    "eslint-plugin-react": "^7.27.0",
+    "eslint-plugin-react-hooks": "^4.3.0"
   },
   "peerDependencies": {
-    "eslint": "^7.23.0",
+    "eslint": "^7.23.0 || ^8.0.0",
     "next": ">=10.2.0",
     "typescript": ">=3.3.1"
   },
diff --git a/packages/next/build/output/index.ts b/packages/next/build/output/index.ts
index 859b8a62593a..ecca2387820b 100644
--- a/packages/next/build/output/index.ts
+++ b/packages/next/build/output/index.ts
@@ -139,12 +139,8 @@ buildStore.subscribe((state) => {
     loading: false,
     typeChecking: false,
     partial:
-      clientWasLoading && !serverWasLoading && !serverWebWasLoading
-        ? 'client'
-        : serverWasLoading && !clientWasLoading && !serverWebWasLoading
-        ? 'server'
-        : serverWebWasLoading && !clientWasLoading && !serverWasLoading
-        ? 'serverWeb'
+      clientWasLoading && (serverWasLoading || serverWebWasLoading)
+        ? 'client and server'
         : undefined,
     modules:
       (clientWasLoading ? client.modules : 0) +
diff --git a/packages/next/build/output/store.ts b/packages/next/build/output/store.ts
index 2e0135f631be..3b2946f04f3c 100644
--- a/packages/next/build/output/store.ts
+++ b/packages/next/build/output/store.ts
@@ -15,7 +15,7 @@ export type OutputState =
       | {
           loading: false
           typeChecking: boolean
-          partial: 'client' | 'server' | 'serverWeb' | undefined
+          partial: 'client and server' | undefined
           modules: number
           errors: string[] | null
           warnings: string[] | null
diff --git a/packages/next/build/swc/options.js b/packages/next/build/swc/options.js
index 1475914d1927..a058eca259fe 100644
--- a/packages/next/build/swc/options.js
+++ b/packages/next/build/swc/options.js
@@ -66,6 +66,7 @@ function getBaseSWCOptions({
           displayName: Boolean(development),
         }
       : null,
+    removeConsole: nextConfig?.experimental?.removeConsole,
   }
 }
 
diff --git a/packages/next/build/swc/src/lib.rs b/packages/next/build/swc/src/lib.rs
index 45d30fb928b1..ba091950fb08 100644
--- a/packages/next/build/swc/src/lib.rs
+++ b/packages/next/build/swc/src/lib.rs
@@ -60,7 +60,9 @@ pub mod minify;
 pub mod next_dynamic;
 pub mod next_ssg;
 pub mod page_config;
+pub mod remove_console;
 pub mod styled_jsx;
+mod top_level_binding_collector;
 mod transform;
 mod util;
 
@@ -87,6 +89,9 @@ pub struct TransformOptions {
 
     #[serde(default)]
     pub styled_components: Option<styled_components::Config>,
+
+    #[serde(default)]
+    pub remove_console: Option<remove_console::Config>,
 }
 
 pub fn custom_before_pass(file: Arc<SourceFile>, opts: &TransformOptions) -> impl Fold {
@@ -113,7 +118,12 @@ pub fn custom_before_pass(file: Arc<SourceFile>, opts: &TransformOptions) -> imp
         Optional::new(
             page_config::page_config(opts.is_development, opts.is_page_file),
             !opts.disable_page_config
-        )
+        ),
+        match &opts.remove_console {
+            Some(config) if config.truthy() =>
+                Either::Left(remove_console::remove_console(config.clone())),
+            _ => Either::Right(noop()),
+        },
     )
 }
 
diff --git a/packages/next/build/swc/src/remove_console.rs b/packages/next/build/swc/src/remove_console.rs
new file mode 100644
index 000000000000..dd7cb46cb0f8
--- /dev/null
+++ b/packages/next/build/swc/src/remove_console.rs
@@ -0,0 +1,146 @@
+use serde::Deserialize;
+use swc_atoms::JsWord;
+use swc_common::collections::AHashSet;
+use swc_common::DUMMY_SP;
+use swc_ecmascript::ast::*;
+use swc_ecmascript::utils::ident::IdentLike;
+use swc_ecmascript::utils::Id;
+use swc_ecmascript::visit::{noop_fold_type, Fold, FoldWith};
+
+use crate::top_level_binding_collector::collect_top_level_decls;
+
+#[derive(Clone, Debug, Deserialize)]
+#[serde(untagged)]
+pub enum Config {
+    All(bool),
+    WithOptions(Options),
+}
+
+impl Config {
+    pub fn truthy(&self) -> bool {
+        match self {
+            Config::All(b) => *b,
+            Config::WithOptions(_) => true,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct Options {
+    #[serde(default)]
+    pub exclude: Vec<JsWord>,
+}
+
+struct RemoveConsole {
+    exclude: Vec<JsWord>,
+    bindings: Vec<AHashSet<Id>>,
+    in_function_params: bool,
+}
+
+impl RemoveConsole {
+    fn is_global_console(&self, ident: &Ident) -> bool {
+        &ident.sym == "console"
+            && self
+                .bindings
+                .iter()
+                .find(|x| x.contains(&ident.to_id()))
+                .is_none()
+    }
+
+    fn should_remove_call(&mut self, n: &CallExpr) -> bool {
+        let callee = &n.callee;
+        let member_expr = match callee {
+            ExprOrSuper::Expr(e) => match &**e {
+                Expr::Member(m) => m,
+                _ => return false,
+            },
+            _ => return false,
+        };
+
+        // Don't attempt to evaluate computed properties.
+        if member_expr.computed {
+            return false;
+        }
+
+        // Only proceed if the object is the global `console` object.
+        match &member_expr.obj {
+            ExprOrSuper::Expr(e) => match &**e {
+                Expr::Ident(i) if self.is_global_console(i) => {}
+                _ => return false,
+            },
+            _ => return false,
+        }
+
+        // Check if the property is requested to be excluded.
+        // Here we do an O(n) search on the list of excluded properties because the size
+        // should be small.
+        match &*member_expr.prop {
+            Expr::Ident(i) if self.exclude.iter().find(|x| **x == i.sym).is_none() => {}
+            _ => return false,
+        }
+
+        true
+    }
+}
+
+impl Fold for RemoveConsole {
+    noop_fold_type!();
+
+    fn fold_stmt(&mut self, stmt: Stmt) -> Stmt {
+        match &stmt {
+            Stmt::Expr(e) => match &*e.expr {
+                Expr::Call(c) => {
+                    if self.should_remove_call(c) {
+                        return Stmt::Empty(EmptyStmt { span: DUMMY_SP });
+                    }
+                }
+                _ => {}
+            },
+            _ => {}
+        }
+        stmt.fold_children_with(self)
+    }
+
+    fn fold_function(&mut self, mut func: Function) -> Function {
+        self.in_function_params = true;
+        let mut new_params: AHashSet<Id> = AHashSet::default();
+        for param in &func.params {
+            new_params.extend(collect_top_level_decls(param));
+        }
+        self.in_function_params = false;
+
+        self.bindings.push(new_params);
+        self.bindings.push(collect_top_level_decls(&func));
+        func.body = func.body.fold_with(self);
+        self.bindings.pop().unwrap();
+        self.bindings.pop().unwrap();
+        func
+    }
+
+    fn fold_module(&mut self, module: Module) -> Module {
+        self.bindings.push(collect_top_level_decls(&module));
+        let m = module.fold_children_with(self);
+        self.bindings.pop().unwrap();
+        m
+    }
+
+    fn fold_script(&mut self, script: Script) -> Script {
+        self.bindings.push(collect_top_level_decls(&script));
+        let s = script.fold_with(self);
+        self.bindings.pop().unwrap();
+        s
+    }
+}
+
+pub fn remove_console(config: Config) -> impl Fold {
+    let exclude = match config {
+        Config::WithOptions(x) => x.exclude,
+        _ => vec![],
+    };
+    let remover = RemoveConsole {
+        exclude,
+        bindings: Default::default(),
+        in_function_params: false,
+    };
+    remover
+}
diff --git a/packages/next/build/swc/src/top_level_binding_collector.rs b/packages/next/build/swc/src/top_level_binding_collector.rs
new file mode 100644
index 000000000000..a5b31386bc3f
--- /dev/null
+++ b/packages/next/build/swc/src/top_level_binding_collector.rs
@@ -0,0 +1,128 @@
+use std::hash::Hash;
+use swc_common::{collections::AHashSet, SyntaxContext, DUMMY_SP};
+use swc_ecmascript::{
+    ast::{
+        ClassDecl, FnDecl, Ident, ImportDefaultSpecifier, ImportNamedSpecifier,
+        ImportStarAsSpecifier, Invalid, ModuleItem, ObjectPatProp, Param, Pat, Stmt, VarDeclarator,
+    },
+    utils::ident::IdentLike,
+    visit::{noop_visit_type, Node, Visit, VisitWith},
+};
+
+// Modified from swc_ecma_utils/src/lib.rs:BindingCollector.
+pub struct TopLevelBindingCollector<I>
+where
+    I: IdentLike + Eq + Hash + Send + Sync,
+{
+    only: Option<SyntaxContext>,
+    bindings: AHashSet<I>,
+    is_pat_decl: bool,
+}
+
+impl<I> TopLevelBindingCollector<I>
+where
+    I: IdentLike + Eq + Hash + Send + Sync,
+{
+    fn add(&mut self, i: &Ident) {
+        if let Some(only) = self.only {
+            if only != i.span.ctxt {
+                return;
+            }
+        }
+
+        self.bindings.insert(I::from_ident(i));
+    }
+}
+
+impl<I> Visit for TopLevelBindingCollector<I>
+where
+    I: IdentLike + Eq + Hash + Send + Sync,
+{
+    noop_visit_type!();
+
+    fn visit_class_decl(&mut self, node: &ClassDecl, _: &dyn Node) {
+        self.add(&node.ident);
+    }
+
+    fn visit_fn_decl(&mut self, node: &FnDecl, _: &dyn Node) {
+        self.add(&node.ident);
+    }
+
+    fn visit_pat(&mut self, node: &Pat, _: &dyn Node) {
+        if self.is_pat_decl {
+            match node {
+                Pat::Ident(i) => self.add(&i.id),
+                Pat::Object(o) => {
+                    for prop in o.props.iter() {
+                        match prop {
+                            ObjectPatProp::Assign(a) => self.add(&a.key),
+                            ObjectPatProp::KeyValue(k) => k.value.visit_with(k, self),
+                            ObjectPatProp::Rest(_) => {}
+                        }
+                    }
+                }
+                Pat::Array(a) => {
+                    for elem in a.elems.iter() {
+                        elem.visit_with(a, self);
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+
+    fn visit_param(&mut self, node: &Param, _: &dyn Node) {
+        let old = self.is_pat_decl;
+        self.is_pat_decl = true;
+        node.visit_children_with(self);
+        self.is_pat_decl = old;
+    }
+
+    fn visit_import_default_specifier(&mut self, node: &ImportDefaultSpecifier, _: &dyn Node) {
+        self.add(&node.local);
+    }
+
+    fn visit_import_named_specifier(&mut self, node: &ImportNamedSpecifier, _: &dyn Node) {
+        self.add(&node.local);
+    }
+
+    fn visit_import_star_as_specifier(&mut self, node: &ImportStarAsSpecifier, _: &dyn Node) {
+        self.add(&node.local);
+    }
+
+    fn visit_module_items(&mut self, nodes: &[ModuleItem], _: &dyn Node) {
+        for node in nodes {
+            node.visit_children_with(self)
+        }
+    }
+
+    fn visit_stmts(&mut self, nodes: &[Stmt], _: &dyn Node) {
+        for node in nodes {
+            node.visit_children_with(self)
+        }
+    }
+
+    fn visit_var_declarator(&mut self, node: &VarDeclarator, _: &dyn Node) {
+        let old = self.is_pat_decl;
+        self.is_pat_decl = true;
+        node.name.visit_with(node, self);
+
+        self.is_pat_decl = false;
+        node.init.visit_with(node, self);
+        self.is_pat_decl = old;
+    }
+}
+
+pub fn collect_top_level_decls<I, N>(n: &N) -> AHashSet<I>
+where
+    I: IdentLike + Eq + Hash + Send + Sync,
+    N: VisitWith<TopLevelBindingCollector<I>>,
+{
+    let mut v = TopLevelBindingCollector {
+        only: None,
+        bindings: Default::default(),
+        is_pat_decl: false,
+    };
+    n.visit_with(&Invalid { span: DUMMY_SP }, &mut v);
+    v.bindings
+}
diff --git a/packages/next/build/swc/tests/fixture.rs b/packages/next/build/swc/tests/fixture.rs
index e9bcdf4ae6cc..56ad91991da1 100644
--- a/packages/next/build/swc/tests/fixture.rs
+++ b/packages/next/build/swc/tests/fixture.rs
@@ -1,6 +1,6 @@
 use next_swc::{
     amp_attributes::amp_attributes, next_dynamic::next_dynamic, next_ssg::next_ssg,
-    page_config::page_config_test, styled_jsx::styled_jsx,
+    page_config::page_config_test, remove_console::remove_console, styled_jsx::styled_jsx,
 };
 use std::path::PathBuf;
 use swc_common::{chain, comments::SingleThreadedComments, FileName, Mark, Span, DUMMY_SP};
@@ -119,3 +119,14 @@ fn page_config_fixture(input: PathBuf) {
     let output = input.parent().unwrap().join("output.js");
     test_fixture(syntax(), &|_tr| page_config_test(), &input, &output);
 }
+
+#[fixture("tests/fixture/remove-console/**/input.js")]
+fn remove_console_fixture(input: PathBuf) {
+    let output = input.parent().unwrap().join("output.js");
+    test_fixture(
+        syntax(),
+        &|_tr| remove_console(next_swc::remove_console::Config::All(true)),
+        &input,
+        &output,
+    );
+}
diff --git a/packages/next/build/swc/tests/fixture/remove-console/all/simple/input.js b/packages/next/build/swc/tests/fixture/remove-console/all/simple/input.js
new file mode 100644
index 000000000000..1bb8ab88ac90
--- /dev/null
+++ b/packages/next/build/swc/tests/fixture/remove-console/all/simple/input.js
@@ -0,0 +1,42 @@
+console.log("remove console test at top level");
+
+export function shouldRemove() {
+  console.log("remove console test in function");
+  console.error("remove console test in function / error");
+}
+
+export function locallyDefinedConsole() {
+  let console = {
+    log: () => { },
+  };
+  console.log();
+}
+
+export function capturedConsole() {
+  let console = {
+    log: () => { },
+  };
+  function innerFunc() {
+    console.log();
+  }
+}
+
+export function overrideInParam(console) {
+  console.log("")
+}
+
+export function overrideInParamObjectPatPropAssign({ console }) {
+  console.log("")
+}
+
+export function overrideInParamObjectPatPropKeyValue({ c: console }) {
+  console.log("")
+}
+
+export function overrideInParamObjectPatPropKeyValueNested({ c: { console } }) {
+  console.log("")
+}
+
+export function overrideInParamArray([ console ]) {
+  console.log("")
+}
diff --git a/packages/next/build/swc/tests/fixture/remove-console/all/simple/output.js b/packages/next/build/swc/tests/fixture/remove-console/all/simple/output.js
new file mode 100644
index 000000000000..ee23146e5d62
--- /dev/null
+++ b/packages/next/build/swc/tests/fixture/remove-console/all/simple/output.js
@@ -0,0 +1,36 @@
+;
+export function shouldRemove() {
+    ;
+    ;
+}
+export function locallyDefinedConsole() {
+    let console = {
+        log: ()=>{
+        }
+    };
+    console.log();
+}
+export function capturedConsole() {
+    let console = {
+        log: ()=>{
+        }
+    };
+    function innerFunc() {
+        console.log();
+    }
+}
+export function overrideInParam(console) {
+    console.log("");
+}
+export function overrideInParamObjectPatPropAssign({ console  }) {
+    console.log("");
+}
+export function overrideInParamObjectPatPropKeyValue({ c: console  }) {
+    console.log("");
+}
+export function overrideInParamObjectPatPropKeyValueNested({ c: { console  }  }) {
+    console.log("");
+}
+export function overrideInParamArray([console]) {
+    console.log("");
+}
diff --git a/packages/next/build/swc/tests/fixture/remove-console/all/toplevel-override/input.js b/packages/next/build/swc/tests/fixture/remove-console/all/toplevel-override/input.js
new file mode 100644
index 000000000000..150e9ddd78c3
--- /dev/null
+++ b/packages/next/build/swc/tests/fixture/remove-console/all/toplevel-override/input.js
@@ -0,0 +1,9 @@
+let console = {
+  log: (msg) => {},
+};
+
+function func1() {
+  console.log("remove console test in function");
+}
+
+console.log("remove console test at top level");
diff --git a/packages/next/build/swc/tests/fixture/remove-console/all/toplevel-override/output.js b/packages/next/build/swc/tests/fixture/remove-console/all/toplevel-override/output.js
new file mode 100644
index 000000000000..2d3b8aa02a89
--- /dev/null
+++ b/packages/next/build/swc/tests/fixture/remove-console/all/toplevel-override/output.js
@@ -0,0 +1,8 @@
+let console = {
+  log: (msg)=>{
+  }
+};
+function func1() {
+  console.log("remove console test in function");
+}
+console.log("remove console test at top level");
diff --git a/packages/next/build/swc/tests/full.rs b/packages/next/build/swc/tests/full.rs
index 38ab5603ed6d..9b1dbf6bc9db 100644
--- a/packages/next/build/swc/tests/full.rs
+++ b/packages/next/build/swc/tests/full.rs
@@ -57,6 +57,7 @@ fn test(input: &Path, minify: bool) {
                 is_page_file: false,
                 is_development: true,
                 styled_components: Some(assert_json("{}")),
+                remove_console: None,
             };
 
             let options = options.patch(&fm);
diff --git a/packages/next/compiled/find-cache-dir/index.js b/packages/next/compiled/find-cache-dir/index.js
index 10391e5d2d0b..39b6be1c6654 100644
--- a/packages/next/compiled/find-cache-dir/index.js
+++ b/packages/next/compiled/find-cache-dir/index.js
@@ -1 +1 @@
-module.exports=(()=>{var r={192:(r,e,t)=>{var s=t(622);r.exports=function(r,e){if(e){var t=e.map(function(e){return s.resolve(r,e)})}else{var t=r}var n=t.slice(1).reduce(function(r,e){if(!e.match(/^([A-Za-z]:)?\/|\\/)){throw new Error("relative path without a basedir")}var t=e.split(/\/+|\\+/);for(var s=0;r[s]===t[s]&&s<Math.min(r.length,t.length);s++);return r.slice(0,s)},t[0].split(/\/+|\\+/));return n.length>1?n.join("/"):"/"}},293:(r,e,t)=>{"use strict";const s=t(747);const n=t(622);const{promisify:o}=t(669);const c=t(519);const i=c.satisfies(process.version,">=10.12.0");const a=r=>{if(process.platform==="win32"){const e=/[<>:"|?*]/.test(r.replace(n.parse(r).root,""));if(e){const e=new Error(`Path contains invalid characters: ${r}`);e.code="EINVAL";throw e}}};const u=r=>{const e={mode:511&~process.umask(),fs:s};return{...e,...r}};const d=r=>{const e=new Error(`operation not permitted, mkdir '${r}'`);e.code="EPERM";e.errno=-4048;e.path=r;e.syscall="mkdir";return e};const f=async(r,e)=>{a(r);e=u(e);const t=o(e.fs.mkdir);const c=o(e.fs.stat);if(i&&e.fs.mkdir===s.mkdir){const s=n.resolve(r);await t(s,{mode:e.mode,recursive:true});return s}const f=async r=>{try{await t(r,e.mode);return r}catch(e){if(e.code==="EPERM"){throw e}if(e.code==="ENOENT"){if(n.dirname(r)===r){throw d(r)}if(e.message.includes("null bytes")){throw e}await f(n.dirname(r));return f(r)}try{const t=await c(r);if(!t.isDirectory()){throw new Error("The path is not a directory")}}catch(r){throw e}return r}};return f(n.resolve(r))};r.exports=f;r.exports.sync=((r,e)=>{a(r);e=u(e);if(i&&e.fs.mkdirSync===s.mkdirSync){const t=n.resolve(r);s.mkdirSync(t,{mode:e.mode,recursive:true});return t}const t=r=>{try{e.fs.mkdirSync(r,e.mode)}catch(s){if(s.code==="EPERM"){throw s}if(s.code==="ENOENT"){if(n.dirname(r)===r){throw d(r)}if(s.message.includes("null bytes")){throw s}t(n.dirname(r));return t(r)}try{if(!e.fs.statSync(r).isDirectory()){throw new Error("The path is not a directory")}}catch(r){throw s}}return r};return t(n.resolve(r))})},477:(r,e,t)=>{"use strict";const s=t(622);const n=t(442);const o=async r=>{const e=await n("package.json",{cwd:r});return e&&s.dirname(e)};r.exports=o;r.exports.default=o;r.exports.sync=(r=>{const e=n.sync("package.json",{cwd:r});return e&&s.dirname(e)})},281:(r,e,t)=>{"use strict";const s=t(622);const n=t(747);const o=t(192);const c=t(477);const i=t(293);const{env:a,cwd:u}=process;const d=r=>{try{n.accessSync(r,n.constants.W_OK);return true}catch(r){return false}};function useDirectory(r,e){if(e.create){i.sync(r)}if(e.thunk){return(...e)=>s.join(r,...e)}return r}function getNodeModuleDirectory(r){const e=s.join(r,"node_modules");if(!d(e)&&(n.existsSync(e)||!d(s.join(r)))){return}return e}r.exports=((r={})=>{if(a.CACHE_DIR&&!["true","false","1","0"].includes(a.CACHE_DIR)){return useDirectory(s.join(a.CACHE_DIR,"find-cache-dir"),r)}let{cwd:e=u()}=r;if(r.files){e=o(e,r.files)}e=c.sync(e);if(!e){return}const t=getNodeModuleDirectory(e);if(!t){return undefined}return useDirectory(s.join(e,"node_modules",".cache",r.name),r)})},747:r=>{"use strict";r.exports=require("fs")},442:r=>{"use strict";r.exports=require("next/dist/compiled/find-up")},519:r=>{"use strict";r.exports=require("next/dist/compiled/semver")},622:r=>{"use strict";r.exports=require("path")},669:r=>{"use strict";r.exports=require("util")}};var e={};function __nccwpck_require__(t){if(e[t]){return e[t].exports}var s=e[t]={exports:{}};var n=true;try{r[t](s,s.exports,__nccwpck_require__);n=false}finally{if(n)delete e[t]}return s.exports}__nccwpck_require__.ab=__dirname+"/";return __nccwpck_require__(281)})();
\ No newline at end of file
+module.exports=(()=>{var r={192:(r,e,t)=>{var s=t(622);r.exports=function(r,e){if(e){var t=e.map(function(e){return s.resolve(r,e)})}else{var t=r}var n=t.slice(1).reduce(function(r,e){if(!e.match(/^([A-Za-z]:)?\/|\\/)){throw new Error("relative path without a basedir")}var t=e.split(/\/+|\\+/);for(var s=0;r[s]===t[s]&&s<Math.min(r.length,t.length);s++);return r.slice(0,s)},t[0].split(/\/+|\\+/));return n.length>1?n.join("/"):"/"}},293:(r,e,t)=>{"use strict";const s=t(747);const n=t(622);const{promisify:o}=t(669);const c=t(519);const i=c.satisfies(process.version,">=10.12.0");const a=r=>{if(process.platform==="win32"){const e=/[<>:"|?*]/.test(r.replace(n.parse(r).root,""));if(e){const e=new Error(`Path contains invalid characters: ${r}`);e.code="EINVAL";throw e}}};const u=r=>{const e={mode:511&~process.umask(),fs:s};return{...e,...r}};const d=r=>{const e=new Error(`operation not permitted, mkdir '${r}'`);e.code="EPERM";e.errno=-4048;e.path=r;e.syscall="mkdir";return e};const f=async(r,e)=>{a(r);e=u(e);const t=o(e.fs.mkdir);const c=o(e.fs.stat);if(i&&e.fs.mkdir===s.mkdir){const s=n.resolve(r);await t(s,{mode:e.mode,recursive:true});return s}const f=async r=>{try{await t(r,e.mode);return r}catch(e){if(e.code==="EPERM"){throw e}if(e.code==="ENOENT"){if(n.dirname(r)===r){throw d(r)}if(e.message.includes("null bytes")){throw e}await f(n.dirname(r));return f(r)}try{const t=await c(r);if(!t.isDirectory()){throw new Error("The path is not a directory")}}catch(r){throw e}return r}};return f(n.resolve(r))};r.exports=f;r.exports.sync=((r,e)=>{a(r);e=u(e);if(i&&e.fs.mkdirSync===s.mkdirSync){const t=n.resolve(r);s.mkdirSync(t,{mode:e.mode,recursive:true});return t}const t=r=>{try{e.fs.mkdirSync(r,e.mode)}catch(s){if(s.code==="EPERM"){throw s}if(s.code==="ENOENT"){if(n.dirname(r)===r){throw d(r)}if(s.message.includes("null bytes")){throw s}t(n.dirname(r));return t(r)}try{if(!e.fs.statSync(r).isDirectory()){throw new Error("The path is not a directory")}}catch(r){throw s}}return r};return t(n.resolve(r))})},281:(r,e,t)=>{"use strict";const s=t(622);const n=t(747);const o=t(192);const c=t(98);const i=t(293);const{env:a,cwd:u}=process;const d=r=>{try{n.accessSync(r,n.constants.W_OK);return true}catch(r){return false}};function useDirectory(r,e){if(e.create){i.sync(r)}if(e.thunk){return(...e)=>s.join(r,...e)}return r}function getNodeModuleDirectory(r){const e=s.join(r,"node_modules");if(!d(e)&&(n.existsSync(e)||!d(s.join(r)))){return}return e}r.exports=((r={})=>{if(a.CACHE_DIR&&!["true","false","1","0"].includes(a.CACHE_DIR)){return useDirectory(s.join(a.CACHE_DIR,"find-cache-dir"),r)}let{cwd:e=u()}=r;if(r.files){e=o(e,r.files)}e=c.sync(e);if(!e){return}const t=getNodeModuleDirectory(e);if(!t){return undefined}return useDirectory(s.join(e,"node_modules",".cache",r.name),r)})},98:(r,e,t)=>{"use strict";const s=t(622);const n=t(442);const o=async r=>{const e=await n("package.json",{cwd:r});return e&&s.dirname(e)};r.exports=o;r.exports.default=o;r.exports.sync=(r=>{const e=n.sync("package.json",{cwd:r});return e&&s.dirname(e)})},747:r=>{"use strict";r.exports=require("fs")},442:r=>{"use strict";r.exports=require("next/dist/compiled/find-up")},519:r=>{"use strict";r.exports=require("next/dist/compiled/semver")},622:r=>{"use strict";r.exports=require("path")},669:r=>{"use strict";r.exports=require("util")}};var e={};function __nccwpck_require__(t){if(e[t]){return e[t].exports}var s=e[t]={exports:{}};var n=true;try{r[t](s,s.exports,__nccwpck_require__);n=false}finally{if(n)delete e[t]}return s.exports}__nccwpck_require__.ab=__dirname+"/";return __nccwpck_require__(281)})();
\ No newline at end of file
diff --git a/packages/next/lib/eslint/runLintCheck.ts b/packages/next/lib/eslint/runLintCheck.ts
index d85dc184a5d7..5d698337b832 100644
--- a/packages/next/lib/eslint/runLintCheck.ts
+++ b/packages/next/lib/eslint/runLintCheck.ts
@@ -94,8 +94,8 @@ async function lint(
           lintDuringBuild ? ' in order to run during builds:' : ':'
         } ${chalk.bold.cyan(
           (await isYarn(baseDir))
-            ? 'yarn add --dev eslint@"<8.0.0"' // TODO: Remove @"<8.0.0" when ESLint v8 is supported https://github.com/vercel/next.js/pull/29865
-            : 'npm install --save-dev eslint@"<8.0.0"' // TODO: Remove @"<8.0.0" when ESLint v8 is supported https://github.com/vercel/next.js/pull/29865
+            ? 'yarn add --dev eslint'
+            : 'npm install --save-dev eslint'
         )}`
       )
       return null
@@ -111,16 +111,7 @@ async function lint(
         'error'
       )} - Your project has an older version of ESLint installed${
         eslintVersion ? ' (' + eslintVersion + ')' : ''
-      }. Please upgrade to ESLint version 7`
-    } else if (semver.gte(eslintVersion, '8.0.0')) {
-      // TODO: Remove this check when ESLint v8 is supported https://github.com/vercel/next.js/pull/29865
-      return `${chalk.red('error')} - ESLint version ${
-        eslintVersion ? eslintVersion : '8'
-      } is not yet supported. Please downgrade to version 7 for the meantime: ${chalk.bold.cyan(
-        (await isYarn(baseDir))
-          ? 'yarn remove eslint && yarn add --dev eslint@"<8.0.0"'
-          : 'npm uninstall eslint && npm install --save-dev eslint@"<8.0.0"'
-      )}`
+      }. Please upgrade to ESLint version 7 or above`
     }
 
     let options: any = {
@@ -209,12 +200,13 @@ async function lint(
         eslintVersion: eslintVersion,
         lintedFilesCount: results.length,
         lintFix: !!options.fix,
-        nextEslintPluginVersion: nextEslintPluginIsEnabled
-          ? require(path.join(
-              path.dirname(deps.resolved.get('eslint-config-next')!),
-              'package.json'
-            )).version
-          : null,
+        nextEslintPluginVersion:
+          nextEslintPluginIsEnabled && deps.resolved.has('eslint-config-next')
+            ? require(path.join(
+                path.dirname(deps.resolved.get('eslint-config-next')!),
+                'package.json'
+              )).version
+            : null,
         nextEslintPluginErrorsCount: formattedResult.totalNextPluginErrorCount,
         nextEslintPluginWarningsCount:
           formattedResult.totalNextPluginWarningCount,
diff --git a/packages/next/server/config-shared.ts b/packages/next/server/config-shared.ts
index aa20df71b079..b15a32f39117 100644
--- a/packages/next/server/config-shared.ts
+++ b/packages/next/server/config-shared.ts
@@ -126,6 +126,11 @@ export type NextConfig = { [key: string]: any } & {
   crossOrigin?: false | 'anonymous' | 'use-credentials'
   swcMinify?: boolean
   experimental?: {
+    removeConsole?:
+      | boolean
+      | {
+          exclude?: string[]
+        }
     styledComponents?: boolean
     swcMinify?: boolean
     cpus?: number
diff --git a/packages/next/server/dev/on-demand-entry-handler.ts b/packages/next/server/dev/on-demand-entry-handler.ts
index cc921c8036b5..2c48073142d1 100644
--- a/packages/next/server/dev/on-demand-entry-handler.ts
+++ b/packages/next/server/dev/on-demand-entry-handler.ts
@@ -259,13 +259,9 @@ export default function onDemandEntryHandler(
 
       if (entriesChanged) {
         reportTrigger(
-          isApiRoute
-            ? `${normalizedPage} (server only)`
-            : isMiddleware
-            ? `${normalizedPage} (middleware only)`
-            : clientOnly
-            ? `${normalizedPage} (client only)`
-            : normalizedPage
+          isApiRoute || isMiddleware || clientOnly
+            ? normalizedPage
+            : `${normalizedPage} (client and server)`
         )
         invalidator.invalidate()
       }
diff --git a/packages/next/server/web/sandbox/polyfills.ts b/packages/next/server/web/sandbox/polyfills.ts
index 2a02824f99f7..75d168e3662a 100644
--- a/packages/next/server/web/sandbox/polyfills.ts
+++ b/packages/next/server/web/sandbox/polyfills.ts
@@ -1,7 +1,5 @@
-import {
-  Crypto as WebCrypto,
-  CryptoKey,
-} from 'next/dist/compiled/@peculiar/webcrypto'
+import { Crypto as WebCrypto } from 'next/dist/compiled/@peculiar/webcrypto'
+import { CryptoKey } from 'next/dist/compiled/@peculiar/webcrypto'
 import { TransformStream } from 'next/dist/compiled/web-streams-polyfill'
 import { v4 as uuid } from 'next/dist/compiled/uuid'
 import crypto from 'crypto'
@@ -14,48 +12,6 @@ export function btoa(str: string) {
   return Buffer.from(str, 'binary').toString('base64')
 }
 
-class TextEncoderRuntime {
-  encoder: TextEncoder
-
-  constructor() {
-    this.encoder = new TextEncoder()
-  }
-
-  get encoding() {
-    return this.encoder.encoding
-  }
-
-  public encode(input: string) {
-    return this.encoder.encode(input)
-  }
-}
-
-class TextDecoderRuntime {
-  decoder: TextDecoder
-
-  constructor() {
-    this.decoder = new TextDecoder()
-  }
-
-  get encoding() {
-    return this.decoder.encoding
-  }
-
-  get fatal() {
-    return this.decoder.fatal
-  }
-
-  get ignoreBOM() {
-    return this.decoder.ignoreBOM
-  }
-
-  public decode(input: BufferSource, options?: TextDecodeOptions) {
-    return this.decoder.decode(input, options)
-  }
-}
-
-export { TextDecoderRuntime as TextDecoder }
-export { TextEncoderRuntime as TextEncoder }
 export { CryptoKey }
 
 export class Crypto extends WebCrypto {
diff --git a/packages/next/server/web/sandbox/sandbox.ts b/packages/next/server/web/sandbox/sandbox.ts
index 688a0ebb7890..af77b0680f6a 100644
--- a/packages/next/server/web/sandbox/sandbox.ts
+++ b/packages/next/server/web/sandbox/sandbox.ts
@@ -82,8 +82,8 @@ export async function run(params: {
       ReadableStream: polyfills.ReadableStream,
       setInterval,
       setTimeout,
-      TextDecoder: polyfills.TextDecoder,
-      TextEncoder: polyfills.TextEncoder,
+      TextDecoder,
+      TextEncoder,
       TransformStream,
       URL,
       URLSearchParams,
diff --git a/test/development/basic/hmr.test.ts b/test/development/basic/hmr.test.ts
index 162d21db3a8f..47ef6872fa61 100644
--- a/test/development/basic/hmr.test.ts
+++ b/test/development/basic/hmr.test.ts
@@ -57,9 +57,11 @@ describe('basic HMR', () => {
 
           expect(next.cliOutput.slice(start)).toContain('compiling...')
           expect(next.cliOutput.slice(start)).toContain(
-            'compiling /hmr/contact...'
+            'compiling /hmr/contact (client and server)...'
+          )
+          expect(next.cliOutput).toContain(
+            'compiling /_error (client and server)...'
           )
-          expect(next.cliOutput).toContain('compiling /_error...')
         } finally {
           if (browser) {
             await browser.close()
@@ -327,9 +329,11 @@ describe('basic HMR', () => {
         )
 
         expect(next.cliOutput.slice(start)).toContain(
-          'compiling /hmr/new-page...'
+          'compiling /hmr/new-page (client and server)...'
+        )
+        expect(next.cliOutput).toContain(
+          'compiling /_error (client and server)...'
         )
-        expect(next.cliOutput).toContain('compiling /_error...')
       } catch (err) {
         await next.deleteFile(newPage)
         throw err
@@ -358,9 +362,11 @@ describe('basic HMR', () => {
 
         await check(() => getBrowserBodyText(browser), /This is the about page/)
         expect(next.cliOutput.slice(start)).toContain(
-          'compiling /hmr/about2...'
+          'compiling /hmr/about2 (client and server)...'
+        )
+        expect(next.cliOutput).toContain(
+          'compiling /_error (client and server)...'
         )
-        expect(next.cliOutput).toContain('compiling /_error...')
       } catch (err) {
         await next.patchFile(aboutPage, aboutContent)
         if (browser) {
diff --git a/test/integration/amphtml/test/index.test.js b/test/integration/amphtml/test/index.test.js
index 82493b71a416..f32cdde1740f 100644
--- a/test/integration/amphtml/test/index.test.js
+++ b/test/integration/amphtml/test/index.test.js
@@ -519,7 +519,7 @@ describe('AMP Usage', () => {
     })
 
     it('should not contain missing files warning', async () => {
-      expect(output).toContain('compiled successfully')
+      expect(output).toContain('compiled client and server successfully')
       expect(output).toContain('compiling /only-amp')
       expect(output).not.toContain('Could not find files for')
     })
diff --git a/test/integration/eslint/invalid-newer-eslint-version/.eslintrc b/test/integration/eslint/invalid-newer-eslint-version/.eslintrc
deleted file mode 100644
index abd5579b49c1..000000000000
--- a/test/integration/eslint/invalid-newer-eslint-version/.eslintrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "extends": "next",
-  "root": true
-}
diff --git a/test/integration/eslint/invalid-newer-eslint-version/node_modules/eslint/lib/api.js b/test/integration/eslint/invalid-newer-eslint-version/node_modules/eslint/lib/api.js
deleted file mode 100644
index 91f7ee938f1b..000000000000
--- a/test/integration/eslint/invalid-newer-eslint-version/node_modules/eslint/lib/api.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = { ESLint: { version: '8.0.1' } }
diff --git a/test/integration/eslint/invalid-newer-eslint-version/node_modules/eslint/package.json b/test/integration/eslint/invalid-newer-eslint-version/node_modules/eslint/package.json
deleted file mode 100644
index ee66bf9b0cf0..000000000000
--- a/test/integration/eslint/invalid-newer-eslint-version/node_modules/eslint/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "eslint",
-  "main": "./lib/api.js",
-  "version": "8.0.1"
-}
diff --git a/test/integration/eslint/invalid-newer-eslint-version/pages/index.js b/test/integration/eslint/invalid-newer-eslint-version/pages/index.js
deleted file mode 100644
index ca1cd577585d..000000000000
--- a/test/integration/eslint/invalid-newer-eslint-version/pages/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const Home = () => (
-  <div>
-    <p>Home</p>
-    /* Badly formatted comment */
-  </div>
-)
-
-export default Home
diff --git a/test/integration/eslint/test/index.test.js b/test/integration/eslint/test/index.test.js
index ac7a005b48cb..e2fedb270a02 100644
--- a/test/integration/eslint/test/index.test.js
+++ b/test/integration/eslint/test/index.test.js
@@ -25,10 +25,6 @@ const dirInvalidOlderEslintVersion = join(
   __dirname,
   '../invalid-eslint-version'
 )
-const dirInvalidNewerEslintVersion = join(
-  __dirname,
-  '../invalid-newer-eslint-version'
-)
 const dirMaxWarnings = join(__dirname, '../max-warnings')
 const dirEmptyDirectory = join(__dirname, '../empty-directory')
 const dirEslintIgnore = join(__dirname, '../eslint-ignore')
@@ -115,24 +111,6 @@ describe('ESLint', () => {
       )
     })
 
-    // TODO: Remove this test when ESLint v8 is supported https://github.com/vercel/next.js/pull/29865
-    test('invalid newer eslint version', async () => {
-      const { stdout, stderr } = await nextBuild(
-        dirInvalidNewerEslintVersion,
-        [],
-        {
-          stdout: true,
-          stderr: true,
-        }
-      )
-
-      const output = stdout + stderr
-      console.log(output)
-      expect(output).toContain(
-        'ESLint version 8.0.1 is not yet supported. Please downgrade to version 7 for the meantime'
-      )
-    })
-
     test('empty directories do not fail the build', async () => {
       const { stdout, stderr } = await nextBuild(dirEmptyDirectory, [], {
         stdout: true,
diff --git a/test/integration/nullish-config/test/index.test.js b/test/integration/nullish-config/test/index.test.js
index e2f60a21ada9..9e80d71e1c00 100644
--- a/test/integration/nullish-config/test/index.test.js
+++ b/test/integration/nullish-config/test/index.test.js
@@ -1,7 +1,7 @@
 /* eslint-env jest */
 import fs from 'fs-extra'
 import { join } from 'path'
-import { launchApp, findPort, nextBuild } from 'next-test-utils'
+import { launchApp, findPort, nextBuild, killApp } from 'next-test-utils'
 
 const appDir = join(__dirname, '..')
 const nextConfig = join(appDir, 'next.config.js')
@@ -27,7 +27,7 @@ const runTests = () => {
 
     const stdout = await getStdout()
 
-    expect(stdout).toContain('ompiled successfully')
+    expect(stdout).toMatch(/compiled .*successfully/i)
   })
 
   it('should ignore configs set to `null` in next.config.js', async () => {
@@ -48,7 +48,7 @@ const runTests = () => {
 
     const stdout = await getStdout()
 
-    expect(stdout).toContain('ompiled successfully')
+    expect(stdout).toMatch(/compiled .*successfully/i)
   })
 }
 
@@ -59,11 +59,12 @@ describe('Nullish configs in next.config.js', () => {
     beforeAll(() => {
       getStdout = async () => {
         let stdout = ''
-        await launchApp(appDir, await findPort(), {
+        const app = await launchApp(appDir, await findPort(), {
           onStdout: (msg) => {
             stdout += msg
           },
         })
+        await killApp(app)
         return stdout
       }
     })
diff --git a/test/integration/telemetry/test/index.test.js b/test/integration/telemetry/test/index.test.js
index 0a01e59be41a..30e2555f0b24 100644
--- a/test/integration/telemetry/test/index.test.js
+++ b/test/integration/telemetry/test/index.test.js
@@ -519,7 +519,10 @@ describe('Telemetry CLI', () => {
   })
 
   it('emits telemetry for lint during build', async () => {
-    await fs.writeFile(path.join(appDir, '.eslintrc'), `{ "extends": "next" }`)
+    await fs.writeFile(
+      path.join(appDir, '.eslintrc'),
+      `{ "root": true, "extends": "next" }`
+    )
     const { stderr } = await nextBuild(appDir, [], {
       stderr: true,
       env: { NEXT_TELEMETRY_DEBUG: 1 },
@@ -541,7 +544,10 @@ describe('Telemetry CLI', () => {
   })
 
   it('emits telemetry for `next lint`', async () => {
-    await fs.writeFile(path.join(appDir, '.eslintrc'), `{ "extends": "next" }`)
+    await fs.writeFile(
+      path.join(appDir, '.eslintrc'),
+      `{ "root": true, "extends": "next" }`
+    )
     const { stderr } = await nextLint(appDir, [], {
       stderr: true,
       env: { NEXT_TELEMETRY_DEBUG: 1 },
diff --git a/test/lib/next-test-utils.js b/test/lib/next-test-utils.js
index b834a802eb47..fd10c90a9785 100644
--- a/test/lib/next-test-utils.js
+++ b/test/lib/next-test-utils.js
@@ -240,7 +240,7 @@ export function runNextCommandDev(argv, stdOut, opts = {}) {
     function handleStdout(data) {
       const message = data.toString()
       const bootupMarkers = {
-        dev: /compiled successfully/i,
+        dev: /compiled .*successfully/i,
         start: /started server/i,
       }
       if (
diff --git a/yarn.lock b/yarn.lock
index 69fe5c815854..f20bcb2f78f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2267,13 +2267,6 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.11.2":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6"
-  integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
 "@babel/runtime@^7.12.5", "@babel/runtime@^7.8.4":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
@@ -2281,6 +2274,13 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.16.3":
+  version "7.16.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5"
+  integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
@@ -4024,10 +4024,10 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@rushstack/eslint-patch@^1.0.6":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.0.6.tgz#023d72a5c4531b4ce204528971700a78a85a0c50"
-  integrity sha512-Myxw//kzromB9yWgS8qYGuGVf91oBUUJpNvy5eM50sqvmKLbKjwLxohJnkWGTeeI9v9IBMtPLxz5Gc60FIfvCA==
+"@rushstack/eslint-patch@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.0.8.tgz#be3e914e84eacf16dbebd311c0d0b44aa1174c64"
+  integrity sha512-ZK5v4bJwgXldAUA8r3q9YKfCwOqoHTK/ZqRjSeRXQrBXWouoPnS4MQtgC4AXGiiBuUu5wxrRgTlv0ktmM4P1Aw==
 
 "@samverschueren/stream-to-observable@^0.3.0":
   version "0.3.0"
@@ -4987,15 +4987,15 @@
     "@typescript-eslint/typescript-estree" "4.29.1"
     debug "^4.3.1"
 
-"@typescript-eslint/parser@^4.20.0":
-  version "4.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.22.0.tgz#e1637327fcf796c641fe55f73530e90b16ac8fe8"
-  integrity sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==
+"@typescript-eslint/parser@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.0.0.tgz#50d1be2e0def82d73e863cceba74aeeac9973592"
+  integrity sha512-B6D5rmmQ14I1fdzs71eL3DAuvnPHTY/t7rQABrL9BLnx/H51Un8ox1xqYAchs0/V2trcoyxB1lMJLlrwrJCDgw==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.22.0"
-    "@typescript-eslint/types" "4.22.0"
-    "@typescript-eslint/typescript-estree" "4.22.0"
-    debug "^4.1.1"
+    "@typescript-eslint/scope-manager" "5.0.0"
+    "@typescript-eslint/types" "5.0.0"
+    "@typescript-eslint/typescript-estree" "5.0.0"
+    debug "^4.3.1"
 
 "@typescript-eslint/scope-manager@4.22.0":
   version "4.22.0"
@@ -5013,6 +5013,14 @@
     "@typescript-eslint/types" "4.29.1"
     "@typescript-eslint/visitor-keys" "4.29.1"
 
+"@typescript-eslint/scope-manager@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.0.0.tgz#aea0fb0e2480c1169a02e89d9005ac3f2835713f"
+  integrity sha512-5RFjdA/ain/MDUHYXdF173btOKncIrLuBmA9s6FJhzDrRAyVSA+70BHg0/MW6TE+UiKVyRtX91XpVS0gVNwVDQ==
+  dependencies:
+    "@typescript-eslint/types" "5.0.0"
+    "@typescript-eslint/visitor-keys" "5.0.0"
+
 "@typescript-eslint/types@4.22.0":
   version "4.22.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.0.tgz#0ca6fde5b68daf6dba133f30959cc0688c8dd0b6"
@@ -5023,6 +5031,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.1.tgz#94cce6cf7cc83451df03339cda99d326be2feaf5"
   integrity sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA==
 
+"@typescript-eslint/types@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.0.0.tgz#25d93f6d269b2d25fdc51a0407eb81ccba60eb0f"
+  integrity sha512-dU/pKBUpehdEqYuvkojmlv0FtHuZnLXFBn16zsDmlFF3LXkOpkAQ2vrKc3BidIIve9EMH2zfTlxqw9XM0fFN5w==
+
 "@typescript-eslint/typescript-estree@4.22.0":
   version "4.22.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz#b5d95d6d366ff3b72f5168c75775a3e46250d05c"
@@ -5049,6 +5062,19 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.0.0.tgz#bc20f413c6e572c7309dbe5fa3be027984952af3"
+  integrity sha512-V/6w+PPQMhinWKSn+fCiX5jwvd1vRBm7AX7SJQXEGQtwtBvjMPjaU3YTQ1ik2UF1u96X7tsB96HMnulG3eLi9Q==
+  dependencies:
+    "@typescript-eslint/types" "5.0.0"
+    "@typescript-eslint/visitor-keys" "5.0.0"
+    debug "^4.3.1"
+    globby "^11.0.3"
+    is-glob "^4.0.1"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/visitor-keys@4.22.0":
   version "4.22.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz#169dae26d3c122935da7528c839f42a8a42f6e47"
@@ -5065,6 +5091,14 @@
     "@typescript-eslint/types" "4.29.1"
     eslint-visitor-keys "^2.0.0"
 
+"@typescript-eslint/visitor-keys@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.0.0.tgz#b789f7cd105e59bee5c0983a353942a5a48f56df"
+  integrity sha512-yRyd2++o/IrJdyHuYMxyFyBhU762MRHQ/bAGQeTnN3pGikfh+nEmM61XTqaDH1XDp53afZ+waXrk0ZvenoZ6xw==
+  dependencies:
+    "@typescript-eslint/types" "5.0.0"
+    eslint-visitor-keys "^3.0.0"
+
 "@vercel/fetch-cached-dns@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@vercel/fetch-cached-dns/-/fetch-cached-dns-2.0.2.tgz#975c395cf53f188fa618fad57f27af6b5ffc5bab"
@@ -5848,6 +5882,17 @@ array-includes@^3.1.2, array-includes@^3.1.3:
     get-intrinsic "^1.1.1"
     is-string "^1.0.5"
 
+array-includes@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
+  integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+    get-intrinsic "^1.1.1"
+    is-string "^1.0.7"
+
 array-iterate@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/array-iterate/-/array-iterate-1.1.4.tgz#add1522e9dd9749bb41152d08b845bd08d6af8b7"
@@ -5885,6 +5930,15 @@ array.prototype.flat@^1.2.3:
     define-properties "^1.1.3"
     es-abstract "^1.18.0-next.1"
 
+array.prototype.flat@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13"
+  integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+
 array.prototype.flatmap@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9"
@@ -5895,6 +5949,15 @@ array.prototype.flatmap@^1.2.4:
     es-abstract "^1.18.0-next.1"
     function-bind "^1.1.1"
 
+array.prototype.flatmap@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446"
+  integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -6068,10 +6131,10 @@ aws4@^1.8.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c"
 
-axe-core@^4.0.2:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.2.1.tgz#2e50bcf10ee5b819014f6e342e41e45096239e34"
-  integrity sha512-evY7DN8qSIbsW2H/TWQ1bX3sXN1d4MNb5Vb4n7BzPuCwRHdkZ1H2eNLuSh73EoQqkGKUtju2G2HCcjCfhvZIAA==
+axe-core@^4.3.5:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.5.tgz#78d6911ba317a8262bfee292aeafcc1e04b49cc5"
+  integrity sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==
 
 axobject-query@^2.2.0:
   version "2.2.0"
@@ -8062,7 +8125,7 @@ d@1, d@^1.0.1:
     es5-ext "^0.10.50"
     type "^1.0.1"
 
-damerau-levenshtein@^1.0.6:
+damerau-levenshtein@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d"
   integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==
@@ -8123,7 +8186,7 @@ debug@^3.0.0, debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^3.2.6:
+debug@^3.2.6, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -8599,7 +8662,7 @@ emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
 
-emoji-regex@^9.0.0:
+emoji-regex@^9.2.2:
   version "9.2.2"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
@@ -8754,6 +8817,32 @@ es-abstract@^1.18.0-next.2:
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.0"
 
+es-abstract@^1.19.0, es-abstract@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
+  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
+    has "^1.0.3"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.1"
+    is-string "^1.0.7"
+    is-weakref "^1.0.1"
+    object-inspect "^1.11.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
+
 es-module-lexer@^0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.0.tgz#fe4c4621977bc668e285c5f1f70ca3b451095fda"
@@ -8856,6 +8945,14 @@ eslint-import-resolver-node@^0.3.4:
     debug "^2.6.9"
     resolve "^1.13.1"
 
+eslint-import-resolver-node@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
+  integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
+  dependencies:
+    debug "^3.2.7"
+    resolve "^1.20.0"
+
 eslint-import-resolver-typescript@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.4.0.tgz#ec1e7063ebe807f0362a7320543aaed6fe1100e1"
@@ -8875,7 +8972,16 @@ eslint-module-utils@^2.6.0:
     debug "^2.6.9"
     pkg-dir "^2.0.0"
 
-eslint-plugin-import@2.22.1, eslint-plugin-import@^2.22.1:
+eslint-module-utils@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.0.tgz#9e97c12688113401259b39d960e6a1f09f966435"
+  integrity sha512-hqSE88MmHl3ru9SYvDyGrlo0JwROlf9fiEMplEV7j/EAuq9iSlIlyCFbBT6pdULQBSnBYtYKiMLps+hKkyP7Gg==
+  dependencies:
+    debug "^3.2.7"
+    find-up "^2.1.0"
+    pkg-dir "^2.0.0"
+
+eslint-plugin-import@2.22.1:
   version "2.22.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
   integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==
@@ -8894,6 +9000,25 @@ eslint-plugin-import@2.22.1, eslint-plugin-import@^2.22.1:
     resolve "^1.17.0"
     tsconfig-paths "^3.9.0"
 
+eslint-plugin-import@^2.25.2:
+  version "2.25.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz#b3b9160efddb702fc1636659e71ba1d10adbe9e9"
+  integrity sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g==
+  dependencies:
+    array-includes "^3.1.4"
+    array.prototype.flat "^1.2.5"
+    debug "^2.6.9"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.6"
+    eslint-module-utils "^2.7.0"
+    has "^1.0.3"
+    is-core-module "^2.7.0"
+    is-glob "^4.0.3"
+    minimatch "^3.0.4"
+    object.values "^1.1.5"
+    resolve "^1.20.0"
+    tsconfig-paths "^3.11.0"
+
 eslint-plugin-jest@24.3.5:
   version "24.3.5"
   resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.5.tgz#71f0b580f87915695c286c3f0eb88cf23664d044"
@@ -8901,29 +9026,35 @@ eslint-plugin-jest@24.3.5:
   dependencies:
     "@typescript-eslint/experimental-utils" "^4.0.1"
 
-eslint-plugin-jsx-a11y@^6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz#a2d84caa49756942f42f1ffab9002436391718fd"
-  integrity sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==
+eslint-plugin-jsx-a11y@^6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz#cdbf2df901040ca140b6ec14715c988889c2a6d8"
+  integrity sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==
   dependencies:
-    "@babel/runtime" "^7.11.2"
+    "@babel/runtime" "^7.16.3"
     aria-query "^4.2.2"
-    array-includes "^3.1.1"
+    array-includes "^3.1.4"
     ast-types-flow "^0.0.7"
-    axe-core "^4.0.2"
+    axe-core "^4.3.5"
     axobject-query "^2.2.0"
-    damerau-levenshtein "^1.0.6"
-    emoji-regex "^9.0.0"
+    damerau-levenshtein "^1.0.7"
+    emoji-regex "^9.2.2"
     has "^1.0.3"
-    jsx-ast-utils "^3.1.0"
+    jsx-ast-utils "^3.2.1"
     language-tags "^1.0.5"
+    minimatch "^3.0.4"
 
-eslint-plugin-react-hooks@4.2.0, eslint-plugin-react-hooks@^4.2.0:
+eslint-plugin-react-hooks@4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556"
   integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==
 
-eslint-plugin-react@7.23.2, eslint-plugin-react@^7.23.1:
+eslint-plugin-react-hooks@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172"
+  integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==
+
+eslint-plugin-react@7.23.2:
   version "7.23.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz#2d2291b0f95c03728b55869f01102290e792d494"
   integrity sha512-AfjgFQB+nYszudkxRkTFu0UR1zEQig0ArVMPloKhxwlwkzaw/fBiH0QWcBBhZONlXqQC51+nfqFrkn4EzHcGBw==
@@ -8941,6 +9072,26 @@ eslint-plugin-react@7.23.2, eslint-plugin-react@^7.23.1:
     resolve "^2.0.0-next.3"
     string.prototype.matchall "^4.0.4"
 
+eslint-plugin-react@^7.27.0:
+  version "7.27.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.27.0.tgz#f952c76517a3915b81c7788b220b2b4c96703124"
+  integrity sha512-0Ut+CkzpppgFtoIhdzi2LpdpxxBvgFf99eFqWxJnUrO7mMe0eOiNpou6rvNYeVVV6lWZvTah0BFne7k5xHjARg==
+  dependencies:
+    array-includes "^3.1.4"
+    array.prototype.flatmap "^1.2.5"
+    doctrine "^2.1.0"
+    estraverse "^5.3.0"
+    jsx-ast-utils "^2.4.1 || ^3.0.0"
+    minimatch "^3.0.4"
+    object.entries "^1.1.5"
+    object.fromentries "^2.0.5"
+    object.hasown "^1.1.0"
+    object.values "^1.1.5"
+    prop-types "^15.7.2"
+    resolve "^2.0.0-next.3"
+    semver "^6.3.0"
+    string.prototype.matchall "^4.0.6"
+
 eslint-scope@5.1.1, eslint-scope@^5.1.0, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -9003,6 +9154,11 @@ eslint-visitor-keys@^2.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
+eslint-visitor-keys@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz#e32e99c6cdc2eb063f204eda5db67bfe58bb4186"
+  integrity sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==
+
 eslint@7.24.0:
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.24.0.tgz#2e44fa62d93892bfdb100521f17345ba54b8513a"
@@ -9088,6 +9244,11 @@ estraverse@^5.1.0, estraverse@^5.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
   integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
 
+estraverse@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
 estree-util-is-identifier-name@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/estree-util-is-identifier-name/-/estree-util-is-identifier-name-1.1.0.tgz#2e3488ea06d9ea2face116058864f6370b37456d"
@@ -9954,6 +10115,14 @@ get-stream@^6.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718"
   integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==
 
+get-symbol-description@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
+  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -10391,7 +10560,7 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-bigints@^1.0.0:
+has-bigints@^1.0.0, has-bigints@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
   integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
@@ -10434,6 +10603,13 @@ has-to-string-tag-x@^1.2.0:
   dependencies:
     has-symbol-support-x "^1.4.1"
 
+has-tostringtag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+  dependencies:
+    has-symbols "^1.0.2"
+
 has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -11131,6 +11307,11 @@ is-callable@^1.2.3:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
   integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
 
+is-callable@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
+  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
+
 is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -11162,6 +11343,13 @@ is-core-module@^2.1.0, is-core-module@^2.2.0:
   dependencies:
     has "^1.0.3"
 
+is-core-module@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3"
+  integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -11294,6 +11482,13 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-glob@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-hexadecimal@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz#e8a426a69b6d31470d3a33a47bb825cda02506ee"
@@ -11457,6 +11652,14 @@ is-regex@^1.1.2:
     call-bind "^1.0.2"
     has-symbols "^1.0.1"
 
+is-regex@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
@@ -11469,6 +11672,11 @@ is-retry-allowed@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
 
+is-shared-array-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
+  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
+
 is-ssh@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3"
@@ -11487,6 +11695,13 @@ is-string@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
 
+is-string@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-svg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
@@ -11531,6 +11746,13 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+is-weakref@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
+  integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==
+  dependencies:
+    call-bind "^1.0.0"
+
 is-whitespace-character@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz#b3ad9546d916d7d3ffa78204bca0c26b56257fac"
@@ -12290,7 +12512,7 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0:
+"jsx-ast-utils@^2.4.1 || ^3.0.0":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82"
   integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==
@@ -12298,6 +12520,14 @@ jsprim@^1.2.2:
     array-includes "^3.1.2"
     object.assign "^4.1.2"
 
+jsx-ast-utils@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
+  integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==
+  dependencies:
+    array-includes "^3.1.3"
+    object.assign "^4.1.2"
+
 jszip@^3.6.0:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
@@ -14273,6 +14503,11 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
+object-inspect@^1.11.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
+  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
+
 object-inspect@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
@@ -14329,6 +14564,15 @@ object.entries@^1.1.3:
     es-abstract "^1.18.0-next.1"
     has "^1.0.3"
 
+object.entries@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
+  integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+
 object.fromentries@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz#26e1ba5c4571c5c6f0890cef4473066456a120b8"
@@ -14339,6 +14583,15 @@ object.fromentries@^2.0.4:
     es-abstract "^1.18.0-next.2"
     has "^1.0.3"
 
+object.fromentries@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251"
+  integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+
 object.getownpropertydescriptors@^2.0.3:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
@@ -14346,6 +14599,14 @@ object.getownpropertydescriptors@^2.0.3:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
+object.hasown@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5"
+  integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -14378,6 +14639,15 @@ object.values@^1.1.3:
     es-abstract "^1.18.0-next.2"
     has "^1.0.3"
 
+object.values@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
+  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -17978,6 +18248,20 @@ string.prototype.matchall@^4.0.4:
     regexp.prototype.flags "^1.3.1"
     side-channel "^1.0.4"
 
+string.prototype.matchall@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"
+  integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+    get-intrinsic "^1.1.1"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    regexp.prototype.flags "^1.3.1"
+    side-channel "^1.0.4"
+
 string.prototype.padend@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz#dc08f57a8010dc5c153550318f67e13adbb72ac3"
@@ -18777,6 +19061,16 @@ trough@^1.0.0:
   dependencies:
     glob "^7.1.2"
 
+tsconfig-paths@^3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36"
+  integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.1"
+    minimist "^1.2.0"
+    strip-bom "^3.0.0"
+
 tsconfig-paths@^3.9.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
@@ -18963,6 +19257,16 @@ unbox-primitive@^1.0.0:
     has-symbols "^1.0.0"
     which-boxed-primitive "^1.0.1"
 
+unbox-primitive@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
+  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+  dependencies:
+    function-bind "^1.1.1"
+    has-bigints "^1.0.1"
+    has-symbols "^1.0.2"
+    which-boxed-primitive "^1.0.2"
+
 unfetch@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.1.0.tgz#6ec2dd0de887e58a4dee83a050ded80ffc4137db"
@@ -19818,7 +20122,7 @@ whatwg-url@^8.5.0:
     tr46 "^2.1.0"
     webidl-conversions "^6.1.0"
 
-which-boxed-primitive@^1.0.1:
+which-boxed-primitive@^1.0.1, which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
   integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==