Merge branch 'master' into master

Tyriar · web-flow · commit 6351a5b748af · 2018-12-13T10:14:15.000-08:00
diff --git a/AUTHORS b/AUTHORS
diff --git a/bin/generate-authors b/bin/generate-authors
diff --git a/bin/prepare-release b/bin/prepare-release
@@ -17,9 +17,6 @@ CURRENT_PACKAGE_JSON_VERSION=$(cat package.json \
 export BUILD_DIR=dist
 npm run build
 
-# Update AUTHORS file
-sh bin/generate-authors
-
 # Update version in package.json
 sed -i "s/\"version\": \"$CURRENT_PACKAGE_JSON_VERSION\"/\"version\": \"$NEW_VERSION\"/g" package.json
 
diff --git a/package.json b/package.json
@@ -28,7 +28,6 @@
     "gulp-sourcemaps": "1.9.1",
     "gulp-typescript": "^3.1.3",
     "gulp-util": "3.0.8",
-    "jsdoc": "3.4.3",
     "jsdom": "^11.11.0",
     "merge-stream": "^1.0.1",
     "node-pty": "0.7.6",
@@ -57,7 +56,6 @@
     "test-suite": "gulp mocha-suite --test",
     "test-coverage": "nyc -x gulpfile.js -x '**/*test*' npm run mocha",
     "mocha": "gulp test",
-    "build:docs": "jsdoc -c jsdoc.json",
     "tsc": "tsc",
     "prebuild": "concurrently --kill-others-on-fail --names \"lib,attach,fit,fullscreen,search,terminado,webLinks,winptyCompat,zmodem,css\" \"tsc\" \"tsc -p ./src/addons/attach\" \"tsc -p ./src/addons/fit\" \"tsc -p ./src/addons/fullscreen\" \"tsc -p ./src/addons/search\" \"tsc -p ./src/addons/terminado\" \"tsc -p ./src/addons/webLinks\" \"tsc -p ./src/addons/winptyCompat\" \"tsc -p ./src/addons/zmodem\" \"gulp css\"",
     "build": "gulp build",
diff --git a/src/addons/fit/tsconfig.json b/src/addons/fit/tsconfig.json
@@ -13,11 +13,11 @@
     "declaration": true,
     "preserveWatchOutput": true,
     "types": [
-      "../../node_modules/@types/mocha",
-      "../.."
+      "../../node_modules/@types/mocha"
     ]
   },
   "include": [
-    "**/*.ts"
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
   ]
 }
diff --git a/src/addons/fullscreen/tsconfig.json b/src/addons/fullscreen/tsconfig.json
@@ -13,11 +13,11 @@
     "declaration": true,
     "preserveWatchOutput": true,
     "types": [
-      "../../node_modules/@types/mocha",
-      "../.."
+      "../../node_modules/@types/mocha"
     ]
   },
   "include": [
-    "**/*.ts"
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
   ]
 }
diff --git a/src/addons/search/tsconfig.json b/src/addons/search/tsconfig.json
@@ -12,11 +12,11 @@
     "declaration": true,
     "preserveWatchOutput": true,
     "types": [
-      "../../node_modules/@types/mocha",
-      "../.."
+      "../../node_modules/@types/mocha"
     ]
   },
   "include": [
-    "**/*.ts"
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
   ]
 }
diff --git a/src/addons/terminado/tsconfig.json b/src/addons/terminado/tsconfig.json
@@ -12,11 +12,11 @@
     "declaration": true,
     "preserveWatchOutput": true,
     "types": [
-      "../../node_modules/@types/mocha",
-      "../.."
+      "../../node_modules/@types/mocha"
     ]
   },
   "include": [
-    "**/*.ts"
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
   ]
 }
diff --git a/src/addons/webLinks/tsconfig.json b/src/addons/webLinks/tsconfig.json
@@ -13,11 +13,11 @@
     "declaration": true,
     "preserveWatchOutput": true,
     "types": [
-      "../../node_modules/@types/mocha",
-      "../.."
+      "../../node_modules/@types/mocha"
     ]
   },
   "include": [
-    "**/*.ts"
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
   ]
 }
diff --git a/src/addons/winptyCompat/tsconfig.json b/src/addons/winptyCompat/tsconfig.json
@@ -12,11 +12,11 @@
     "declaration": true,
     "preserveWatchOutput": true,
     "types": [
-      "../../node_modules/@types/mocha",
-      "../.."
+      "../../node_modules/@types/mocha"
     ]
   },
   "include": [
-    "**/*.ts"
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
   ]
 }
diff --git a/src/addons/zmodem/tsconfig.json b/src/addons/zmodem/tsconfig.json
@@ -12,11 +12,11 @@
     "declaration": true,
     "preserveWatchOutput": true,
     "types": [
-      "../../node_modules/@types/mocha",
-      "../.."
+      "../../node_modules/@types/mocha"
     ]
   },
   "include": [
-    "**/*.ts"
+    "**/*.ts",
+    "../../../typings/xterm.d.ts"
   ]
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@`
`13`	`13`	`"declaration": true,`
`14`	`14`	`"preserveWatchOutput": true,`
`15`	`15`	`"types": [`
`16`		`- "../../node_modules/@types/mocha",`
`17`		`- "../.."`
	`16`	`+ "../../node_modules/@types/mocha"`
`18`	`17`	`]`
`19`	`18`	`},`
`20`	`19`	`"include": [`
`21`		`- "*/.ts"`
	`20`	`+ "*/.ts",`
	`21`	`+ "../../../typings/xterm.d.ts"`
`22`	`22`	`]`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@`
`12`	`12`	`"declaration": true,`
`13`	`13`	`"preserveWatchOutput": true,`
`14`	`14`	`"types": [`
`15`		`- "../../node_modules/@types/mocha",`
`16`		`- "../.."`
	`15`	`+ "../../node_modules/@types/mocha"`
`17`	`16`	`]`
`18`	`17`	`},`
`19`	`18`	`"include": [`
`20`		`- "*/.ts"`
	`19`	`+ "*/.ts",`
	`20`	`+ "../../../typings/xterm.d.ts"`
`21`	`21`	`]`
`22`	`22`	`}`