From 3397ecf97797f159d601e28cb6c346fc0770bfa4 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Mon, 10 Dec 2018 16:40:04 -0800 Subject: [PATCH 1/3] Remove authors Fixes #1605 --- AUTHORS | 134 ------------------------------------------- bin/generate-authors | 7 --- bin/prepare-release | 3 - 3 files changed, 144 deletions(-) delete mode 100644 AUTHORS delete mode 100755 bin/generate-authors diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 482e0309a4..0000000000 --- a/AUTHORS +++ /dev/null @@ -1,134 +0,0 @@ -List of xterm.js contributors. Updated before every release. - -7PH -7PH -Adrian Labbé -Aleksandr Andrienko -Aleksandr Andriienko -Alessandro Nadalin -Alexander Olsson -Alexandre Petit-Pas -Alexey Kontsevoy -Andres Mejia -Anish Athalye -Anthony Lapenna -Antonin Stefanutti -Antonis Kalipetis -Anton Skshidlevsky -Anton Yurovskykh -Artem Arbatskiy -Austin Robertson -ayapi -Ben Hall -Benjamin Fischer -Benjamin Raymond -Benjamin Woodruff -Bill Church -Bob Reid -bottleofwater -Brandon Bayer -Brian Mock -Bruno Ribeiro -Bruno Ribeito -Carson Anderson -CHaBou -Christian Budde Christensen -Christof Marti -Christopher Jeffrey -coderaiser -Damien Tournoud -Dan Brown -Daniel Griffen -Daniel Griffen -Daniel Imms -Daniel Risacher -Dan Kaplun -Darin Morrison -dcylabs -Dominik Csapak -Edgar Andrés Margffoy Tuay -Elliot Saba -Exile -Felipe Gasper -Felix <30559812+felixse@users.noreply.github.com> -ficristo -Gary Ritchie -hiro-su -Ian Lewis -imoses -InDieTasten -irokas -Jakob Gillich -Jan Kuri -Jean Bruenn -Jeff Principe -Jeremy Danyow -Jianhui Zhao -Joao Moreno -Joao Moreno -Johannes Zellner -Jon Austin -Jon Kohler -Jon Masters -Jörg Breitbart -Jose Anton -jpoth -Justin Luk -Justin Mecham -Kirill Merkushev -Krasimir Tsonev -Ledion Bitincka -Linus Unnebäck -Luca -Lucian Buzzo -Lukas Drgon -Lukas Geiger -Maël Nison -Marc Dumais -Marek Libra -Markus F.X.J. Oberhumer -Martin Chloride -Martin Koppehel -Martin Wang -Matt Bierner -Matthew James -Michael Irwin -Mikko Karvonen -mofux -muji -Nicolas Ramz -npezza93 -Oleksandr Andriienko -Paris Kasidiaris -Paris Kasidiaris -Peng Xiao -Peter Baumgarten -Philip Olson -PowerHat <31401273+7PH@users.noreply.github.com> -PowerHat -pro-src <34285059+pro-src@users.noreply.github.com> -pro-src -Rick Baker -runarberg -Saad Malik -Samuel Williams -Saswat Das -Saul Costa -Segev Finer -Shuanglei Tao -sitzmar -Steven Silvester -stuicey -Sven-Hendrik Haase -t-amqi -Thanasis Daglis -thomas -Thomas Zilz -Tine Jozelj -Tyler Jewell -Vincent Woo -Viraj Sinha -yutaka -YuviPanda -ZHAO Xudong -赵雪珂 diff --git a/bin/generate-authors b/bin/generate-authors deleted file mode 100755 index 21446ad492..0000000000 --- a/bin/generate-authors +++ /dev/null @@ -1,7 +0,0 @@ -#! /usr/bin/env sh - -tail --lines=+3 AUTHORS > AUTHORS.tmp -git log --format='%aN <%aE>' >> AUTHORS.tmp -echo "List of xterm.js contributors. Updated before every release.\n" > AUTHORS -sort -u AUTHORS.tmp >> AUTHORS -rm -f AUTHORS.tmp diff --git a/bin/prepare-release b/bin/prepare-release index fed7919e74..53f0947a67 100755 --- 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 From 1e94fce545ee410c9954b5e1ccc7748598018043 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Tue, 11 Dec 2018 07:19:37 -0800 Subject: [PATCH 2/3] Remove triple slash directive error in addon types Fixes #1830 --- src/addons/fit/tsconfig.json | 6 +++--- src/addons/fullscreen/tsconfig.json | 6 +++--- src/addons/search/tsconfig.json | 6 +++--- src/addons/terminado/tsconfig.json | 6 +++--- src/addons/webLinks/tsconfig.json | 6 +++--- src/addons/winptyCompat/tsconfig.json | 6 +++--- src/addons/zmodem/tsconfig.json | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/addons/fit/tsconfig.json b/src/addons/fit/tsconfig.json index f478e03f79..489ccdfead 100644 --- 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 index 40d0ae7146..05e6df68d7 100644 --- 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 index c34a0bc504..c42412be7e 100644 --- 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 index 0e30963dc4..91c18314ec 100644 --- 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 index 6f9db2cb96..18105aa246 100644 --- 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 index 6056da08cd..9fc4d25e31 100644 --- 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 index 5dd438a373..2b49f537ec 100644 --- 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" ] } From 4d3345182fc9a910c6c637dd265ce47ca09d0836 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Tue, 11 Dec 2018 08:56:55 -0800 Subject: [PATCH 3/3] Remove jsdoc dependency --- package.json | 2 -- yarn.lock | 95 ++-------------------------------------------------- 2 files changed, 3 insertions(+), 94 deletions(-) diff --git a/package.json b/package.json index 4aef95af9c..c5918cb57c 100644 --- 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/yarn.lock b/yarn.lock index db31bfe17a..7ebdbf3c1f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -290,13 +290,6 @@ acorn-globals@^4.1.0: dependencies: acorn "^5.0.0" -acorn-jsx@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" - integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s= - dependencies: - acorn "^3.0.4" - acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.5.2.tgz#2ca723df19d997b05824b69f6c7fb091fc42c322" @@ -311,11 +304,6 @@ acorn@4.X: resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c= -acorn@^3.0.4, acorn@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" - integrity sha1-ReN/s56No/JbruP/U2niu18iAXo= - acorn@^5.0.0, acorn@^5.2.1, acorn@^5.3.0, acorn@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8" @@ -749,11 +737,6 @@ bluebird@^3.5.1: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA== -bluebird@~3.4.6: - version "3.4.7" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" - integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM= - bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" @@ -1054,13 +1037,6 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -catharsis@~0.8.8: - version "0.8.9" - resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.8.9.tgz#98cc890ca652dd2ef0e70b37925310ff9e90fc8b" - integrity sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is= - dependencies: - underscore-contrib "~0.3.0" - center-align@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" @@ -2000,7 +1976,7 @@ escape-html@~1.0.3: resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5, escape-string-regexp@~1.0.5: +escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= @@ -2025,14 +2001,6 @@ eslint-scope@^4.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -espree@~3.1.7: - version "3.1.7" - resolved "https://registry.yarnpkg.com/espree/-/espree-3.1.7.tgz#fd5deec76a97a5120a9cd3a7cb1177a0923b11d2" - integrity sha1-/V3ux2qXpRIKnNOnyxF3oJI7EdI= - dependencies: - acorn "^3.3.0" - acorn-jsx "^3.0.0" - esprima@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" @@ -3615,34 +3583,11 @@ js-yaml@^3.11.0, js-yaml@^3.7.0: argparse "^1.0.7" esprima "^4.0.0" -js2xmlparser@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-1.0.0.tgz#5a170f2e8d6476ce45405e04823242513782fe30" - integrity sha1-WhcPLo1kds5FQF4EgjJCUTeC/jA= - jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsdoc@3.4.3: - version "3.4.3" - resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-3.4.3.tgz#e5740d6145c681f6679e6c17783a88dbdd97ccd3" - integrity sha1-5XQNYUXGgfZnnmwXeDqI292XzNM= - dependencies: - bluebird "~3.4.6" - catharsis "~0.8.8" - escape-string-regexp "~1.0.5" - espree "~3.1.7" - js2xmlparser "~1.0.0" - klaw "~1.3.0" - marked "~0.3.6" - mkdirp "~0.5.1" - requizzle "~0.2.1" - strip-json-comments "~2.0.1" - taffydb "2.6.2" - underscore "~1.8.3" - jsdom@^11.11.0: version "11.11.0" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.11.0.tgz#df486efad41aee96c59ad7a190e2449c7eb1110e" @@ -3780,7 +3725,7 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== -klaw@^1.0.0, klaw@~1.3.0: +klaw@^1.0.0: version "1.3.1" resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk= @@ -4193,11 +4138,6 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -marked@~0.3.6: - version "0.3.19" - resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790" - integrity sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg== - matchdep@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-1.0.1.tgz#a57a33804491fbae208aba8f68380437abc2dca5" @@ -4431,7 +4371,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: +mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= @@ -5662,13 +5602,6 @@ require-main-filename@^1.0.1: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= -requizzle@~0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.1.tgz#6943c3530c4d9a7e46f1cddd51c158fc670cdbde" - integrity sha1-aUPDUwxNmn5G8c3dUcFY/GcM294= - dependencies: - underscore "~1.6.0" - resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" @@ -6424,11 +6357,6 @@ syntax-error@^1.1.1: dependencies: acorn-node "^1.2.0" -taffydb@2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/taffydb/-/taffydb-2.6.2.tgz#7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268" - integrity sha1-fLy2S1oUG2ou/CxdLGe04VCyomg= - tapable@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2" @@ -6788,23 +6716,6 @@ undefsafe@0.0.3: resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-0.0.3.tgz#ecca3a03e56b9af17385baac812ac83b994a962f" integrity sha1-7Mo6A+VrmvFzhbqsgSrIO5lKli8= -underscore-contrib@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/underscore-contrib/-/underscore-contrib-0.3.0.tgz#665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7" - integrity sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc= - dependencies: - underscore "1.6.0" - -underscore@1.6.0, underscore@~1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8" - integrity sha1-izixDKze9jM3uLJOT/htRa6lKag= - -underscore@~1.8.3: - version "1.8.3" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" - integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI= - union-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"