Merge branch 'master' of github.com:Eugeny/terminus

2024-12-15 06:30:13 +08:00 · 2019-06-26 21:48:27 +02:00 · 2019-06-26 21:48:27 +02:00 · fb90ae7b93
commit fb90ae7b93
parent 8241bb2679 fac506e0b3
4 changed files with 121 additions and 48 deletions
--- a/package.json
+++ b/package.json
@ -9,7 +9,7 @@
    "@types/webpack-env": "1.13.9",
    "@typescript-eslint/eslint-plugin": "^1.11.0",
    "@typescript-eslint/parser": "^1.11.0",
-    "app-builder-lib": "^20.44.3",
+    "app-builder-lib": "^21.0.2",
    "apply-loader": "2.0.0",
    "awesome-typescript-loader": "^5.0.0",
    "core-js": "^3.1.4",
@ -31,7 +31,7 @@
    "npx": "^10.2.0",
    "pug": "^2.0.4",
    "pug-html-loader": "1.1.5",
-    "pug-lint": "^2.5.0",
+    "pug-lint": "^2.6.0",
    "pug-loader": "^2.4.0",
    "pug-static-loader": "2.0.0",
    "raven-js": "3.27.2",
@ -136,6 +136,6 @@
  },
  "repository": "eugeny/terminus",
  "dependencies": {
-    "eslint-plugin-import": "^2.17.3"
+    "eslint-plugin-import": "^2.18.0"
  }
 }
--- a/terminus-terminal/package.json
+++ b/terminus-terminal/package.json
@ -31,7 +31,7 @@
    "runes": "^0.4.2",
    "slug": "^1.1.0",
    "uuid": "^3.3.2",
-    "xterm": "3.15.0-beta56",
+    "xterm": "3.15.0-beta58",
    "xterm-addon-fit": "^0.1.0-beta3",
    "xterm-addon-ligatures": "^0.1.0-beta-2",
    "xterm-addon-search": "^0.1.0-beta6",
--- a/terminus-terminal/yarn.lock
+++ b/terminus-terminal/yarn.lock
@ -269,10 +269,10 @@ xterm-addon-webgl@^0.1.0-beta2:
  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.1.0.tgz#885450d5bedc65708a15ff39dce9c24db7fff19e"
  integrity sha512-/F6jia0Cwg3TIe0+5ARqtX46VmwHshwfwhrF2QLl31dh1Z/DrukQAQhaHb+g9khAaJ+NQiNLkPR5GWK7tL1ujQ==

-xterm@3.15.0-beta56:
-  version "3.15.0-beta56"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta56.tgz#51e80a4894d4ea47f196ab34187aafea9c894518"
-  integrity sha512-iMvA7BjwVi5YhQttlCc2a6TmmXpP6Oe5IQN/w8eWfpL3W8hylAItaM/7pKFEFuJMxCX7xeI/yeKEZc1/0z0lNQ==
+xterm@3.15.0-beta58:
+  version "3.15.0-beta58"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta58.tgz#8260e2403766c16d833cc65c9ec1d721c4e818b0"
+  integrity sha512-UtI7p7ukvLwhx/pMq/JTNFwZnPWIB3H9HOf0HeUYW1OL4hCSPDo3P0/TyoqL7pFvN90kYklQihhH2ZviEPk9Cw==

 yallist@^2.1.2:
  version "2.1.2"
--- a/yarn.lock
+++ b/yarn.lock
@ -391,7 +391,7 @@ ajv@^4.9.1:
    co "^4.6.0"
    json-stable-stringify "^1.0.1"

-ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1, ajv@^6.9.2:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.5.5, ajv@^6.9.1, ajv@^6.9.2:
  version "6.10.0"
  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
  dependencies:
@ -472,7 +472,12 @@ app-builder-bin@2.7.1:
  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.7.1.tgz#9f690af65093821b8a6149aa29ce9f8c81fc554c"
  integrity sha512-ubIBeiL9XysjMW4HETBKxj3DC8ika6dGyC0vftPc0kZwGh1iXQ5bycsjoAqY/3t3BBEEIg0VruicvBaUl1pOSQ==

