diff --git a/.eslintrc.json b/.eslintrc.json
index 9287da5c1..015776d33 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,7 +1,7 @@
 {
   "env": {
     "browser": true,
-    "es6": true,
+    "es2021": true,
     "node": true
   },
   "parser": "@typescript-eslint/parser",
diff --git a/.eslintrc.json.typings b/.eslintrc.json.typings
index 5af028d39..0d234ee73 100644
--- a/.eslintrc.json.typings
+++ b/.eslintrc.json.typings
@@ -1,7 +1,7 @@
 {
   "env": {
     "browser": true,
-    "es6": true,
+    "es2021": true,
     "node": true
   },
   "parser": "@typescript-eslint/parser",
diff --git a/addons/xterm-addon-attach/src/tsconfig.json b/addons/xterm-addon-attach/src/tsconfig.json
index f3e409d14..7e68574d9 100644
--- a/addons/xterm-addon-attach/src/tsconfig.json
+++ b/addons/xterm-addon-attach/src/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
       "dom",
       "es2015"
diff --git a/addons/xterm-addon-attach/test/tsconfig.json b/addons/xterm-addon-attach/test/tsconfig.json
index fa67b1698..67ad42b72 100644
--- a/addons/xterm-addon-attach/test/tsconfig.json
+++ b/addons/xterm-addon-attach/test/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
       "es2015"
     ],
diff --git a/addons/xterm-addon-canvas/src/tsconfig.json b/addons/xterm-addon-canvas/src/tsconfig.json
index f752dc5b6..f6fb08a7a 100644
--- a/addons/xterm-addon-canvas/src/tsconfig.json
+++ b/addons/xterm-addon-canvas/src/tsconfig.json
@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
       "dom",
-      "es6"
+      "es2021"
     ],
     "rootDir": ".",
     "outDir": "../out",
diff --git a/addons/xterm-addon-fit/src/tsconfig.json b/addons/xterm-addon-fit/src/tsconfig.json
index 3bfbea677..668f910be 100644
--- a/addons/xterm-addon-fit/src/tsconfig.json
+++ b/addons/xterm-addon-fit/src/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
       "dom",
       "es2015"
diff --git a/addons/xterm-addon-fit/test/tsconfig.json b/addons/xterm-addon-fit/test/tsconfig.json
index fa67b1698..67ad42b72 100644
--- a/addons/xterm-addon-fit/test/tsconfig.json
+++ b/addons/xterm-addon-fit/test/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
       "es2015"
     ],
diff --git a/addons/xterm-addon-search/src/tsconfig.json b/addons/xterm-addon-search/src/tsconfig.json
index 9ef27b5cf..1f08b12dc 100644
--- a/addons/xterm-addon-search/src/tsconfig.json
+++ b/addons/xterm-addon-search/src/tsconfig.json
@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
       "dom",
-      "es6",
+      "es2021",
     ],
     "rootDir": ".",
     "outDir": "../out",
diff --git a/addons/xterm-addon-search/test/tsconfig.json b/addons/xterm-addon-search/test/tsconfig.json
index 052fac433..ee45e7258 100644
--- a/addons/xterm-addon-search/test/tsconfig.json
+++ b/addons/xterm-addon-search/test/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
-      "es6",
+      "es2021",
     ],
     "rootDir": ".",
     "outDir": "../out-test",
