diff --git a/.eslintrc.yml b/.eslintrc.yml index f65859a9..ed6f9331 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -110,7 +110,6 @@ rules: '@typescript-eslint/lines-between-class-members': - error - exceptAfterSingleLine: true - '@typescript-eslint/dot-notation': off '@typescript-eslint/no-implicit-any-catch': off '@typescript-eslint/member-ordering': off '@typescript-eslint/no-var-requires': off diff --git a/app/package.json b/app/package.json index f989c3b4..e68bb1ee 100644 --- a/app/package.json +++ b/app/package.json @@ -27,6 +27,8 @@ "native-process-working-directory": "^1.0.2", "node-pty": "^0.10.1", "npm": "6", + "rxjs": "^7.2.0", + "source-map-support": "^0.5.19", "yargs": "^17.0.1" }, "optionalDependencies": { @@ -40,8 +42,7 @@ "@types/mz": "2.7.4", "@types/node": "16.0.0", "ngx-filesize": "^2.0.16", - "node-abi": "^2.30.0", - "source-map-support": "^0.5.19" + "node-abi": "^2.30.0" }, "peerDependencies": { "tabby-community-color-schemes": "*", diff --git a/app/webpack.main.config.js b/app/webpack.main.config.js index f34e1b8d..5ec6a3dc 100644 --- a/app/webpack.main.config.js +++ b/app/webpack.main.config.js @@ -39,15 +39,12 @@ module.exports = { 'electron-config': 'commonjs electron-config', 'electron-debug': 'commonjs electron-debug', 'electron-promise-ipc': 'commonjs electron-promise-ipc', - 'electron-vibrancy': 'commonjs electron-vibrancy', fs: 'commonjs fs', glasstron: 'commonjs glasstron', mz: 'commonjs mz', npm: 'commonjs npm', 'node-pty': 'commonjs node-pty', path: 'commonjs path', - rxjs: 'commonjs rxjs', - 'rxjs/operators': 'commonjs rxjs/operators', util: 'commonjs util', 'source-map-support': 'commonjs source-map-support', 'windows-swca': 'commonjs windows-swca', diff --git a/app/yarn.lock b/app/yarn.lock index 4c3a3408..c8143422 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -2953,6 +2953,13 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" +rxjs@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.2.0.tgz#5cd12409639e9514a71c9f5f9192b2c4ae94de31" + integrity sha512-aX8w9OpKrQmiPKfT1bqETtUr9JygIz6GZ+gql8v7CijClsP0laoFUdKzxFAoWuRdSlOdU2+crss+cMf+cqMTnw== + dependencies: + tslib "~2.1.0" + safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" @@ -3392,6 +3399,11 @@ tslib@^2.0.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== +tslib@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== + tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz" diff --git a/package.json b/package.json index 66262a7b..fc306112 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,6 @@ "pug-loader": "^2.4.0", "pug-static-loader": "2.0.0", "raw-loader": "4.0.2", - "rxjs": "^7.2.0", "sass-loader": "^12.1.0", "shelljs": "0.8.4", "slugify": "^1.5.3", diff --git a/yarn.lock b/yarn.lock index f90e268d..87af1fc2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6862,13 +6862,6 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rxjs@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.2.0.tgz#5cd12409639e9514a71c9f5f9192b2c4ae94de31" - integrity sha512-aX8w9OpKrQmiPKfT1bqETtUr9JygIz6GZ+gql8v7CijClsP0laoFUdKzxFAoWuRdSlOdU2+crss+cMf+cqMTnw== - dependencies: - tslib "~2.1.0" - safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" @@ -7845,11 +7838,6 @@ tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== -tslib@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== - tsutils@^3.21.0: version "3.21.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"