diff --git a/app/lib/pty.ts b/app/lib/pty.ts index e0e53eb9..c08c60d4 100644 --- a/app/lib/pty.ts +++ b/app/lib/pty.ts @@ -1,4 +1,4 @@ -import * as nodePTY from '@terminus-term/node-pty' +import * as nodePTY from 'node-pty' import { StringDecoder } from './stringDecoder' import { v4 as uuidv4 } from 'uuid' import { ipcMain } from 'electron' diff --git a/app/package.json b/app/package.json index 4e9e471c..d3676fbc 100644 --- a/app/package.json +++ b/app/package.json @@ -23,7 +23,6 @@ "@angular/platform-browser-dynamic": "^12.0.0", "@electron/remote": "1.2.0", "@ng-bootstrap/ng-bootstrap": "^9.1.1", - "@terminus-term/node-pty": "0.10.0-terminus.3", "any-promise": "^1.3.0", "electron-config": "2.0.0", "electron-debug": "^3.2.0", @@ -35,6 +34,7 @@ "mz": "^2.7.0", "native-process-working-directory": "^1.0.2", "ngx-toastr": "^14.0.0", + "node-pty": "^0.10.1", "npm": "6", "rxjs": "^7.1.0", "yargs": "^17.0.1", diff --git a/app/webpack.main.config.js b/app/webpack.main.config.js index 166b13c2..148d50a6 100644 --- a/app/webpack.main.config.js +++ b/app/webpack.main.config.js @@ -3,64 +3,64 @@ const webpack = require('webpack') const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin module.exports = { - name: 'tabby-main', - target: 'electron-main', - entry: { - main: path.resolve(__dirname, 'lib/index.ts'), - }, - mode: process.env.TABBY_DEV ? 'development' : 'production', - context: __dirname, - devtool: 'source-map', - output: { - path: path.join(__dirname, 'dist'), - pathinfo: true, - filename: '[name].js', - }, - resolve: { - modules: ['lib/', 'node_modules', '../node_modules'].map(x => path.join(__dirname, x)), - extensions: ['.ts', '.js'], - }, - module: { - rules: [ - { - test: /\.ts$/, - use: { - loader: 'awesome-typescript-loader', - options: { - configFileName: path.resolve(__dirname, 'tsconfig.main.json'), - }, - }, - }, + name: 'tabby-main', + target: 'electron-main', + entry: { + main: path.resolve(__dirname, 'lib/index.ts'), + }, + mode: process.env.TABBY_DEV ? 'development' : 'production', + context: __dirname, + devtool: 'source-map', + output: { + path: path.join(__dirname, 'dist'), + pathinfo: true, + filename: '[name].js', + }, + resolve: { + modules: ['lib/', 'node_modules', '../node_modules'].map(x => path.join(__dirname, x)), + extensions: ['.ts', '.js'], + }, + module: { + rules: [ + { + test: /\.ts$/, + use: { + loader: 'awesome-typescript-loader', + options: { + configFileName: path.resolve(__dirname, 'tsconfig.main.json'), + }, + }, + }, + ], + }, + externals: { + 'any-promise': 'commonjs any-promise', + electron: 'commonjs electron', + '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', + 'windows-native-registry': 'commonjs windows-native-registry', + 'windows-blurbehind': 'commonjs windows-blurbehind', + 'yargs/yargs': 'commonjs yargs/yargs', + }, + plugins: [ + new webpack.optimize.ModuleConcatenationPlugin(), + new webpack.DefinePlugin({ + 'process.type': '"main"', + }), ], - }, - externals: { - 'any-promise': 'commonjs any-promise', - electron: 'commonjs electron', - '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', - '@terminus-term/node-pty': 'commonjs @terminus-term/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', - 'windows-native-registry': 'commonjs windows-native-registry', - 'windows-blurbehind': 'commonjs windows-blurbehind', - 'yargs/yargs': 'commonjs yargs/yargs', - }, - plugins: [ - new webpack.optimize.ModuleConcatenationPlugin(), - new webpack.DefinePlugin({ - 'process.type': '"main"', - }), - ], } if (process.env.BUNDLE_ANALYZER) { diff --git a/app/yarn.lock b/app/yarn.lock index b70d4cc5..d61531bb 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -143,13 +143,6 @@ dependencies: debug "^4.3.1" -"@terminus-term/node-pty@0.10.0-terminus.3": - version "0.10.0-terminus.3" - resolved "https://registry.yarnpkg.com/@terminus-term/node-pty/-/node-pty-0.10.0-terminus.3.tgz#9dbd64d52afda5079e66265a89d313fe42affab7" - integrity sha512-HvIOts22dnoBXhRfLiK9DyPasuixYVgEUvgqZmOr0B0Ki9tF8e074oYPUtzLRll6Y553QiUzTWhriCS99MChNQ== - dependencies: - nan "^2.14.0" - "@types/mz@2.7.3": version "2.7.3" resolved "https://registry.yarnpkg.com/@types/mz/-/mz-2.7.3.tgz#e42a21e73f5f9340fe4a176981fafb1eb8cc6c12" @@ -2156,6 +2149,13 @@ node-gyp@^5.0.2, node-gyp@^5.1.0: tar "^4.4.12" which "^1.3.1" +node-pty@^0.10.1: + version "0.10.1" + resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.10.1.tgz#cd05d03a2710315ec40221232ec04186f6ac2c6d" + integrity sha512-JTdtUS0Im/yRsWJSx7yiW9rtpfmxqxolrtnyKwPLI+6XqTAPW/O2MjS8FYL4I5TsMbH2lVgDb2VMjp+9LoQGNg== + dependencies: + nan "^2.14.0" + noop-logger@^0.1.1: version "0.1.1" resolved "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz" diff --git a/scripts/sentry-upload.js b/scripts/sentry-upload.js index 819980e5..83e38619 100755 --- a/scripts/sentry-upload.js +++ b/scripts/sentry-upload.js @@ -9,7 +9,7 @@ sh.exec(`${sentryCli} releases new ${vars.version}`) if (process.platform === 'darwin') { for (const path of [ 'app/node_modules/@serialport/bindings/build/Release/bindings.node', - 'app/node_modules/@terminus-term/node-pty/build/Release/pty.node', + 'app/node_modules/node-pty/build/Release/pty.node', 'app/node_modules/fontmanager-redux/build/Release/fontmanager.node', 'app/node_modules/macos-native-processlist/build/Release/native.node', ]) {