diff --git a/addons/xterm-addon-serialize/benchmark/tsconfig.json b/addons/xterm-addon-serialize/benchmark/tsconfig.json
index bf5e335c2..6bbb2a4b7 100644
--- a/addons/xterm-addon-serialize/benchmark/tsconfig.json
+++ b/addons/xterm-addon-serialize/benchmark/tsconfig.json
@@ -1,11 +1,14 @@
 {
   "compilerOptions": {
-    "lib": ["dom", "es6"],
+    "lib": [
+      "dom",
+      "es2021"
+    ],
     "outDir": "../out-benchmark",
     "types": ["../../../node_modules/@types/node"],
     "moduleResolution": "node",
     "strict": false,
-    "target": "es2015",
+    "target": "es2021",
     "module": "commonjs",
     "baseUrl": ".",
     "paths": {
diff --git a/addons/xterm-addon-serialize/src/tsconfig.json b/addons/xterm-addon-serialize/src/tsconfig.json
index ba26f22e4..22ffe53e0 100644
--- a/addons/xterm-addon-serialize/src/tsconfig.json
+++ b/addons/xterm-addon-serialize/src/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
       "dom",
       "es2015"
diff --git a/addons/xterm-addon-serialize/test/tsconfig.json b/addons/xterm-addon-serialize/test/tsconfig.json
index 971f3e92f..6eeb5cde0 100644
--- a/addons/xterm-addon-serialize/test/tsconfig.json
+++ b/addons/xterm-addon-serialize/test/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
       "es2015"
     ],
diff --git a/addons/xterm-addon-unicode11/src/tsconfig.json b/addons/xterm-addon-unicode11/src/tsconfig.json
index f5489fcc1..e2c1464e6 100644
--- a/addons/xterm-addon-unicode11/src/tsconfig.json
+++ b/addons/xterm-addon-unicode11/src/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
       "dom",
       "es2015"
diff --git a/addons/xterm-addon-unicode11/test/tsconfig.json b/addons/xterm-addon-unicode11/test/tsconfig.json
index 4b3cb31cf..0406d3a41 100644
--- a/addons/xterm-addon-unicode11/test/tsconfig.json
+++ b/addons/xterm-addon-unicode11/test/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
       "dom",
       "es2015"
diff --git a/addons/xterm-addon-web-links/src/tsconfig.json b/addons/xterm-addon-web-links/src/tsconfig.json
index f3e409d14..7e68574d9 100644
--- a/addons/xterm-addon-web-links/src/tsconfig.json
+++ b/addons/xterm-addon-web-links/src/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
       "dom",
       "es2015"
diff --git a/addons/xterm-addon-web-links/test/tsconfig.json b/addons/xterm-addon-web-links/test/tsconfig.json
index 489757641..2b4ec58f7 100644
--- a/addons/xterm-addon-web-links/test/tsconfig.json
+++ b/addons/xterm-addon-web-links/test/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
       "es2015"
     ],
diff --git a/addons/xterm-addon-webgl/src/tsconfig.json b/addons/xterm-addon-webgl/src/tsconfig.json
index 749899736..4d4194db4 100644
--- a/addons/xterm-addon-webgl/src/tsconfig.json
+++ b/addons/xterm-addon-webgl/src/tsconfig.json
@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
       "dom",
-      "es6"
+      "es2021"
     ],
     "rootDir": ".",
     "outDir": "../out",
diff --git a/addons/xterm-addon-webgl/test/tsconfig.json b/addons/xterm-addon-webgl/test/tsconfig.json
index 1ff9217ea..6479cec9e 100644
--- a/addons/xterm-addon-webgl/test/tsconfig.json
+++ b/addons/xterm-addon-webgl/test/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "lib": [
-      "es6",
+      "es2021",
     ],
     "rootDir": ".",
     "outDir": "../out-test",
diff --git a/demo/tsconfig.json b/demo/tsconfig.json
index 018ddb42e..f728f20e9 100644
--- a/demo/tsconfig.json
+++ b/demo/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "rootDir": ".",
     "sourceMap": true,
     "baseUrl": ".",
diff --git a/src/browser/tsconfig.json b/src/browser/tsconfig.json
index 212aeab83..673a55a6c 100644
--- a/src/browser/tsconfig.json
+++ b/src/browser/tsconfig.json
@@ -3,8 +3,7 @@
   "compilerOptions": {
     "lib": [
       "dom",
-      "es2015",
-      "es2016.Array.Include"
+      "es2021"
     ],
     "outDir": "../../out",
     "types": [
diff --git a/src/tsconfig-base.json b/src/tsconfig-base.json
index cf4454a49..5ea04ea27 100644
--- a/src/tsconfig-base.json
+++ b/src/tsconfig-base.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es2021",
     "rootDir": ".",
 
     "sourceMap": true,
diff --git a/test/api/tsconfig.json b/test/api/tsconfig.json
index 60eb33cd0..bc050db4f 100644
--- a/test/api/tsconfig.json
+++ b/test/api/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "lib": [
       "dom",
-      "es6"
+      "es2021"
     ],
     "rootDir": ".",
     "outDir": "../../out-test/api",
diff --git a/test/benchmark/tsconfig.json b/test/benchmark/tsconfig.json
index 2ebe2ebe6..8d1736df7 100644
--- a/test/benchmark/tsconfig.json
+++ b/test/benchmark/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "lib": [
       "dom",
-      "es6",
+      "es2021",
     ],
     "outDir": "../../out-test/benchmark",
     "types": [
@@ -10,7 +10,7 @@
     ],
     "moduleResolution": "node",
     "strict": false,
-    "target": "es2015",
+    "target": "es2021",
     "module": "commonjs",
     "baseUrl": ".",
     "paths": {