-app-builder-lib@20.44.4, app-builder-lib@^20.44.3, app-builder-lib@~20.44.4:
+app-builder-bin@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.0.1.tgz#08ea930efcd374dfdbe50523c8abe7eee06fdcc9"
+  integrity sha512-eSC1ZxQIGuvhXKB9m7rRwTbou522FbQuc95XoqOMqMjf50//So1IjNPFOzXd6SDHcMx7f5SYEW5AYSs1Pwovtw==
+
+app-builder-lib@20.44.4, app-builder-lib@~20.44.4:
  version "20.44.4"
  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.44.4.tgz#39ac20b3155e1b0c2499862bcdea879b50389573"
  integrity sha512-1K1xfrhyqDgnibwyuYMgvfwGilGLMF31YwOUJ8IXreyjRef9lUjWW+BZuBXqk4Uqd0C0EYPjhofgpuN0WoAQ+A==
@ -502,6 +507,36 @@ app-builder-lib@20.44.4, app-builder-lib@^20.44.3, app-builder-lib@~20.44.4:
    semver "^6.1.1"
    temp-file "^3.3.3"

+app-builder-lib@^21.0.2:
+  version "21.0.2"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.0.2.tgz#7d4ddca1a6a7f4c69e3840b158db56d9a0c181d0"
+  integrity sha512-0sQJ8M1iBo3ng4HQjRsqtCI+RJQHDi8IyY/PkR7MyQqi91d4gWiLIfjKuV/b0PSNE4U+75oZOWh+wkR3+G4rrQ==
+  dependencies:
+    "7zip-bin" "~4.1.0"
+    app-builder-bin "3.0.1"
+    async-exit-hook "^2.0.1"
+    bluebird-lst "^1.0.9"
+    builder-util "10.2.0"
+    builder-util-runtime "8.2.5"
+    chromium-pickle-js "^0.2.0"
+    debug "^4.1.1"
+    ejs "^2.6.2"
+    electron-osx-sign "0.4.11"
+    electron-publish "21.0.2"
+    fs-extra-p "^8.0.2"
+    hosted-git-info "^2.7.1"
+    is-ci "^2.0.0"
+    isbinaryfile "^4.0.1"
+    js-yaml "^3.13.1"
+    lazy-val "^1.0.4"
+    minimatch "^3.0.4"
+    normalize-package-data "^2.5.0"
+    plist "^3.0.1"
+    read-config-file "3.3.0"
+    sanitize-filename "^1.6.1"
+    semver "^6.1.2"
+    temp-file "^3.3.3"
+
 apply-loader@2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/apply-loader/-/apply-loader-2.0.0.tgz#9cedf84f12ad89399dc9e7b91f4bb183ecea05b9"
@ -933,6 +968,25 @@ builder-util@10.1.2, builder-util@~10.1.2:
    stat-mode "^0.3.0"
    temp-file "^3.3.3"

+builder-util@10.2.0, builder-util@~10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-10.2.0.tgz#073db634b8c121650f98725fbde1b851081314fd"
+  integrity sha512-9x+RpqKl50VnestgFa+0r9atMq7NUF0b719W8NSzRg/WOrPI9z3oJiLJv0L+JOSzLiu80Fu97kvEb/1l3+/9TQ==
+  dependencies:
+    "7zip-bin" "~4.1.0"
+    "@types/debug" "^4.1.4"
+    app-builder-bin "3.0.1"
+    bluebird-lst "^1.0.9"
+    builder-util-runtime "^8.2.5"
+    chalk "^2.4.2"
+    debug "^4.1.1"
+    fs-extra-p "^8.0.2"
+    is-ci "^2.0.0"
+    js-yaml "^3.13.1"
+    source-map-support "^0.5.12"
+    stat-mode "^0.3.0"
+    temp-file "^3.3.3"
+
 builtin-modules@^1.0.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@ -1804,6 +1858,11 @@ dotenv-expand@^4.2.0:
  version "4.2.0"
  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275"

