restructured test folder

benchmarks/tsconfig.json

@@ -1,32 +0,0 @@
-{
-  "compilerOptions": {
-    "lib": [
-      "dom",
-      "es6",
-    ],
-    "outDir": "../out/test",
-    "types": [
-      "../../node_modules/@types/node"
-    ],
-    "baseUrl": "..",
-    "strict": true,
-    "baseUrl": ".",
-    "paths": {
-      "common/*": [ "../src/common/*" ],
-      "browser/*": [ "../src/browser/*" ],
-      "Terminal": [ "../src/Terminal" ]
-    },
-  },
-  "include": [
-    "./**/*",
-    "../typings/xterm.d.ts"
-  ],
-  "exclude": [
-    "../**/*test.ts"
-  ],
-  "references": [
-    { "path": "../src/common" },
-    { "path": "../src/browser" },
-    { "path": "../src" },
-  ]
-}

package.json

@@ -14,16 +14,16 @@
     "lint": "tslint 'src/**/*.ts' './demo/**/*.ts' './addons/**/*.ts'",
     "test": "npm run test-unit",
     "posttest": "npm run lint",
-    "test-api": "mocha \"**/*.api.js\"",
+    "test-api": "mocha \"./out-test/api/*.api.js\"",
     "test-unit": "node ./bin/test.js",
     "build": "tsc -b ./tsconfig.all.json",
     "prepare": "npm run build",
     "prepublishOnly": "npm run package",
     "watch": "tsc -b -w ./tsconfig.all.json --preserveWatchOutput",
     "clean": "rm -rf lib out addons/*/lib",
-    "benchmark": "NODE_PATH=./out xterm-benchmark -r 5 -c benchmarks/benchmark.json",
-    "benchmark-baseline": "NODE_PATH=./out xterm-benchmark -r 5 -c benchmarks/benchmark.json --baseline out/test/*benchmark.js",
-    "benchmark-eval": "NODE_PATH=./out xterm-benchmark -r 5 -c benchmarks/benchmark.json --eval out/test/*benchmark.js"
+    "benchmark": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json",
+    "benchmark-baseline": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --baseline out-test/benchmark/test/benchmark/*benchmark.js",
+    "benchmark-eval": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --eval out-test/benchmark/test/benchmark/*benchmark.js"
   },
   "devDependencies": {
     "@types/chai": "^3.4.34",

src/tsconfig.json

@@ -11,7 +11,6 @@
     ],
     "rootDir": ".",
     "outDir": "../out",
-    "composite": true,
     "baseUrl": ".",
     "paths": {
       "common/*": [ "./common/*" ],

test/api/tsconfig.json

@@ -5,9 +5,9 @@
       "es6",
     ],
     "rootDir": ".",
-    "outDir": "../out/test",
+    "outDir": "../../out-test/api",
     "types": [
-      "../node_modules/@types/mocha"
+      "../../node_modules/@types/mocha"
     ],
     "sourceMap": true,
     "removeComments": true,
@@ -16,6 +16,6 @@
   },
   "include": [
     "./**/*",
-    "../typings/xterm.d.ts"
+    "../../typings/xterm.d.ts"
   ]
 }

test/benchmark/tsconfig.json

@@ -0,0 +1,34 @@
+{
+  "compilerOptions": {
+    "lib": [
+      "dom",
+      "es6",
+    ],
+    "outDir": "../../out-test/benchmark",
+    "types": [
+      "../../node_modules/@types/node"
+    ],
+    "moduleResolution": "node",
+    "strict": false,
+    "target": "es2015",
+    "module": "commonjs",
+    "baseUrl": ".",
+    "paths": {
+      "common/*": [ "../../src/common/*" ],
+      "browser/*": [ "../../src/browser/*" ],
+      "Terminal": [ "../../src/Terminal" ]
+    },
+  },
+  "include": [
+    "./**/*",
+    "../../typings/xterm.d.ts",
+    "../../out/**/*"
+  ],
+  "exclude": [
+    "../../**/*test.ts"
+  ],
+  "references": [
+    { "path": "../../src/common" },
+    { "path": "../../src/browser" },
+  ]
+}

tsconfig.all.json

@@ -3,8 +3,8 @@
   "include": [],
   "references": [
     { "path": "./src" },
-    { "path": "./test" },
-    { "path": "./benchmarks" },
+    { "path": "./test/api" },
+    { "path": "./test/benchmark" },
     { "path": "./addons/xterm-addon-attach/src" },
     { "path": "./addons/xterm-addon-fit/src" },
     { "path": "./addons/xterm-addon-search/src" },