From eca36458b394ce980957518f23d53c10af7e13ff Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Wed, 9 Sep 2020 12:53:33 -0700
Subject: [PATCH] Move webgl addon test code into own tsconfig

Part of #2917
---
 .eslintrc.json                                |  1 +
 addons/xterm-addon-webgl/package.json         |  2 +-
 addons/xterm-addon-webgl/src/tsconfig.json    |  3 +-
 .../{src => test}/WebglRenderer.api.ts        |  0
 addons/xterm-addon-webgl/test/tsconfig.json   | 40 +++++++++++++++++++
 addons/xterm-addon-webgl/tsconfig.all.json    |  8 ++++
 tsconfig.all.json                             |  2 +-
 7 files changed, 52 insertions(+), 4 deletions(-)
 rename addons/xterm-addon-webgl/{src => test}/WebglRenderer.api.ts (100%)
 create mode 100644 addons/xterm-addon-webgl/test/tsconfig.json
 create mode 100644 addons/xterm-addon-webgl/tsconfig.all.json

diff --git a/.eslintrc.json b/.eslintrc.json
index dabf9c41..76557365 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -17,6 +17,7 @@
       "addons/xterm-addon-unicode11/src/tsconfig.json",
       "addons/xterm-addon-web-links/src/tsconfig.json",
       "addons/xterm-addon-webgl/src/tsconfig.json",
+      "addons/xterm-addon-webgl/test/tsconfig.json",
       "addons/xterm-addon-serialize/src/tsconfig.json",
       "addons/xterm-addon-serialize/benchmark/tsconfig.json",
       "addons/xterm-addon-ligatures/src/tsconfig.json"
diff --git a/addons/xterm-addon-webgl/package.json b/addons/xterm-addon-webgl/package.json
index a3484a82..eb016d49 100644
--- a/addons/xterm-addon-webgl/package.json
+++ b/addons/xterm-addon-webgl/package.json
@@ -10,7 +10,7 @@
   "repository": "https://github.com/xtermjs/xterm.js",
   "license": "MIT",
   "scripts": {
-    "build": "../../node_modules/.bin/tsc -p src",
+    "build": "../../node_modules/.bin/tsc -p tsconfig.all.json",
     "prepackage": "npm run build",
     "package": "../../node_modules/.bin/webpack",
     "prepublishOnly": "npm run package"
diff --git a/addons/xterm-addon-webgl/src/tsconfig.json b/addons/xterm-addon-webgl/src/tsconfig.json
index 27ce9ec9..0b95491f 100644
--- a/addons/xterm-addon-webgl/src/tsconfig.json
+++ b/addons/xterm-addon-webgl/src/tsconfig.json
@@ -21,8 +21,7 @@
     },
     "strict": true,
     "types": [
-      "../../../node_modules/@types/mocha",
-      "../../../out-test/api/TestUtils"
+      "../../../node_modules/@types/mocha"
     ]
   },
   "include": [
diff --git a/addons/xterm-addon-webgl/src/WebglRenderer.api.ts b/addons/xterm-addon-webgl/test/WebglRenderer.api.ts
similarity index 100%
rename from addons/xterm-addon-webgl/src/WebglRenderer.api.ts
rename to addons/xterm-addon-webgl/test/WebglRenderer.api.ts
diff --git a/addons/xterm-addon-webgl/test/tsconfig.json b/addons/xterm-addon-webgl/test/tsconfig.json
new file mode 100644
index 00000000..9c7f602f
--- /dev/null
+++ b/addons/xterm-addon-webgl/test/tsconfig.json
@@ -0,0 +1,40 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es5",
+    "lib": [
+      "es6",
+    ],
+    "rootDir": ".",
+    "outDir": "../out-test",
+    "sourceMap": true,
+    "removeComments": true,
+    "baseUrl": ".",
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ]
+    },
+    "strict": true,
+    "types": [
+      "../../../node_modules/@types/mocha",
+      "../../../node_modules/@types/node",
+      "../../../out-test/api/TestUtils"
+    ]
+  },
+  "include": [
+    "./**/*",
+    "../../../typings/xterm.d.ts"
+  ],
+  "references": [
+    {
+      "path": "../../../src/common"
+    },
+    {
+      "path": "../../../src/browser"
+    }
+  ]
+}
diff --git a/addons/xterm-addon-webgl/tsconfig.all.json b/addons/xterm-addon-webgl/tsconfig.all.json
new file mode 100644
index 00000000..2d820dd1
--- /dev/null
+++ b/addons/xterm-addon-webgl/tsconfig.all.json
@@ -0,0 +1,8 @@
+{
+  "files": [],
+  "include": [],
+  "references": [
+    { "path": "./src" },
+    { "path": "./test" }
+  ]
+}
diff --git a/tsconfig.all.json b/tsconfig.all.json
index a4286deb..f5433aac 100644
--- a/tsconfig.all.json
+++ b/tsconfig.all.json
@@ -13,6 +13,6 @@
     { "path": "./addons/xterm-addon-serialize/benchmark" },
     { "path": "./addons/xterm-addon-unicode11/src" },
     { "path": "./addons/xterm-addon-web-links/src" },
-    { "path": "./addons/xterm-addon-webgl/src" }
+    { "path": "./addons/xterm-addon-webgl/tsconfig.all.json" }
   ]
 }