+dotenv-expand@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
+  integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
+
 dotenv@^5.0.1:
  version "5.0.1"
  resolved "http://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef"
@ -1812,6 +1871,11 @@ dotenv@^6.2.0:
  version "6.2.0"
  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"

+dotenv@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440"
+  integrity sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg==
+
 duplexer3@^0.1.4:
  version "0.1.4"
  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@ -1966,6 +2030,19 @@ electron-publish@20.44.4:
    lazy-val "^1.0.4"
    mime "^2.4.4"

+electron-publish@21.0.2:
+  version "21.0.2"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-21.0.2.tgz#39e99ce8536a72b571f329eb67e86a3d7183ac83"
+  integrity sha512-Wy/MbX501Z4OPeDz7u9N6ZtsPo6J4rMSxluj9KhqRftkMW9jcRVWmqs26NyBxE2l+aFRHMlGe0YtPfHPEDXHoQ==
+  dependencies:
+    bluebird-lst "^1.0.9"
+    builder-util "~10.2.0"
+    builder-util-runtime "^8.2.5"
+    chalk "^2.4.2"
+    fs-extra-p "^8.0.2"
+    lazy-val "^1.0.4"
+    mime "^2.4.4"
+
 electron-rebuild@^1.8.5:
  version "1.8.5"
  resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.8.5.tgz#d15d0aa7f2151eb3f2935a596a92c0348984ba55"
@ -2132,10 +2209,10 @@ eslint-module-utils@^2.4.0:
    debug "^2.6.8"
    pkg-dir "^2.0.0"

-eslint-plugin-import@^2.17.3:
-  version "2.17.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.3.tgz#00548b4434c18faebaba04b24ae6198f280de189"
-  integrity sha512-qeVf/UwXFJbeyLbxuY8RgqDyEKCkqV7YC+E5S5uOjAp4tOc8zj01JP3ucoBM8JcEqd1qRasJSg6LLlisirfy0Q==
+eslint-plugin-import@^2.18.0:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.0.tgz#7a5ba8d32622fb35eb9c8db195c2090bd18a3678"
+  integrity sha512-PZpAEC4gj/6DEMMoU2Df01C5c50r7zdGIN52Yfi7CvvWaYssG7Jt5R9nFG5gmqodxNOz9vQS87xk6Izdtpdrig==
  dependencies:
    array-includes "^3.0.3"
    contains-path "^0.1.0"
@ -5136,15 +5213,7 @@ public-encrypt@^4.0.0:
    parse-asn1 "^5.0.0"
    randombytes "^2.0.1"

-pug-attrs@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.3.tgz#a3095f970e64151f7bdad957eef55fb5d7905d15"
-  dependencies:
-    constantinople "^3.0.1"
-    js-stringify "^1.0.1"
-    pug-runtime "^2.0.4"
-
-pug-attrs@^2.0.4:
+pug-attrs@^2.0.3, pug-attrs@^2.0.4:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.4.tgz#b2f44c439e4eb4ad5d4ef25cac20d18ad28cc336"
  integrity sha512-TaZ4Z2TWUPDJcV3wjU3RtUXMrd3kM4Wzjbe3EWnSsZPsJ3LDI0F3yCnf2/W7PPFF+edUFQ0HgDL1IoxSz5K8EQ==
@ -5167,11 +5236,7 @@ pug-code-gen@^2.0.2:
    void-elements "^2.0.1"
    with "^5.0.0"

-pug-error@^1.3.0, pug-error@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26"
-
-pug-error@^1.3.3:
+pug-error@^1.3.2, pug-error@^1.3.3:
  version "1.3.3"
  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.3.tgz#f342fb008752d58034c185de03602dd9ffe15fa6"
  integrity sha512-qE3YhESP2mRAWMFJgKdtT5D7ckThRScXRwkfo+Erqga7dyJdY3ZquspprMCj/9sJ2ijm5hXFWQE/A3l4poMWiQ==
