From 0ad32fa79d482f3bdbc1240e5ef7c2d01efdcb03 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Wed, 7 Jul 2021 01:22:50 +0200 Subject: [PATCH] moved profile settings view to settings plugin, web entry cleanup --- app/yarn.lock | 84 +------------------ scripts/publish-plugins.js | 2 +- tabby-community-color-schemes/package.json | 2 +- tabby-core/package.json | 2 +- tabby-core/src/configDefaults.yaml | 5 ++ tabby-electron/package.json | 2 +- tabby-local/package.json | 2 +- tabby-local/src/config.ts | 5 -- tabby-local/src/index.ts | 9 +- tabby-local/src/settings.ts | 13 --- tabby-plugin-manager/package.json | 2 +- tabby-serial/package.json | 2 +- tabby-settings/package.json | 2 +- .../components/editProfileModal.component.pug | 0 .../components/editProfileModal.component.ts | 5 +- .../profilesSettingsTab.component.pug | 0 .../profilesSettingsTab.component.scss | 0 .../profilesSettingsTab.component.ts | 0 tabby-settings/src/index.ts | 9 +- tabby-settings/src/settings.ts | 14 ++++ tabby-ssh/package.json | 2 +- tabby-telnet/package.json | 2 +- tabby-terminal/package.json | 2 +- tabby-web/package.json | 2 +- web/entry.preload.ts | 3 +- web/package.json | 4 +- web/polyfills.ts | 2 +- 27 files changed, 47 insertions(+), 130 deletions(-) rename {tabby-local => tabby-settings}/src/components/editProfileModal.component.pug (100%) rename {tabby-local => tabby-settings}/src/components/editProfileModal.component.ts (94%) rename {tabby-local => tabby-settings}/src/components/profilesSettingsTab.component.pug (100%) rename {tabby-local => tabby-settings}/src/components/profilesSettingsTab.component.scss (100%) rename {tabby-local => tabby-settings}/src/components/profilesSettingsTab.component.ts (100%) diff --git a/app/yarn.lock b/app/yarn.lock index 083dc750..a1e99705 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -2,55 +2,6 @@ # yarn lockfile v1 -"@angular/animations@^12.0.0": - version "12.0.0" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-12.0.0.tgz#5f845b1a58ffb6f3ea6103edf0756ac65320b725" - integrity sha512-BG/Ksk3863I7GKUem73Kty4UeU289oN+iPo/0O0x2dJCzNcpafML0GJpz4lg/RT9l6UddFviI4q9NiopR+eJfw== - dependencies: - tslib "^2.1.0" - -"@angular/common@^12.0.0": - version "12.0.0" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-12.0.0.tgz#a4b992f3af997e9e957500148100f3f2a90ad3e9" - integrity sha512-d6+WSnCFcxAHBsbCvBC3Rutmk+tB5CEdKhkTBY/vGe0A/MjbayzHR4IDv2i0+UZDLSgMJubqh3iCPUcSglXSEg== - dependencies: - tslib "^2.1.0" - -"@angular/compiler@^12.0.0": - version "12.0.0" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-12.0.0.tgz#bb0d4f464fee4803dbda49d862474f771c31f633" - integrity sha512-7NdZNyxm9KLlRMmmtId6RfV6VbQIUMDxN44R+ax66BoWsuhdYXUDsDO554LwYwrjnnXXGkurDJhv7umeRwaZGw== - dependencies: - tslib "^2.1.0" - -"@angular/core@^12.0.0": - version "12.0.0" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-12.0.0.tgz#d16a217f0919b3b161229118c52b1f703815eb71" - integrity sha512-fwXtF6qP8pr07+El/dg67RmgsI4Ubfi+E5YLjYKQ62gM8MzYyYGmLPakFzFnbzYrOr05zdprrbcVgGtMRHapMA== - dependencies: - tslib "^2.1.0" - -"@angular/forms@^12.0.0": - version "12.0.0" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-12.0.0.tgz#faf5e3e36a8c4f57f42a5b3dd11786f39c94d693" - integrity sha512-/Z2AWd2k/9cs+WwXBlZ8yUqgGsHYcp8g6PUCehZQk1gd/4n4FOKvTIGiypajGUPwO4GOHJDzibfCsGw8MenCpQ== - dependencies: - tslib "^2.1.0" - -"@angular/platform-browser-dynamic@^12.0.0": - version "12.0.0" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-12.0.0.tgz#295036e7b487b6dbe3b13db763a371675d391ee6" - integrity sha512-Rkxr/KVOZGuGSuIYo2XZYbOpyS2t2jpLPS65KUUcOEwktj4hSv5VZ2soZF18tG5ZNbx06C1QDW/j9HwmZjEh5g== - dependencies: - tslib "^2.1.0" - -"@angular/platform-browser@^12.0.0": - version "12.0.0" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-12.0.0.tgz#097805ad9a5db044dc0a74c1294cdfa5122eca4c" - integrity sha512-h+uMMluRh4dqJIor7EpvwNKRjv4xCxpttizJlqbo3vfcoOoLDoc9SvEFiXxd+UVh3S0re8zBsyBIJl+gTVFKWQ== - dependencies: - tslib "^2.1.0" - "@electron/remote@1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-1.2.0.tgz#772eb4c3ac17aaba5a9cf05a09092f6277f5671f" @@ -65,13 +16,6 @@ update-notifier "^2.2.0" yargs "^8.0.2" -"@ng-bootstrap/ng-bootstrap@^10.0.0": - version "10.0.0" - resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-10.0.0.tgz#6022927bac7029bdd12d7f1e10b5b20074db06dc" - integrity sha512-Sz+QaxjuyJYJ+zyUbf0TevgcgVesCPQiiFiggEzxKjzY5R+Hvq3YgryLdXf2r/ryePL+C3FXCcmmKpTM5bfczQ== - dependencies: - tslib "^2.1.0" - "@serialport/binding-abstract@^9.0.7": version "9.0.7" resolved "https://registry.yarnpkg.com/@serialport/binding-abstract/-/binding-abstract-9.0.7.tgz#d2c7ecea0f100bdf20187bfc0d34ba90f5504e1e" @@ -2099,13 +2043,6 @@ ngx-filesize@^2.0.16: filesize ">= 4.0.0" tslib "^2.0.0" -ngx-toastr@^14.0.0: - version "14.0.0" - resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-14.0.0.tgz#20e4737ef330b892a453768cd98b980558aeb286" - integrity sha512-dnDzSY73pF6FvNyxdh6ftfvXvUg6SU7MAT3orPUCzA77t3ZcFslro06zk4NCA2g67RF7dBwM0OJ/y0SN6fdGYw== - dependencies: - tslib "^2.1.0" - node-abi@^2.20.0, node-abi@^2.30.0, node-abi@^2.7.0: version "2.30.0" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.0.tgz#8be53bf3e7945a34eea10e0fc9a5982776cf550b" @@ -3016,13 +2953,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" @@ -3457,16 +3387,11 @@ tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -tslib@^2.0.0, tslib@^2.1.0: +tslib@^2.0.0: version "2.2.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" @@ -3820,10 +3745,3 @@ yargs@^8.0.2: which-module "^2.0.0" y18n "^3.2.1" yargs-parser "^7.0.0" - -zone.js@^0.11.4: - version "0.11.4" - resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.11.4.tgz#0f70dcf6aba80f698af5735cbb257969396e8025" - integrity sha512-DDh2Ab+A/B+9mJyajPjHFPWfYU1H+pdun4wnnk0OcQTNjem1XQSZ2CDW+rfZEUDjv5M19SBqAkjZi0x5wuB5Qw== - dependencies: - tslib "^2.0.0" diff --git a/scripts/publish-plugins.js b/scripts/publish-plugins.js index f1c36a7c..a220a694 100755 --- a/scripts/publish-plugins.js +++ b/scripts/publish-plugins.js @@ -3,7 +3,7 @@ const sh = require('shelljs') const vars = require('./vars') const log = require('npmlog') -vars.builtinPlugins.forEach(plugin => { +;[...vars.builtinPlugins, 'web'].forEach(plugin => { log.info('bump', plugin) sh.cd(plugin) sh.exec('npm --no-git-tag-version version ' + vars.version) diff --git a/tabby-community-color-schemes/package.json b/tabby-community-color-schemes/package.json index b80a694a..5270a916 100644 --- a/tabby-community-color-schemes/package.json +++ b/tabby-community-color-schemes/package.json @@ -1,6 +1,6 @@ { "name": "tabby-community-color-schemes", - "version": "1.0.144", + "version": "1.0.145-nightly.0", "description": "Community color schemes for Tabby", "keywords": [ "tabby-builtin-plugin" diff --git a/tabby-core/package.json b/tabby-core/package.json index 2cc9e1f7..6401866a 100644 --- a/tabby-core/package.json +++ b/tabby-core/package.json @@ -1,6 +1,6 @@ { "name": "tabby-core", - "version": "1.0.144", + "version": "1.0.145-nightly.0", "description": "Tabby core", "keywords": [ "tabby-builtin-plugin" diff --git a/tabby-core/src/configDefaults.yaml b/tabby-core/src/configDefaults.yaml index a84f2a03..c04f593c 100644 --- a/tabby-core/src/configDefaults.yaml +++ b/tabby-core/src/configDefaults.yaml @@ -14,6 +14,11 @@ appearance: opacity: 1.0 vibrancy: true vibrancyType: 'blur' +terminal: + showBuiltinProfiles: true +hotkeys: + profile: + __nonStructural: true profiles: [] recentProfiles: [] recoverTabs: true diff --git a/tabby-electron/package.json b/tabby-electron/package.json index 781a1987..8b93faab 100644 --- a/tabby-electron/package.json +++ b/tabby-electron/package.json @@ -1,6 +1,6 @@ { "name": "tabby-electron", - "version": "1.0.144", + "version": "1.0.145-nightly.0", "description": "Electron-specific bindings", "keywords": [ "tabby-builtin-plugin" diff --git a/tabby-local/package.json b/tabby-local/package.json index d9ca03cb..08727963 100644 --- a/tabby-local/package.json +++ b/tabby-local/package.json @@ -1,6 +1,6 @@ { "name": "tabby-local", - "version": "1.0.144", + "version": "1.0.145-nightly.0", "description": "Tabby's local shell plugin", "keywords": [ "tabby-builtin-plugin" diff --git a/tabby-local/src/config.ts b/tabby-local/src/config.ts index 01b2f181..e79ee21a 100644 --- a/tabby-local/src/config.ts +++ b/tabby-local/src/config.ts @@ -5,16 +5,11 @@ export class TerminalConfigProvider extends ConfigProvider { defaults = { hotkeys: { 'copy-current-path': [], - profile: { - __nonStructural: true, - }, }, terminal: { autoOpen: false, useConPTY: true, - showBuiltinProfiles: true, environment: {}, - profiles: [], setComSpec: false, }, } diff --git a/tabby-local/src/index.ts b/tabby-local/src/index.ts index 7c208f24..3ba73402 100644 --- a/tabby-local/src/index.ts +++ b/tabby-local/src/index.ts @@ -11,9 +11,7 @@ import { SettingsTabProvider } from 'tabby-settings' import { TerminalTabComponent } from './components/terminalTab.component' import { ShellSettingsTabComponent } from './components/shellSettingsTab.component' -import { EditProfileModalComponent } from './components/editProfileModal.component' import { EnvironmentEditorComponent } from './components/environmentEditor.component' -import { ProfilesSettingsTabComponent } from './components/profilesSettingsTab.component' import { LocalProfileSettingsComponent } from './components/localProfileSettings.component' import { TerminalService } from './services/terminal.service' @@ -22,7 +20,7 @@ import { DockMenuService } from './services/dockMenu.service' import { ButtonProvider } from './buttonProvider' import { RecoveryProvider } from './recoveryProvider' import { ShellProvider } from './api' -import { ProfilesSettingsTabProvider, ShellSettingsTabProvider } from './settings' +import { ShellSettingsTabProvider } from './settings' import { TerminalConfigProvider } from './config' import { LocalTerminalHotkeyProvider } from './hotkeys' import { NewTabContextMenu, SaveAsProfileContextMenu } from './tabContextMenu' @@ -56,7 +54,6 @@ import { LocalProfilesService } from './profiles' ], providers: [ { provide: SettingsTabProvider, useClass: ShellSettingsTabProvider, multi: true }, - { provide: SettingsTabProvider, useClass: ProfilesSettingsTabProvider, multi: true }, { provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true }, { provide: TabRecoveryProvider, useClass: RecoveryProvider, multi: true }, @@ -92,16 +89,12 @@ import { LocalProfilesService } from './profiles' ], entryComponents: [ TerminalTabComponent, - ProfilesSettingsTabComponent, ShellSettingsTabComponent, - EditProfileModalComponent, LocalProfileSettingsComponent, ] as any[], declarations: [ TerminalTabComponent, - ProfilesSettingsTabComponent, ShellSettingsTabComponent, - EditProfileModalComponent, EnvironmentEditorComponent, LocalProfileSettingsComponent, ] as any[], diff --git a/tabby-local/src/settings.ts b/tabby-local/src/settings.ts index ab7eebe9..ac07c225 100644 --- a/tabby-local/src/settings.ts +++ b/tabby-local/src/settings.ts @@ -2,7 +2,6 @@ import { Injectable } from '@angular/core' import { HostAppService, Platform } from 'tabby-core' import { SettingsTabProvider } from 'tabby-settings' -import { ProfilesSettingsTabComponent } from './components/profilesSettingsTab.component' import { ShellSettingsTabComponent } from './components/shellSettingsTab.component' /** @hidden */ @@ -22,15 +21,3 @@ export class ShellSettingsTabProvider extends SettingsTabProvider { } } } - -/** @hidden */ -@Injectable() -export class ProfilesSettingsTabProvider extends SettingsTabProvider { - id = 'profiles' - icon = 'window-restore' - title = 'Profiles' - - getComponentType (): any { - return ProfilesSettingsTabComponent - } -} diff --git a/tabby-plugin-manager/package.json b/tabby-plugin-manager/package.json index e1f97387..358bb6e4 100644 --- a/tabby-plugin-manager/package.json +++ b/tabby-plugin-manager/package.json @@ -1,6 +1,6 @@ { "name": "tabby-plugin-manager", - "version": "1.0.144", + "version": "1.0.145-nightly.0", "description": "Tabby's plugin manager", "keywords": [ "tabby-builtin-plugin" diff --git a/tabby-serial/package.json b/tabby-serial/package.json index a5bb362c..505cbc4f 100644 --- a/tabby-serial/package.json +++ b/tabby-serial/package.json @@ -1,6 +1,6 @@ { "name": "tabby-serial", - "version": "1.0.144", + "version": "1.0.145-nightly.0", "description": "Serial connections for Tabby", "keywords": [ "tabby-builtin-plugin" diff --git a/tabby-settings/package.json b/tabby-settings/package.json index e19681b8..b7b61615 100644 --- a/tabby-settings/package.json +++ b/tabby-settings/package.json @@ -1,6 +1,6 @@ { "name": "tabby-settings", - "version": "1.0.144", + "version": "1.0.145-nightly.0", "description": "Tabby terminal settings page", "keywords": [ "tabby-builtin-plugin" diff --git a/tabby-local/src/components/editProfileModal.component.pug b/tabby-settings/src/components/editProfileModal.component.pug similarity index 100% rename from tabby-local/src/components/editProfileModal.component.pug rename to tabby-settings/src/components/editProfileModal.component.pug diff --git a/tabby-local/src/components/editProfileModal.component.ts b/tabby-settings/src/components/editProfileModal.component.ts similarity index 94% rename from tabby-local/src/components/editProfileModal.component.ts rename to tabby-settings/src/components/editProfileModal.component.ts index 6f21a703..3e2bcea0 100644 --- a/tabby-local/src/components/editProfileModal.component.ts +++ b/tabby-settings/src/components/editProfileModal.component.ts @@ -2,8 +2,6 @@ import { Observable, OperatorFunction, debounceTime, map, distinctUntilChanged } from 'rxjs' import { Component, Input, ViewChild, ViewContainerRef, ComponentFactoryResolver, Injector } from '@angular/core' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { UACService } from '../services/uac.service' -import { LocalProfile } from '../api' import { ConfigService, Profile, ProfileProvider, ProfileSettingsComponent } from 'tabby-core' const iconsData = require('../../../tabby-core/src/icons.json') @@ -18,7 +16,7 @@ const iconsClassList = Object.keys(iconsData).map( template: require('./editProfileModal.component.pug'), }) export class EditProfileModalComponent { - @Input() profile: LocalProfile + @Input() profile: Profile @Input() profileProvider: ProfileProvider @Input() settingsComponent: new () => ProfileSettingsComponent groupNames: string[] @@ -27,7 +25,6 @@ export class EditProfileModalComponent { private settingsComponentInstance: ProfileSettingsComponent constructor ( - public uac: UACService, private injector: Injector, private componentFactoryResolver: ComponentFactoryResolver, config: ConfigService, diff --git a/tabby-local/src/components/profilesSettingsTab.component.pug b/tabby-settings/src/components/profilesSettingsTab.component.pug similarity index 100% rename from tabby-local/src/components/profilesSettingsTab.component.pug rename to tabby-settings/src/components/profilesSettingsTab.component.pug diff --git a/tabby-local/src/components/profilesSettingsTab.component.scss b/tabby-settings/src/components/profilesSettingsTab.component.scss similarity index 100% rename from tabby-local/src/components/profilesSettingsTab.component.scss rename to tabby-settings/src/components/profilesSettingsTab.component.scss diff --git a/tabby-local/src/components/profilesSettingsTab.component.ts b/tabby-settings/src/components/profilesSettingsTab.component.ts similarity index 100% rename from tabby-local/src/components/profilesSettingsTab.component.ts rename to tabby-settings/src/components/profilesSettingsTab.component.ts diff --git a/tabby-settings/src/index.ts b/tabby-settings/src/index.ts index 6930625f..2d47a345 100644 --- a/tabby-settings/src/index.ts +++ b/tabby-settings/src/index.ts @@ -5,6 +5,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap' import TabbyCorePlugin, { ToolbarButtonProvider, HotkeyProvider, ConfigProvider } from 'tabby-core' +import { EditProfileModalComponent } from './components/editProfileModal.component' import { HotkeyInputModalComponent } from './components/hotkeyInputModal.component' import { HotkeySettingsTabComponent } from './components/hotkeySettingsTab.component' import { MultiHotkeyInputComponent } from './components/multiHotkeyInput.component' @@ -13,12 +14,13 @@ import { SettingsTabBodyComponent } from './components/settingsTabBody.component import { WindowSettingsTabComponent } from './components/windowSettingsTab.component' import { VaultSettingsTabComponent } from './components/vaultSettingsTab.component' import { SetVaultPassphraseModalComponent } from './components/setVaultPassphraseModal.component' +import { ProfilesSettingsTabComponent } from './components/profilesSettingsTab.component' import { SettingsTabProvider } from './api' import { ButtonProvider } from './buttonProvider' import { SettingsHotkeyProvider } from './hotkeys' import { SettingsConfigProvider } from './config' -import { HotkeySettingsTabProvider, WindowSettingsTabProvider, VaultSettingsTabProvider } from './settings' +import { HotkeySettingsTabProvider, WindowSettingsTabProvider, VaultSettingsTabProvider, ProfilesSettingsTabProvider } from './settings' /** @hidden */ @NgModule({ @@ -35,19 +37,24 @@ import { HotkeySettingsTabProvider, WindowSettingsTabProvider, VaultSettingsTabP { provide: SettingsTabProvider, useClass: HotkeySettingsTabProvider, multi: true }, { provide: SettingsTabProvider, useClass: WindowSettingsTabProvider, multi: true }, { provide: SettingsTabProvider, useClass: VaultSettingsTabProvider, multi: true }, + { provide: SettingsTabProvider, useClass: ProfilesSettingsTabProvider, multi: true }, ], entryComponents: [ + EditProfileModalComponent, HotkeyInputModalComponent, HotkeySettingsTabComponent, + ProfilesSettingsTabComponent, SettingsTabComponent, SetVaultPassphraseModalComponent, VaultSettingsTabComponent, WindowSettingsTabComponent, ], declarations: [ + EditProfileModalComponent, HotkeyInputModalComponent, HotkeySettingsTabComponent, MultiHotkeyInputComponent, + ProfilesSettingsTabComponent, SettingsTabComponent, SettingsTabBodyComponent, SetVaultPassphraseModalComponent, diff --git a/tabby-settings/src/settings.ts b/tabby-settings/src/settings.ts index 8a07a49f..4f704ee8 100644 --- a/tabby-settings/src/settings.ts +++ b/tabby-settings/src/settings.ts @@ -3,6 +3,7 @@ import { SettingsTabProvider } from './api' import { HotkeySettingsTabComponent } from './components/hotkeySettingsTab.component' import { WindowSettingsTabComponent } from './components/windowSettingsTab.component' import { VaultSettingsTabComponent } from './components/vaultSettingsTab.component' +import { ProfilesSettingsTabComponent } from './components/profilesSettingsTab.component' /** @hidden */ @Injectable() @@ -41,3 +42,16 @@ export class VaultSettingsTabProvider extends SettingsTabProvider { return VaultSettingsTabComponent } } + + +/** @hidden */ +@Injectable() +export class ProfilesSettingsTabProvider extends SettingsTabProvider { + id = 'profiles' + icon = 'window-restore' + title = 'Profiles' + + getComponentType (): any { + return ProfilesSettingsTabComponent + } +} diff --git a/tabby-ssh/package.json b/tabby-ssh/package.json index d253573c..5aa9df9e 100644 --- a/tabby-ssh/package.json +++ b/tabby-ssh/package.json @@ -1,6 +1,6 @@ { "name": "tabby-ssh", - "version": "1.0.144", + "version": "1.0.145-nightly.0", "description": "SSH connections for Tabby", "keywords": [ "tabby-builtin-plugin" diff --git a/tabby-telnet/package.json b/tabby-telnet/package.json index 3e47b2ba..d7205d27 100644 --- a/tabby-telnet/package.json +++ b/tabby-telnet/package.json @@ -1,6 +1,6 @@ { "name": "tabby-telnet", - "version": "1.0.144", + "version": "1.0.145-nightly.0", "description": "Telnet/socket connections for Tabby", "keywords": [ "tabby-builtin-plugin" diff --git a/tabby-terminal/package.json b/tabby-terminal/package.json index 6ba212ce..a21eeae9 100644 --- a/tabby-terminal/package.json +++ b/tabby-terminal/package.json @@ -1,6 +1,6 @@ { "name": "tabby-terminal", - "version": "1.0.144", + "version": "1.0.145-nightly.0", "description": "Tabby's terminal emulation core", "keywords": [ "tabby-builtin-plugin" diff --git a/tabby-web/package.json b/tabby-web/package.json index 3cc68dc4..93cf25d8 100644 --- a/tabby-web/package.json +++ b/tabby-web/package.json @@ -1,6 +1,6 @@ { "name": "tabby-web", - "version": "1.0.144", + "version": "1.0.145-nightly.0", "description": "Web-specific bindings", "keywords": [ "tabby-builtin-plugin" diff --git a/web/entry.preload.ts b/web/entry.preload.ts index 79cdb3a5..fa484cf7 100644 --- a/web/entry.preload.ts +++ b/web/entry.preload.ts @@ -13,7 +13,6 @@ import './polyfills.buffer' const mocks = {} const modules = {} -const originalRequire = window['require'] const customRequire = path => { if (mocks[path]) { console.log(':: mock', path) @@ -22,7 +21,7 @@ const customRequire = path => { if (modules[path]) { return modules[path] } - return originalRequire(path) + throw new Error(`Attempted to require ${path}`) } customRequire['resolve'] = (() => null) as any diff --git a/web/package.json b/web/package.json index 5bb8b448..379eee81 100644 --- a/web/package.json +++ b/web/package.json @@ -1,4 +1,5 @@ { + "name": "tabby-web-container", "devDependencies": { "assert": "1.5.0", "browserify-zlib": "^0.2.0", @@ -13,5 +14,6 @@ }, "resolutions": { "**/util": "^0.12.0" - } + }, + "version": "1.0.145-nightly.0" } diff --git a/web/polyfills.ts b/web/polyfills.ts index 444d1951..15a7acbd 100644 --- a/web/polyfills.ts +++ b/web/polyfills.ts @@ -156,7 +156,7 @@ Tabby.registerModule('@ng-bootstrap/ng-bootstrap', ngBootstrapModule) Tabby.registerModule('ngx-toastr', ngxToastrModule) Tabby.registerModule('deepmerge', require('deepmerge')) Tabby.registerModule('rxjs', require('rxjs')) -Tabby.registerModule('rxjs/operators', require('rxjs/operators')) +Tabby.registerModule('rxjs/operators', require('rxjs')) Tabby.registerModule('js-yaml', require('js-yaml')) Tabby.registerModule('zone.js/dist/zone.js', require('zone.js/dist/zone.js'))