From 0187a83cfe79096cfc4faf61f349527542401432 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Sun, 5 Feb 2023 21:02:50 +0100 Subject: [PATCH] angular 15 WIP --- .eslintrc.yml | 3 ++ app/package.json | 5 ++- app/yarn.lock | 5 +++ package.json | 3 -- scripts/vars.mjs | 22 +++++------ .../webpack.config.js | 6 --- .../webpack.config.mjs | 12 ++++++ tabby-core/package.json | 1 - .../src/components/tabBody.component.scss | 5 --- tabby-core/src/config.ts | 10 ++--- tabby-core/src/index.ts | 13 ++----- tabby-core/yarn.lock | 37 ------------------- tabby-electron/webpack.config.js | 5 --- tabby-electron/webpack.config.mjs | 8 ++++ tabby-linkifier/webpack.config.js | 5 --- tabby-linkifier/webpack.config.mjs | 8 ++++ tabby-local/webpack.config.js | 5 --- tabby-local/webpack.config.mjs | 8 ++++ tabby-plugin-manager/webpack.config.js | 5 --- tabby-plugin-manager/webpack.config.mjs | 8 ++++ tabby-serial/src/services/serial.service.ts | 6 +-- tabby-serial/webpack.config.js | 5 --- tabby-serial/webpack.config.mjs | 8 ++++ tabby-settings/package.json | 2 +- tabby-settings/webpack.config.js | 5 --- tabby-settings/webpack.config.mjs | 8 ++++ tabby-settings/yarn.lock | 24 +++++------- .../{webpack.config.js => webpack.config.mjs} | 7 +++- tabby-telnet/webpack.config.js | 5 --- tabby-telnet/webpack.config.mjs | 8 ++++ tabby-terminal/package.json | 2 +- ...+5.2.0-beta.10.patch => xterm+5.1.0.patch} | 0 .../loginScriptsSettings.component.pug | 3 +- tabby-terminal/webpack.config.js | 15 -------- tabby-terminal/webpack.config.mjs | 21 +++++++++++ tabby-terminal/yarn.lock | 8 ++-- tabby-web/webpack.config.js | 5 --- tabby-web/webpack.config.mjs | 8 ++++ 38 files changed, 152 insertions(+), 162 deletions(-) delete mode 100644 tabby-community-color-schemes/webpack.config.js create mode 100644 tabby-community-color-schemes/webpack.config.mjs delete mode 100644 tabby-electron/webpack.config.js create mode 100644 tabby-electron/webpack.config.mjs delete mode 100644 tabby-linkifier/webpack.config.js create mode 100644 tabby-linkifier/webpack.config.mjs delete mode 100644 tabby-local/webpack.config.js create mode 100644 tabby-local/webpack.config.mjs delete mode 100644 tabby-plugin-manager/webpack.config.js create mode 100644 tabby-plugin-manager/webpack.config.mjs delete mode 100644 tabby-serial/webpack.config.js create mode 100644 tabby-serial/webpack.config.mjs delete mode 100644 tabby-settings/webpack.config.js create mode 100644 tabby-settings/webpack.config.mjs rename tabby-ssh/{webpack.config.js => webpack.config.mjs} (53%) delete mode 100644 tabby-telnet/webpack.config.js create mode 100644 tabby-telnet/webpack.config.mjs rename tabby-terminal/patches/{xterm+5.2.0-beta.10.patch => xterm+5.1.0.patch} (100%) delete mode 100644 tabby-terminal/webpack.config.js create mode 100644 tabby-terminal/webpack.config.mjs delete mode 100644 tabby-web/webpack.config.js create mode 100644 tabby-web/webpack.config.mjs diff --git a/.eslintrc.yml b/.eslintrc.yml index 79fff87f..53b67bed 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -12,6 +12,9 @@ overrides: - files: '*.mjs' plugins: - 'import' + parserOptions: + sourceType: module + ecmaVersion: latest - files: '*.ts' parser: '@typescript-eslint/parser' diff --git a/app/package.json b/app/package.json index 2b78d5b2..c3c03987 100644 --- a/app/package.json +++ b/app/package.json @@ -37,16 +37,17 @@ "optionalDependencies": { "@tabby-gang/windows-blurbehind": "^3.0.0", "macos-native-processlist": "^2.1.0", + "patch-package": "^6.5.0", "serialport": "10.5.0", "serialport-binding-webserialapi": "^1.0.3", "windows-native-registry": "^3.2.1", - "windows-process-tree": "^0.3.4", - "patch-package": "^6.5.0" + "windows-process-tree": "^0.3.4" }, "devDependencies": { "@types/mz": "2.7.4", "@types/node": "18.7.23", "atomically": "^1.7.0", + "filesize": "^9", "ngx-filesize": "^3.0.1" }, "peerDependencies": { diff --git a/app/yarn.lock b/app/yarn.lock index 2c5f4dbb..63072cbf 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -1094,6 +1094,11 @@ figgy-pudding@^3.4.1, figgy-pudding@^3.5.1: resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== +filesize@^9: + version "9.0.11" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-9.0.11.tgz#4ac3a42c084232dd9b2a1da0107f32d42fcfa5e4" + integrity sha512-gTAiTtI0STpKa5xesyTA9hA3LX4ga8sm2nWRcffEa1L/5vQwb4mj2MdzMkoHoGv4QzfDshQZuYscQSf8c4TKOA== + fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" diff --git a/package.json b/package.json index 336f5709..6f4bc921 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "@types/fs-extra": "^9.0.13", "@types/js-yaml": "^4.0.5", "@types/node": "16.0.1", - "@types/sortablejs": "^1.15.0", "@types/webpack-env": "^1.18.0", "@typescript-eslint/eslint-plugin": "^5.45.0", "@typescript-eslint/parser": "^5.45.0", @@ -53,7 +52,6 @@ "json-loader": "^0.5.7", "lru-cache": "^6.0.0", "macos-release": "^3.1.0", - "ngx-sortablejs": "^11.1.0", "ngx-toastr": "^16.0.2", "node-abi": "^3.25.0", "npmlog": "6.0.2", @@ -72,7 +70,6 @@ "shell-quote": "^1.7.4", "shelljs": "0.8.5", "slugify": "^1.6.5", - "sortablejs": "^1.15.0", "source-code-pro": "^2.38.0", "source-map-loader": "^4.0.1", "source-sans-pro": "3.6.0", diff --git a/scripts/vars.mjs b/scripts/vars.mjs index ce96ecad..4dd9bd76 100755 --- a/scripts/vars.mjs +++ b/scripts/vars.mjs @@ -17,17 +17,17 @@ if (version.includes('-c')) { export const builtinPlugins = [ 'tabby-core', - // 'tabby-settings', - // 'tabby-terminal', - // 'tabby-web', - // 'tabby-community-color-schemes', - // 'tabby-ssh', - // 'tabby-serial', - // 'tabby-telnet', - // 'tabby-electron', - // 'tabby-local', - // 'tabby-plugin-manager', - // 'tabby-linkifier', + 'tabby-settings', + 'tabby-terminal', + 'tabby-web', + 'tabby-community-color-schemes', + 'tabby-ssh', + 'tabby-serial', + 'tabby-telnet', + 'tabby-electron', + 'tabby-local', + 'tabby-plugin-manager', + 'tabby-linkifier', ] export const packagesWithDocs = [ diff --git a/tabby-community-color-schemes/webpack.config.js b/tabby-community-color-schemes/webpack.config.js deleted file mode 100644 index 031a4556..00000000 --- a/tabby-community-color-schemes/webpack.config.js +++ /dev/null @@ -1,6 +0,0 @@ -const config = require('../webpack.plugin.config') -module.exports = config({ - name: 'community-color-schemes', - dirname: __dirname, -}) -module.exports.module.rules.push({ test: /[\\\/]schemes[\\\/]/, use: 'raw-loader' }) diff --git a/tabby-community-color-schemes/webpack.config.mjs b/tabby-community-color-schemes/webpack.config.mjs new file mode 100644 index 00000000..fc89447e --- /dev/null +++ b/tabby-community-color-schemes/webpack.config.mjs @@ -0,0 +1,12 @@ +import * as path from 'path' +const __dirname = path.dirname(new URL(import.meta.url).pathname) +import config from '../webpack.plugin.config.mjs' + +export default () => { + const cfg = config({ + name: 'community-color-schemes', + dirname: __dirname, + }) + cfg.module.rules.push({ test: /[\\\/]schemes[\\\/]/, use: 'raw-loader' }) + return cfg +} diff --git a/tabby-core/package.json b/tabby-core/package.json index 80e88dbf..5fb46013 100644 --- a/tabby-core/package.json +++ b/tabby-core/package.json @@ -24,7 +24,6 @@ "js-yaml": "^4.0.0", "messageformat": "^2.3.0", "mixpanel": "^0.17.0", - "ngx-perfect-scrollbar": "^10.1.0", "ngx-translate-messageformat-compiler": "^4.11.0", "readable-stream": "4.2.0", "uuid": "^9.0.0" diff --git a/tabby-core/src/components/tabBody.component.scss b/tabby-core/src/components/tabBody.component.scss index 4c27b23f..d1dfaacf 100644 --- a/tabby-core/src/components/tabBody.component.scss +++ b/tabby-core/src/components/tabBody.component.scss @@ -7,9 +7,4 @@ >* { flex: auto; } - - > perfect-scrollbar { - width: auto; - height: auto; - } } diff --git a/tabby-core/src/config.ts b/tabby-core/src/config.ts index 5ff96a08..4dd0d8dd 100644 --- a/tabby-core/src/config.ts +++ b/tabby-core/src/config.ts @@ -4,10 +4,10 @@ import { Platform } from './api/hostApp' /** @hidden */ export class CoreConfigProvider extends ConfigProvider { platformDefaults = { - [Platform.macOS]: require('./configDefaults.macos.yaml'), - [Platform.Windows]: require('./configDefaults.windows.yaml'), - [Platform.Linux]: require('./configDefaults.linux.yaml'), - [Platform.Web]: require('./configDefaults.web.yaml'), + [Platform.macOS]: require('./configDefaults.macos.yaml').default, + [Platform.Windows]: require('./configDefaults.windows.yaml').default, + [Platform.Linux]: require('./configDefaults.linux.yaml').default, + [Platform.Web]: require('./configDefaults.web.yaml').default, } - defaults = require('./configDefaults.yaml') + defaults = require('./configDefaults.yaml').default } diff --git a/tabby-core/src/index.ts b/tabby-core/src/index.ts index c0be2804..a1cced46 100644 --- a/tabby-core/src/index.ts +++ b/tabby-core/src/index.ts @@ -1,11 +1,9 @@ import { NgModule, ModuleWithProviders, LOCALE_ID } from '@angular/core' -import { BrowserModule } from '@angular/platform-browser' import { BrowserAnimationsModule } from '@angular/platform-browser/animations' +import { CommonModule } from '@angular/common' import { FormsModule } from '@angular/forms' import { NgbModule } from '@ng-bootstrap/ng-bootstrap' -import { PerfectScrollbarModule, PERFECT_SCROLLBAR_CONFIG } from 'ngx-perfect-scrollbar' import { NgxFilesizeModule } from 'ngx-filesize' -import { SortablejsModule } from 'ngx-sortablejs' import { DragDropModule } from '@angular/cdk/drag-drop' import { TranslateModule, TranslateCompiler, TranslateService } from '@ngx-translate/core' import { TranslateMessageFormatCompiler, MESSAGE_FORMAT_CONFIG } from 'ngx-translate-messageformat-compiler' @@ -54,8 +52,6 @@ import { LastCLIHandler, ProfileCLIHandler } from './cli' import { SplitLayoutProfilesService } from './profiles' import { CoreCommandProvider } from './commands' -import 'perfect-scrollbar/css/perfect-scrollbar.css' - export function TranslateMessageFormatCompilerFactory (): TranslateMessageFormatCompiler { return new TranslateMessageFormatCompiler() } @@ -73,7 +69,6 @@ const PROVIDERS = [ { provide: TabRecoveryProvider, useExisting: SplitTabRecoveryProvider, multi: true }, { provide: CLIHandler, useClass: ProfileCLIHandler, multi: true }, { provide: CLIHandler, useClass: LastCLIHandler, multi: true }, - { provide: PERFECT_SCROLLBAR_CONFIG, useValue: { suppressScrollX: true } }, { provide: FileProvider, useClass: VaultFileProvider, multi: true }, { provide: ProfileProvider, useExisting: SplitLayoutProfilesService, multi: true }, { provide: CommandProvider, useExisting: CoreCommandProvider, multi: true }, @@ -95,14 +90,12 @@ const PROVIDERS = [ /** @hidden */ @NgModule({ imports: [ - BrowserModule, BrowserAnimationsModule, + CommonModule, FormsModule, NgbModule, NgxFilesizeModule, - PerfectScrollbarModule, DragDropModule, - SortablejsModule.forRoot({ animation: 150 }), TranslateModule, ], declarations: [ @@ -133,6 +126,7 @@ const PROVIDERS = [ ProfileIconComponent, ], entryComponents: [ + AppRootComponent, PromptModalComponent, RenameTabModalComponent, SafeModeModalComponent, @@ -149,7 +143,6 @@ const PROVIDERS = [ DropZoneDirective, FastHtmlBindDirective, AlwaysVisibleTypeaheadDirective, - SortablejsModule, DragDropModule, TranslateModule, CdkAutoDropGroup, diff --git a/tabby-core/yarn.lock b/tabby-core/yarn.lock index 91568ad9..aa4374c1 100644 --- a/tabby-core/yarn.lock +++ b/tabby-core/yarn.lock @@ -68,11 +68,6 @@ events@^3.3.0: resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== -"filesize@>= 4.0.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.3.0.tgz#dff53cfb3f104c9e422f346d53be8dbcc971bf11" - integrity sha512-ytx0ruGpDHKWVoiui6+BY/QMNngtDQ/pJaFwfBpQif0J63+E8DLdFyqS3NkKQn7vIruUEpoGD9JUJSg7Kp+I0g== - fuzzy-search@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/fuzzy-search/-/fuzzy-search-3.2.1.tgz#65d5faad6bc633aee86f1898b7788dfe312ac6c9" @@ -141,23 +136,6 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ngx-filesize@^2.0.16: - version "2.0.16" - resolved "https://registry.yarnpkg.com/ngx-filesize/-/ngx-filesize-2.0.16.tgz#fdaba04170edb6cfcdf7be932783cf913b03f016" - integrity sha512-VdaCirE7hSyfQh8ZEmhzNEhbddiTYUHF4V6OX+KyTmnQSVx4hp9kmzDX5YlkIlmClI6wI+LZmH9/q7XS3fsMPA== - dependencies: - filesize ">= 4.0.0" - tslib "^2.0.0" - -ngx-perfect-scrollbar@^10.1.0: - version "10.1.1" - resolved "https://registry.yarnpkg.com/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-10.1.1.tgz#f89832b9109e89bb59d516184638accd028e9735" - integrity sha512-f9IaDJGlBzSxnJ3Ki76n2JdzfQngUFyCf0E+CuVLaR5jL0IJDcTu7vOs8wexXunRMTd8xvIv0+sdIxf8hXAGWg== - dependencies: - perfect-scrollbar "1.5.0" - resize-observer-polyfill "^1.5.0" - tslib "^2.0.0" - ngx-translate-messageformat-compiler@^4.11.0: version "4.11.0" resolved "https://registry.yarnpkg.com/ngx-translate-messageformat-compiler/-/ngx-translate-messageformat-compiler-4.11.0.tgz#c9b71dd139ba5fcdcd809001e22622de589fd707" @@ -165,11 +143,6 @@ ngx-translate-messageformat-compiler@^4.11.0: dependencies: tslib "^1.10.0" -perfect-scrollbar@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.5.0.tgz#821d224ed8ff61990c23f26db63048cdc75b6b83" - integrity sha512-NrNHJn5mUGupSiheBTy6x+6SXCFbLlm8fVZh9moIzw/LgqElN5q4ncR4pbCBCYuCJ8Kcl9mYM0NgDxvW+b4LxA== - process@^0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" @@ -185,21 +158,11 @@ readable-stream@4.2.0: events "^3.3.0" process "^0.11.10" -resize-observer-polyfill@^1.5.0: - version "1.5.1" - resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" - integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== - tslib@^1.10.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== - tslib@^2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" diff --git a/tabby-electron/webpack.config.js b/tabby-electron/webpack.config.js deleted file mode 100644 index 432b0e9d..00000000 --- a/tabby-electron/webpack.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const config = require('../webpack.plugin.config') -module.exports = config({ - name: 'electron', - dirname: __dirname, -}) diff --git a/tabby-electron/webpack.config.mjs b/tabby-electron/webpack.config.mjs new file mode 100644 index 00000000..9a695bc8 --- /dev/null +++ b/tabby-electron/webpack.config.mjs @@ -0,0 +1,8 @@ +import * as path from 'path' +const __dirname = path.dirname(new URL(import.meta.url).pathname) +import config from '../webpack.plugin.config.mjs' + +export default () => config({ + name: 'electron', + dirname: __dirname, +}) diff --git a/tabby-linkifier/webpack.config.js b/tabby-linkifier/webpack.config.js deleted file mode 100644 index 2f08b443..00000000 --- a/tabby-linkifier/webpack.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const config = require('../webpack.plugin.config') -module.exports = config({ - name: 'linkifier', - dirname: __dirname, -}) diff --git a/tabby-linkifier/webpack.config.mjs b/tabby-linkifier/webpack.config.mjs new file mode 100644 index 00000000..3d7248ca --- /dev/null +++ b/tabby-linkifier/webpack.config.mjs @@ -0,0 +1,8 @@ +import * as path from 'path' +const __dirname = path.dirname(new URL(import.meta.url).pathname) +import config from '../webpack.plugin.config.mjs' + +export default () => config({ + name: 'linkifier', + dirname: __dirname, +}) diff --git a/tabby-local/webpack.config.js b/tabby-local/webpack.config.js deleted file mode 100644 index 3a406025..00000000 --- a/tabby-local/webpack.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const config = require('../webpack.plugin.config') -module.exports = config({ - name: 'local', - dirname: __dirname, -}) diff --git a/tabby-local/webpack.config.mjs b/tabby-local/webpack.config.mjs new file mode 100644 index 00000000..0f23e306 --- /dev/null +++ b/tabby-local/webpack.config.mjs @@ -0,0 +1,8 @@ +import * as path from 'path' +const __dirname = path.dirname(new URL(import.meta.url).pathname) +import config from '../webpack.plugin.config.mjs' + +export default () => config({ + name: 'local', + dirname: __dirname, +}) diff --git a/tabby-plugin-manager/webpack.config.js b/tabby-plugin-manager/webpack.config.js deleted file mode 100644 index c150f071..00000000 --- a/tabby-plugin-manager/webpack.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const config = require('../webpack.plugin.config') -module.exports = config({ - name: 'plugin-manager', - dirname: __dirname, -}) diff --git a/tabby-plugin-manager/webpack.config.mjs b/tabby-plugin-manager/webpack.config.mjs new file mode 100644 index 00000000..68c47175 --- /dev/null +++ b/tabby-plugin-manager/webpack.config.mjs @@ -0,0 +1,8 @@ +import * as path from 'path' +const __dirname = path.dirname(new URL(import.meta.url).pathname) +import config from '../webpack.plugin.config.mjs' + +export default () => config({ + name: 'plugin-manager', + dirname: __dirname, +}) diff --git a/tabby-serial/src/services/serial.service.ts b/tabby-serial/src/services/serial.service.ts index 63228b70..6794f213 100644 --- a/tabby-serial/src/services/serial.service.ts +++ b/tabby-serial/src/services/serial.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core' +import { Injectable, Injector } from '@angular/core' import WSABinding from 'serialport-binding-webserialapi' import AbstractBinding from '@serialport/binding-abstract' import { autoDetect } from '@serialport/bindings-cpp' @@ -9,7 +9,7 @@ import { SerialTabComponent } from '../components/serialTab.component' @Injectable({ providedIn: 'root' }) export class SerialService { private constructor ( - private profilesService: ProfilesService, + private injector: Injector, private hostApp: HostAppService, ) { } @@ -45,6 +45,6 @@ export class SerialService { }, } window.localStorage.lastSerialConnection = JSON.stringify(profile) - return this.profilesService.openNewTabForProfile(profile) as Promise + return this.injector.get(ProfilesService).openNewTabForProfile(profile) as Promise } } diff --git a/tabby-serial/webpack.config.js b/tabby-serial/webpack.config.js deleted file mode 100644 index 4e76d61c..00000000 --- a/tabby-serial/webpack.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const config = require('../webpack.plugin.config') -module.exports = config({ - name: 'serial', - dirname: __dirname, -}) diff --git a/tabby-serial/webpack.config.mjs b/tabby-serial/webpack.config.mjs new file mode 100644 index 00000000..5de5a31d --- /dev/null +++ b/tabby-serial/webpack.config.mjs @@ -0,0 +1,8 @@ +import * as path from 'path' +const __dirname = path.dirname(new URL(import.meta.url).pathname) +import config from '../webpack.plugin.config.mjs' + +export default () => config({ + name: 'serial', + dirname: __dirname, +}) diff --git a/tabby-settings/package.json b/tabby-settings/package.json index ecebe212..91be3ff2 100644 --- a/tabby-settings/package.json +++ b/tabby-settings/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@types/marked": "^4.0.2", "marked": "^4.0.8", - "ngx-infinite-scroll": "^10.0.1" + "ngx-infinite-scroll": "^15" }, "peerDependencies": { "@angular/animations": "^9.1.9", diff --git a/tabby-settings/webpack.config.js b/tabby-settings/webpack.config.js deleted file mode 100644 index b20dea8d..00000000 --- a/tabby-settings/webpack.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const config = require('../webpack.plugin.config') -module.exports = config({ - name: 'settings', - dirname: __dirname, -}) diff --git a/tabby-settings/webpack.config.mjs b/tabby-settings/webpack.config.mjs new file mode 100644 index 00000000..73863ebe --- /dev/null +++ b/tabby-settings/webpack.config.mjs @@ -0,0 +1,8 @@ +import * as path from 'path' +const __dirname = path.dirname(new URL(import.meta.url).pathname) +import config from '../webpack.plugin.config.mjs' + +export default () => config({ + name: 'settings', + dirname: __dirname, +}) diff --git a/tabby-settings/yarn.lock b/tabby-settings/yarn.lock index 570905be..21c575c8 100644 --- a/tabby-settings/yarn.lock +++ b/tabby-settings/yarn.lock @@ -2,11 +2,6 @@ # yarn lockfile v1 -"@scarf/scarf@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@scarf/scarf/-/scarf-1.1.1.tgz#d8b9f20037b3a37dbf8dcdc4b3b72f9285bfce35" - integrity sha512-VGbKDbk1RFIaSmdVb0cNjjWJoRWRI/Weo23AjRCC2nryO0iAS8pzsToJfPVPtVs74WHw4L1UTADNdIYRLkirZQ== - "@types/marked@^4.0.2": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.2.tgz#cb2dbf10da2f41cf20bd91fb5f89b67540c282f7" @@ -17,15 +12,14 @@ marked@^4.0.8: resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.12.tgz#2262a4e6fd1afd2f13557726238b69a48b982f7d" integrity sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ== -ngx-infinite-scroll@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/ngx-infinite-scroll/-/ngx-infinite-scroll-10.0.1.tgz#6f51f2f8775a7c50d1dd8bad125d4e748abbe880" - integrity sha512-7is0eJZ9kJPsaHohRmMhJ/QFHAW9jp9twO5HcHRvFM/Yl/R8QCiokgjwmH0/CR3MuxUanxfHZMfO3PbYTwlBEg== +ngx-infinite-scroll@^15: + version "15.0.0" + resolved "https://registry.yarnpkg.com/ngx-infinite-scroll/-/ngx-infinite-scroll-15.0.0.tgz#61bbf89f121a796880a4ad67fe785b406532b220" + integrity sha512-FSP5UphRdl47vW8f/dRnPAU+napzruAKizBX2HS7MH292Ca+va6IU0J5+UQQmO5rXod2RZV7UhJ6+7g4xLfs1A== dependencies: - "@scarf/scarf" "^1.1.0" - opencollective-postinstall "^2.0.2" + tslib "^2.3.0" -opencollective-postinstall@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" - integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== +tslib@^2.3.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" + integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== diff --git a/tabby-ssh/webpack.config.js b/tabby-ssh/webpack.config.mjs similarity index 53% rename from tabby-ssh/webpack.config.js rename to tabby-ssh/webpack.config.mjs index e89594b6..69c1e163 100644 --- a/tabby-ssh/webpack.config.js +++ b/tabby-ssh/webpack.config.mjs @@ -1,5 +1,8 @@ -const config = require('../webpack.plugin.config') -module.exports = config({ +import * as path from 'path' +const __dirname = path.dirname(new URL(import.meta.url).pathname) +import config from '../webpack.plugin.config.mjs' + +export default () => config({ name: 'ssh', dirname: __dirname, alias: { diff --git a/tabby-telnet/webpack.config.js b/tabby-telnet/webpack.config.js deleted file mode 100644 index f645567c..00000000 --- a/tabby-telnet/webpack.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const config = require('../webpack.plugin.config') -module.exports = config({ - name: 'telnet', - dirname: __dirname -}) diff --git a/tabby-telnet/webpack.config.mjs b/tabby-telnet/webpack.config.mjs new file mode 100644 index 00000000..a3e10c8d --- /dev/null +++ b/tabby-telnet/webpack.config.mjs @@ -0,0 +1,8 @@ +import * as path from 'path' +const __dirname = path.dirname(new URL(import.meta.url).pathname) +import config from '../webpack.plugin.config.mjs' + +export default () => config({ + name: 'telnet', + dirname: __dirname, +}) diff --git a/tabby-terminal/package.json b/tabby-terminal/package.json index ab66e1e9..1bedc65f 100644 --- a/tabby-terminal/package.json +++ b/tabby-terminal/package.json @@ -24,7 +24,7 @@ "cli-spinner": "^0.2.10", "dataurl": "0.1.0", "hexer": "^1.5.0", - "ngx-colors": "^3.0.4", + "ngx-colors": "^3.4.0", "patch-package": "^6.5.0", "ps-node": "^0.1.6", "runes": "^0.4.2", diff --git a/tabby-terminal/patches/xterm+5.2.0-beta.10.patch b/tabby-terminal/patches/xterm+5.1.0.patch similarity index 100% rename from tabby-terminal/patches/xterm+5.2.0-beta.10.patch rename to tabby-terminal/patches/xterm+5.1.0.patch diff --git a/tabby-terminal/src/components/loginScriptsSettings.component.pug b/tabby-terminal/src/components/loginScriptsSettings.component.pug index 8505ddb7..4c1db3c4 100644 --- a/tabby-terminal/src/components/loginScriptsSettings.component.pug +++ b/tabby-terminal/src/components/loginScriptsSettings.component.pug @@ -1,4 +1,5 @@ -div([sortablejs]='scripts') +div + //TODO ([sortablejs]='scripts') .input-group.flex-grow-1(*ngFor='let script of scripts') input.form-control( type='text', diff --git a/tabby-terminal/webpack.config.js b/tabby-terminal/webpack.config.js deleted file mode 100644 index e7c81a06..00000000 --- a/tabby-terminal/webpack.config.js +++ /dev/null @@ -1,15 +0,0 @@ -const config = require('../webpack.plugin.config') -module.exports = config({ - name: 'terminal', - dirname: __dirname, - externals: [ - 'opentype.js', - ], - rules: [ - { - test: /lib[\\/]xterm-addon-image-worker.js$/i, - type: 'asset/source', - }, - ], -}) -module.exports.resolve.modules.push('node_modules/xterm/src') diff --git a/tabby-terminal/webpack.config.mjs b/tabby-terminal/webpack.config.mjs new file mode 100644 index 00000000..8ea38b00 --- /dev/null +++ b/tabby-terminal/webpack.config.mjs @@ -0,0 +1,21 @@ +import * as path from 'path' +const __dirname = path.dirname(new URL(import.meta.url).pathname) +import config from '../webpack.plugin.config.mjs' + +export default () => { + const cfg = config({ + name: 'terminal', + dirname: __dirname, + externals: [ + 'opentype.js', + ], + rules: [ + { + test: /lib[\\/]xterm-addon-image-worker.js$/i, + type: 'asset/source', + }, + ], + }) + cfg.resolve.modules.push('node_modules/xterm/src') + return cfg +} diff --git a/tabby-terminal/yarn.lock b/tabby-terminal/yarn.lock index 940cc7d2..8df4d50a 100644 --- a/tabby-terminal/yarn.lock +++ b/tabby-terminal/yarn.lock @@ -293,10 +293,10 @@ minimist@^1.2.6: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== -ngx-colors@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/ngx-colors/-/ngx-colors-3.0.4.tgz#69b760760e6e1e92fda5da51fa9b4bea7e555d40" - integrity sha512-peNvVpYkm8pe3nP8/TbaFFqo/RxZevGljKrzFa2g1hPPacdx+WdfwAN4uJfcGk7qTYbqlV64SSfb3Pnx8qjzDA== +ngx-colors@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/ngx-colors/-/ngx-colors-3.4.0.tgz#522d37563202053bd5b68ce8726afbfddf2f83a5" + integrity sha512-aJBpOC7t6DUDcEfkyFo6+6JzdHH82hCuj+zdqAmdrFTMyOVFZCw0FhCfcEuQRNsR1yYtyMRhSs6zUXr7oTiNlw== dependencies: tslib "^2.0.0" diff --git a/tabby-web/webpack.config.js b/tabby-web/webpack.config.js deleted file mode 100644 index 23ecfa61..00000000 --- a/tabby-web/webpack.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const config = require('../webpack.plugin.config') -module.exports = config({ - name: 'web', - dirname: __dirname, -}) diff --git a/tabby-web/webpack.config.mjs b/tabby-web/webpack.config.mjs new file mode 100644 index 00000000..aa0f510a --- /dev/null +++ b/tabby-web/webpack.config.mjs @@ -0,0 +1,8 @@ +import * as path from 'path' +const __dirname = path.dirname(new URL(import.meta.url).pathname) +import config from '../webpack.plugin.config.mjs' + +export default () => config({ + name: 'web', + dirname: __dirname, +})