@ -5197,15 +5262,7 @@ pug-html-loader@1.1.5:
    loader-utils "^0.2.17"
    pug "^2.0.0-rc.2"

-pug-lexer@^2.0.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-2.3.2.tgz#68b19d96ea5dc0e4a86148b01cb966c17815a614"
-  dependencies:
-    character-parser "^2.1.1"
-    is-expression "^3.0.0"
-    pug-error "^1.3.2"
-
-pug-lexer@^4.1.0:
+pug-lexer@^4.0.0, pug-lexer@^4.1.0:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-4.1.0.tgz#531cde48c7c0b1fcbbc2b85485c8665e31489cfd"
  integrity sha512-i55yzEBtjm0mlplW4LoANq7k3S8gDdfC6+LThGEvsK4FuobcKfDAwt6V4jKPH9RtiE3a2Akfg5UpafZ1OksaPA==
@ -5222,9 +5279,10 @@ pug-linker@^3.0.6:
    pug-error "^1.3.3"
    pug-walk "^1.1.8"

-pug-lint@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/pug-lint/-/pug-lint-2.5.0.tgz#4419ee301aeca45f54061b0eca4a9a471f3aa9a9"
+pug-lint@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/pug-lint/-/pug-lint-2.6.0.tgz#3964f11bbe6d5a5cb1cf5a20206d7b2fa79907d1"
+  integrity sha512-bCENAUT0grCSlUBIfX1USjpZPQWs5QccxVZoCIT4S+IevTn9NqJyzhrcyq/CFVSCOp9Z+pdwPQIkzdCvZ1pGlQ==
  dependencies:
    acorn "^4.0.1"
    commander "^2.9.0"
@ -5233,9 +5291,9 @@ pug-lint@^2.5.0:
    glob "^7.0.3"
    minimatch "^3.0.3"
    path-is-absolute "^1.0.0"
-    pug-attrs "^2.0.1"
-    pug-error "^1.3.0"
-    pug-lexer "^2.0.1"
+    pug-attrs "^2.0.3"
+    pug-error "^1.3.2"
+    pug-lexer "^4.0.0"
    resolve "^1.1.7"
    strip-json-comments "^2.0.1"
    void-elements "^2.0.1"
@ -5264,7 +5322,7 @@ pug-parser@^5.0.1:
    pug-error "^1.3.3"
    token-stream "0.0.1"

-pug-runtime@^2.0.4, pug-runtime@^2.0.5:
+pug-runtime@^2.0.5:
  version "2.0.5"
  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.5.tgz#6da7976c36bf22f68e733c359240d8ae7a32953a"
  integrity sha512-P+rXKn9un4fQY77wtpcuFyvFaBww7/91f3jHa154qU26qFAnOe6SW1CbIDcxiG5lLK9HazYrMCCuDvNgDQNptw==
@ -5419,6 +5477,21 @@ read-config-file@3.2.2:
    json5 "^2.1.0"
    lazy-val "^1.0.4"

+read-config-file@3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.3.0.tgz#fdb81476372aa63d39dc74b3b1393e5970d0decf"
+  integrity sha512-VzA1UVvNwEYQi9wGVa7Cji/E6YNr3VwbPXUcHed00cYoZsqg1kYcMnHgIx8nt0NQjFz/ai/8n8Xq0rmHD153Gg==
+  dependencies:
+    ajv "^6.10.0"
+    ajv-keywords "^3.4.0"
+    bluebird-lst "^1.0.9"
+    dotenv "^8.0.0"
+    dotenv-expand "^5.1.0"
+    fs-extra-p "^8.0.2"
+    js-yaml "^3.13.1"
+    json5 "^2.1.0"
+    lazy-val "^1.0.4"
+
 read-installed@~4.0.3:
  version "4.0.3"
  resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067"
@ -5863,10 +5936,10 @@ semver@5.5.0:
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
  integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==

-semver@^6.0.0, semver@^6.1.0, semver@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
-  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.2.tgz#079960381376a3db62eb2edc8a3bfb10c7cfe318"
+  integrity sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==

 semver@~5.3.0:
  version "5.3.0"