From ceef536b7919cd6761777baa8c66ef03c64e6a53 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 1 Sep 2023 07:36:48 -0700
Subject: [PATCH] Upgrade es6 -> es2021

This uses the recommended target for node 16 in tsconfig/bases.

Fixes #4706
---
 .eslintrc.json                                       | 2 +-
 .eslintrc.json.typings                               | 2 +-
 addons/xterm-addon-attach/src/tsconfig.json          | 2 +-
 addons/xterm-addon-attach/test/tsconfig.json         | 2 +-
 addons/xterm-addon-canvas/src/tsconfig.json          | 4 ++--
 addons/xterm-addon-fit/src/tsconfig.json             | 2 +-
 addons/xterm-addon-fit/test/tsconfig.json            | 2 +-
 addons/xterm-addon-search/src/tsconfig.json          | 4 ++--
 addons/xterm-addon-search/test/tsconfig.json         | 4 ++--
 addons/xterm-addon-serialize/benchmark/tsconfig.json | 7 +++++--
 addons/xterm-addon-serialize/src/tsconfig.json       | 2 +-
 addons/xterm-addon-serialize/test/tsconfig.json      | 2 +-
 addons/xterm-addon-unicode11/src/tsconfig.json       | 2 +-
 addons/xterm-addon-unicode11/test/tsconfig.json      | 2 +-
 addons/xterm-addon-web-links/src/tsconfig.json       | 2 +-
 addons/xterm-addon-web-links/test/tsconfig.json      | 2 +-
 addons/xterm-addon-webgl/src/tsconfig.json           | 4 ++--
 addons/xterm-addon-webgl/test/tsconfig.json          | 4 ++--
 demo/tsconfig.json                                   | 2 +-
 src/browser/tsconfig.json                            | 3 +--
 src/tsconfig-base.json                               | 2 +-
 test/api/tsconfig.json                               | 2 +-
 test/benchmark/tsconfig.json                         | 4 ++--
 23 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 9287da5c1a..015776d336 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 5af028d395..0d234ee731 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 f3e409d149..7e68574d95 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 fa67b16982..67ad42b720 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 f752dc5b63..f6fb08a7a0 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 3bfbea6778..668f910be7 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 fa67b16982..67ad42b720 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 9ef27b5cf7..1f08b12dcc 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 052fac433f..ee45e72585 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 bf5e335c2b..6bbb2a4b78 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 ba26f22e4a..22ffe53e0f 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 971f3e92f5..6eeb5cde04 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 f5489fcc1b..e2c1464e6e 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 4b3cb31cfd..0406d3a414 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 f3e409d149..7e68574d95 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 489757641e..2b4ec58f7a 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 749899736c..4d4194db45 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 1ff9217ea9..6479cec9e6 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 018ddb42e5..f728f20e9c 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 212aeab830..673a55a6cb 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 cf4454a49b..5ea04ea27a 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 60eb33cd0a..bc050db4ff 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 2ebe2ebe64..8d1736df75 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": {