diff --git a/.github/dependabot.yml b/.github/dependabot.yml index dafb3fe8..cfc41b10 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,55 +13,55 @@ updates: time: "04:00" open-pull-requests-limit: 20 - package-ecosystem: npm - directory: "/terminus-core" + directory: "/tabby-core" schedule: interval: daily time: "04:00" open-pull-requests-limit: 20 - package-ecosystem: npm - directory: "/terminus-settings" + directory: "/tabby-settings" schedule: interval: daily time: "04:00" open-pull-requests-limit: 20 - package-ecosystem: npm - directory: "/terminus-terminal" + directory: "/tabby-terminal" schedule: interval: daily time: "04:00" open-pull-requests-limit: 20 - package-ecosystem: npm - directory: "/terminus-local" + directory: "/tabby-local" schedule: interval: daily time: "04:00" open-pull-requests-limit: 20 - package-ecosystem: npm - directory: "/terminus-community-color-schemes" + directory: "/tabby-community-color-schemes" schedule: interval: daily time: "04:00" open-pull-requests-limit: 20 - package-ecosystem: npm - directory: "/terminus-electron" + directory: "/tabby-electron" schedule: interval: daily time: "04:00" open-pull-requests-limit: 20 - package-ecosystem: npm - directory: "/terminus-web" + directory: "/tabby-web" schedule: interval: daily time: "04:00" open-pull-requests-limit: 20 - package-ecosystem: npm - directory: "/terminus-plugin-manager" + directory: "/tabby-plugin-manager" schedule: interval: daily time: "04:00" open-pull-requests-limit: 20 - package-ecosystem: npm - directory: "/terminus-ssh" + directory: "/tabby-ssh" schedule: interval: daily time: "04:00" diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a8f6be52..428f82e9 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -44,7 +44,7 @@ jobs: # DEBUG: electron-builder,electron-builder:* - name: Build web resources - run: zsh -c 'tar czf terminus-web.tar.gz (terminus-*|web)/dist' + run: zsh -c 'tar czf tabby-web.tar.gz (tabby-*|web)/dist' - name: Upload symbols run: | @@ -68,7 +68,7 @@ jobs: mkdir artifact-tar.gz mv dist/*.tar.gz artifact-tar.gz/ || true mkdir artifact-web - mv terminus-web.tar.gz artifact-web/ || true + mv tabby-web.tar.gz artifact-web/ || true - uses: actions/upload-artifact@master name: Upload DEB diff --git a/.gitignore b/.gitignore index 9d66c834..fae220ba 100644 --- a/.gitignore +++ b/.gitignore @@ -32,5 +32,5 @@ docs/api sentry.properties sentry-symbols.js -terminus-ssh/util/pagent.exe +tabby-ssh/util/pagent.exe *.psd diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index afc16676..00000000 --- a/.travis.yml +++ /dev/null @@ -1,36 +0,0 @@ -language: node_js -node_js: 15 - -stages: - - Build - - name: Docs - if: branch = master - -jobs: - include: - - stage: 'Docs' - os: linux - if: branch = master - script: - - '[ -z "${encrypted_4e2fb4889ef8_iv}" ] && exit 0 || true' - - set -e - - openssl aes-256-cbc -K $encrypted_4e2fb4889ef8_key -iv $encrypted_4e2fb4889ef8_iv -in .travis.ssh.key.enc -out .travis.ssh.key -d - - eval "$(ssh-agent -s)" - - chmod 600 .travis.ssh.key - - ssh-add .travis.ssh.key - - yarn - - yarn run docs - - rsync -e "ssh -o StrictHostKeyChecking=no" -arv docs/api/ root@ajenti.org:/srv/terminus-docs/ - -dist: xenial -sudo: false - -addons: - apt: - packages: - - rpm - - yarn - - libsecret-1-dev - sources: - - sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main' - key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg' diff --git a/.vscode/launch.json b/.vscode/launch.json index 5b6275e4..ef28ff84 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "protocol": "inspector", "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", "env": { - "TERMINUS_DEV": "1" + "TABBY_DEV": "1" }, "runtimeArgs": [ "--remote-debugging-port=9223", diff --git a/HACKING.md b/HACKING.md index 703962ac..d3c5bc8b 100644 --- a/HACKING.md +++ b/HACKING.md @@ -1,6 +1,6 @@ # Some background -Terminus is an Electron app, with the frontend written in Typescript with the help of Angular framework. It's built using Webpack. +Tabby is an Electron app, with the frontend written in Typescript with the help of Angular framework. It's built using Webpack. # Getting started @@ -34,7 +34,7 @@ Now, check if your build is working: yarn run build ``` -Start Terminus with +Start Tabby with ``` yarn start @@ -58,26 +58,26 @@ The artifacts will be produced in the `dist` folder. # Project layout ``` -terminus +tabby ├─ app # Electron app, just the bare essentials | ├─ src # Electron renderer code | └─ main.js # Electron main entry point ├─ build ├─ clink # Clink distributive, for Windows ├─ scripts # Maintenance scripts -├─ terminus-community-color-schemes # Plugin that provides color schemes -├─ terminus-core # Plugin that provides base UI and tab management -├─ terminus-electron # Plugin that provides Electron-specific functions -├─ terminus-local # Plugin that provides local shells and profiles -├─ terminus-plugin-manager # Plugin that installs other plugins -├─ terminus-settings # Plugin that provides the settings tab -├─ terminus-terminal # Plugin that provides terminal tabs -└─ terminus-web # Plugin that provides web-specific functions +├─ tabby-community-color-schemes # Plugin that provides color schemes +├─ tabby-core # Plugin that provides base UI and tab management +├─ tabby-electron # Plugin that provides Electron-specific functions +├─ tabby-local # Plugin that provides local shells and profiles +├─ tabby-plugin-manager # Plugin that installs other plugins +├─ tabby-settings # Plugin that provides the settings tab +├─ tabby-terminal # Plugin that provides terminal tabs +└─ tabby-web # Plugin that provides web-specific functions ``` # Plugin layout ``` -terminus-pluginname +tabby-pluginname ├─ src # Typescript code | ├─ components # Angular components | | ├─ foo.component.ts # Code @@ -94,11 +94,11 @@ terminus-pluginname # Plugins -The app will load all plugins from the source checkout in the dev mode, from the user's plugins directory at all times (click `Open Plugins Directory` under `Settings` > `Plugins`) and from the directory specified by the `TERMINUS_PLUGINS` environment var. +The app will load all plugins from the source checkout in the dev mode, from the user's plugins directory at all times (click `Open Plugins Directory` under `Settings` > `Plugins`) and from the directory specified by the `TABBY_PLUGINS` environment var. -Only modules whose `package.json` file contains a `terminus-plugin` keyword will be loaded. +Only modules whose `package.json` file contains a `tabby-plugin` keyword will be loaded. -If you're currently in your plugin's directory, start Terminus as `TERMINUS_PLUGINS=$(pwd) terminus --debug` +If you're currently in your plugin's directory, start Tabby as `TABBY_PLUGINS=$(pwd) tabby --debug` A plugin should only provide a default export, which should be a `NgModule` class (or a `NgModuleWithDependencies` where applicable). This module will be injected as a dependency to the app's root module. @@ -118,7 +118,7 @@ Plugins provide functionality by exporting singular or multi providers: ```javascript import { NgModule, Injectable } from '@angular/core' -import { ToolbarButtonProvider, ToolbarButton } from 'terminus-core' +import { ToolbarButtonProvider, ToolbarButton } from 'tabby-core' @Injectable() export class MyButtonProvider extends ToolbarButtonProvider { @@ -143,6 +143,6 @@ export default class MyModule { } ``` -See `terminus-core/src/api.ts`, `terminus-settings/src/api.ts`, `terminus-local/src/api.ts` and `terminus-terminal/src/api.ts` for the available extension points. +See `tabby-core/src/api.ts`, `tabby-settings/src/api.ts`, `tabby-local/src/api.ts` and `tabby-terminal/src/api.ts` for the available extension points. -Publish your plugin on NPM with a `terminus-plugin` keyword to make it appear in the Plugin Manager. +Publish your plugin on NPM with a `tabby-plugin` keyword to make it appear in the Plugin Manager. diff --git a/README.md b/README.md index 99437da3..4dfce1e2 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ---- -**Terminus** is a highly configurable terminal emulator, SSH and serial client for Windows, macOS and Linux +**Tabby** (formerly **Terminus**) is a highly configurable terminal emulator, SSH and serial client for Windows, macOS and Linux * Integrated SSH client and connection manager * Integrated serial terminal @@ -29,7 +29,7 @@ # Contents - [Contents](#contents) -- [What Terminus is and isn't](#what-terminus-is-and-isnt) +- [What Tabby is and isn't](#what-tabby-is-and-isnt) - [Terminal features](#terminal-features) - [SSH Client](#ssh-client) - [Serial Terminal](#serial-terminal) @@ -39,11 +39,11 @@ - [Contributing](#contributing) -# What Terminus is and isn't +# What Tabby is and isn't -* **Terminus is** an alternative to Windows' standard terminal (conhost), PowerShell ISE, PuTTY or iTerm +* **Tabby is** an alternative to Windows' standard terminal (conhost), PowerShell ISE, PuTTY or iTerm -* **Terminus is not** a new shell or a MinGW or Cygwin replacement. Neither is it lightweight - if RAM usage is of importance, consider [Conemu](https://conemu.github.io) or [Alacritty](https://github.com/jwilm/alacritty) +* **Tabby is not** a new shell or a MinGW or Cygwin replacement. Neither is it lightweight - if RAM usage is of importance, consider [Conemu](https://conemu.github.io) or [Alacritty](https://github.com/jwilm/alacritty) # Terminal features @@ -84,12 +84,12 @@ # Portable -Terminus will run as a portable app on Windows, if you create a `data` folder in the same location where `Terminus.exe` lives. +Tabby will run as a portable app on Windows, if you create a `data` folder in the same location where `Tabby.exe` lives. # Plugins -Plugins and themes can be installed directly from the Settings view inside Terminus. +Plugins and themes can be installed directly from the Settings view inside Tabby. * [clickable-links](https://github.com/Eugeny/terminus-clickable-links) - makes paths and URLs in the terminal clickable * [title-control](https://github.com/kbjr/terminus-title-control) - allows modifying the title of the terminal tabs by providing a prefix, suffix, and/or strings to be removed @@ -102,7 +102,7 @@ Plugins and themes can be installed directly from the Settings view inside Termi # Themes * [hype](https://github.com/Eugeny/terminus-theme-hype) - a Hyper inspired theme - * [relaxed](https://github.com/Relaxed-Theme/relaxed-terminal-themes#terminus) - the Relaxed theme for Terminus + * [relaxed](https://github.com/Relaxed-Theme/relaxed-terminal-themes#terminus) - the Relaxed theme for Tabby * [gruvbox](https://github.com/porkloin/terminus-theme-gruvbox) * [windows10](https://www.npmjs.com/package/terminus-theme-windows10) * [altair](https://github.com/yxuko/terminus-altair) diff --git a/app/dev-app-update.yml b/app/dev-app-update.yml index e95e81c4..1d71679a 100644 --- a/app/dev-app-update.yml +++ b/app/dev-app-update.yml @@ -1,4 +1,4 @@ owner: eugeny repo: terminus provider: github -updaterCacheDirName: terminus-updater +updaterCacheDirName: tabby-updater diff --git a/app/index.pug b/app/index.pug index 1a88818d..90d1619d 100644 --- a/app/index.pug +++ b/app/index.pug @@ -1,5 +1,5 @@ doctype html -html.terminus +html.tabby head meta(charset='UTF-8') base(href='index.html') @@ -15,8 +15,8 @@ html.terminus app-root .preload-logo div - .terminus-logo - h1.terminus-title Terminus + .tabby-logo + h1.tabby-title Tabby sup α .progress .bar(style='width: 0%') diff --git a/app/lib/app.ts b/app/lib/app.ts index c0a5b316..f764f5e8 100644 --- a/app/lib/app.ts +++ b/app/lib/app.ts @@ -154,7 +154,7 @@ export class Application { this.tray.setContextMenu(contextMenu) } - this.tray.setToolTip(`Terminus ${app.getVersion()}`) + this.tray.setToolTip(`Tabby ${app.getVersion()}`) } disableTray (): void { @@ -195,7 +195,7 @@ export class Application { { label: 'Application', submenu: [ - { role: 'about', label: 'About Terminus' }, + { role: 'about', label: 'About Tabby' }, { type: 'separator' }, { label: 'Preferences', diff --git a/app/lib/cli.ts b/app/lib/cli.ts index 910871b4..a5304869 100644 --- a/app/lib/cli.ts +++ b/app/lib/cli.ts @@ -6,7 +6,7 @@ export function parseArgs (argv: string[], cwd: string): any { } return require('yargs/yargs')(argv.slice(1)) - .usage('terminus [command] [arguments]') + .usage('tabby [command] [arguments]') .command('open [directory]', 'open a shell in a directory', { directory: { type: 'string', 'default': cwd }, }) diff --git a/app/lib/config.ts b/app/lib/config.ts index 8692e70c..3cf951ab 100644 --- a/app/lib/config.ts +++ b/app/lib/config.ts @@ -3,7 +3,20 @@ import * as path from 'path' import * as yaml from 'js-yaml' import { app } from 'electron' +export function migrateConfig (): void { + const configPath = path.join(app.getPath('userData'), 'config.yaml') + const legacyConfigPath = path.join(app.getPath('userData'), '../terminus', 'config.yaml') + if (fs.existsSync(legacyConfigPath) && ( + !fs.existsSync(configPath) || + fs.statSync(configPath).mtime < fs.statSync(legacyConfigPath).mtime + )) { + fs.writeFileSync(configPath, fs.readFileSync(legacyConfigPath)) + } +} + export function loadConfig (): any { + migrateConfig() + const configPath = path.join(app.getPath('userData'), 'config.yaml') if (fs.existsSync(configPath)) { return yaml.load(fs.readFileSync(configPath, 'utf8')) diff --git a/app/lib/index.ts b/app/lib/index.ts index 61b24045..80aee909 100644 --- a/app/lib/index.ts +++ b/app/lib/index.ts @@ -7,8 +7,8 @@ import { parseArgs } from './cli' import { Application } from './app' import electronDebug = require('electron-debug') -if (!process.env.TERMINUS_PLUGINS) { - process.env.TERMINUS_PLUGINS = '' +if (!process.env.TABBY_PLUGINS) { + process.env.TABBY_PLUGINS = '' } const application = new Application() diff --git a/app/lib/portable.ts b/app/lib/portable.ts index 367e15da..824beca8 100755 --- a/app/lib/portable.ts +++ b/app/lib/portable.ts @@ -4,9 +4,6 @@ import * as electron from 'electron' const appPath = path.dirname(electron.app.getPath('exe')) -if (fs.existsSync(path.join(appPath, 'terminus-data'))) { - fs.renameSync(path.join(appPath, 'terminus-data'), path.join(appPath, 'data')) -} const portableData = path.join(appPath, 'data') if (fs.existsSync(portableData)) { console.log('reset user data to ' + portableData) diff --git a/app/lib/sentry.ts b/app/lib/sentry.ts index 57912449..a4743972 100755 --- a/app/lib/sentry.ts +++ b/app/lib/sentry.ts @@ -8,7 +8,7 @@ try { release = require('@electron/remote').app.getVersion() } -if (!process.env.TERMINUS_DEV) { +if (!process.env.TABBY_DEV) { init({ dsn: SENTRY_DSN, release, diff --git a/app/lib/window.ts b/app/lib/window.ts index 200e4175..f7d935bf 100644 --- a/app/lib/window.ts +++ b/app/lib/window.ts @@ -56,7 +56,7 @@ export class Window { const bwOptions: BrowserWindowConstructorOptions = { width: 800, height: 600, - title: 'Terminus', + title: 'Tabby', minWidth: 400, minHeight: 300, webPreferences: { @@ -118,7 +118,7 @@ export class Window { }) this.window.on('blur', () => { - if (this.configStore.appearance.dock !== 'off' && this.configStore.appearance?.dockHideOnBlur) { + if (this.configStore.appearance?.dock !== 'off' && this.configStore.appearance?.dockHideOnBlur) { this.hide() } }) diff --git a/app/package.json b/app/package.json index 9a083525..4e9e471c 100644 --- a/app/package.json +++ b/app/package.json @@ -1,5 +1,5 @@ { - "name": "terminus", + "name": "tabby", "description": "A terminal for a modern age", "private": true, "repository": "https://github.com/eugeny/terminus", @@ -55,15 +55,15 @@ "source-map-support": "^0.5.19" }, "peerDependencies": { - "terminus-community-color-schemes": "*", - "terminus-core": "*", - "terminus-electron": "*", - "terminus-local": "*", - "terminus-plugin-manager": "*", - "terminus-serial": "*", - "terminus-settings": "*", - "terminus-ssh": "*", - "terminus-terminal": "*" + "tabby-community-color-schemes": "*", + "tabby-core": "*", + "tabby-electron": "*", + "tabby-local": "*", + "tabby-plugin-manager": "*", + "tabby-serial": "*", + "tabby-settings": "*", + "tabby-ssh": "*", + "tabby-terminal": "*" }, "resolutions": { "*/node-abi": "^2.20.0" diff --git a/app/src/entry.ts b/app/src/entry.ts index 101a536b..743e05b5 100644 --- a/app/src/entry.ts +++ b/app/src/entry.ts @@ -12,7 +12,7 @@ import { ipcRenderer } from 'electron' import { getRootModule } from './app.module' import { findPlugins, initModuleLookup, loadPlugins } from './plugins' -import { BootstrapData, BOOTSTRAP_DATA, PluginInfo } from '../../terminus-core/src/api/mainProcess' +import { BootstrapData, BOOTSTRAP_DATA, PluginInfo } from '../../tabby-core/src/api/mainProcess' // Always land on the start view location.hash = '' @@ -23,7 +23,7 @@ if (process.platform === 'win32' && !('HOME' in process.env)) { process.env.HOME = `${process.env.HOMEDRIVE}${process.env.HOMEPATH}` } -if (process.env.TERMINUS_DEV && !process.env.TERMINUS_FORCE_ANGULAR_PROD) { +if (process.env.TABBY_DEV && !process.env.TABBY_FORCE_ANGULAR_PROD) { console.warn('Running in debug mode') } else { enableProdMode() @@ -42,7 +42,7 @@ async function bootstrap (bootstrapData: BootstrapData, plugins: PluginInfo[], s const moduleRef = await platformBrowserDynamic([ { provide: BOOTSTRAP_DATA, useValue: bootstrapData }, ]).bootstrapModule(module) - if (process.env.TERMINUS_DEV) { + if (process.env.TABBY_DEV) { const applicationRef = moduleRef.injector.get(ApplicationRef) const componentRef = applicationRef.components[0] enableDebugTools(componentRef) diff --git a/app/src/plugins.ts b/app/src/plugins.ts index 671ea147..401353cb 100644 --- a/app/src/plugins.ts +++ b/app/src/plugins.ts @@ -1,7 +1,7 @@ import * as fs from 'mz/fs' import * as path from 'path' import * as remote from '@electron/remote' -import { PluginInfo } from '../../terminus-core/src/api/mainProcess' +import { PluginInfo } from '../../tabby-core/src/api/mainProcess' const nodeModule = require('module') // eslint-disable-line @typescript-eslint/no-var-requires @@ -16,7 +16,7 @@ function normalizePath (p: string): string { return p } -const builtinPluginsPath = process.env.TERMINUS_DEV ? path.dirname(remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins') +const builtinPluginsPath = process.env.TABBY_DEV ? path.dirname(remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins') const builtinModules = [ '@angular/animations', @@ -30,10 +30,10 @@ const builtinModules = [ 'ngx-toastr', 'rxjs', 'rxjs/operators', - 'terminus-core', - 'terminus-local', - 'terminus-settings', - 'terminus-terminal', + 'tabby-core', + 'tabby-local', + 'tabby-settings', + 'tabby-terminal', 'zone.js/dist/zone.js', ] @@ -42,15 +42,15 @@ export type ProgressCallback = (current: number, total: number) => void // eslin export function initModuleLookup (userPluginsPath: string): void { global['module'].paths.map((x: string) => nodeModule.globalPaths.push(normalizePath(x))) - if (process.env.TERMINUS_DEV) { + if (process.env.TABBY_DEV) { nodeModule.globalPaths.unshift(path.dirname(remote.app.getAppPath())) } nodeModule.globalPaths.unshift(builtinPluginsPath) nodeModule.globalPaths.unshift(path.join(userPluginsPath, 'node_modules')) // nodeModule.globalPaths.unshift(path.join((process as any).resourcesPath, 'app.asar', 'node_modules')) - if (process.env.TERMINUS_PLUGINS) { - process.env.TERMINUS_PLUGINS.split(':').map(x => nodeModule.globalPaths.push(normalizePath(x))) + if (process.env.TABBY_PLUGINS) { + process.env.TABBY_PLUGINS.split(':').map(x => nodeModule.globalPaths.push(normalizePath(x))) } const cachedBuiltinModules = {} @@ -79,7 +79,8 @@ export async function findPlugins (): Promise { const paths = nodeModule.globalPaths let foundPlugins: PluginInfo[] = [] const candidateLocations: { pluginDir: string, packageName: string }[] = [] - const PREFIX = 'terminus-' + const PREFIX = 'tabby-' + const LEGACY_PREFIX = 'terminus-' const processedPaths = [] @@ -101,7 +102,7 @@ export async function findPlugins (): Promise { }) } for (const packageName of pluginNames) { - if (packageName.startsWith(PREFIX)) { + if (packageName.startsWith(PREFIX) || packageName.startsWith(LEGACY_PREFIX)) { candidateLocations.push({ pluginDir, packageName }) } } @@ -114,7 +115,7 @@ export async function findPlugins (): Promise { continue } - const name = packageName.substring(PREFIX.length) + const name = packageName.startsWith(PREFIX) ? packageName.substring(PREFIX.length) : packageName.substring(LEGACY_PREFIX.length) if (builtinModules.includes(packageName) && pluginDir !== builtinPluginsPath) { continue @@ -129,7 +130,7 @@ export async function findPlugins (): Promise { try { const info = JSON.parse(await fs.readFile(infoPath, { encoding: 'utf-8' })) - if (!info.keywords || !(info.keywords.includes('terminus-plugin') || info.keywords.includes('terminus-builtin-plugin'))) { + if (!info.keywords || !(info.keywords.includes('terminus-plugin') || info.keywords.includes('terminus-builtin-plugin') || !info.keywords.includes('tabby-plugin') || info.keywords.includes('tabby-builtin-plugin'))) { continue } let author = info.author diff --git a/app/src/preload.scss b/app/src/preload.scss index 484bd159..6315e9ac 100644 --- a/app/src/preload.scss +++ b/app/src/preload.scss @@ -38,7 +38,7 @@ -.terminus-logo { +.tabby-logo { width: 120px; height: 120px; background: url('../assets/logo.svg'); @@ -48,7 +48,7 @@ } -.terminus-title { +.tabby-title { color: #a1c5e4; font-family: 'Source Sans Pro'; text-align: center; diff --git a/app/tsconfig.json b/app/tsconfig.json index 82c6c87d..a9ccbff5 100644 --- a/app/tsconfig.json +++ b/app/tsconfig.json @@ -27,7 +27,7 @@ "dist", "node_modules", "*/node_modules", - "terminus*", + "tabby*", "platforms" ] } diff --git a/app/webpack.config.js b/app/webpack.config.js index 8653b58e..f61a3b66 100644 --- a/app/webpack.config.js +++ b/app/webpack.config.js @@ -2,7 +2,7 @@ const path = require('path') const webpack = require('webpack') module.exports = { - name: 'terminus', + name: 'tabby', target: 'node', entry: { 'index.ignore': 'file-loader?name=index.html!pug-html-loader!' + path.resolve(__dirname, './index.pug'), @@ -10,7 +10,7 @@ module.exports = { preload: path.resolve(__dirname, 'src/entry.preload.ts'), bundle: path.resolve(__dirname, 'src/entry.ts'), }, - mode: process.env.TERMINUS_DEV ? 'development' : 'production', + mode: process.env.TABBY_DEV ? 'development' : 'production', optimization:{ minimize: false, }, diff --git a/app/webpack.main.config.js b/app/webpack.main.config.js index e037996e..166b13c2 100644 --- a/app/webpack.main.config.js +++ b/app/webpack.main.config.js @@ -3,12 +3,12 @@ const webpack = require('webpack') const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin module.exports = { - name: 'terminus-main', + name: 'tabby-main', target: 'electron-main', entry: { main: path.resolve(__dirname, 'lib/index.ts'), }, - mode: process.env.TERMINUS_DEV ? 'development' : 'production', + mode: process.env.TABBY_DEV ? 'development' : 'production', context: __dirname, devtool: 'source-map', output: { diff --git a/build/installer.nsh b/build/installer.nsh index 45fcaf8a..436a37eb 100644 --- a/build/installer.nsh +++ b/build/installer.nsh @@ -1,3 +1,3 @@ !macro customInit - nsExec::Exec '"$LOCALAPPDATA\terminus\Update.exe" --uninstall -s' + nsExec::Exec '"$LOCALAPPDATA\tabby\Update.exe" --uninstall -s' !macroend diff --git a/build/mac/afterSignHook.js b/build/mac/afterSignHook.js index 3be474c3..bad98de0 100644 --- a/build/mac/afterSignHook.js +++ b/build/mac/afterSignHook.js @@ -11,7 +11,7 @@ module.exports = async function (params) { } console.log('afterSign hook triggered', params) - let appId = 'org.terminus' + let appId = 'org.tabby' let appPath = path.join(params.appOutDir, params._pathOverride || `${params.packager.appInfo.productFilename}.app`) if (!fs.existsSync(appPath)) { diff --git a/electron-builder.yml b/electron-builder.yml index 4241f685..85606f10 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -1,6 +1,6 @@ --- -appId: org.terminus -productName: Terminus +appId: org.tabby +productName: Tabby compression: normal npmRebuild: false afterSign: "./build/mac/afterSignHook.js" @@ -39,18 +39,18 @@ publish: win: icon: "./build/windows/icon.ico" - artifactName: terminus-${version}-portable.${ext} + artifactName: tabby-${version}-portable.${ext} rfc3161TimeStampServer: http://sha256timestamp.ws.symantec.com/sha256/timestamp nsis: oneClick: false - artifactName: terminus-${version}-setup.${ext} + artifactName: tabby-${version}-setup.${ext} installerIcon: "./build/windows/icon.ico" allowToChangeInstallationDirectory: true mac: category: public.app-category.video icon: "./build/mac/icon.icns" - artifactName: terminus-${version}-macos-${env.ARCH}.${ext} + artifactName: tabby-${version}-macos-${env.ARCH}.${ext} hardenedRuntime: true entitlements: "./build/mac/entitlements.plist" entitlementsInherit: "./build/mac/entitlements.plist" @@ -68,11 +68,11 @@ mac: linux: category: Utility icon: "./build/icons" - artifactName: terminus-${version}-linux.${ext} + artifactName: tabby-${version}-linux.${ext} executableArgs: - "--no-sandbox" desktop: - StartupWMClass: terminus + StartupWMClass: tabby snap: plugs: - default @@ -91,7 +91,7 @@ deb: afterInstall: build/linux/after-install.tpl fpm: - '--replaces' - - 'terminus' + - 'terminus-terminal' pacman: depends: - gnome-keyring @@ -103,4 +103,4 @@ rpm: - '--rpm-rpmbuild-define' - '_build_id_links none' - '--replaces' - - 'terminus' + - 'terminus-terminal' diff --git a/extras/automator-workflows/Open Terminus here.workflow/Contents/Info.plist b/extras/automator-workflows/Open Tabby here.workflow/Contents/Info.plist similarity index 94% rename from extras/automator-workflows/Open Terminus here.workflow/Contents/Info.plist rename to extras/automator-workflows/Open Tabby here.workflow/Contents/Info.plist index 182cb2c3..d8f55bb1 100644 --- a/extras/automator-workflows/Open Terminus here.workflow/Contents/Info.plist +++ b/extras/automator-workflows/Open Tabby here.workflow/Contents/Info.plist @@ -12,7 +12,7 @@ NSMenuItem default - Open Terminus here + Open Tabby here NSMessage runWorkflowAsService diff --git a/extras/automator-workflows/Open Terminus here.workflow/Contents/QuickLook/Thumbnail.png b/extras/automator-workflows/Open Tabby here.workflow/Contents/QuickLook/Thumbnail.png similarity index 100% rename from extras/automator-workflows/Open Terminus here.workflow/Contents/QuickLook/Thumbnail.png rename to extras/automator-workflows/Open Tabby here.workflow/Contents/QuickLook/Thumbnail.png diff --git a/extras/automator-workflows/Open Terminus here.workflow/Contents/_CodeSignature/CodeDirectory b/extras/automator-workflows/Open Tabby here.workflow/Contents/_CodeSignature/CodeDirectory similarity index 100% rename from extras/automator-workflows/Open Terminus here.workflow/Contents/_CodeSignature/CodeDirectory rename to extras/automator-workflows/Open Tabby here.workflow/Contents/_CodeSignature/CodeDirectory diff --git a/extras/automator-workflows/Open Terminus here.workflow/Contents/_CodeSignature/CodeRequirements b/extras/automator-workflows/Open Tabby here.workflow/Contents/_CodeSignature/CodeRequirements similarity index 100% rename from extras/automator-workflows/Open Terminus here.workflow/Contents/_CodeSignature/CodeRequirements rename to extras/automator-workflows/Open Tabby here.workflow/Contents/_CodeSignature/CodeRequirements diff --git a/extras/automator-workflows/Open Terminus here.workflow/Contents/_CodeSignature/CodeRequirements-1 b/extras/automator-workflows/Open Tabby here.workflow/Contents/_CodeSignature/CodeRequirements-1 similarity index 100% rename from extras/automator-workflows/Open Terminus here.workflow/Contents/_CodeSignature/CodeRequirements-1 rename to extras/automator-workflows/Open Tabby here.workflow/Contents/_CodeSignature/CodeRequirements-1 diff --git a/extras/automator-workflows/Open Terminus here.workflow/Contents/_CodeSignature/CodeResources b/extras/automator-workflows/Open Tabby here.workflow/Contents/_CodeSignature/CodeResources similarity index 100% rename from extras/automator-workflows/Open Terminus here.workflow/Contents/_CodeSignature/CodeResources rename to extras/automator-workflows/Open Tabby here.workflow/Contents/_CodeSignature/CodeResources diff --git a/extras/automator-workflows/Open Terminus here.workflow/Contents/_CodeSignature/CodeSignature b/extras/automator-workflows/Open Tabby here.workflow/Contents/_CodeSignature/CodeSignature similarity index 100% rename from extras/automator-workflows/Open Terminus here.workflow/Contents/_CodeSignature/CodeSignature rename to extras/automator-workflows/Open Tabby here.workflow/Contents/_CodeSignature/CodeSignature diff --git a/extras/automator-workflows/Open Terminus here.workflow/Contents/document.wflow b/extras/automator-workflows/Open Tabby here.workflow/Contents/document.wflow similarity index 98% rename from extras/automator-workflows/Open Terminus here.workflow/Contents/document.wflow rename to extras/automator-workflows/Open Tabby here.workflow/Contents/document.wflow index 7d657c80..433cf38f 100644 --- a/extras/automator-workflows/Open Terminus here.workflow/Contents/document.wflow +++ b/extras/automator-workflows/Open Tabby here.workflow/Contents/document.wflow @@ -59,7 +59,7 @@ ActionParameters COMMAND_STRING - /Applications/Terminus.app/Contents/MacOS/terminus open "$1" + /Applications/Tabby.app/Contents/MacOS/tabby open "$1" CheckedForUserDefaultShell inputMethod diff --git a/extras/automator-workflows/Paste path into Terminus.workflow/Contents/Info.plist b/extras/automator-workflows/Paste path into Tabby.workflow/Contents/Info.plist similarity index 94% rename from extras/automator-workflows/Paste path into Terminus.workflow/Contents/Info.plist rename to extras/automator-workflows/Paste path into Tabby.workflow/Contents/Info.plist index 569b3e8e..9df619e2 100644 --- a/extras/automator-workflows/Paste path into Terminus.workflow/Contents/Info.plist +++ b/extras/automator-workflows/Paste path into Tabby.workflow/Contents/Info.plist @@ -12,7 +12,7 @@ NSMenuItem default - Paste path into Terminus + Paste path into Tabby NSMessage runWorkflowAsService diff --git a/extras/automator-workflows/Paste path into Terminus.workflow/Contents/QuickLook/Thumbnail.png b/extras/automator-workflows/Paste path into Tabby.workflow/Contents/QuickLook/Thumbnail.png similarity index 100% rename from extras/automator-workflows/Paste path into Terminus.workflow/Contents/QuickLook/Thumbnail.png rename to extras/automator-workflows/Paste path into Tabby.workflow/Contents/QuickLook/Thumbnail.png diff --git a/extras/automator-workflows/Paste path into Terminus.workflow/Contents/_CodeSignature/CodeDirectory b/extras/automator-workflows/Paste path into Tabby.workflow/Contents/_CodeSignature/CodeDirectory similarity index 100% rename from extras/automator-workflows/Paste path into Terminus.workflow/Contents/_CodeSignature/CodeDirectory rename to extras/automator-workflows/Paste path into Tabby.workflow/Contents/_CodeSignature/CodeDirectory diff --git a/extras/automator-workflows/Paste path into Terminus.workflow/Contents/_CodeSignature/CodeRequirements b/extras/automator-workflows/Paste path into Tabby.workflow/Contents/_CodeSignature/CodeRequirements similarity index 100% rename from extras/automator-workflows/Paste path into Terminus.workflow/Contents/_CodeSignature/CodeRequirements rename to extras/automator-workflows/Paste path into Tabby.workflow/Contents/_CodeSignature/CodeRequirements diff --git a/extras/automator-workflows/Paste path into Terminus.workflow/Contents/_CodeSignature/CodeRequirements-1 b/extras/automator-workflows/Paste path into Tabby.workflow/Contents/_CodeSignature/CodeRequirements-1 similarity index 100% rename from extras/automator-workflows/Paste path into Terminus.workflow/Contents/_CodeSignature/CodeRequirements-1 rename to extras/automator-workflows/Paste path into Tabby.workflow/Contents/_CodeSignature/CodeRequirements-1 diff --git a/extras/automator-workflows/Paste path into Terminus.workflow/Contents/_CodeSignature/CodeResources b/extras/automator-workflows/Paste path into Tabby.workflow/Contents/_CodeSignature/CodeResources similarity index 100% rename from extras/automator-workflows/Paste path into Terminus.workflow/Contents/_CodeSignature/CodeResources rename to extras/automator-workflows/Paste path into Tabby.workflow/Contents/_CodeSignature/CodeResources diff --git a/extras/automator-workflows/Paste path into Terminus.workflow/Contents/_CodeSignature/CodeSignature b/extras/automator-workflows/Paste path into Tabby.workflow/Contents/_CodeSignature/CodeSignature similarity index 100% rename from extras/automator-workflows/Paste path into Terminus.workflow/Contents/_CodeSignature/CodeSignature rename to extras/automator-workflows/Paste path into Tabby.workflow/Contents/_CodeSignature/CodeSignature diff --git a/extras/automator-workflows/Paste path into Terminus.workflow/Contents/document.wflow b/extras/automator-workflows/Paste path into Tabby.workflow/Contents/document.wflow similarity index 98% rename from extras/automator-workflows/Paste path into Terminus.workflow/Contents/document.wflow rename to extras/automator-workflows/Paste path into Tabby.workflow/Contents/document.wflow index 3ad088c6..d06e93c1 100644 --- a/extras/automator-workflows/Paste path into Terminus.workflow/Contents/document.wflow +++ b/extras/automator-workflows/Paste path into Tabby.workflow/Contents/document.wflow @@ -59,7 +59,7 @@ ActionParameters COMMAND_STRING - /Applications/Terminus.app/Contents/MacOS/terminus paste --escape "$1" + /Applications/Tabby.app/Contents/MacOS/tabby paste --escape "$1" CheckedForUserDefaultShell inputMethod diff --git a/package.json b/package.json index c83bddae..62f215fd 100644 --- a/package.json +++ b/package.json @@ -64,13 +64,13 @@ "**/graceful-fs": "^4.2.4" }, "scripts": { - "build": "npm run build:typings && webpack --color --config app/webpack.main.config.js && webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-local/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js && webpack --color --config terminus-ssh/webpack.config.js && webpack --color --config terminus-serial/webpack.config.js && webpack --color --config terminus-electron/webpack.config.js && webpack --color --config terminus-web/webpack.config.js && webpack --color --config web/webpack.config.js", + "build": "npm run build:typings && webpack --color --config app/webpack.main.config.js && webpack --color --config app/webpack.config.js && webpack --color --config tabby-core/webpack.config.js && webpack --color --config tabby-settings/webpack.config.js && webpack --color --config tabby-terminal/webpack.config.js && webpack --color --config tabby-local/webpack.config.js && webpack --color --config tabby-plugin-manager/webpack.config.js && webpack --color --config tabby-community-color-schemes/webpack.config.js && webpack --color --config tabby-ssh/webpack.config.js && webpack --color --config tabby-serial/webpack.config.js && webpack --color --config tabby-electron/webpack.config.js && webpack --color --config tabby-web/webpack.config.js && webpack --color --config web/webpack.config.js", "build:typings": "node scripts/build-typings.js", - "watch": "cross-env TERMINUS_DEV=1 webpack --progress --color --watch", - "start": "cross-env TERMINUS_DEV=1 electron app --debug --inspect", + "watch": "cross-env TABBY_DEV=1 webpack --progress --color --watch", + "start": "cross-env TABBY_DEV=1 electron app --debug --inspect", "start:prod": "electron app --debug", - "prod": "cross-env TERMINUS_DEV=1 electron app", - "docs": "typedoc --out docs/api --tsconfig terminus-core/src/tsconfig.typings.json terminus-core/src/index.ts && typedoc --out docs/api/terminal --tsconfig terminus-terminal/tsconfig.typings.json terminus-terminal/src/index.ts && typedoc --out docs/api/local --tsconfig terminus-local/tsconfig.typings.json terminus-local/src/index.ts && typedoc --out docs/api/settings --tsconfig terminus-settings/tsconfig.typings.json terminus-settings/src/index.ts", + "prod": "cross-env TABBY_DEV=1 electron app", + "docs": "typedoc --out docs/api --tsconfig tabby-core/src/tsconfig.typings.json tabby-core/src/index.ts && typedoc --out docs/api/terminal --tsconfig tabby-terminal/tsconfig.typings.json tabby-terminal/src/index.ts && typedoc --out docs/api/local --tsconfig tabby-local/tsconfig.typings.json tabby-local/src/index.ts && typedoc --out docs/api/settings --tsconfig tabby-settings/tsconfig.typings.json tabby-settings/src/index.ts", "lint": "eslint --ext ts */src */lib", "postinstall": "node ./scripts/install-deps.js", "patch": "patch-package; cd web; patch-package" diff --git a/patches/app-builder-lib+22.10.5.patch b/patches/app-builder-lib+22.10.5.patch index 3dd4f753..d95648db 100644 --- a/patches/app-builder-lib+22.10.5.patch +++ b/patches/app-builder-lib+22.10.5.patch @@ -5,9 +5,9 @@ index 25a159e..d8a0262 100644 @@ -165,7 +165,7 @@ class AppInfo { get linuxPackageName() { const name = this.name; // https://github.com/electron-userland/electron-builder/issues/2963 - + - return name.startsWith("@") ? this.sanitizedProductName : name; -+ return 'terminus-terminal' ++ return 'tabby-terminal' } - + get sanitizedName() { diff --git a/scripts/build-native.js b/scripts/build-native.js index f3202865..8fb295b6 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -4,7 +4,7 @@ const path = require('path') const vars = require('./vars') let lifecycles = [] -for (let dir of ['app', 'terminus-core', 'terminus-local', 'terminus-ssh', 'terminus-terminal']) { +for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) { const build = rebuild({ buildPath: path.resolve(__dirname, '../' + dir), electronVersion: vars.electronVersion, diff --git a/scripts/prepackage-plugins.js b/scripts/prepackage-plugins.js index ff4eb185..ce5f4769 100755 --- a/scripts/prepackage-plugins.js +++ b/scripts/prepackage-plugins.js @@ -11,7 +11,7 @@ sh.mkdir('-p', target) fs.writeFileSync(path.join(target, 'package.json'), '{}') sh.cd(target) vars.builtinPlugins.forEach(plugin => { - if (plugin === 'terminus-web') { + if (plugin === 'tabby-web') { return } log.info('install', plugin) diff --git a/scripts/vars.js b/scripts/vars.js index c37c0fe5..b2855914 100755 --- a/scripts/vars.js +++ b/scripts/vars.js @@ -14,16 +14,16 @@ if (exports.version.includes('-c')) { } exports.builtinPlugins = [ - 'terminus-core', - 'terminus-settings', - 'terminus-terminal', - 'terminus-electron', - 'terminus-local', - 'terminus-web', - 'terminus-community-color-schemes', - 'terminus-plugin-manager', - 'terminus-ssh', - 'terminus-serial', + 'tabby-core', + 'tabby-settings', + 'tabby-terminal', + 'tabby-electron', + 'tabby-local', + 'tabby-web', + 'tabby-community-color-schemes', + 'tabby-plugin-manager', + 'tabby-ssh', + 'tabby-serial', ] exports.bundledModules = [ '@angular', diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 98eb91bf..b440b798 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,26 +1,26 @@ -name: terminus +name: tabby version: '1.0.0' summary: A terminal for a modern age description: | - Terminus is a terminal heavily inspired by Hyper. It is, however, designed for people who need to get things done. + Tabby is a local, SSH and serial terminal heavily inspired by Hyper. -grade: devel +grade: devel confinement: devmode apps: - terminus: - command: opt/terminus/terminus - + tabby: + command: opt/tabby/tabby + parts: app: plugin: nodejs source: . - build-packages: + build-packages: - libfontconfig-dev override-build: | yarn ./scripts/build-native.js yarn run build ./scripts/build-linux.js - mkdir -p $SNAPCRAFT_PART_INSTALL/opt/terminus || true - cp -ar dist/linux-unpacked/* $SNAPCRAFT_PART_INSTALL/opt/terminus/ + mkdir -p $SNAPCRAFT_PART_INSTALL/opt/tabby || true + cp -ar dist/linux-unpacked/* $SNAPCRAFT_PART_INSTALL/opt/tabby/ diff --git a/terminus-community-color-schemes/.gitignore b/tabby-community-color-schemes/.gitignore similarity index 100% rename from terminus-community-color-schemes/.gitignore rename to tabby-community-color-schemes/.gitignore diff --git a/terminus-community-color-schemes/package.json b/tabby-community-color-schemes/package.json similarity index 65% rename from terminus-community-color-schemes/package.json rename to tabby-community-color-schemes/package.json index dbec8bfc..6cf8fe0a 100644 --- a/terminus-community-color-schemes/package.json +++ b/tabby-community-color-schemes/package.json @@ -1,9 +1,9 @@ { - "name": "terminus-community-color-schemes", + "name": "tabby-community-color-schemes", "version": "1.0.140", - "description": "Community color schemes for Terminus", + "description": "Community color schemes for Tabby", "keywords": [ - "terminus-builtin-plugin" + "tabby-builtin-plugin" ], "main": "dist/index.js", "typings": "typings/index.d.ts", @@ -18,7 +18,7 @@ "license": "MIT", "peerDependencies": { "@angular/core": "^9.1.9", - "terminus-core": "*", - "terminus-terminal": "*" + "tabby-core": "*", + "tabby-terminal": "*" } } diff --git a/terminus-community-color-schemes/schemes/3024 Day b/tabby-community-color-schemes/schemes/3024 Day similarity index 100% rename from terminus-community-color-schemes/schemes/3024 Day rename to tabby-community-color-schemes/schemes/3024 Day diff --git a/terminus-community-color-schemes/schemes/3024 Night b/tabby-community-color-schemes/schemes/3024 Night similarity index 100% rename from terminus-community-color-schemes/schemes/3024 Night rename to tabby-community-color-schemes/schemes/3024 Night diff --git a/terminus-community-color-schemes/schemes/AdventureTime b/tabby-community-color-schemes/schemes/AdventureTime similarity index 100% rename from terminus-community-color-schemes/schemes/AdventureTime rename to tabby-community-color-schemes/schemes/AdventureTime diff --git a/terminus-community-color-schemes/schemes/Afterglow b/tabby-community-color-schemes/schemes/Afterglow similarity index 100% rename from terminus-community-color-schemes/schemes/Afterglow rename to tabby-community-color-schemes/schemes/Afterglow diff --git a/terminus-community-color-schemes/schemes/AlienBlood b/tabby-community-color-schemes/schemes/AlienBlood similarity index 100% rename from terminus-community-color-schemes/schemes/AlienBlood rename to tabby-community-color-schemes/schemes/AlienBlood diff --git a/terminus-community-color-schemes/schemes/Argonaut b/tabby-community-color-schemes/schemes/Argonaut similarity index 100% rename from terminus-community-color-schemes/schemes/Argonaut rename to tabby-community-color-schemes/schemes/Argonaut diff --git a/terminus-community-color-schemes/schemes/Arthur b/tabby-community-color-schemes/schemes/Arthur similarity index 100% rename from terminus-community-color-schemes/schemes/Arthur rename to tabby-community-color-schemes/schemes/Arthur diff --git a/terminus-community-color-schemes/schemes/AtelierSulphurpool b/tabby-community-color-schemes/schemes/AtelierSulphurpool similarity index 100% rename from terminus-community-color-schemes/schemes/AtelierSulphurpool rename to tabby-community-color-schemes/schemes/AtelierSulphurpool diff --git a/terminus-community-color-schemes/schemes/Atom b/tabby-community-color-schemes/schemes/Atom similarity index 100% rename from terminus-community-color-schemes/schemes/Atom rename to tabby-community-color-schemes/schemes/Atom diff --git a/terminus-community-color-schemes/schemes/AtomOneLight b/tabby-community-color-schemes/schemes/AtomOneLight similarity index 100% rename from terminus-community-color-schemes/schemes/AtomOneLight rename to tabby-community-color-schemes/schemes/AtomOneLight diff --git a/terminus-community-color-schemes/schemes/Base16 Default Dark b/tabby-community-color-schemes/schemes/Base16 Default Dark similarity index 100% rename from terminus-community-color-schemes/schemes/Base16 Default Dark rename to tabby-community-color-schemes/schemes/Base16 Default Dark diff --git a/terminus-community-color-schemes/schemes/Batman b/tabby-community-color-schemes/schemes/Batman similarity index 100% rename from terminus-community-color-schemes/schemes/Batman rename to tabby-community-color-schemes/schemes/Batman diff --git a/terminus-community-color-schemes/schemes/Belafonte Day b/tabby-community-color-schemes/schemes/Belafonte Day similarity index 100% rename from terminus-community-color-schemes/schemes/Belafonte Day rename to tabby-community-color-schemes/schemes/Belafonte Day diff --git a/terminus-community-color-schemes/schemes/Belafonte Night b/tabby-community-color-schemes/schemes/Belafonte Night similarity index 100% rename from terminus-community-color-schemes/schemes/Belafonte Night rename to tabby-community-color-schemes/schemes/Belafonte Night diff --git a/terminus-community-color-schemes/schemes/BirdsOfParadise b/tabby-community-color-schemes/schemes/BirdsOfParadise similarity index 100% rename from terminus-community-color-schemes/schemes/BirdsOfParadise rename to tabby-community-color-schemes/schemes/BirdsOfParadise diff --git a/terminus-community-color-schemes/schemes/Blazer b/tabby-community-color-schemes/schemes/Blazer similarity index 100% rename from terminus-community-color-schemes/schemes/Blazer rename to tabby-community-color-schemes/schemes/Blazer diff --git a/terminus-community-color-schemes/schemes/Borland b/tabby-community-color-schemes/schemes/Borland similarity index 100% rename from terminus-community-color-schemes/schemes/Borland rename to tabby-community-color-schemes/schemes/Borland diff --git a/terminus-community-color-schemes/schemes/Bright Lights b/tabby-community-color-schemes/schemes/Bright Lights similarity index 100% rename from terminus-community-color-schemes/schemes/Bright Lights rename to tabby-community-color-schemes/schemes/Bright Lights diff --git a/terminus-community-color-schemes/schemes/Broadcast b/tabby-community-color-schemes/schemes/Broadcast similarity index 100% rename from terminus-community-color-schemes/schemes/Broadcast rename to tabby-community-color-schemes/schemes/Broadcast diff --git a/terminus-community-color-schemes/schemes/Brogrammer b/tabby-community-color-schemes/schemes/Brogrammer similarity index 100% rename from terminus-community-color-schemes/schemes/Brogrammer rename to tabby-community-color-schemes/schemes/Brogrammer diff --git a/terminus-community-color-schemes/schemes/C64 b/tabby-community-color-schemes/schemes/C64 similarity index 100% rename from terminus-community-color-schemes/schemes/C64 rename to tabby-community-color-schemes/schemes/C64 diff --git a/terminus-community-color-schemes/schemes/CLRS b/tabby-community-color-schemes/schemes/CLRS similarity index 100% rename from terminus-community-color-schemes/schemes/CLRS rename to tabby-community-color-schemes/schemes/CLRS diff --git a/terminus-community-color-schemes/schemes/Chalk b/tabby-community-color-schemes/schemes/Chalk similarity index 100% rename from terminus-community-color-schemes/schemes/Chalk rename to tabby-community-color-schemes/schemes/Chalk diff --git a/terminus-community-color-schemes/schemes/Chalkboard b/tabby-community-color-schemes/schemes/Chalkboard similarity index 100% rename from terminus-community-color-schemes/schemes/Chalkboard rename to tabby-community-color-schemes/schemes/Chalkboard diff --git a/terminus-community-color-schemes/schemes/Ciapre b/tabby-community-color-schemes/schemes/Ciapre similarity index 100% rename from terminus-community-color-schemes/schemes/Ciapre rename to tabby-community-color-schemes/schemes/Ciapre diff --git a/terminus-community-color-schemes/schemes/Cobalt Neon b/tabby-community-color-schemes/schemes/Cobalt Neon similarity index 100% rename from terminus-community-color-schemes/schemes/Cobalt Neon rename to tabby-community-color-schemes/schemes/Cobalt Neon diff --git a/terminus-community-color-schemes/schemes/Cobalt2 b/tabby-community-color-schemes/schemes/Cobalt2 similarity index 100% rename from terminus-community-color-schemes/schemes/Cobalt2 rename to tabby-community-color-schemes/schemes/Cobalt2 diff --git a/terminus-community-color-schemes/schemes/CrayonPonyFish b/tabby-community-color-schemes/schemes/CrayonPonyFish similarity index 100% rename from terminus-community-color-schemes/schemes/CrayonPonyFish rename to tabby-community-color-schemes/schemes/CrayonPonyFish diff --git a/terminus-community-color-schemes/schemes/Dark Pastel b/tabby-community-color-schemes/schemes/Dark Pastel similarity index 100% rename from terminus-community-color-schemes/schemes/Dark Pastel rename to tabby-community-color-schemes/schemes/Dark Pastel diff --git a/terminus-community-color-schemes/schemes/Darkside b/tabby-community-color-schemes/schemes/Darkside similarity index 100% rename from terminus-community-color-schemes/schemes/Darkside rename to tabby-community-color-schemes/schemes/Darkside diff --git a/terminus-community-color-schemes/schemes/Desert b/tabby-community-color-schemes/schemes/Desert similarity index 100% rename from terminus-community-color-schemes/schemes/Desert rename to tabby-community-color-schemes/schemes/Desert diff --git a/terminus-community-color-schemes/schemes/DimmedMonokai b/tabby-community-color-schemes/schemes/DimmedMonokai similarity index 100% rename from terminus-community-color-schemes/schemes/DimmedMonokai rename to tabby-community-color-schemes/schemes/DimmedMonokai diff --git a/terminus-community-color-schemes/schemes/DotGov b/tabby-community-color-schemes/schemes/DotGov similarity index 100% rename from terminus-community-color-schemes/schemes/DotGov rename to tabby-community-color-schemes/schemes/DotGov diff --git a/terminus-community-color-schemes/schemes/Dracula b/tabby-community-color-schemes/schemes/Dracula similarity index 100% rename from terminus-community-color-schemes/schemes/Dracula rename to tabby-community-color-schemes/schemes/Dracula diff --git a/terminus-community-color-schemes/schemes/Duotone Dark b/tabby-community-color-schemes/schemes/Duotone Dark similarity index 100% rename from terminus-community-color-schemes/schemes/Duotone Dark rename to tabby-community-color-schemes/schemes/Duotone Dark diff --git a/terminus-community-color-schemes/schemes/ENCOM b/tabby-community-color-schemes/schemes/ENCOM similarity index 100% rename from terminus-community-color-schemes/schemes/ENCOM rename to tabby-community-color-schemes/schemes/ENCOM diff --git a/terminus-community-color-schemes/schemes/Earthsong b/tabby-community-color-schemes/schemes/Earthsong similarity index 100% rename from terminus-community-color-schemes/schemes/Earthsong rename to tabby-community-color-schemes/schemes/Earthsong diff --git a/terminus-community-color-schemes/schemes/Elemental b/tabby-community-color-schemes/schemes/Elemental similarity index 100% rename from terminus-community-color-schemes/schemes/Elemental rename to tabby-community-color-schemes/schemes/Elemental diff --git a/terminus-community-color-schemes/schemes/Elementary b/tabby-community-color-schemes/schemes/Elementary similarity index 100% rename from terminus-community-color-schemes/schemes/Elementary rename to tabby-community-color-schemes/schemes/Elementary diff --git a/terminus-community-color-schemes/schemes/Espresso b/tabby-community-color-schemes/schemes/Espresso similarity index 100% rename from terminus-community-color-schemes/schemes/Espresso rename to tabby-community-color-schemes/schemes/Espresso diff --git a/terminus-community-color-schemes/schemes/Espresso Libre b/tabby-community-color-schemes/schemes/Espresso Libre similarity index 100% rename from terminus-community-color-schemes/schemes/Espresso Libre rename to tabby-community-color-schemes/schemes/Espresso Libre diff --git a/terminus-community-color-schemes/schemes/Fideloper b/tabby-community-color-schemes/schemes/Fideloper similarity index 100% rename from terminus-community-color-schemes/schemes/Fideloper rename to tabby-community-color-schemes/schemes/Fideloper diff --git a/terminus-community-color-schemes/schemes/FirefoxDev b/tabby-community-color-schemes/schemes/FirefoxDev similarity index 100% rename from terminus-community-color-schemes/schemes/FirefoxDev rename to tabby-community-color-schemes/schemes/FirefoxDev diff --git a/terminus-community-color-schemes/schemes/Firewatch b/tabby-community-color-schemes/schemes/Firewatch similarity index 100% rename from terminus-community-color-schemes/schemes/Firewatch rename to tabby-community-color-schemes/schemes/Firewatch diff --git a/terminus-community-color-schemes/schemes/FishTank b/tabby-community-color-schemes/schemes/FishTank similarity index 100% rename from terminus-community-color-schemes/schemes/FishTank rename to tabby-community-color-schemes/schemes/FishTank diff --git a/terminus-community-color-schemes/schemes/Flat b/tabby-community-color-schemes/schemes/Flat similarity index 100% rename from terminus-community-color-schemes/schemes/Flat rename to tabby-community-color-schemes/schemes/Flat diff --git a/terminus-community-color-schemes/schemes/Flatland b/tabby-community-color-schemes/schemes/Flatland similarity index 100% rename from terminus-community-color-schemes/schemes/Flatland rename to tabby-community-color-schemes/schemes/Flatland diff --git a/terminus-community-color-schemes/schemes/Floraverse b/tabby-community-color-schemes/schemes/Floraverse similarity index 100% rename from terminus-community-color-schemes/schemes/Floraverse rename to tabby-community-color-schemes/schemes/Floraverse diff --git a/terminus-community-color-schemes/schemes/ForestBlue b/tabby-community-color-schemes/schemes/ForestBlue similarity index 100% rename from terminus-community-color-schemes/schemes/ForestBlue rename to tabby-community-color-schemes/schemes/ForestBlue diff --git a/terminus-community-color-schemes/schemes/FrontEndDelight b/tabby-community-color-schemes/schemes/FrontEndDelight similarity index 100% rename from terminus-community-color-schemes/schemes/FrontEndDelight rename to tabby-community-color-schemes/schemes/FrontEndDelight diff --git a/terminus-community-color-schemes/schemes/FunForrest b/tabby-community-color-schemes/schemes/FunForrest similarity index 100% rename from terminus-community-color-schemes/schemes/FunForrest rename to tabby-community-color-schemes/schemes/FunForrest diff --git a/terminus-community-color-schemes/schemes/Galaxy b/tabby-community-color-schemes/schemes/Galaxy similarity index 100% rename from terminus-community-color-schemes/schemes/Galaxy rename to tabby-community-color-schemes/schemes/Galaxy diff --git a/terminus-community-color-schemes/schemes/Github b/tabby-community-color-schemes/schemes/Github similarity index 100% rename from terminus-community-color-schemes/schemes/Github rename to tabby-community-color-schemes/schemes/Github diff --git a/terminus-community-color-schemes/schemes/Glacier b/tabby-community-color-schemes/schemes/Glacier similarity index 100% rename from terminus-community-color-schemes/schemes/Glacier rename to tabby-community-color-schemes/schemes/Glacier diff --git a/terminus-community-color-schemes/schemes/Grape b/tabby-community-color-schemes/schemes/Grape similarity index 100% rename from terminus-community-color-schemes/schemes/Grape rename to tabby-community-color-schemes/schemes/Grape diff --git a/terminus-community-color-schemes/schemes/Grass b/tabby-community-color-schemes/schemes/Grass similarity index 100% rename from terminus-community-color-schemes/schemes/Grass rename to tabby-community-color-schemes/schemes/Grass diff --git a/terminus-community-color-schemes/schemes/Gruvbox Dark b/tabby-community-color-schemes/schemes/Gruvbox Dark similarity index 100% rename from terminus-community-color-schemes/schemes/Gruvbox Dark rename to tabby-community-color-schemes/schemes/Gruvbox Dark diff --git a/terminus-community-color-schemes/schemes/Hardcore b/tabby-community-color-schemes/schemes/Hardcore similarity index 100% rename from terminus-community-color-schemes/schemes/Hardcore rename to tabby-community-color-schemes/schemes/Hardcore diff --git a/terminus-community-color-schemes/schemes/Harper b/tabby-community-color-schemes/schemes/Harper similarity index 100% rename from terminus-community-color-schemes/schemes/Harper rename to tabby-community-color-schemes/schemes/Harper diff --git a/terminus-community-color-schemes/schemes/Highway b/tabby-community-color-schemes/schemes/Highway similarity index 100% rename from terminus-community-color-schemes/schemes/Highway rename to tabby-community-color-schemes/schemes/Highway diff --git a/terminus-community-color-schemes/schemes/Hipster Green b/tabby-community-color-schemes/schemes/Hipster Green similarity index 100% rename from terminus-community-color-schemes/schemes/Hipster Green rename to tabby-community-color-schemes/schemes/Hipster Green diff --git a/terminus-community-color-schemes/schemes/Homebrew b/tabby-community-color-schemes/schemes/Homebrew similarity index 100% rename from terminus-community-color-schemes/schemes/Homebrew rename to tabby-community-color-schemes/schemes/Homebrew diff --git a/terminus-community-color-schemes/schemes/Hurtado b/tabby-community-color-schemes/schemes/Hurtado similarity index 100% rename from terminus-community-color-schemes/schemes/Hurtado rename to tabby-community-color-schemes/schemes/Hurtado diff --git a/terminus-community-color-schemes/schemes/Hybrid b/tabby-community-color-schemes/schemes/Hybrid similarity index 100% rename from terminus-community-color-schemes/schemes/Hybrid rename to tabby-community-color-schemes/schemes/Hybrid diff --git a/terminus-community-color-schemes/schemes/IC_Green_PPL b/tabby-community-color-schemes/schemes/IC_Green_PPL similarity index 100% rename from terminus-community-color-schemes/schemes/IC_Green_PPL rename to tabby-community-color-schemes/schemes/IC_Green_PPL diff --git a/terminus-community-color-schemes/schemes/IC_Orange_PPL b/tabby-community-color-schemes/schemes/IC_Orange_PPL similarity index 100% rename from terminus-community-color-schemes/schemes/IC_Orange_PPL rename to tabby-community-color-schemes/schemes/IC_Orange_PPL diff --git a/terminus-community-color-schemes/schemes/IR_Black b/tabby-community-color-schemes/schemes/IR_Black similarity index 100% rename from terminus-community-color-schemes/schemes/IR_Black rename to tabby-community-color-schemes/schemes/IR_Black diff --git a/terminus-community-color-schemes/schemes/Iceberg b/tabby-community-color-schemes/schemes/Iceberg similarity index 100% rename from terminus-community-color-schemes/schemes/Iceberg rename to tabby-community-color-schemes/schemes/Iceberg diff --git a/terminus-community-color-schemes/schemes/Jackie Brown b/tabby-community-color-schemes/schemes/Jackie Brown similarity index 100% rename from terminus-community-color-schemes/schemes/Jackie Brown rename to tabby-community-color-schemes/schemes/Jackie Brown diff --git a/terminus-community-color-schemes/schemes/Japanesque b/tabby-community-color-schemes/schemes/Japanesque similarity index 100% rename from terminus-community-color-schemes/schemes/Japanesque rename to tabby-community-color-schemes/schemes/Japanesque diff --git a/terminus-community-color-schemes/schemes/Jellybeans b/tabby-community-color-schemes/schemes/Jellybeans similarity index 100% rename from terminus-community-color-schemes/schemes/Jellybeans rename to tabby-community-color-schemes/schemes/Jellybeans diff --git a/terminus-community-color-schemes/schemes/JetBrains Darcula b/tabby-community-color-schemes/schemes/JetBrains Darcula similarity index 100% rename from terminus-community-color-schemes/schemes/JetBrains Darcula rename to tabby-community-color-schemes/schemes/JetBrains Darcula diff --git a/terminus-community-color-schemes/schemes/Kibble b/tabby-community-color-schemes/schemes/Kibble similarity index 100% rename from terminus-community-color-schemes/schemes/Kibble rename to tabby-community-color-schemes/schemes/Kibble diff --git a/terminus-community-color-schemes/schemes/Later This Evening b/tabby-community-color-schemes/schemes/Later This Evening similarity index 100% rename from terminus-community-color-schemes/schemes/Later This Evening rename to tabby-community-color-schemes/schemes/Later This Evening diff --git a/terminus-community-color-schemes/schemes/Lavandula b/tabby-community-color-schemes/schemes/Lavandula similarity index 100% rename from terminus-community-color-schemes/schemes/Lavandula rename to tabby-community-color-schemes/schemes/Lavandula diff --git a/terminus-community-color-schemes/schemes/LiquidCarbon b/tabby-community-color-schemes/schemes/LiquidCarbon similarity index 100% rename from terminus-community-color-schemes/schemes/LiquidCarbon rename to tabby-community-color-schemes/schemes/LiquidCarbon diff --git a/terminus-community-color-schemes/schemes/LiquidCarbonTransparent b/tabby-community-color-schemes/schemes/LiquidCarbonTransparent similarity index 100% rename from terminus-community-color-schemes/schemes/LiquidCarbonTransparent rename to tabby-community-color-schemes/schemes/LiquidCarbonTransparent diff --git a/terminus-community-color-schemes/schemes/LiquidCarbonTransparentInverse b/tabby-community-color-schemes/schemes/LiquidCarbonTransparentInverse similarity index 100% rename from terminus-community-color-schemes/schemes/LiquidCarbonTransparentInverse rename to tabby-community-color-schemes/schemes/LiquidCarbonTransparentInverse diff --git a/terminus-community-color-schemes/schemes/Man Page b/tabby-community-color-schemes/schemes/Man Page similarity index 100% rename from terminus-community-color-schemes/schemes/Man Page rename to tabby-community-color-schemes/schemes/Man Page diff --git a/terminus-community-color-schemes/schemes/Material b/tabby-community-color-schemes/schemes/Material similarity index 100% rename from terminus-community-color-schemes/schemes/Material rename to tabby-community-color-schemes/schemes/Material diff --git a/terminus-community-color-schemes/schemes/MaterialDark b/tabby-community-color-schemes/schemes/MaterialDark similarity index 100% rename from terminus-community-color-schemes/schemes/MaterialDark rename to tabby-community-color-schemes/schemes/MaterialDark diff --git a/terminus-community-color-schemes/schemes/Mathias b/tabby-community-color-schemes/schemes/Mathias similarity index 100% rename from terminus-community-color-schemes/schemes/Mathias rename to tabby-community-color-schemes/schemes/Mathias diff --git a/terminus-community-color-schemes/schemes/Medallion b/tabby-community-color-schemes/schemes/Medallion similarity index 100% rename from terminus-community-color-schemes/schemes/Medallion rename to tabby-community-color-schemes/schemes/Medallion diff --git a/terminus-community-color-schemes/schemes/Misterioso b/tabby-community-color-schemes/schemes/Misterioso similarity index 100% rename from terminus-community-color-schemes/schemes/Misterioso rename to tabby-community-color-schemes/schemes/Misterioso diff --git a/terminus-community-color-schemes/schemes/Molokai b/tabby-community-color-schemes/schemes/Molokai similarity index 100% rename from terminus-community-color-schemes/schemes/Molokai rename to tabby-community-color-schemes/schemes/Molokai diff --git a/terminus-community-color-schemes/schemes/MonaLisa b/tabby-community-color-schemes/schemes/MonaLisa similarity index 100% rename from terminus-community-color-schemes/schemes/MonaLisa rename to tabby-community-color-schemes/schemes/MonaLisa diff --git a/terminus-community-color-schemes/schemes/Monokai Soda b/tabby-community-color-schemes/schemes/Monokai Soda similarity index 100% rename from terminus-community-color-schemes/schemes/Monokai Soda rename to tabby-community-color-schemes/schemes/Monokai Soda diff --git a/terminus-community-color-schemes/schemes/Monokai Vivid b/tabby-community-color-schemes/schemes/Monokai Vivid similarity index 100% rename from terminus-community-color-schemes/schemes/Monokai Vivid rename to tabby-community-color-schemes/schemes/Monokai Vivid diff --git a/terminus-community-color-schemes/schemes/N0tch2k b/tabby-community-color-schemes/schemes/N0tch2k similarity index 100% rename from terminus-community-color-schemes/schemes/N0tch2k rename to tabby-community-color-schemes/schemes/N0tch2k diff --git a/terminus-community-color-schemes/schemes/Neopolitan b/tabby-community-color-schemes/schemes/Neopolitan similarity index 100% rename from terminus-community-color-schemes/schemes/Neopolitan rename to tabby-community-color-schemes/schemes/Neopolitan diff --git a/terminus-community-color-schemes/schemes/Neutron b/tabby-community-color-schemes/schemes/Neutron similarity index 100% rename from terminus-community-color-schemes/schemes/Neutron rename to tabby-community-color-schemes/schemes/Neutron diff --git a/terminus-community-color-schemes/schemes/NightLion v1 b/tabby-community-color-schemes/schemes/NightLion v1 similarity index 100% rename from terminus-community-color-schemes/schemes/NightLion v1 rename to tabby-community-color-schemes/schemes/NightLion v1 diff --git a/terminus-community-color-schemes/schemes/NightLion v2 b/tabby-community-color-schemes/schemes/NightLion v2 similarity index 100% rename from terminus-community-color-schemes/schemes/NightLion v2 rename to tabby-community-color-schemes/schemes/NightLion v2 diff --git a/terminus-community-color-schemes/schemes/Nord b/tabby-community-color-schemes/schemes/Nord similarity index 100% rename from terminus-community-color-schemes/schemes/Nord rename to tabby-community-color-schemes/schemes/Nord diff --git a/terminus-community-color-schemes/schemes/Novel b/tabby-community-color-schemes/schemes/Novel similarity index 100% rename from terminus-community-color-schemes/schemes/Novel rename to tabby-community-color-schemes/schemes/Novel diff --git a/terminus-community-color-schemes/schemes/Obsidian b/tabby-community-color-schemes/schemes/Obsidian similarity index 100% rename from terminus-community-color-schemes/schemes/Obsidian rename to tabby-community-color-schemes/schemes/Obsidian diff --git a/terminus-community-color-schemes/schemes/Ocean b/tabby-community-color-schemes/schemes/Ocean similarity index 100% rename from terminus-community-color-schemes/schemes/Ocean rename to tabby-community-color-schemes/schemes/Ocean diff --git a/terminus-community-color-schemes/schemes/OceanicMaterial b/tabby-community-color-schemes/schemes/OceanicMaterial similarity index 100% rename from terminus-community-color-schemes/schemes/OceanicMaterial rename to tabby-community-color-schemes/schemes/OceanicMaterial diff --git a/terminus-community-color-schemes/schemes/Ollie b/tabby-community-color-schemes/schemes/Ollie similarity index 100% rename from terminus-community-color-schemes/schemes/Ollie rename to tabby-community-color-schemes/schemes/Ollie diff --git a/terminus-community-color-schemes/schemes/OneHalfDark b/tabby-community-color-schemes/schemes/OneHalfDark similarity index 100% rename from terminus-community-color-schemes/schemes/OneHalfDark rename to tabby-community-color-schemes/schemes/OneHalfDark diff --git a/terminus-community-color-schemes/schemes/OneHalfLight b/tabby-community-color-schemes/schemes/OneHalfLight similarity index 100% rename from terminus-community-color-schemes/schemes/OneHalfLight rename to tabby-community-color-schemes/schemes/OneHalfLight diff --git a/terminus-community-color-schemes/schemes/Pandora b/tabby-community-color-schemes/schemes/Pandora similarity index 100% rename from terminus-community-color-schemes/schemes/Pandora rename to tabby-community-color-schemes/schemes/Pandora diff --git a/terminus-community-color-schemes/schemes/Paraiso Dark b/tabby-community-color-schemes/schemes/Paraiso Dark similarity index 100% rename from terminus-community-color-schemes/schemes/Paraiso Dark rename to tabby-community-color-schemes/schemes/Paraiso Dark diff --git a/terminus-community-color-schemes/schemes/Parasio Dark b/tabby-community-color-schemes/schemes/Parasio Dark similarity index 100% rename from terminus-community-color-schemes/schemes/Parasio Dark rename to tabby-community-color-schemes/schemes/Parasio Dark diff --git a/terminus-community-color-schemes/schemes/PaulMillr b/tabby-community-color-schemes/schemes/PaulMillr similarity index 100% rename from terminus-community-color-schemes/schemes/PaulMillr rename to tabby-community-color-schemes/schemes/PaulMillr diff --git a/terminus-community-color-schemes/schemes/PencilDark b/tabby-community-color-schemes/schemes/PencilDark similarity index 100% rename from terminus-community-color-schemes/schemes/PencilDark rename to tabby-community-color-schemes/schemes/PencilDark diff --git a/terminus-community-color-schemes/schemes/PencilLight b/tabby-community-color-schemes/schemes/PencilLight similarity index 100% rename from terminus-community-color-schemes/schemes/PencilLight rename to tabby-community-color-schemes/schemes/PencilLight diff --git a/terminus-community-color-schemes/schemes/Piatto Light b/tabby-community-color-schemes/schemes/Piatto Light similarity index 100% rename from terminus-community-color-schemes/schemes/Piatto Light rename to tabby-community-color-schemes/schemes/Piatto Light diff --git a/terminus-community-color-schemes/schemes/Pnevma b/tabby-community-color-schemes/schemes/Pnevma similarity index 100% rename from terminus-community-color-schemes/schemes/Pnevma rename to tabby-community-color-schemes/schemes/Pnevma diff --git a/terminus-community-color-schemes/schemes/Pro b/tabby-community-color-schemes/schemes/Pro similarity index 100% rename from terminus-community-color-schemes/schemes/Pro rename to tabby-community-color-schemes/schemes/Pro diff --git a/terminus-community-color-schemes/schemes/Red Alert b/tabby-community-color-schemes/schemes/Red Alert similarity index 100% rename from terminus-community-color-schemes/schemes/Red Alert rename to tabby-community-color-schemes/schemes/Red Alert diff --git a/terminus-community-color-schemes/schemes/Red Sands b/tabby-community-color-schemes/schemes/Red Sands similarity index 100% rename from terminus-community-color-schemes/schemes/Red Sands rename to tabby-community-color-schemes/schemes/Red Sands diff --git a/terminus-community-color-schemes/schemes/Relaxed b/tabby-community-color-schemes/schemes/Relaxed similarity index 100% rename from terminus-community-color-schemes/schemes/Relaxed rename to tabby-community-color-schemes/schemes/Relaxed diff --git a/terminus-community-color-schemes/schemes/Rippedcasts b/tabby-community-color-schemes/schemes/Rippedcasts similarity index 100% rename from terminus-community-color-schemes/schemes/Rippedcasts rename to tabby-community-color-schemes/schemes/Rippedcasts diff --git a/terminus-community-color-schemes/schemes/Royal b/tabby-community-color-schemes/schemes/Royal similarity index 100% rename from terminus-community-color-schemes/schemes/Royal rename to tabby-community-color-schemes/schemes/Royal diff --git a/terminus-community-color-schemes/schemes/Ryuuko b/tabby-community-color-schemes/schemes/Ryuuko similarity index 100% rename from terminus-community-color-schemes/schemes/Ryuuko rename to tabby-community-color-schemes/schemes/Ryuuko diff --git a/terminus-community-color-schemes/schemes/SeaShells b/tabby-community-color-schemes/schemes/SeaShells similarity index 100% rename from terminus-community-color-schemes/schemes/SeaShells rename to tabby-community-color-schemes/schemes/SeaShells diff --git a/terminus-community-color-schemes/schemes/Seafoam Pastel b/tabby-community-color-schemes/schemes/Seafoam Pastel similarity index 100% rename from terminus-community-color-schemes/schemes/Seafoam Pastel rename to tabby-community-color-schemes/schemes/Seafoam Pastel diff --git a/terminus-community-color-schemes/schemes/Seti b/tabby-community-color-schemes/schemes/Seti similarity index 100% rename from terminus-community-color-schemes/schemes/Seti rename to tabby-community-color-schemes/schemes/Seti diff --git a/terminus-community-color-schemes/schemes/Shaman b/tabby-community-color-schemes/schemes/Shaman similarity index 100% rename from terminus-community-color-schemes/schemes/Shaman rename to tabby-community-color-schemes/schemes/Shaman diff --git a/terminus-community-color-schemes/schemes/Slate b/tabby-community-color-schemes/schemes/Slate similarity index 100% rename from terminus-community-color-schemes/schemes/Slate rename to tabby-community-color-schemes/schemes/Slate diff --git a/terminus-community-color-schemes/schemes/Smyck b/tabby-community-color-schemes/schemes/Smyck similarity index 100% rename from terminus-community-color-schemes/schemes/Smyck rename to tabby-community-color-schemes/schemes/Smyck diff --git a/terminus-community-color-schemes/schemes/SoftServer b/tabby-community-color-schemes/schemes/SoftServer similarity index 100% rename from terminus-community-color-schemes/schemes/SoftServer rename to tabby-community-color-schemes/schemes/SoftServer diff --git a/terminus-community-color-schemes/schemes/Solarized Darcula b/tabby-community-color-schemes/schemes/Solarized Darcula similarity index 100% rename from terminus-community-color-schemes/schemes/Solarized Darcula rename to tabby-community-color-schemes/schemes/Solarized Darcula diff --git a/terminus-community-color-schemes/schemes/Solarized Dark b/tabby-community-color-schemes/schemes/Solarized Dark similarity index 100% rename from terminus-community-color-schemes/schemes/Solarized Dark rename to tabby-community-color-schemes/schemes/Solarized Dark diff --git a/terminus-community-color-schemes/schemes/Solarized Dark - Patched b/tabby-community-color-schemes/schemes/Solarized Dark - Patched similarity index 100% rename from terminus-community-color-schemes/schemes/Solarized Dark - Patched rename to tabby-community-color-schemes/schemes/Solarized Dark - Patched diff --git a/terminus-community-color-schemes/schemes/Solarized Dark Higher Contrast b/tabby-community-color-schemes/schemes/Solarized Dark Higher Contrast similarity index 100% rename from terminus-community-color-schemes/schemes/Solarized Dark Higher Contrast rename to tabby-community-color-schemes/schemes/Solarized Dark Higher Contrast diff --git a/terminus-community-color-schemes/schemes/Solarized Light b/tabby-community-color-schemes/schemes/Solarized Light similarity index 100% rename from terminus-community-color-schemes/schemes/Solarized Light rename to tabby-community-color-schemes/schemes/Solarized Light diff --git a/terminus-community-color-schemes/schemes/SpaceGray b/tabby-community-color-schemes/schemes/SpaceGray similarity index 100% rename from terminus-community-color-schemes/schemes/SpaceGray rename to tabby-community-color-schemes/schemes/SpaceGray diff --git a/terminus-community-color-schemes/schemes/SpaceGray Eighties b/tabby-community-color-schemes/schemes/SpaceGray Eighties similarity index 100% rename from terminus-community-color-schemes/schemes/SpaceGray Eighties rename to tabby-community-color-schemes/schemes/SpaceGray Eighties diff --git a/terminus-community-color-schemes/schemes/SpaceGray Eighties Dull b/tabby-community-color-schemes/schemes/SpaceGray Eighties Dull similarity index 100% rename from terminus-community-color-schemes/schemes/SpaceGray Eighties Dull rename to tabby-community-color-schemes/schemes/SpaceGray Eighties Dull diff --git a/terminus-community-color-schemes/schemes/Spacedust b/tabby-community-color-schemes/schemes/Spacedust similarity index 100% rename from terminus-community-color-schemes/schemes/Spacedust rename to tabby-community-color-schemes/schemes/Spacedust diff --git a/terminus-community-color-schemes/schemes/Spiderman b/tabby-community-color-schemes/schemes/Spiderman similarity index 100% rename from terminus-community-color-schemes/schemes/Spiderman rename to tabby-community-color-schemes/schemes/Spiderman diff --git a/terminus-community-color-schemes/schemes/Spring b/tabby-community-color-schemes/schemes/Spring similarity index 100% rename from terminus-community-color-schemes/schemes/Spring rename to tabby-community-color-schemes/schemes/Spring diff --git a/terminus-community-color-schemes/schemes/Square b/tabby-community-color-schemes/schemes/Square similarity index 100% rename from terminus-community-color-schemes/schemes/Square rename to tabby-community-color-schemes/schemes/Square diff --git a/terminus-community-color-schemes/schemes/Sundried b/tabby-community-color-schemes/schemes/Sundried similarity index 100% rename from terminus-community-color-schemes/schemes/Sundried rename to tabby-community-color-schemes/schemes/Sundried diff --git a/terminus-community-color-schemes/schemes/Symfonic b/tabby-community-color-schemes/schemes/Symfonic similarity index 100% rename from terminus-community-color-schemes/schemes/Symfonic rename to tabby-community-color-schemes/schemes/Symfonic diff --git a/terminus-community-color-schemes/schemes/Tango b/tabby-community-color-schemes/schemes/Tango similarity index 100% rename from terminus-community-color-schemes/schemes/Tango rename to tabby-community-color-schemes/schemes/Tango diff --git a/terminus-community-color-schemes/schemes/Teerb b/tabby-community-color-schemes/schemes/Teerb similarity index 100% rename from terminus-community-color-schemes/schemes/Teerb rename to tabby-community-color-schemes/schemes/Teerb diff --git a/terminus-community-color-schemes/schemes/Terminal Basic b/tabby-community-color-schemes/schemes/Terminal Basic similarity index 100% rename from terminus-community-color-schemes/schemes/Terminal Basic rename to tabby-community-color-schemes/schemes/Terminal Basic diff --git a/terminus-community-color-schemes/schemes/Thayer Bright b/tabby-community-color-schemes/schemes/Thayer Bright similarity index 100% rename from terminus-community-color-schemes/schemes/Thayer Bright rename to tabby-community-color-schemes/schemes/Thayer Bright diff --git a/terminus-community-color-schemes/schemes/The Hulk b/tabby-community-color-schemes/schemes/The Hulk similarity index 100% rename from terminus-community-color-schemes/schemes/The Hulk rename to tabby-community-color-schemes/schemes/The Hulk diff --git a/terminus-community-color-schemes/schemes/Tomorrow b/tabby-community-color-schemes/schemes/Tomorrow similarity index 100% rename from terminus-community-color-schemes/schemes/Tomorrow rename to tabby-community-color-schemes/schemes/Tomorrow diff --git a/terminus-community-color-schemes/schemes/Tomorrow Night b/tabby-community-color-schemes/schemes/Tomorrow Night similarity index 100% rename from terminus-community-color-schemes/schemes/Tomorrow Night rename to tabby-community-color-schemes/schemes/Tomorrow Night diff --git a/terminus-community-color-schemes/schemes/Tomorrow Night Blue b/tabby-community-color-schemes/schemes/Tomorrow Night Blue similarity index 100% rename from terminus-community-color-schemes/schemes/Tomorrow Night Blue rename to tabby-community-color-schemes/schemes/Tomorrow Night Blue diff --git a/terminus-community-color-schemes/schemes/Tomorrow Night Bright b/tabby-community-color-schemes/schemes/Tomorrow Night Bright similarity index 100% rename from terminus-community-color-schemes/schemes/Tomorrow Night Bright rename to tabby-community-color-schemes/schemes/Tomorrow Night Bright diff --git a/terminus-community-color-schemes/schemes/Tomorrow Night Eighties b/tabby-community-color-schemes/schemes/Tomorrow Night Eighties similarity index 100% rename from terminus-community-color-schemes/schemes/Tomorrow Night Eighties rename to tabby-community-color-schemes/schemes/Tomorrow Night Eighties diff --git a/terminus-community-color-schemes/schemes/ToyChest b/tabby-community-color-schemes/schemes/ToyChest similarity index 100% rename from terminus-community-color-schemes/schemes/ToyChest rename to tabby-community-color-schemes/schemes/ToyChest diff --git a/terminus-community-color-schemes/schemes/Treehouse b/tabby-community-color-schemes/schemes/Treehouse similarity index 100% rename from terminus-community-color-schemes/schemes/Treehouse rename to tabby-community-color-schemes/schemes/Treehouse diff --git a/terminus-community-color-schemes/schemes/Twilight b/tabby-community-color-schemes/schemes/Twilight similarity index 100% rename from terminus-community-color-schemes/schemes/Twilight rename to tabby-community-color-schemes/schemes/Twilight diff --git a/terminus-community-color-schemes/schemes/Ubuntu b/tabby-community-color-schemes/schemes/Ubuntu similarity index 100% rename from terminus-community-color-schemes/schemes/Ubuntu rename to tabby-community-color-schemes/schemes/Ubuntu diff --git a/terminus-community-color-schemes/schemes/UnderTheSea b/tabby-community-color-schemes/schemes/UnderTheSea similarity index 100% rename from terminus-community-color-schemes/schemes/UnderTheSea rename to tabby-community-color-schemes/schemes/UnderTheSea diff --git a/terminus-community-color-schemes/schemes/Urple b/tabby-community-color-schemes/schemes/Urple similarity index 100% rename from terminus-community-color-schemes/schemes/Urple rename to tabby-community-color-schemes/schemes/Urple diff --git a/terminus-community-color-schemes/schemes/Vaughn b/tabby-community-color-schemes/schemes/Vaughn similarity index 100% rename from terminus-community-color-schemes/schemes/Vaughn rename to tabby-community-color-schemes/schemes/Vaughn diff --git a/terminus-community-color-schemes/schemes/VibrantInk b/tabby-community-color-schemes/schemes/VibrantInk similarity index 100% rename from terminus-community-color-schemes/schemes/VibrantInk rename to tabby-community-color-schemes/schemes/VibrantInk diff --git a/terminus-community-color-schemes/schemes/Violet Dark b/tabby-community-color-schemes/schemes/Violet Dark similarity index 100% rename from terminus-community-color-schemes/schemes/Violet Dark rename to tabby-community-color-schemes/schemes/Violet Dark diff --git a/terminus-community-color-schemes/schemes/Violet Light b/tabby-community-color-schemes/schemes/Violet Light similarity index 100% rename from terminus-community-color-schemes/schemes/Violet Light rename to tabby-community-color-schemes/schemes/Violet Light diff --git a/terminus-community-color-schemes/schemes/WarmNeon b/tabby-community-color-schemes/schemes/WarmNeon similarity index 100% rename from terminus-community-color-schemes/schemes/WarmNeon rename to tabby-community-color-schemes/schemes/WarmNeon diff --git a/terminus-community-color-schemes/schemes/Wez b/tabby-community-color-schemes/schemes/Wez similarity index 100% rename from terminus-community-color-schemes/schemes/Wez rename to tabby-community-color-schemes/schemes/Wez diff --git a/terminus-community-color-schemes/schemes/WildCherry b/tabby-community-color-schemes/schemes/WildCherry similarity index 100% rename from terminus-community-color-schemes/schemes/WildCherry rename to tabby-community-color-schemes/schemes/WildCherry diff --git a/terminus-community-color-schemes/schemes/Wombat b/tabby-community-color-schemes/schemes/Wombat similarity index 100% rename from terminus-community-color-schemes/schemes/Wombat rename to tabby-community-color-schemes/schemes/Wombat diff --git a/terminus-community-color-schemes/schemes/Wryan b/tabby-community-color-schemes/schemes/Wryan similarity index 100% rename from terminus-community-color-schemes/schemes/Wryan rename to tabby-community-color-schemes/schemes/Wryan diff --git a/terminus-community-color-schemes/schemes/Zenburn b/tabby-community-color-schemes/schemes/Zenburn similarity index 100% rename from terminus-community-color-schemes/schemes/Zenburn rename to tabby-community-color-schemes/schemes/Zenburn diff --git a/terminus-community-color-schemes/schemes/ayu b/tabby-community-color-schemes/schemes/ayu similarity index 100% rename from terminus-community-color-schemes/schemes/ayu rename to tabby-community-color-schemes/schemes/ayu diff --git a/terminus-community-color-schemes/schemes/ayu_light b/tabby-community-color-schemes/schemes/ayu_light similarity index 100% rename from terminus-community-color-schemes/schemes/ayu_light rename to tabby-community-color-schemes/schemes/ayu_light diff --git a/terminus-community-color-schemes/schemes/base2tone-cave-dark b/tabby-community-color-schemes/schemes/base2tone-cave-dark similarity index 100% rename from terminus-community-color-schemes/schemes/base2tone-cave-dark rename to tabby-community-color-schemes/schemes/base2tone-cave-dark diff --git a/terminus-community-color-schemes/schemes/base2tone-desert-dark b/tabby-community-color-schemes/schemes/base2tone-desert-dark similarity index 100% rename from terminus-community-color-schemes/schemes/base2tone-desert-dark rename to tabby-community-color-schemes/schemes/base2tone-desert-dark diff --git a/terminus-community-color-schemes/schemes/base2tone-drawbridge-dark b/tabby-community-color-schemes/schemes/base2tone-drawbridge-dark similarity index 100% rename from terminus-community-color-schemes/schemes/base2tone-drawbridge-dark rename to tabby-community-color-schemes/schemes/base2tone-drawbridge-dark diff --git a/terminus-community-color-schemes/schemes/base2tone-evening-dark b/tabby-community-color-schemes/schemes/base2tone-evening-dark similarity index 100% rename from terminus-community-color-schemes/schemes/base2tone-evening-dark rename to tabby-community-color-schemes/schemes/base2tone-evening-dark diff --git a/terminus-community-color-schemes/schemes/base2tone-forest-dark b/tabby-community-color-schemes/schemes/base2tone-forest-dark similarity index 100% rename from terminus-community-color-schemes/schemes/base2tone-forest-dark rename to tabby-community-color-schemes/schemes/base2tone-forest-dark diff --git a/terminus-community-color-schemes/schemes/base2tone-heath-dark b/tabby-community-color-schemes/schemes/base2tone-heath-dark similarity index 100% rename from terminus-community-color-schemes/schemes/base2tone-heath-dark rename to tabby-community-color-schemes/schemes/base2tone-heath-dark diff --git a/terminus-community-color-schemes/schemes/base2tone-heath-light b/tabby-community-color-schemes/schemes/base2tone-heath-light similarity index 100% rename from terminus-community-color-schemes/schemes/base2tone-heath-light rename to tabby-community-color-schemes/schemes/base2tone-heath-light diff --git a/terminus-community-color-schemes/schemes/base2tone-lake-dark b/tabby-community-color-schemes/schemes/base2tone-lake-dark similarity index 100% rename from terminus-community-color-schemes/schemes/base2tone-lake-dark rename to tabby-community-color-schemes/schemes/base2tone-lake-dark diff --git a/terminus-community-color-schemes/schemes/base2tone-meadow-dark b/tabby-community-color-schemes/schemes/base2tone-meadow-dark similarity index 100% rename from terminus-community-color-schemes/schemes/base2tone-meadow-dark rename to tabby-community-color-schemes/schemes/base2tone-meadow-dark diff --git a/terminus-community-color-schemes/schemes/base2tone-morning-light b/tabby-community-color-schemes/schemes/base2tone-morning-light similarity index 100% rename from terminus-community-color-schemes/schemes/base2tone-morning-light rename to tabby-community-color-schemes/schemes/base2tone-morning-light diff --git a/terminus-community-color-schemes/schemes/base2tone-pool-dark b/tabby-community-color-schemes/schemes/base2tone-pool-dark similarity index 100% rename from terminus-community-color-schemes/schemes/base2tone-pool-dark rename to tabby-community-color-schemes/schemes/base2tone-pool-dark diff --git a/terminus-community-color-schemes/schemes/base2tone-sea-dark b/tabby-community-color-schemes/schemes/base2tone-sea-dark similarity index 100% rename from terminus-community-color-schemes/schemes/base2tone-sea-dark rename to tabby-community-color-schemes/schemes/base2tone-sea-dark diff --git a/terminus-community-color-schemes/schemes/base2tone-space-dark b/tabby-community-color-schemes/schemes/base2tone-space-dark similarity index 100% rename from terminus-community-color-schemes/schemes/base2tone-space-dark rename to tabby-community-color-schemes/schemes/base2tone-space-dark diff --git a/terminus-community-color-schemes/schemes/deep b/tabby-community-color-schemes/schemes/deep similarity index 100% rename from terminus-community-color-schemes/schemes/deep rename to tabby-community-color-schemes/schemes/deep diff --git a/terminus-community-color-schemes/schemes/idleToes b/tabby-community-color-schemes/schemes/idleToes similarity index 100% rename from terminus-community-color-schemes/schemes/idleToes rename to tabby-community-color-schemes/schemes/idleToes diff --git a/terminus-community-color-schemes/src/colorSchemes.ts b/tabby-community-color-schemes/src/colorSchemes.ts similarity index 98% rename from terminus-community-color-schemes/src/colorSchemes.ts rename to tabby-community-color-schemes/src/colorSchemes.ts index 021872ad..6988bc34 100644 --- a/terminus-community-color-schemes/src/colorSchemes.ts +++ b/tabby-community-color-schemes/src/colorSchemes.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { TerminalColorSchemeProvider, TerminalColorScheme } from 'terminus-terminal' +import { TerminalColorSchemeProvider, TerminalColorScheme } from 'tabby-terminal' const schemeContents = require.context('../schemes/', false, /.*/) diff --git a/terminus-community-color-schemes/src/index.ts b/tabby-community-color-schemes/src/index.ts similarity index 83% rename from terminus-community-color-schemes/src/index.ts rename to tabby-community-color-schemes/src/index.ts index 757dc81d..449a9f1d 100644 --- a/terminus-community-color-schemes/src/index.ts +++ b/tabby-community-color-schemes/src/index.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core' -import { TerminalColorSchemeProvider } from 'terminus-terminal' +import { TerminalColorSchemeProvider } from 'tabby-terminal' import { ColorSchemes } from './colorSchemes' diff --git a/terminus-community-color-schemes/tsconfig.json b/tabby-community-color-schemes/tsconfig.json similarity index 100% rename from terminus-community-color-schemes/tsconfig.json rename to tabby-community-color-schemes/tsconfig.json diff --git a/terminus-core/tsconfig.typings.json b/tabby-community-color-schemes/tsconfig.typings.json similarity index 87% rename from terminus-core/tsconfig.typings.json rename to tabby-community-color-schemes/tsconfig.typings.json index c0d2273c..9188bdf7 100644 --- a/terminus-core/tsconfig.typings.json +++ b/tabby-community-color-schemes/tsconfig.typings.json @@ -7,7 +7,7 @@ "declaration": true, "declarationDir": "./typings", "paths": { - "terminus-*": ["../../terminus-*"], + "tabby-*": ["../../tabby-*"], "*": ["../../app/node_modules/*"] } } diff --git a/terminus-community-color-schemes/webpack.config.js b/tabby-community-color-schemes/webpack.config.js similarity index 100% rename from terminus-community-color-schemes/webpack.config.js rename to tabby-community-color-schemes/webpack.config.js diff --git a/terminus-community-color-schemes/yarn.lock b/tabby-community-color-schemes/yarn.lock similarity index 100% rename from terminus-community-color-schemes/yarn.lock rename to tabby-community-color-schemes/yarn.lock diff --git a/terminus-core/.gitignore b/tabby-core/.gitignore similarity index 100% rename from terminus-core/.gitignore rename to tabby-core/.gitignore diff --git a/terminus-core/README.md b/tabby-core/README.md similarity index 83% rename from terminus-core/README.md rename to tabby-core/README.md index 454f3532..cf1c87b7 100644 --- a/terminus-core/README.md +++ b/tabby-core/README.md @@ -1,4 +1,4 @@ -Terminus Core Plugin +Tabby Core Plugin -------------------- See also: [Settings plugin API](./settings/), [Terminal plugin API](./terminal/), [Local terminal API](./local/) @@ -14,7 +14,7 @@ See also: [Settings plugin API](./settings/), [Terminal plugin API](./terminal/) Using the API: ```ts -import { AppService, TabContextMenuItemProvider } from 'terminus-core' +import { AppService, TabContextMenuItemProvider } from 'tabby-core' ``` Exporting your subclasses: diff --git a/terminus-core/package.json b/tabby-core/package.json similarity index 91% rename from terminus-core/package.json rename to tabby-core/package.json index 48ccae11..c063af53 100644 --- a/terminus-core/package.json +++ b/tabby-core/package.json @@ -1,9 +1,9 @@ { - "name": "terminus-core", + "name": "tabby-core", "version": "1.0.140", - "description": "Terminus core", + "description": "Tabby core", "keywords": [ - "terminus-builtin-plugin" + "tabby-builtin-plugin" ], "main": "dist/index.js", "typings": "typings/index.d.ts", diff --git a/terminus-core/src/api/cli.ts b/tabby-core/src/api/cli.ts similarity index 100% rename from terminus-core/src/api/cli.ts rename to tabby-core/src/api/cli.ts diff --git a/terminus-core/src/api/configProvider.ts b/tabby-core/src/api/configProvider.ts similarity index 100% rename from terminus-core/src/api/configProvider.ts rename to tabby-core/src/api/configProvider.ts diff --git a/terminus-core/src/api/fileProvider.ts b/tabby-core/src/api/fileProvider.ts similarity index 100% rename from terminus-core/src/api/fileProvider.ts rename to tabby-core/src/api/fileProvider.ts diff --git a/terminus-core/src/api/hostApp.ts b/tabby-core/src/api/hostApp.ts similarity index 100% rename from terminus-core/src/api/hostApp.ts rename to tabby-core/src/api/hostApp.ts diff --git a/terminus-core/src/api/hostWindow.ts b/tabby-core/src/api/hostWindow.ts similarity index 100% rename from terminus-core/src/api/hostWindow.ts rename to tabby-core/src/api/hostWindow.ts diff --git a/terminus-core/src/api/hotkeyProvider.ts b/tabby-core/src/api/hotkeyProvider.ts similarity index 100% rename from terminus-core/src/api/hotkeyProvider.ts rename to tabby-core/src/api/hotkeyProvider.ts diff --git a/terminus-core/src/api/index.ts b/tabby-core/src/api/index.ts similarity index 100% rename from terminus-core/src/api/index.ts rename to tabby-core/src/api/index.ts diff --git a/terminus-core/src/api/mainProcess.ts b/tabby-core/src/api/mainProcess.ts similarity index 100% rename from terminus-core/src/api/mainProcess.ts rename to tabby-core/src/api/mainProcess.ts diff --git a/terminus-core/src/api/menu.ts b/tabby-core/src/api/menu.ts similarity index 100% rename from terminus-core/src/api/menu.ts rename to tabby-core/src/api/menu.ts diff --git a/terminus-core/src/api/platform.ts b/tabby-core/src/api/platform.ts similarity index 100% rename from terminus-core/src/api/platform.ts rename to tabby-core/src/api/platform.ts diff --git a/terminus-core/src/api/selector.ts b/tabby-core/src/api/selector.ts similarity index 100% rename from terminus-core/src/api/selector.ts rename to tabby-core/src/api/selector.ts diff --git a/terminus-core/src/api/tabContextMenuProvider.ts b/tabby-core/src/api/tabContextMenuProvider.ts similarity index 100% rename from terminus-core/src/api/tabContextMenuProvider.ts rename to tabby-core/src/api/tabContextMenuProvider.ts diff --git a/terminus-core/src/api/tabRecovery.ts b/tabby-core/src/api/tabRecovery.ts similarity index 95% rename from terminus-core/src/api/tabRecovery.ts rename to tabby-core/src/api/tabRecovery.ts index d169d896..c1bd050e 100644 --- a/terminus-core/src/api/tabRecovery.ts +++ b/tabby-core/src/api/tabRecovery.ts @@ -23,7 +23,7 @@ export interface RecoveryToken { * Extend to enable recovery for your custom tab. * This works in conjunction with [[getRecoveryToken()]] * - * Terminus will try to find any [[TabRecoveryProvider]] that is able to process + * Tabby will try to find any [[TabRecoveryProvider]] that is able to process * the recovery token previously returned by [[getRecoveryToken]]. * * Recommended token format: diff --git a/terminus-core/src/api/theme.ts b/tabby-core/src/api/theme.ts similarity index 100% rename from terminus-core/src/api/theme.ts rename to tabby-core/src/api/theme.ts diff --git a/terminus-core/src/api/toolbarButtonProvider.ts b/tabby-core/src/api/toolbarButtonProvider.ts similarity index 100% rename from terminus-core/src/api/toolbarButtonProvider.ts rename to tabby-core/src/api/toolbarButtonProvider.ts diff --git a/terminus-core/src/cli.ts b/tabby-core/src/cli.ts similarity index 100% rename from terminus-core/src/cli.ts rename to tabby-core/src/cli.ts diff --git a/terminus-core/src/components/appRoot.component.pug b/tabby-core/src/components/appRoot.component.pug similarity index 100% rename from terminus-core/src/components/appRoot.component.pug rename to tabby-core/src/components/appRoot.component.pug diff --git a/terminus-core/src/components/appRoot.component.scss b/tabby-core/src/components/appRoot.component.scss similarity index 100% rename from terminus-core/src/components/appRoot.component.scss rename to tabby-core/src/components/appRoot.component.scss diff --git a/terminus-core/src/components/appRoot.component.ts b/tabby-core/src/components/appRoot.component.ts similarity index 100% rename from terminus-core/src/components/appRoot.component.ts rename to tabby-core/src/components/appRoot.component.ts diff --git a/terminus-core/src/components/base.component.ts b/tabby-core/src/components/base.component.ts similarity index 100% rename from terminus-core/src/components/base.component.ts rename to tabby-core/src/components/base.component.ts diff --git a/terminus-core/src/components/baseTab.component.ts b/tabby-core/src/components/baseTab.component.ts similarity index 100% rename from terminus-core/src/components/baseTab.component.ts rename to tabby-core/src/components/baseTab.component.ts diff --git a/terminus-core/src/components/checkbox.component.ts b/tabby-core/src/components/checkbox.component.ts similarity index 100% rename from terminus-core/src/components/checkbox.component.ts rename to tabby-core/src/components/checkbox.component.ts diff --git a/terminus-core/src/components/renameTabModal.component.pug b/tabby-core/src/components/renameTabModal.component.pug similarity index 100% rename from terminus-core/src/components/renameTabModal.component.pug rename to tabby-core/src/components/renameTabModal.component.pug diff --git a/terminus-core/src/components/renameTabModal.component.ts b/tabby-core/src/components/renameTabModal.component.ts similarity index 100% rename from terminus-core/src/components/renameTabModal.component.ts rename to tabby-core/src/components/renameTabModal.component.ts diff --git a/tabby-core/src/components/safeModeModal.component.pug b/tabby-core/src/components/safeModeModal.component.pug new file mode 100644 index 00000000..9b550bb0 --- /dev/null +++ b/tabby-core/src/components/safeModeModal.component.pug @@ -0,0 +1,7 @@ +.modal-body + .alert.alert-danger Tabby could not start with your plugins, so all third party plugins have been disabled in this session. The error was: + + pre {{error}} + +.modal-footer + button.btn.btn-outline-primary((click)='close()') Close diff --git a/terminus-core/src/components/safeModeModal.component.ts b/tabby-core/src/components/safeModeModal.component.ts similarity index 100% rename from terminus-core/src/components/safeModeModal.component.ts rename to tabby-core/src/components/safeModeModal.component.ts diff --git a/terminus-core/src/components/selectorModal.component.pug b/tabby-core/src/components/selectorModal.component.pug similarity index 100% rename from terminus-core/src/components/selectorModal.component.pug rename to tabby-core/src/components/selectorModal.component.pug diff --git a/terminus-core/src/components/selectorModal.component.scss b/tabby-core/src/components/selectorModal.component.scss similarity index 100% rename from terminus-core/src/components/selectorModal.component.scss rename to tabby-core/src/components/selectorModal.component.scss diff --git a/terminus-core/src/components/selectorModal.component.ts b/tabby-core/src/components/selectorModal.component.ts similarity index 100% rename from terminus-core/src/components/selectorModal.component.ts rename to tabby-core/src/components/selectorModal.component.ts diff --git a/terminus-core/src/components/splitTab.component.scss b/tabby-core/src/components/splitTab.component.scss similarity index 100% rename from terminus-core/src/components/splitTab.component.scss rename to tabby-core/src/components/splitTab.component.scss diff --git a/terminus-core/src/components/splitTab.component.ts b/tabby-core/src/components/splitTab.component.ts similarity index 100% rename from terminus-core/src/components/splitTab.component.ts rename to tabby-core/src/components/splitTab.component.ts diff --git a/terminus-core/src/components/splitTabSpanner.component.scss b/tabby-core/src/components/splitTabSpanner.component.scss similarity index 100% rename from terminus-core/src/components/splitTabSpanner.component.scss rename to tabby-core/src/components/splitTabSpanner.component.scss diff --git a/terminus-core/src/components/splitTabSpanner.component.ts b/tabby-core/src/components/splitTabSpanner.component.ts similarity index 100% rename from terminus-core/src/components/splitTabSpanner.component.ts rename to tabby-core/src/components/splitTabSpanner.component.ts diff --git a/terminus-core/src/components/startPage.component.pug b/tabby-core/src/components/startPage.component.pug similarity index 93% rename from terminus-core/src/components/startPage.component.pug rename to tabby-core/src/components/startPage.component.pug index 12368ae4..698b282d 100644 --- a/terminus-core/src/components/startPage.component.pug +++ b/tabby-core/src/components/startPage.component.pug @@ -1,6 +1,6 @@ div - .terminus-logo - h1.terminus-title Terminus + .tabby-logo + h1.tabby-title Tabby sup α .list-group diff --git a/terminus-core/src/components/startPage.component.scss b/tabby-core/src/components/startPage.component.scss similarity index 96% rename from terminus-core/src/components/startPage.component.scss rename to tabby-core/src/components/startPage.component.scss index 72e84555..07449a7f 100644 --- a/terminus-core/src/components/startPage.component.scss +++ b/tabby-core/src/components/startPage.component.scss @@ -14,7 +14,7 @@ flex-direction: column; } -.terminus-title { +.tabby-title { margin: 0 0 60px; } diff --git a/terminus-core/src/components/startPage.component.ts b/tabby-core/src/components/startPage.component.ts similarity index 100% rename from terminus-core/src/components/startPage.component.ts rename to tabby-core/src/components/startPage.component.ts diff --git a/terminus-core/src/components/tabBody.component.scss b/tabby-core/src/components/tabBody.component.scss similarity index 100% rename from terminus-core/src/components/tabBody.component.scss rename to tabby-core/src/components/tabBody.component.scss diff --git a/terminus-core/src/components/tabBody.component.ts b/tabby-core/src/components/tabBody.component.ts similarity index 100% rename from terminus-core/src/components/tabBody.component.ts rename to tabby-core/src/components/tabBody.component.ts diff --git a/terminus-core/src/components/tabBody.deep.component.css b/tabby-core/src/components/tabBody.deep.component.css similarity index 100% rename from terminus-core/src/components/tabBody.deep.component.css rename to tabby-core/src/components/tabBody.deep.component.css diff --git a/terminus-core/src/components/tabHeader.component.pug b/tabby-core/src/components/tabHeader.component.pug similarity index 100% rename from terminus-core/src/components/tabHeader.component.pug rename to tabby-core/src/components/tabHeader.component.pug diff --git a/terminus-core/src/components/tabHeader.component.scss b/tabby-core/src/components/tabHeader.component.scss similarity index 100% rename from terminus-core/src/components/tabHeader.component.scss rename to tabby-core/src/components/tabHeader.component.scss diff --git a/terminus-core/src/components/tabHeader.component.ts b/tabby-core/src/components/tabHeader.component.ts similarity index 100% rename from terminus-core/src/components/tabHeader.component.ts rename to tabby-core/src/components/tabHeader.component.ts diff --git a/tabby-core/src/components/titleBar.component.pug b/tabby-core/src/components/titleBar.component.pug new file mode 100644 index 00000000..50640804 --- /dev/null +++ b/tabby-core/src/components/titleBar.component.pug @@ -0,0 +1,2 @@ +.title((dblclick)='hostApp.toggleMaximize()') Tabby +window-controls diff --git a/terminus-core/src/components/titleBar.component.scss b/tabby-core/src/components/titleBar.component.scss similarity index 100% rename from terminus-core/src/components/titleBar.component.scss rename to tabby-core/src/components/titleBar.component.scss diff --git a/terminus-core/src/components/titleBar.component.ts b/tabby-core/src/components/titleBar.component.ts similarity index 100% rename from terminus-core/src/components/titleBar.component.ts rename to tabby-core/src/components/titleBar.component.ts diff --git a/terminus-core/src/components/toggle.component.scss b/tabby-core/src/components/toggle.component.scss similarity index 100% rename from terminus-core/src/components/toggle.component.scss rename to tabby-core/src/components/toggle.component.scss diff --git a/terminus-core/src/components/toggle.component.ts b/tabby-core/src/components/toggle.component.ts similarity index 100% rename from terminus-core/src/components/toggle.component.ts rename to tabby-core/src/components/toggle.component.ts diff --git a/terminus-core/src/components/transfersMenu.component.pug b/tabby-core/src/components/transfersMenu.component.pug similarity index 100% rename from terminus-core/src/components/transfersMenu.component.pug rename to tabby-core/src/components/transfersMenu.component.pug diff --git a/terminus-core/src/components/transfersMenu.component.scss b/tabby-core/src/components/transfersMenu.component.scss similarity index 100% rename from terminus-core/src/components/transfersMenu.component.scss rename to tabby-core/src/components/transfersMenu.component.scss diff --git a/terminus-core/src/components/transfersMenu.component.ts b/tabby-core/src/components/transfersMenu.component.ts similarity index 100% rename from terminus-core/src/components/transfersMenu.component.ts rename to tabby-core/src/components/transfersMenu.component.ts diff --git a/terminus-core/src/components/unlockVaultModal.component.pug b/tabby-core/src/components/unlockVaultModal.component.pug similarity index 100% rename from terminus-core/src/components/unlockVaultModal.component.pug rename to tabby-core/src/components/unlockVaultModal.component.pug diff --git a/terminus-core/src/components/unlockVaultModal.component.ts b/tabby-core/src/components/unlockVaultModal.component.ts similarity index 100% rename from terminus-core/src/components/unlockVaultModal.component.ts rename to tabby-core/src/components/unlockVaultModal.component.ts diff --git a/terminus-core/src/components/welcomeTab.component.pug b/tabby-core/src/components/welcomeTab.component.pug similarity index 62% rename from terminus-core/src/components/welcomeTab.component.pug rename to tabby-core/src/components/welcomeTab.component.pug index ad91f9d8..8bfc382b 100644 --- a/terminus-core/src/components/welcomeTab.component.pug +++ b/tabby-core/src/components/welcomeTab.component.pug @@ -1,34 +1,34 @@ .container.mt-5.mb-5 .mb-4 - .terminus-logo - h1.terminus-title Terminus + .tabby-logo + h1.tabby-title Tabby sup α - .text-center.mb-5 Thank you for downloading Terminus! + .text-center.mb-5 Thank you for downloading Tabby! .form-line .header .title Enable analytics - .description Help track the number of Terminus installs across the world! + .description Help track the number of Tabby installs across the world! toggle([(ngModel)]='config.store.enableAnalytics') .form-line .header .title Enable global hotkey (#[strong Ctrl-Space]) - .description Toggles the Terminus window visibility + .description Toggles the Tabby window visibility toggle([(ngModel)]='enableGlobalHotkey') .form-line .header .title Enable #[strong SSH] plugin - .description Adds an SSH connection manager UI to Terminus + .description Adds an SSH connection manager UI to Tabby toggle([(ngModel)]='enableSSH') .form-line .header .title Enable #[strong Serial] plugin - .description Allows attaching Terminus to serial ports + .description Allows attaching Tabby to serial ports toggle([(ngModel)]='enableSerial') diff --git a/terminus-core/src/components/welcomeTab.component.scss b/tabby-core/src/components/welcomeTab.component.scss similarity index 100% rename from terminus-core/src/components/welcomeTab.component.scss rename to tabby-core/src/components/welcomeTab.component.scss diff --git a/terminus-core/src/components/welcomeTab.component.ts b/tabby-core/src/components/welcomeTab.component.ts similarity index 100% rename from terminus-core/src/components/welcomeTab.component.ts rename to tabby-core/src/components/welcomeTab.component.ts diff --git a/terminus-core/src/components/windowControls.component.pug b/tabby-core/src/components/windowControls.component.pug similarity index 100% rename from terminus-core/src/components/windowControls.component.pug rename to tabby-core/src/components/windowControls.component.pug diff --git a/terminus-core/src/components/windowControls.component.scss b/tabby-core/src/components/windowControls.component.scss similarity index 100% rename from terminus-core/src/components/windowControls.component.scss rename to tabby-core/src/components/windowControls.component.scss diff --git a/terminus-core/src/components/windowControls.component.ts b/tabby-core/src/components/windowControls.component.ts similarity index 100% rename from terminus-core/src/components/windowControls.component.ts rename to tabby-core/src/components/windowControls.component.ts diff --git a/terminus-core/src/config.ts b/tabby-core/src/config.ts similarity index 100% rename from terminus-core/src/config.ts rename to tabby-core/src/config.ts diff --git a/terminus-core/src/configDefaults.linux.yaml b/tabby-core/src/configDefaults.linux.yaml similarity index 100% rename from terminus-core/src/configDefaults.linux.yaml rename to tabby-core/src/configDefaults.linux.yaml diff --git a/terminus-core/src/configDefaults.macos.yaml b/tabby-core/src/configDefaults.macos.yaml similarity index 100% rename from terminus-core/src/configDefaults.macos.yaml rename to tabby-core/src/configDefaults.macos.yaml diff --git a/terminus-core/src/configDefaults.web.yaml b/tabby-core/src/configDefaults.web.yaml similarity index 100% rename from terminus-core/src/configDefaults.web.yaml rename to tabby-core/src/configDefaults.web.yaml diff --git a/terminus-core/src/configDefaults.windows.yaml b/tabby-core/src/configDefaults.windows.yaml similarity index 100% rename from terminus-core/src/configDefaults.windows.yaml rename to tabby-core/src/configDefaults.windows.yaml diff --git a/terminus-core/src/configDefaults.yaml b/tabby-core/src/configDefaults.yaml similarity index 100% rename from terminus-core/src/configDefaults.yaml rename to tabby-core/src/configDefaults.yaml diff --git a/terminus-core/src/directives/autofocus.directive.ts b/tabby-core/src/directives/autofocus.directive.ts similarity index 100% rename from terminus-core/src/directives/autofocus.directive.ts rename to tabby-core/src/directives/autofocus.directive.ts diff --git a/terminus-core/src/directives/dropZone.directive.pug b/tabby-core/src/directives/dropZone.directive.pug similarity index 100% rename from terminus-core/src/directives/dropZone.directive.pug rename to tabby-core/src/directives/dropZone.directive.pug diff --git a/terminus-core/src/directives/dropZone.directive.scss b/tabby-core/src/directives/dropZone.directive.scss similarity index 100% rename from terminus-core/src/directives/dropZone.directive.scss rename to tabby-core/src/directives/dropZone.directive.scss diff --git a/terminus-core/src/directives/dropZone.directive.ts b/tabby-core/src/directives/dropZone.directive.ts similarity index 100% rename from terminus-core/src/directives/dropZone.directive.ts rename to tabby-core/src/directives/dropZone.directive.ts diff --git a/terminus-core/src/directives/fastHtmlBind.directive.ts b/tabby-core/src/directives/fastHtmlBind.directive.ts similarity index 100% rename from terminus-core/src/directives/fastHtmlBind.directive.ts rename to tabby-core/src/directives/fastHtmlBind.directive.ts diff --git a/terminus-core/src/hotkeys.ts b/tabby-core/src/hotkeys.ts similarity index 100% rename from terminus-core/src/hotkeys.ts rename to tabby-core/src/hotkeys.ts diff --git a/terminus-core/src/icons/download-solid.svg b/tabby-core/src/icons/download-solid.svg similarity index 100% rename from terminus-core/src/icons/download-solid.svg rename to tabby-core/src/icons/download-solid.svg diff --git a/terminus-core/src/icons/download.svg b/tabby-core/src/icons/download.svg similarity index 100% rename from terminus-core/src/icons/download.svg rename to tabby-core/src/icons/download.svg diff --git a/terminus-core/src/icons/gift.svg b/tabby-core/src/icons/gift.svg similarity index 100% rename from terminus-core/src/icons/gift.svg rename to tabby-core/src/icons/gift.svg diff --git a/terminus-core/src/icons/times.svg b/tabby-core/src/icons/times.svg similarity index 100% rename from terminus-core/src/icons/times.svg rename to tabby-core/src/icons/times.svg diff --git a/terminus-core/src/icons/upload.svg b/tabby-core/src/icons/upload.svg similarity index 100% rename from terminus-core/src/icons/upload.svg rename to tabby-core/src/icons/upload.svg diff --git a/terminus-core/src/index.ts b/tabby-core/src/index.ts similarity index 100% rename from terminus-core/src/index.ts rename to tabby-core/src/index.ts diff --git a/terminus-core/src/services/app.service.ts b/tabby-core/src/services/app.service.ts similarity index 100% rename from terminus-core/src/services/app.service.ts rename to tabby-core/src/services/app.service.ts diff --git a/terminus-core/src/services/config.service.ts b/tabby-core/src/services/config.service.ts similarity index 100% rename from terminus-core/src/services/config.service.ts rename to tabby-core/src/services/config.service.ts diff --git a/terminus-core/src/services/docking.service.ts b/tabby-core/src/services/docking.service.ts similarity index 100% rename from terminus-core/src/services/docking.service.ts rename to tabby-core/src/services/docking.service.ts diff --git a/terminus-core/src/services/fileProviders.service.ts b/tabby-core/src/services/fileProviders.service.ts similarity index 100% rename from terminus-core/src/services/fileProviders.service.ts rename to tabby-core/src/services/fileProviders.service.ts diff --git a/terminus-core/src/services/homeBase.service.ts b/tabby-core/src/services/homeBase.service.ts similarity index 100% rename from terminus-core/src/services/homeBase.service.ts rename to tabby-core/src/services/homeBase.service.ts diff --git a/terminus-core/src/services/hotkeys.service.ts b/tabby-core/src/services/hotkeys.service.ts similarity index 100% rename from terminus-core/src/services/hotkeys.service.ts rename to tabby-core/src/services/hotkeys.service.ts diff --git a/terminus-core/src/services/hotkeys.util.ts b/tabby-core/src/services/hotkeys.util.ts similarity index 100% rename from terminus-core/src/services/hotkeys.util.ts rename to tabby-core/src/services/hotkeys.util.ts diff --git a/terminus-core/src/services/log.service.ts b/tabby-core/src/services/log.service.ts similarity index 100% rename from terminus-core/src/services/log.service.ts rename to tabby-core/src/services/log.service.ts diff --git a/terminus-core/src/services/notifications.service.ts b/tabby-core/src/services/notifications.service.ts similarity index 100% rename from terminus-core/src/services/notifications.service.ts rename to tabby-core/src/services/notifications.service.ts diff --git a/terminus-core/src/services/selector.service.ts b/tabby-core/src/services/selector.service.ts similarity index 100% rename from terminus-core/src/services/selector.service.ts rename to tabby-core/src/services/selector.service.ts diff --git a/terminus-core/src/services/tabRecovery.service.ts b/tabby-core/src/services/tabRecovery.service.ts similarity index 100% rename from terminus-core/src/services/tabRecovery.service.ts rename to tabby-core/src/services/tabRecovery.service.ts diff --git a/terminus-core/src/services/tabs.service.ts b/tabby-core/src/services/tabs.service.ts similarity index 100% rename from terminus-core/src/services/tabs.service.ts rename to tabby-core/src/services/tabs.service.ts diff --git a/terminus-core/src/services/themes.service.ts b/tabby-core/src/services/themes.service.ts similarity index 100% rename from terminus-core/src/services/themes.service.ts rename to tabby-core/src/services/themes.service.ts diff --git a/terminus-core/src/services/updater.service.ts b/tabby-core/src/services/updater.service.ts similarity index 100% rename from terminus-core/src/services/updater.service.ts rename to tabby-core/src/services/updater.service.ts diff --git a/terminus-core/src/services/vault.service.ts b/tabby-core/src/services/vault.service.ts similarity index 100% rename from terminus-core/src/services/vault.service.ts rename to tabby-core/src/services/vault.service.ts diff --git a/terminus-core/src/tabContextMenu.ts b/tabby-core/src/tabContextMenu.ts similarity index 100% rename from terminus-core/src/tabContextMenu.ts rename to tabby-core/src/tabContextMenu.ts diff --git a/terminus-core/src/theme.compact.scss b/tabby-core/src/theme.compact.scss similarity index 100% rename from terminus-core/src/theme.compact.scss rename to tabby-core/src/theme.compact.scss diff --git a/terminus-core/src/theme.paper.scss b/tabby-core/src/theme.paper.scss similarity index 99% rename from terminus-core/src/theme.paper.scss rename to tabby-core/src/theme.paper.scss index a864e67c..c9b6f6ed 100644 --- a/terminus-core/src/theme.paper.scss +++ b/tabby-core/src/theme.paper.scss @@ -374,11 +374,11 @@ toggle { fill: $black; } -.terminus-title { +.tabby-title { color: $base01; } -.terminus-logo { +.tabby-logo { filter: saturate(0); } diff --git a/terminus-core/src/theme.scss b/tabby-core/src/theme.scss similarity index 100% rename from terminus-core/src/theme.scss rename to tabby-core/src/theme.scss diff --git a/terminus-core/src/theme.ts b/tabby-core/src/theme.ts similarity index 100% rename from terminus-core/src/theme.ts rename to tabby-core/src/theme.ts diff --git a/terminus-core/src/theme.vars.scss b/tabby-core/src/theme.vars.scss similarity index 100% rename from terminus-core/src/theme.vars.scss rename to tabby-core/src/theme.vars.scss diff --git a/terminus-core/src/utils.ts b/tabby-core/src/utils.ts similarity index 100% rename from terminus-core/src/utils.ts rename to tabby-core/src/utils.ts diff --git a/terminus-core/tsconfig.json b/tabby-core/tsconfig.json similarity index 100% rename from terminus-core/tsconfig.json rename to tabby-core/tsconfig.json diff --git a/terminus-community-color-schemes/tsconfig.typings.json b/tabby-core/tsconfig.typings.json similarity index 87% rename from terminus-community-color-schemes/tsconfig.typings.json rename to tabby-core/tsconfig.typings.json index c0d2273c..9188bdf7 100644 --- a/terminus-community-color-schemes/tsconfig.typings.json +++ b/tabby-core/tsconfig.typings.json @@ -7,7 +7,7 @@ "declaration": true, "declarationDir": "./typings", "paths": { - "terminus-*": ["../../terminus-*"], + "tabby-*": ["../../tabby-*"], "*": ["../../app/node_modules/*"] } } diff --git a/terminus-core/webpack.config.js b/tabby-core/webpack.config.js similarity index 100% rename from terminus-core/webpack.config.js rename to tabby-core/webpack.config.js diff --git a/terminus-core/yarn.lock b/tabby-core/yarn.lock similarity index 100% rename from terminus-core/yarn.lock rename to tabby-core/yarn.lock diff --git a/terminus-electron/.gitignore b/tabby-electron/.gitignore similarity index 100% rename from terminus-electron/.gitignore rename to tabby-electron/.gitignore diff --git a/terminus-electron/package.json b/tabby-electron/package.json similarity index 89% rename from terminus-electron/package.json rename to tabby-electron/package.json index 72bcb95a..3946c02b 100644 --- a/terminus-electron/package.json +++ b/tabby-electron/package.json @@ -1,9 +1,9 @@ { - "name": "terminus-electron", + "name": "tabby-electron", "version": "1.0.140", "description": "Electron-specific bindings", "keywords": [ - "terminus-builtin-plugin" + "tabby-builtin-plugin" ], "main": "dist/index.js", "typings": "typings/index.d.ts", diff --git a/terminus-electron/src/colorSchemes.ts b/tabby-electron/src/colorSchemes.ts similarity index 99% rename from terminus-electron/src/colorSchemes.ts rename to tabby-electron/src/colorSchemes.ts index 23f1bcb2..6dd88b54 100644 --- a/terminus-electron/src/colorSchemes.ts +++ b/tabby-electron/src/colorSchemes.ts @@ -1,7 +1,7 @@ import * as fs from 'mz/fs' import * as path from 'path' import { Injectable } from '@angular/core' -import { TerminalColorSchemeProvider, TerminalColorScheme } from 'terminus-terminal' +import { TerminalColorSchemeProvider, TerminalColorScheme } from 'tabby-terminal' /** @hidden */ @Injectable() diff --git a/terminus-electron/src/config.ts b/tabby-electron/src/config.ts similarity index 91% rename from terminus-electron/src/config.ts rename to tabby-electron/src/config.ts index 2c9b89f6..e4b2c278 100644 --- a/terminus-electron/src/config.ts +++ b/tabby-electron/src/config.ts @@ -1,4 +1,4 @@ -import { ConfigProvider, Platform } from 'terminus-core' +import { ConfigProvider, Platform } from 'tabby-core' /** @hidden */ export class ElectronConfigProvider extends ConfigProvider { diff --git a/terminus-electron/src/hotkeys.ts b/tabby-electron/src/hotkeys.ts similarity index 87% rename from terminus-electron/src/hotkeys.ts rename to tabby-electron/src/hotkeys.ts index 5432987c..5d2e4789 100644 --- a/terminus-electron/src/hotkeys.ts +++ b/tabby-electron/src/hotkeys.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { HotkeyDescription, HotkeyProvider } from 'terminus-core' +import { HotkeyDescription, HotkeyProvider } from 'tabby-core' /** @hidden */ @Injectable() diff --git a/terminus-electron/src/index.ts b/tabby-electron/src/index.ts similarity index 98% rename from terminus-electron/src/index.ts rename to tabby-electron/src/index.ts index d8ddf183..1e733da7 100644 --- a/terminus-electron/src/index.ts +++ b/tabby-electron/src/index.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core' -import { PlatformService, LogService, UpdaterService, DockingService, HostAppService, ThemesService, Platform, AppService, ConfigService, WIN_BUILD_FLUENT_BG_SUPPORTED, isWindowsBuild, HostWindowService, HotkeyProvider, ConfigProvider, FileProvider } from 'terminus-core' -import { TerminalColorSchemeProvider } from 'terminus-terminal' +import { PlatformService, LogService, UpdaterService, DockingService, HostAppService, ThemesService, Platform, AppService, ConfigService, WIN_BUILD_FLUENT_BG_SUPPORTED, isWindowsBuild, HostWindowService, HotkeyProvider, ConfigProvider, FileProvider } from 'tabby-core' +import { TerminalColorSchemeProvider } from 'tabby-terminal' import { HyperColorSchemes } from './colorSchemes' import { ElectronPlatformService } from './services/platform.service' diff --git a/terminus-electron/src/services/docking.service.ts b/tabby-electron/src/services/docking.service.ts similarity index 99% rename from terminus-electron/src/services/docking.service.ts rename to tabby-electron/src/services/docking.service.ts index 63cc72e0..692915f8 100644 --- a/terminus-electron/src/services/docking.service.ts +++ b/tabby-electron/src/services/docking.service.ts @@ -1,6 +1,6 @@ import { Injectable, NgZone } from '@angular/core' import type { Display } from 'electron' -import { ConfigService, DockingService, Screen, PlatformService } from 'terminus-core' +import { ConfigService, DockingService, Screen, PlatformService } from 'tabby-core' import { ElectronService } from '../services/electron.service' import { ElectronHostWindow, Bounds } from './hostWindow.service' diff --git a/terminus-electron/src/services/electron.service.ts b/tabby-electron/src/services/electron.service.ts similarity index 100% rename from terminus-electron/src/services/electron.service.ts rename to tabby-electron/src/services/electron.service.ts diff --git a/terminus-electron/src/services/fileProvider.service.ts b/tabby-electron/src/services/fileProvider.service.ts similarity index 96% rename from terminus-electron/src/services/fileProvider.service.ts rename to tabby-electron/src/services/fileProvider.service.ts index c00a3276..fc3d0845 100644 --- a/terminus-electron/src/services/fileProvider.service.ts +++ b/tabby-electron/src/services/fileProvider.service.ts @@ -1,6 +1,6 @@ import { promises as fs } from 'fs' import { Injectable } from '@angular/core' -import { FileProvider } from 'terminus-core' +import { FileProvider } from 'tabby-core' import { ElectronService } from '../services/electron.service' import { ElectronHostWindow } from './hostWindow.service' diff --git a/terminus-electron/src/services/hostApp.service.ts b/tabby-electron/src/services/hostApp.service.ts similarity index 98% rename from terminus-electron/src/services/hostApp.service.ts rename to tabby-electron/src/services/hostApp.service.ts index c74fc64e..cc186f2d 100644 --- a/terminus-electron/src/services/hostApp.service.ts +++ b/tabby-electron/src/services/hostApp.service.ts @@ -1,5 +1,5 @@ import { Injectable, NgZone, Injector } from '@angular/core' -import { isWindowsBuild, WIN_BUILD_FLUENT_BG_SUPPORTED, HostAppService, Platform, CLIHandler } from 'terminus-core' +import { isWindowsBuild, WIN_BUILD_FLUENT_BG_SUPPORTED, HostAppService, Platform, CLIHandler } from 'tabby-core' import { ElectronService } from '../services/electron.service' diff --git a/terminus-electron/src/services/hostWindow.service.ts b/tabby-electron/src/services/hostWindow.service.ts similarity index 98% rename from terminus-electron/src/services/hostWindow.service.ts rename to tabby-electron/src/services/hostWindow.service.ts index 45809867..87db827d 100644 --- a/terminus-electron/src/services/hostWindow.service.ts +++ b/tabby-electron/src/services/hostWindow.service.ts @@ -1,6 +1,6 @@ import type { BrowserWindow, TouchBar } from 'electron' import { Injectable, Inject, NgZone } from '@angular/core' -import { BootstrapData, BOOTSTRAP_DATA, HostWindowService } from 'terminus-core' +import { BootstrapData, BOOTSTRAP_DATA, HostWindowService } from 'tabby-core' import { ElectronService } from '../services/electron.service' export interface Bounds { @@ -60,7 +60,7 @@ export class ElectronHostWindow extends HostWindowService { } setTitle (title?: string): void { - this.electron.ipcRenderer.send('window-set-title', title ?? 'Terminus') + this.electron.ipcRenderer.send('window-set-title', title ?? 'Tabby') } toggleFullscreen (): void { diff --git a/terminus-electron/src/services/log.service.ts b/tabby-electron/src/services/log.service.ts similarity index 96% rename from terminus-electron/src/services/log.service.ts rename to tabby-electron/src/services/log.service.ts index 42ac70f7..32993c56 100644 --- a/terminus-electron/src/services/log.service.ts +++ b/tabby-electron/src/services/log.service.ts @@ -2,7 +2,7 @@ import * as fs from 'fs' import * as path from 'path' import * as winston from 'winston' import { Injectable } from '@angular/core' -import { ConsoleLogger, Logger } from 'terminus-core' +import { ConsoleLogger, Logger } from 'tabby-core' import { ElectronService } from '../services/electron.service' const initializeWinston = (electron: ElectronService) => { diff --git a/terminus-electron/src/services/platform.service.ts b/tabby-electron/src/services/platform.service.ts similarity index 99% rename from terminus-electron/src/services/platform.service.ts rename to tabby-electron/src/services/platform.service.ts index 664fdafa..ad076c83 100644 --- a/terminus-electron/src/services/platform.service.ts +++ b/tabby-electron/src/services/platform.service.ts @@ -5,7 +5,7 @@ import * as os from 'os' import promiseIpc from 'electron-promise-ipc' import { execFile } from 'mz/child_process' import { Injectable, NgZone } from '@angular/core' -import { PlatformService, ClipboardContent, HostAppService, Platform, MenuItemOptions, MessageBoxOptions, MessageBoxResult, FileUpload, FileDownload, FileUploadOptions, wrapPromise } from 'terminus-core' +import { PlatformService, ClipboardContent, HostAppService, Platform, MenuItemOptions, MessageBoxOptions, MessageBoxResult, FileUpload, FileDownload, FileUploadOptions, wrapPromise } from 'tabby-core' import { ElectronService } from '../services/electron.service' import { ElectronHostWindow } from './hostWindow.service' import { ShellIntegrationService } from './shellIntegration.service' diff --git a/terminus-electron/src/services/shellIntegration.service.ts b/tabby-electron/src/services/shellIntegration.service.ts similarity index 85% rename from terminus-electron/src/services/shellIntegration.service.ts rename to tabby-electron/src/services/shellIntegration.service.ts index 784b93d8..780043e2 100644 --- a/terminus-electron/src/services/shellIntegration.service.ts +++ b/tabby-electron/src/services/shellIntegration.service.ts @@ -2,7 +2,7 @@ import * as path from 'path' import * as fs from 'mz/fs' import { exec } from 'mz/child_process' import { Injectable } from '@angular/core' -import { HostAppService, Platform } from 'terminus-core' +import { HostAppService, Platform } from 'tabby-core' import { ElectronService } from '../services/electron.service' /* eslint-disable block-scoped-var */ @@ -13,23 +13,23 @@ try { @Injectable({ providedIn: 'root' }) export class ShellIntegrationService { - private automatorWorkflows = ['Open Terminus here.workflow', 'Paste path into Terminus.workflow'] + private automatorWorkflows = ['Open Tabby here.workflow', 'Paste path into Tabby.workflow'] private automatorWorkflowsLocation: string private automatorWorkflowsDestination: string private registryKeys = [ { - path: 'Software\\Classes\\Directory\\Background\\shell\\Terminus', - value: 'Open Terminus here', + path: 'Software\\Classes\\Directory\\Background\\shell\\Tabby', + value: 'Open Tabby here', command: 'open "%V"', }, { - path: 'SOFTWARE\\Classes\\Directory\\shell\\Terminus', - value: 'Open Terminus here', + path: 'SOFTWARE\\Classes\\Directory\\shell\\Tabby', + value: 'Open Tabby here', command: 'open "%V"', }, { - path: 'Software\\Classes\\*\\shell\\Terminus', - value: 'Paste path into Terminus', + path: 'Software\\Classes\\*\\shell\\Tabby', + value: 'Paste path into Tabby', command: 'paste "%V"', }, ] @@ -73,11 +73,11 @@ export class ShellIntegrationService { wnr.setRegistryValue(wnr.HK.CU, registryKey.path + '\\command', '', wnr.REG.SZ, exe + ' ' + registryKey.command) } - if (wnr.getRegistryKey(wnr.HK.CU, 'Software\\Classes\\Directory\\Background\\shell\\Open Terminus here')) { - wnr.deleteRegistryKey(wnr.HK.CU, 'Software\\Classes\\Directory\\Background\\shell\\Open Terminus here') + if (wnr.getRegistryKey(wnr.HK.CU, 'Software\\Classes\\Directory\\Background\\shell\\Open Tabby here')) { + wnr.deleteRegistryKey(wnr.HK.CU, 'Software\\Classes\\Directory\\Background\\shell\\Open Tabby here') } - if (wnr.getRegistryKey(wnr.HK.CU, 'Software\\Classes\\*\\shell\\Paste path into Terminus')) { - wnr.deleteRegistryKey(wnr.HK.CU, 'Software\\Classes\\*\\shell\\Paste path into Terminus') + if (wnr.getRegistryKey(wnr.HK.CU, 'Software\\Classes\\*\\shell\\Paste path into Tabby')) { + wnr.deleteRegistryKey(wnr.HK.CU, 'Software\\Classes\\*\\shell\\Paste path into Tabby') } } } diff --git a/terminus-electron/src/services/touchbar.service.ts b/tabby-electron/src/services/touchbar.service.ts similarity index 97% rename from terminus-electron/src/services/touchbar.service.ts rename to tabby-electron/src/services/touchbar.service.ts index 342efc14..fc75a370 100644 --- a/terminus-electron/src/services/touchbar.service.ts +++ b/tabby-electron/src/services/touchbar.service.ts @@ -1,6 +1,6 @@ import { SegmentedControlSegment, TouchBarSegmentedControl } from 'electron' import { Injectable, NgZone } from '@angular/core' -import { AppService, HostAppService, Platform } from 'terminus-core' +import { AppService, HostAppService, Platform } from 'tabby-core' import { ElectronService } from '../services/electron.service' import { ElectronHostWindow } from './hostWindow.service' diff --git a/terminus-electron/src/services/updater.service.ts b/tabby-electron/src/services/updater.service.ts similarity index 97% rename from terminus-electron/src/services/updater.service.ts rename to tabby-electron/src/services/updater.service.ts index 6e063cf0..d6cecae3 100644 --- a/terminus-electron/src/services/updater.service.ts +++ b/tabby-electron/src/services/updater.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core' import axios from 'axios' -import { Logger, LogService, ConfigService, UpdaterService, PlatformService } from 'terminus-core' +import { Logger, LogService, ConfigService, UpdaterService, PlatformService } from 'tabby-core' import { ElectronService } from '../services/electron.service' const UPDATES_URL = 'https://api.github.com/repos/eugeny/terminus/releases/latest' @@ -46,7 +46,7 @@ export class ElectronUpdaterService extends UpdaterService { config.ready$.toPromise().then(() => { - if (config.store.enableAutomaticUpdates && this.electronUpdaterAvailable && !process.env.TERMINUS_DEV) { + if (config.store.enableAutomaticUpdates && this.electronUpdaterAvailable && !process.env.TABBY_DEV) { this.logger.debug('Checking for updates') try { electron.autoUpdater.setFeedURL({ @@ -125,7 +125,7 @@ export class ElectronUpdaterService extends UpdaterService { if ((await this.platform.showMessageBox( { type: 'warning', - message: 'Installing the update will close all tabs and restart Terminus.', + message: 'Installing the update will close all tabs and restart Tabby.', buttons: ['Cancel', 'Update'], defaultId: 1, } diff --git a/terminus-electron/tsconfig.json b/tabby-electron/tsconfig.json similarity index 100% rename from terminus-electron/tsconfig.json rename to tabby-electron/tsconfig.json diff --git a/terminus-plugin-manager/tsconfig.typings.json b/tabby-electron/tsconfig.typings.json similarity index 87% rename from terminus-plugin-manager/tsconfig.typings.json rename to tabby-electron/tsconfig.typings.json index c0d2273c..9188bdf7 100644 --- a/terminus-plugin-manager/tsconfig.typings.json +++ b/tabby-electron/tsconfig.typings.json @@ -7,7 +7,7 @@ "declaration": true, "declarationDir": "./typings", "paths": { - "terminus-*": ["../../terminus-*"], + "tabby-*": ["../../tabby-*"], "*": ["../../app/node_modules/*"] } } diff --git a/terminus-electron/webpack.config.js b/tabby-electron/webpack.config.js similarity index 100% rename from terminus-electron/webpack.config.js rename to tabby-electron/webpack.config.js diff --git a/terminus-electron/yarn.lock b/tabby-electron/yarn.lock similarity index 100% rename from terminus-electron/yarn.lock rename to tabby-electron/yarn.lock diff --git a/terminus-local/.gitignore b/tabby-local/.gitignore similarity index 100% rename from terminus-local/.gitignore rename to tabby-local/.gitignore diff --git a/terminus-local/README.md b/tabby-local/README.md similarity index 76% rename from terminus-local/README.md rename to tabby-local/README.md index 25307867..b3b7d2db 100644 --- a/terminus-local/README.md +++ b/tabby-local/README.md @@ -1,4 +1,4 @@ -Terminus Local Plugin +Tabby Local Plugin --------------------- * local shells @@ -6,7 +6,7 @@ Terminus Local Plugin Using the API: ```ts -import { ShellProvider } from 'terminus-local' +import { ShellProvider } from 'tabby-local' ``` Exporting your subclasses: diff --git a/terminus-local/package.json b/tabby-local/package.json similarity index 83% rename from terminus-local/package.json rename to tabby-local/package.json index c6acd1ba..f3255b26 100644 --- a/terminus-local/package.json +++ b/tabby-local/package.json @@ -1,9 +1,9 @@ { - "name": "terminus-local", + "name": "tabby-local", "version": "1.0.140", - "description": "Terminus' local shell plugin", + "description": "Tabby's local shell plugin", "keywords": [ - "terminus-builtin-plugin" + "tabby-builtin-plugin" ], "main": "dist/index.js", "typings": "typings/index.d.ts", @@ -40,8 +40,8 @@ "@angular/platform-browser": "^9.1.11", "@ng-bootstrap/ng-bootstrap": "^6.1.0", "rxjs": "^6.5.5", - "terminus-core": "*", - "terminus-settings": "*", - "terminus-terminal": "*" + "tabby-core": "*", + "tabby-settings": "*", + "tabby-terminal": "*" } } diff --git a/terminus-local/src/api.ts b/tabby-local/src/api.ts similarity index 100% rename from terminus-local/src/api.ts rename to tabby-local/src/api.ts diff --git a/terminus-local/src/buttonProvider.ts b/tabby-local/src/buttonProvider.ts similarity index 93% rename from terminus-local/src/buttonProvider.ts rename to tabby-local/src/buttonProvider.ts index 654cd922..48ad21ff 100644 --- a/terminus-local/src/buttonProvider.ts +++ b/tabby-local/src/buttonProvider.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { Injectable } from '@angular/core' -import { ToolbarButtonProvider, ToolbarButton, ConfigService, SelectorOption, SelectorService } from 'terminus-core' -import { ElectronService } from 'terminus-electron' +import { ToolbarButtonProvider, ToolbarButton, ConfigService, SelectorOption, SelectorService } from 'tabby-core' +import { ElectronService } from 'tabby-electron' import { TerminalService } from './services/terminal.service' diff --git a/terminus-local/src/cli.ts b/tabby-local/src/cli.ts similarity index 98% rename from terminus-local/src/cli.ts rename to tabby-local/src/cli.ts index b30fe3f1..88e9a635 100644 --- a/terminus-local/src/cli.ts +++ b/tabby-local/src/cli.ts @@ -1,7 +1,7 @@ import * as path from 'path' import * as fs from 'mz/fs' import { Injectable } from '@angular/core' -import { CLIHandler, CLIEvent, AppService, ConfigService, HostWindowService } from 'terminus-core' +import { CLIHandler, CLIEvent, AppService, ConfigService, HostWindowService } from 'tabby-core' import { TerminalService } from './services/terminal.service' @Injectable() diff --git a/terminus-local/src/components/editProfileModal.component.pug b/tabby-local/src/components/editProfileModal.component.pug similarity index 100% rename from terminus-local/src/components/editProfileModal.component.pug rename to tabby-local/src/components/editProfileModal.component.pug diff --git a/terminus-local/src/components/editProfileModal.component.ts b/tabby-local/src/components/editProfileModal.component.ts similarity index 100% rename from terminus-local/src/components/editProfileModal.component.ts rename to tabby-local/src/components/editProfileModal.component.ts diff --git a/terminus-local/src/components/environmentEditor.component.pug b/tabby-local/src/components/environmentEditor.component.pug similarity index 100% rename from terminus-local/src/components/environmentEditor.component.pug rename to tabby-local/src/components/environmentEditor.component.pug diff --git a/terminus-local/src/components/environmentEditor.component.scss b/tabby-local/src/components/environmentEditor.component.scss similarity index 100% rename from terminus-local/src/components/environmentEditor.component.scss rename to tabby-local/src/components/environmentEditor.component.scss diff --git a/terminus-local/src/components/environmentEditor.component.ts b/tabby-local/src/components/environmentEditor.component.ts similarity index 100% rename from terminus-local/src/components/environmentEditor.component.ts rename to tabby-local/src/components/environmentEditor.component.ts diff --git a/terminus-local/src/components/shellSettingsTab.component.pug b/tabby-local/src/components/shellSettingsTab.component.pug similarity index 100% rename from terminus-local/src/components/shellSettingsTab.component.pug rename to tabby-local/src/components/shellSettingsTab.component.pug diff --git a/terminus-local/src/components/shellSettingsTab.component.ts b/tabby-local/src/components/shellSettingsTab.component.ts similarity index 95% rename from terminus-local/src/components/shellSettingsTab.component.ts rename to tabby-local/src/components/shellSettingsTab.component.ts index 42cb79e7..62055013 100644 --- a/terminus-local/src/components/shellSettingsTab.component.ts +++ b/tabby-local/src/components/shellSettingsTab.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { Subscription } from 'rxjs' -import { ConfigService, HostAppService, Platform, WIN_BUILD_CONPTY_SUPPORTED, WIN_BUILD_CONPTY_STABLE, isWindowsBuild } from 'terminus-core' -import { ElectronService, ElectronHostWindow } from 'terminus-electron' +import { ConfigService, HostAppService, Platform, WIN_BUILD_CONPTY_SUPPORTED, WIN_BUILD_CONPTY_STABLE, isWindowsBuild } from 'tabby-core' +import { ElectronService, ElectronHostWindow } from 'tabby-electron' import { EditProfileModalComponent } from './editProfileModal.component' import { Shell, Profile } from '../api' import { TerminalService } from '../services/terminal.service' diff --git a/terminus-local/src/components/terminalTab.component.ts b/tabby-local/src/components/terminalTab.component.ts similarity index 97% rename from terminus-local/src/components/terminalTab.component.ts rename to tabby-local/src/components/terminalTab.component.ts index 1304f2fd..8383c821 100644 --- a/terminus-local/src/components/terminalTab.component.ts +++ b/tabby-local/src/components/terminalTab.component.ts @@ -1,6 +1,6 @@ import { Component, Input, Injector } from '@angular/core' -import { BaseTabProcess, WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild } from 'terminus-core' -import { BaseTerminalTabComponent } from 'terminus-terminal' +import { BaseTabProcess, WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild } from 'tabby-core' +import { BaseTerminalTabComponent } from 'tabby-terminal' import { SessionOptions } from '../api' import { Session } from '../session' diff --git a/terminus-local/src/config.ts b/tabby-local/src/config.ts similarity index 96% rename from terminus-local/src/config.ts rename to tabby-local/src/config.ts index 7884f5e6..dbb16748 100644 --- a/terminus-local/src/config.ts +++ b/tabby-local/src/config.ts @@ -1,4 +1,4 @@ -import { ConfigProvider, Platform } from 'terminus-core' +import { ConfigProvider, Platform } from 'tabby-core' /** @hidden */ export class TerminalConfigProvider extends ConfigProvider { diff --git a/terminus-local/src/hotkeys.ts b/tabby-local/src/hotkeys.ts similarity index 91% rename from terminus-local/src/hotkeys.ts rename to tabby-local/src/hotkeys.ts index 10b29dac..707f66d5 100644 --- a/terminus-local/src/hotkeys.ts +++ b/tabby-local/src/hotkeys.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { HotkeyDescription, HotkeyProvider } from 'terminus-core' +import { HotkeyDescription, HotkeyProvider } from 'tabby-core' import { TerminalService } from './services/terminal.service' /** @hidden */ diff --git a/terminus-local/src/icons/alpine.svg b/tabby-local/src/icons/alpine.svg similarity index 100% rename from terminus-local/src/icons/alpine.svg rename to tabby-local/src/icons/alpine.svg diff --git a/terminus-local/src/icons/clink.svg b/tabby-local/src/icons/clink.svg similarity index 100% rename from terminus-local/src/icons/clink.svg rename to tabby-local/src/icons/clink.svg diff --git a/terminus-local/src/icons/cmd.svg b/tabby-local/src/icons/cmd.svg similarity index 100% rename from terminus-local/src/icons/cmd.svg rename to tabby-local/src/icons/cmd.svg diff --git a/terminus-local/src/icons/cmder-powershell.svg b/tabby-local/src/icons/cmder-powershell.svg similarity index 100% rename from terminus-local/src/icons/cmder-powershell.svg rename to tabby-local/src/icons/cmder-powershell.svg diff --git a/terminus-local/src/icons/cmder.svg b/tabby-local/src/icons/cmder.svg similarity index 100% rename from terminus-local/src/icons/cmder.svg rename to tabby-local/src/icons/cmder.svg diff --git a/terminus-local/src/icons/cygwin.svg b/tabby-local/src/icons/cygwin.svg similarity index 100% rename from terminus-local/src/icons/cygwin.svg rename to tabby-local/src/icons/cygwin.svg diff --git a/terminus-local/src/icons/debian.svg b/tabby-local/src/icons/debian.svg similarity index 100% rename from terminus-local/src/icons/debian.svg rename to tabby-local/src/icons/debian.svg diff --git a/terminus-local/src/icons/git-bash.svg b/tabby-local/src/icons/git-bash.svg similarity index 100% rename from terminus-local/src/icons/git-bash.svg rename to tabby-local/src/icons/git-bash.svg diff --git a/terminus-local/src/icons/linux.svg b/tabby-local/src/icons/linux.svg similarity index 100% rename from terminus-local/src/icons/linux.svg rename to tabby-local/src/icons/linux.svg diff --git a/terminus-local/src/icons/plus.svg b/tabby-local/src/icons/plus.svg similarity index 100% rename from terminus-local/src/icons/plus.svg rename to tabby-local/src/icons/plus.svg diff --git a/terminus-local/src/icons/powershell-core.svg b/tabby-local/src/icons/powershell-core.svg similarity index 100% rename from terminus-local/src/icons/powershell-core.svg rename to tabby-local/src/icons/powershell-core.svg diff --git a/terminus-local/src/icons/powershell.svg b/tabby-local/src/icons/powershell.svg similarity index 100% rename from terminus-local/src/icons/powershell.svg rename to tabby-local/src/icons/powershell.svg diff --git a/terminus-local/src/icons/profiles.svg b/tabby-local/src/icons/profiles.svg similarity index 100% rename from terminus-local/src/icons/profiles.svg rename to tabby-local/src/icons/profiles.svg diff --git a/terminus-local/src/icons/suse.svg b/tabby-local/src/icons/suse.svg similarity index 100% rename from terminus-local/src/icons/suse.svg rename to tabby-local/src/icons/suse.svg diff --git a/terminus-local/src/icons/ubuntu.svg b/tabby-local/src/icons/ubuntu.svg similarity index 100% rename from terminus-local/src/icons/ubuntu.svg rename to tabby-local/src/icons/ubuntu.svg diff --git a/terminus-local/src/index.ts b/tabby-local/src/index.ts similarity index 92% rename from terminus-local/src/index.ts rename to tabby-local/src/index.ts index 96a54bd8..87fa9ae1 100644 --- a/terminus-local/src/index.ts +++ b/tabby-local/src/index.ts @@ -4,10 +4,10 @@ import { FormsModule } from '@angular/forms' import { NgbModule } from '@ng-bootstrap/ng-bootstrap' import { ToastrModule } from 'ngx-toastr' -import TerminusCorePlugin, { HostAppService, ToolbarButtonProvider, TabRecoveryProvider, ConfigProvider, HotkeysService, HotkeyProvider, TabContextMenuItemProvider, CLIHandler, ConfigService } from 'terminus-core' -import TerminusTerminalModule from 'terminus-terminal' -import TerminusElectronPlugin from 'terminus-electron' -import { SettingsTabProvider } from 'terminus-settings' +import TabbyCorePlugin, { HostAppService, ToolbarButtonProvider, TabRecoveryProvider, ConfigProvider, HotkeysService, HotkeyProvider, TabContextMenuItemProvider, CLIHandler, ConfigService } from 'tabby-core' +import TabbyTerminalModule from 'tabby-terminal' +import TabbyElectronPlugin from 'tabby-electron' +import { SettingsTabProvider } from 'tabby-settings' import { TerminalTabComponent } from './components/terminalTab.component' import { ShellSettingsTabComponent } from './components/shellSettingsTab.component' @@ -47,9 +47,9 @@ import { AutoOpenTabCLIHandler, OpenPathCLIHandler, TerminalCLIHandler } from '. FormsModule, NgbModule, ToastrModule, - TerminusCorePlugin, - TerminusElectronPlugin, - TerminusTerminalModule, + TabbyCorePlugin, + TabbyElectronPlugin, + TabbyTerminalModule, ], providers: [ { provide: SettingsTabProvider, useClass: ShellSettingsTabProvider, multi: true }, diff --git a/terminus-local/src/recoveryProvider.ts b/tabby-local/src/recoveryProvider.ts similarity index 98% rename from terminus-local/src/recoveryProvider.ts rename to tabby-local/src/recoveryProvider.ts index 67d60499..d0751827 100644 --- a/terminus-local/src/recoveryProvider.ts +++ b/tabby-local/src/recoveryProvider.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { TabRecoveryProvider, RecoveredTab, RecoveryToken } from 'terminus-core' +import { TabRecoveryProvider, RecoveredTab, RecoveryToken } from 'tabby-core' import { TerminalTabComponent } from './components/terminalTab.component' diff --git a/terminus-local/src/services/dockMenu.service.ts b/tabby-local/src/services/dockMenu.service.ts similarity index 92% rename from terminus-local/src/services/dockMenu.service.ts rename to tabby-local/src/services/dockMenu.service.ts index 2577df6f..3dcde5fc 100644 --- a/terminus-local/src/services/dockMenu.service.ts +++ b/tabby-local/src/services/dockMenu.service.ts @@ -1,6 +1,6 @@ import { NgZone, Injectable } from '@angular/core' -import { ConfigService, HostAppService, Platform } from 'terminus-core' -import { ElectronService } from 'terminus-electron' +import { ConfigService, HostAppService, Platform } from 'tabby-core' +import { ElectronService } from 'tabby-electron' import { TerminalService } from './terminal.service' /** @hidden */ diff --git a/terminus-local/src/services/terminal.service.ts b/tabby-local/src/services/terminal.service.ts similarity index 98% rename from terminus-local/src/services/terminal.service.ts rename to tabby-local/src/services/terminal.service.ts index e71b9c27..1481cdc6 100644 --- a/terminus-local/src/services/terminal.service.ts +++ b/tabby-local/src/services/terminal.service.ts @@ -2,10 +2,10 @@ import * as fs from 'mz/fs' import slugify from 'slugify' import { Observable, AsyncSubject } from 'rxjs' import { Injectable, Inject } from '@angular/core' -import { AppService, Logger, LogService, ConfigService, SplitTabComponent } from 'terminus-core' +import { AppService, Logger, LogService, ConfigService, SplitTabComponent } from 'tabby-core' import { TerminalTabComponent } from '../components/terminalTab.component' import { ShellProvider, Shell, SessionOptions, Profile } from '../api' -import { UACService } from '../services/uac.service' +import { UACService } from './uac.service' @Injectable({ providedIn: 'root' }) export class TerminalService { diff --git a/terminus-local/src/services/uac.service.ts b/tabby-local/src/services/uac.service.ts similarity index 85% rename from terminus-local/src/services/uac.service.ts rename to tabby-local/src/services/uac.service.ts index 16c93fd6..98844693 100644 --- a/terminus-local/src/services/uac.service.ts +++ b/tabby-local/src/services/uac.service.ts @@ -1,7 +1,7 @@ import * as path from 'path' import { Injectable } from '@angular/core' -import { WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild } from 'terminus-core' -import { ElectronService } from 'terminus-electron' +import { WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild } from 'tabby-core' +import { ElectronService } from 'tabby-electron' import { SessionOptions } from '../api' /** @hidden */ @@ -23,7 +23,7 @@ export class UACService { 'UAC.exe', ) - if (process.env.TERMINUS_DEV) { + if (process.env.TABBY_DEV) { helperPath = path.join( path.dirname(this.electron.app.getPath('exe')), '..', '..', '..', diff --git a/terminus-local/src/session.ts b/tabby-local/src/session.ts similarity index 99% rename from terminus-local/src/session.ts rename to tabby-local/src/session.ts index a9558f55..7757c15b 100644 --- a/terminus-local/src/session.ts +++ b/tabby-local/src/session.ts @@ -2,8 +2,8 @@ import * as psNode from 'ps-node' import * as fs from 'mz/fs' import * as os from 'os' import { Injector } from '@angular/core' -import { HostAppService, ConfigService, WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild, Platform, BootstrapData, BOOTSTRAP_DATA } from 'terminus-core' -import { BaseSession } from 'terminus-terminal' +import { HostAppService, ConfigService, WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild, Platform, BootstrapData, BOOTSTRAP_DATA } from 'tabby-core' +import { BaseSession } from 'tabby-terminal' import { ipcRenderer } from 'electron' import { getWorkingDirectoryFromPID } from 'native-process-working-directory' import { SessionOptions, ChildProcess } from './api' @@ -117,7 +117,7 @@ export class Session extends BaseSession { const env = { ...process.env, TERM: 'xterm-256color', - TERM_PROGRAM: 'Terminus', + TERM_PROGRAM: 'Tabby', ...options.env, ...this.config.store.terminal.environment || {}, } diff --git a/terminus-local/src/settings.ts b/tabby-local/src/settings.ts similarity index 86% rename from terminus-local/src/settings.ts rename to tabby-local/src/settings.ts index 85465e88..2df9e9e5 100644 --- a/terminus-local/src/settings.ts +++ b/tabby-local/src/settings.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { SettingsTabProvider } from 'terminus-settings' +import { SettingsTabProvider } from 'tabby-settings' import { ShellSettingsTabComponent } from './components/shellSettingsTab.component' diff --git a/terminus-local/src/shells/cmder.ts b/tabby-local/src/shells/cmder.ts similarity index 96% rename from terminus-local/src/shells/cmder.ts rename to tabby-local/src/shells/cmder.ts index 3efd4422..fb3d8eb3 100644 --- a/terminus-local/src/shells/cmder.ts +++ b/tabby-local/src/shells/cmder.ts @@ -1,6 +1,6 @@ import * as path from 'path' import { Injectable } from '@angular/core' -import { HostAppService, Platform } from 'terminus-core' +import { HostAppService, Platform } from 'tabby-core' import { ShellProvider, Shell } from '../api' diff --git a/terminus-local/src/shells/custom.ts b/tabby-local/src/shells/custom.ts similarity index 92% rename from terminus-local/src/shells/custom.ts rename to tabby-local/src/shells/custom.ts index a1bcd1a8..c36f5ee6 100644 --- a/terminus-local/src/shells/custom.ts +++ b/tabby-local/src/shells/custom.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { ConfigService } from 'terminus-core' +import { ConfigService } from 'tabby-core' import { ShellProvider, Shell } from '../api' diff --git a/terminus-local/src/shells/cygwin32.ts b/tabby-local/src/shells/cygwin32.ts similarity index 95% rename from terminus-local/src/shells/cygwin32.ts rename to tabby-local/src/shells/cygwin32.ts index 6f43954b..f7c7874e 100644 --- a/terminus-local/src/shells/cygwin32.ts +++ b/tabby-local/src/shells/cygwin32.ts @@ -1,6 +1,6 @@ import * as path from 'path' import { Injectable } from '@angular/core' -import { HostAppService, Platform } from 'terminus-core' +import { HostAppService, Platform } from 'tabby-core' import { ShellProvider, Shell } from '../api' diff --git a/terminus-local/src/shells/cygwin64.ts b/tabby-local/src/shells/cygwin64.ts similarity index 94% rename from terminus-local/src/shells/cygwin64.ts rename to tabby-local/src/shells/cygwin64.ts index 9874d9ff..b6a44668 100644 --- a/terminus-local/src/shells/cygwin64.ts +++ b/tabby-local/src/shells/cygwin64.ts @@ -1,6 +1,6 @@ import * as path from 'path' import { Injectable } from '@angular/core' -import { HostAppService, Platform } from 'terminus-core' +import { HostAppService, Platform } from 'tabby-core' import { ShellProvider, Shell } from '../api' diff --git a/terminus-local/src/shells/gitBash.ts b/tabby-local/src/shells/gitBash.ts similarity index 95% rename from terminus-local/src/shells/gitBash.ts rename to tabby-local/src/shells/gitBash.ts index d0fdca43..60846fb2 100644 --- a/terminus-local/src/shells/gitBash.ts +++ b/tabby-local/src/shells/gitBash.ts @@ -1,6 +1,6 @@ import * as path from 'path' import { Injectable } from '@angular/core' -import { HostAppService, Platform } from 'terminus-core' +import { HostAppService, Platform } from 'tabby-core' import { ShellProvider, Shell } from '../api' diff --git a/terminus-local/src/shells/linuxDefault.ts b/tabby-local/src/shells/linuxDefault.ts similarity index 94% rename from terminus-local/src/shells/linuxDefault.ts rename to tabby-local/src/shells/linuxDefault.ts index 42e70df5..68119328 100644 --- a/terminus-local/src/shells/linuxDefault.ts +++ b/tabby-local/src/shells/linuxDefault.ts @@ -1,6 +1,6 @@ import * as fs from 'mz/fs' import { Injectable } from '@angular/core' -import { HostAppService, Platform, LogService, Logger } from 'terminus-core' +import { HostAppService, Platform, LogService, Logger } from 'tabby-core' import { ShellProvider, Shell } from '../api' diff --git a/terminus-local/src/shells/macDefault.ts b/tabby-local/src/shells/macDefault.ts similarity index 95% rename from terminus-local/src/shells/macDefault.ts rename to tabby-local/src/shells/macDefault.ts index 1961ccac..4c4e4cd3 100644 --- a/terminus-local/src/shells/macDefault.ts +++ b/tabby-local/src/shells/macDefault.ts @@ -1,6 +1,6 @@ import { exec } from 'mz/child_process' import { Injectable } from '@angular/core' -import { HostAppService, Platform } from 'terminus-core' +import { HostAppService, Platform } from 'tabby-core' import { ShellProvider, Shell } from '../api' diff --git a/terminus-local/src/shells/posix.ts b/tabby-local/src/shells/posix.ts similarity index 93% rename from terminus-local/src/shells/posix.ts rename to tabby-local/src/shells/posix.ts index e0403fa1..e6a53644 100644 --- a/terminus-local/src/shells/posix.ts +++ b/tabby-local/src/shells/posix.ts @@ -1,7 +1,7 @@ import * as fs from 'mz/fs' import slugify from 'slugify' import { Injectable } from '@angular/core' -import { HostAppService, Platform } from 'terminus-core' +import { HostAppService, Platform } from 'tabby-core' import { ShellProvider, Shell } from '../api' diff --git a/terminus-local/src/shells/powershellCore.ts b/tabby-local/src/shells/powershellCore.ts similarity index 94% rename from terminus-local/src/shells/powershellCore.ts rename to tabby-local/src/shells/powershellCore.ts index c93d299e..277ba15a 100644 --- a/terminus-local/src/shells/powershellCore.ts +++ b/tabby-local/src/shells/powershellCore.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { HostAppService, Platform } from 'terminus-core' +import { HostAppService, Platform } from 'tabby-core' import { ShellProvider, Shell } from '../api' diff --git a/terminus-local/src/shells/winDefault.ts b/tabby-local/src/shells/winDefault.ts similarity index 95% rename from terminus-local/src/shells/winDefault.ts rename to tabby-local/src/shells/winDefault.ts index e6541f02..1788b109 100644 --- a/terminus-local/src/shells/winDefault.ts +++ b/tabby-local/src/shells/winDefault.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { HostAppService, Platform } from 'terminus-core' +import { HostAppService, Platform } from 'tabby-core' import { ShellProvider, Shell } from '../api' diff --git a/terminus-local/src/shells/windowsStock.ts b/tabby-local/src/shells/windowsStock.ts similarity index 92% rename from terminus-local/src/shells/windowsStock.ts rename to tabby-local/src/shells/windowsStock.ts index 1627b6cf..59fa7197 100644 --- a/terminus-local/src/shells/windowsStock.ts +++ b/tabby-local/src/shells/windowsStock.ts @@ -1,7 +1,7 @@ import * as path from 'path' import { Injectable } from '@angular/core' -import { HostAppService, Platform } from 'terminus-core' -import { ElectronService } from 'terminus-electron' +import { HostAppService, Platform } from 'tabby-core' +import { ElectronService } from 'tabby-electron' import { ShellProvider, Shell } from '../api' @@ -28,7 +28,7 @@ export class WindowsStockShellsProvider extends ShellProvider { `clink_${process.arch}.exe`, ) - if (process.env.TERMINUS_DEV) { + if (process.env.TABBY_DEV) { clinkPath = path.join( path.dirname(this.electron.app.getPath('exe')), '..', '..', '..', diff --git a/terminus-local/src/shells/wsl.ts b/tabby-local/src/shells/wsl.ts similarity index 99% rename from terminus-local/src/shells/wsl.ts rename to tabby-local/src/shells/wsl.ts index 8aacf0a9..3a519900 100644 --- a/terminus-local/src/shells/wsl.ts +++ b/tabby-local/src/shells/wsl.ts @@ -2,7 +2,7 @@ import * as fs from 'mz/fs' import slugify from 'slugify' import { Injectable } from '@angular/core' -import { HostAppService, Platform, isWindowsBuild, WIN_BUILD_WSL_EXE_DISTRO_FLAG } from 'terminus-core' +import { HostAppService, Platform, isWindowsBuild, WIN_BUILD_WSL_EXE_DISTRO_FLAG } from 'tabby-core' import { ShellProvider, Shell } from '../api' diff --git a/terminus-local/src/tabContextMenu.ts b/tabby-local/src/tabContextMenu.ts similarity index 99% rename from terminus-local/src/tabContextMenu.ts rename to tabby-local/src/tabContextMenu.ts index 51708692..fd1ebb80 100644 --- a/terminus-local/src/tabContextMenu.ts +++ b/tabby-local/src/tabContextMenu.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { ConfigService, BaseTabComponent, TabContextMenuItemProvider, TabHeaderComponent, SplitTabComponent, NotificationsService, MenuItemOptions } from 'terminus-core' +import { ConfigService, BaseTabComponent, TabContextMenuItemProvider, TabHeaderComponent, SplitTabComponent, NotificationsService, MenuItemOptions } from 'tabby-core' import { TerminalTabComponent } from './components/terminalTab.component' import { UACService } from './services/uac.service' import { TerminalService } from './services/terminal.service' diff --git a/terminus-local/tsconfig.json b/tabby-local/tsconfig.json similarity index 100% rename from terminus-local/tsconfig.json rename to tabby-local/tsconfig.json diff --git a/terminus-local/tsconfig.typings.json b/tabby-local/tsconfig.typings.json similarity index 87% rename from terminus-local/tsconfig.typings.json rename to tabby-local/tsconfig.typings.json index 94ae3c19..1122d238 100644 --- a/terminus-local/tsconfig.typings.json +++ b/tabby-local/tsconfig.typings.json @@ -7,7 +7,7 @@ "declaration": true, "declarationDir": "./typings", "paths": { - "terminus-*": ["../../terminus-*"], + "tabby-*": ["../../tabby-*"], "*": [ "../../app/node_modules/*" ] diff --git a/terminus-local/webpack.config.js b/tabby-local/webpack.config.js similarity index 100% rename from terminus-local/webpack.config.js rename to tabby-local/webpack.config.js diff --git a/terminus-local/yarn.lock b/tabby-local/yarn.lock similarity index 100% rename from terminus-local/yarn.lock rename to tabby-local/yarn.lock diff --git a/terminus-plugin-manager/.gitignore b/tabby-plugin-manager/.gitignore similarity index 100% rename from terminus-plugin-manager/.gitignore rename to tabby-plugin-manager/.gitignore diff --git a/terminus-plugin-manager/package.json b/tabby-plugin-manager/package.json similarity index 79% rename from terminus-plugin-manager/package.json rename to tabby-plugin-manager/package.json index a7e9cc90..66f3f598 100644 --- a/terminus-plugin-manager/package.json +++ b/tabby-plugin-manager/package.json @@ -1,9 +1,9 @@ { - "name": "terminus-plugin-manager", + "name": "tabby-plugin-manager", "version": "1.0.140", - "description": "Terminus' plugin manager", + "description": "Tabby's plugin manager", "keywords": [ - "terminus-builtin-plugin" + "tabby-builtin-plugin" ], "main": "dist/index.js", "typings": "typings/index.d.ts", @@ -28,7 +28,7 @@ "@angular/platform-browser": "^9.1.11", "@ng-bootstrap/ng-bootstrap": "^6.1.0", "rxjs": "^6.5.5", - "terminus-core": "*", - "terminus-settings": "*" + "tabby-core": "*", + "tabby-settings": "*" } } diff --git a/terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug b/tabby-plugin-manager/src/components/pluginsSettingsTab.component.pug similarity index 100% rename from terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug rename to tabby-plugin-manager/src/components/pluginsSettingsTab.component.pug diff --git a/terminus-plugin-manager/src/components/pluginsSettingsTab.component.scss b/tabby-plugin-manager/src/components/pluginsSettingsTab.component.scss similarity index 100% rename from terminus-plugin-manager/src/components/pluginsSettingsTab.component.scss rename to tabby-plugin-manager/src/components/pluginsSettingsTab.component.scss diff --git a/terminus-plugin-manager/src/components/pluginsSettingsTab.component.ts b/tabby-plugin-manager/src/components/pluginsSettingsTab.component.ts similarity index 97% rename from terminus-plugin-manager/src/components/pluginsSettingsTab.component.ts rename to tabby-plugin-manager/src/components/pluginsSettingsTab.component.ts index 849fe937..5b20e214 100644 --- a/terminus-plugin-manager/src/components/pluginsSettingsTab.component.ts +++ b/tabby-plugin-manager/src/components/pluginsSettingsTab.component.ts @@ -4,12 +4,12 @@ import { debounceTime, distinctUntilChanged, first, tap, flatMap, map } from 'rx import semverGt from 'semver/functions/gt' import { Component, Input } from '@angular/core' -import { ConfigService, PlatformService, PluginInfo } from 'terminus-core' +import { ConfigService, PlatformService, PluginInfo } from 'tabby-core' import { PluginManagerService } from '../services/pluginManager.service' enum BusyState { Installing = 'Installing', Uninstalling = 'Uninstalling' } -const FORCE_ENABLE = ['terminus-core', 'terminus-settings'] +const FORCE_ENABLE = ['tabby-core', 'tabby-settings'] /** @hidden */ @Component({ diff --git a/terminus-plugin-manager/src/index.ts b/tabby-plugin-manager/src/index.ts similarity index 87% rename from terminus-plugin-manager/src/index.ts rename to tabby-plugin-manager/src/index.ts index 57638989..bcc98971 100644 --- a/terminus-plugin-manager/src/index.ts +++ b/tabby-plugin-manager/src/index.ts @@ -3,8 +3,8 @@ import { BrowserModule } from '@angular/platform-browser' import { FormsModule } from '@angular/forms' import { NgbModule } from '@ng-bootstrap/ng-bootstrap' -import TerminusCorePlugin from 'terminus-core' -import { SettingsTabProvider } from 'terminus-settings' +import TabbyCorePlugin from 'tabby-core' +import { SettingsTabProvider } from 'tabby-settings' import { PluginsSettingsTabComponent } from './components/pluginsSettingsTab.component' import { PluginManagerService } from './services/pluginManager.service' @@ -15,7 +15,7 @@ import { PluginsSettingsTabProvider } from './settings' BrowserModule, FormsModule, NgbModule, - TerminusCorePlugin, + TabbyCorePlugin, ], providers: [ { provide: SettingsTabProvider, useClass: PluginsSettingsTabProvider, multi: true }, diff --git a/terminus-plugin-manager/src/services/pluginManager.service.ts b/tabby-plugin-manager/src/services/pluginManager.service.ts similarity index 80% rename from terminus-plugin-manager/src/services/pluginManager.service.ts rename to tabby-plugin-manager/src/services/pluginManager.service.ts index a2f14c67..4a70b1d5 100644 --- a/terminus-plugin-manager/src/services/pluginManager.service.ts +++ b/tabby-plugin-manager/src/services/pluginManager.service.ts @@ -1,11 +1,9 @@ import axios from 'axios' -import { Observable, from } from 'rxjs' +import { Observable, from, forkJoin } from 'rxjs' import { map } from 'rxjs/operators' import { Injectable, Inject } from '@angular/core' -import { Logger, LogService, PlatformService, BOOTSTRAP_DATA, BootstrapData, PluginInfo } from 'terminus-core' +import { Logger, LogService, PlatformService, BOOTSTRAP_DATA, BootstrapData, PluginInfo } from 'tabby-core' -const NAME_PREFIX = 'terminus-' -const KEYWORD = 'terminus-plugin' const OFFICIAL_NPM_ACCOUNT = 'eugenepankov' const BLACKLIST = [ @@ -29,15 +27,22 @@ export class PluginManagerService { } listAvailable (query?: string): Observable { + return forkJoin( + this._listAvailableInternal('tabby-', 'tabby-plugin', query), + this._listAvailableInternal('terminus-', 'terminus-plugin', query), + ).pipe(map(x => x.reduce((a, b) => a.concat(b), []))) + } + + _listAvailableInternal (namePrefix: string, keyword: string, query?: string): Observable { return from( - axios.get(`https://www.npmjs.com/search?q=keywords%3A${KEYWORD}+${encodeURIComponent(query ?? '')}&from=0&size=1000`, { + axios.get(`https://www.npmjs.com/search?q=keywords%3A${keyword}+${encodeURIComponent(query ?? '')}&from=0&size=1000`, { headers: { 'x-spiferack': '1', }, }) ).pipe( map(response => response.data.objects.map(item => ({ - name: item.package.name.substring(NAME_PREFIX.length), + name: item.package.name.substring(namePrefix.length), packageName: item.package.name, description: item.package.description, version: item.package.version, @@ -45,7 +50,7 @@ export class PluginManagerService { author: (item.package.author || {}).name, isOfficial: item.package.publisher.name === OFFICIAL_NPM_ACCOUNT, }))), - map(plugins => plugins.filter(x => x.packageName.startsWith(NAME_PREFIX))), + map(plugins => plugins.filter(x => x.packageName.startsWith(namePrefix))), map(plugins => plugins.filter(x => !BLACKLIST.includes(x.packageName))), map(plugins => plugins.sort((a, b) => a.name.localeCompare(b.name))), ) diff --git a/terminus-plugin-manager/src/settings.ts b/tabby-plugin-manager/src/settings.ts similarity index 86% rename from terminus-plugin-manager/src/settings.ts rename to tabby-plugin-manager/src/settings.ts index 9405ed22..a8d565d2 100644 --- a/terminus-plugin-manager/src/settings.ts +++ b/tabby-plugin-manager/src/settings.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { SettingsTabProvider } from 'terminus-settings' +import { SettingsTabProvider } from 'tabby-settings' import { PluginsSettingsTabComponent } from './components/pluginsSettingsTab.component' diff --git a/terminus-plugin-manager/tsconfig.json b/tabby-plugin-manager/tsconfig.json similarity index 100% rename from terminus-plugin-manager/tsconfig.json rename to tabby-plugin-manager/tsconfig.json diff --git a/terminus-electron/tsconfig.typings.json b/tabby-plugin-manager/tsconfig.typings.json similarity index 87% rename from terminus-electron/tsconfig.typings.json rename to tabby-plugin-manager/tsconfig.typings.json index c0d2273c..9188bdf7 100644 --- a/terminus-electron/tsconfig.typings.json +++ b/tabby-plugin-manager/tsconfig.typings.json @@ -7,7 +7,7 @@ "declaration": true, "declarationDir": "./typings", "paths": { - "terminus-*": ["../../terminus-*"], + "tabby-*": ["../../tabby-*"], "*": ["../../app/node_modules/*"] } } diff --git a/terminus-plugin-manager/webpack.config.js b/tabby-plugin-manager/webpack.config.js similarity index 100% rename from terminus-plugin-manager/webpack.config.js rename to tabby-plugin-manager/webpack.config.js diff --git a/terminus-plugin-manager/yarn.lock b/tabby-plugin-manager/yarn.lock similarity index 100% rename from terminus-plugin-manager/yarn.lock rename to tabby-plugin-manager/yarn.lock diff --git a/terminus-serial/.gitignore b/tabby-serial/.gitignore similarity index 100% rename from terminus-serial/.gitignore rename to tabby-serial/.gitignore diff --git a/terminus-serial/package.json b/tabby-serial/package.json similarity index 80% rename from terminus-serial/package.json rename to tabby-serial/package.json index 47ef0329..6be9e2be 100644 --- a/terminus-serial/package.json +++ b/tabby-serial/package.json @@ -1,9 +1,9 @@ { - "name": "terminus-serial", + "name": "tabby-serial", "version": "1.0.140", - "description": "Serial connection manager for Terminus", + "description": "Serial connection manager for Tabby", "keywords": [ - "terminus-builtin-plugin" + "tabby-builtin-plugin" ], "main": "dist/index.js", "typings": "typings/index.d.ts", @@ -33,8 +33,8 @@ "@angular/platform-browser-dynamic": "^9.1.11", "@ng-bootstrap/ng-bootstrap": "^6.2.0", "rxjs": "^6.6.3", - "terminus-core": "*", - "terminus-settings": "*", - "terminus-terminal": "*" + "tabby-core": "*", + "tabby-settings": "*", + "tabby-terminal": "*" } } diff --git a/terminus-serial/src/api.ts b/tabby-serial/src/api.ts similarity index 98% rename from terminus-serial/src/api.ts rename to tabby-serial/src/api.ts index 58d53b47..1726733b 100644 --- a/terminus-serial/src/api.ts +++ b/tabby-serial/src/api.ts @@ -3,9 +3,9 @@ import colors from 'ansi-colors' import binstring from 'binstring' import stripAnsi from 'strip-ansi' import bufferReplace from 'buffer-replace' -import { BaseSession } from 'terminus-terminal' +import { BaseSession } from 'tabby-terminal' import { SerialPort } from 'serialport' -import { Logger } from 'terminus-core' +import { Logger } from 'tabby-core' import { Subject, Observable, interval } from 'rxjs' import { debounce } from 'rxjs/operators' import { ReadLine, createInterface as createReadline, clearLine } from 'readline' diff --git a/terminus-serial/src/buttonProvider.ts b/tabby-serial/src/buttonProvider.ts similarity index 98% rename from terminus-serial/src/buttonProvider.ts rename to tabby-serial/src/buttonProvider.ts index f6449f8a..6a7fbc8e 100644 --- a/terminus-serial/src/buttonProvider.ts +++ b/tabby-serial/src/buttonProvider.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { Injectable, Injector } from '@angular/core' -import { HotkeysService, ToolbarButtonProvider, ToolbarButton } from 'terminus-core' +import { HotkeysService, ToolbarButtonProvider, ToolbarButton } from 'tabby-core' import { SerialService } from './services/serial.service' /** @hidden */ diff --git a/terminus-serial/src/cli.ts b/tabby-serial/src/cli.ts similarity index 91% rename from terminus-serial/src/cli.ts rename to tabby-serial/src/cli.ts index 7b8b8229..66e460f1 100644 --- a/terminus-serial/src/cli.ts +++ b/tabby-serial/src/cli.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { CLIHandler, CLIEvent, ConfigService } from 'terminus-core' +import { CLIHandler, CLIEvent, ConfigService } from 'tabby-core' import { SerialService } from './services/serial.service' @Injectable() diff --git a/terminus-serial/src/components/editConnectionModal.component.pug b/tabby-serial/src/components/editConnectionModal.component.pug similarity index 100% rename from terminus-serial/src/components/editConnectionModal.component.pug rename to tabby-serial/src/components/editConnectionModal.component.pug diff --git a/terminus-serial/src/components/editConnectionModal.component.ts b/tabby-serial/src/components/editConnectionModal.component.ts similarity index 98% rename from terminus-serial/src/components/editConnectionModal.component.ts rename to tabby-serial/src/components/editConnectionModal.component.ts index 1c3aae1e..b4bde061 100644 --- a/terminus-serial/src/components/editConnectionModal.component.ts +++ b/tabby-serial/src/components/editConnectionModal.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators' -import { PlatformService } from 'terminus-core' +import { PlatformService } from 'tabby-core' import { SerialConnection, LoginScript, SerialPortInfo, BAUD_RATES } from '../api' import { SerialService } from '../services/serial.service' diff --git a/terminus-serial/src/components/serialSettingsTab.component.pug b/tabby-serial/src/components/serialSettingsTab.component.pug similarity index 100% rename from terminus-serial/src/components/serialSettingsTab.component.pug rename to tabby-serial/src/components/serialSettingsTab.component.pug diff --git a/terminus-serial/src/components/serialSettingsTab.component.ts b/tabby-serial/src/components/serialSettingsTab.component.ts similarity index 97% rename from terminus-serial/src/components/serialSettingsTab.component.ts rename to tabby-serial/src/components/serialSettingsTab.component.ts index 75d55aca..864acf24 100644 --- a/terminus-serial/src/components/serialSettingsTab.component.ts +++ b/tabby-serial/src/components/serialSettingsTab.component.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { Component } from '@angular/core' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' -import { ConfigService, PlatformService } from 'terminus-core' +import { ConfigService, PlatformService } from 'tabby-core' import { SerialConnection } from '../api' import { EditConnectionModalComponent } from './editConnectionModal.component' diff --git a/terminus-serial/src/components/serialTab.component.pug b/tabby-serial/src/components/serialTab.component.pug similarity index 100% rename from terminus-serial/src/components/serialTab.component.pug rename to tabby-serial/src/components/serialTab.component.pug diff --git a/tabby-serial/src/components/serialTab.component.scss b/tabby-serial/src/components/serialTab.component.scss new file mode 100644 index 00000000..a40e2dc9 --- /dev/null +++ b/tabby-serial/src/components/serialTab.component.scss @@ -0,0 +1,7 @@ +@import '../../../tabby-ssh/src/components/sshTab.component.scss'; + +:host { + select { + width: auto; + } +} diff --git a/terminus-serial/src/components/serialTab.component.ts b/tabby-serial/src/components/serialTab.component.ts similarity index 97% rename from terminus-serial/src/components/serialTab.component.ts rename to tabby-serial/src/components/serialTab.component.ts index 5bab8032..45cd7af9 100644 --- a/terminus-serial/src/components/serialTab.component.ts +++ b/tabby-serial/src/components/serialTab.component.ts @@ -3,8 +3,8 @@ import colors from 'ansi-colors' import { Spinner } from 'cli-spinner' import { Component, Injector } from '@angular/core' import { first } from 'rxjs/operators' -import { SelectorService } from 'terminus-core' -import { BaseTerminalTabComponent } from 'terminus-terminal' +import { SelectorService } from 'tabby-core' +import { BaseTerminalTabComponent } from 'tabby-terminal' import { SerialService } from '../services/serial.service' import { SerialConnection, SerialSession, BAUD_RATES } from '../api' diff --git a/terminus-serial/src/config.ts b/tabby-serial/src/config.ts similarity index 88% rename from terminus-serial/src/config.ts rename to tabby-serial/src/config.ts index 052aa5a3..1d9fd907 100644 --- a/terminus-serial/src/config.ts +++ b/tabby-serial/src/config.ts @@ -1,4 +1,4 @@ -import { ConfigProvider } from 'terminus-core' +import { ConfigProvider } from 'tabby-core' /** @hidden */ export class SerialConfigProvider extends ConfigProvider { diff --git a/terminus-serial/src/hotkeys.ts b/tabby-serial/src/hotkeys.ts similarity index 87% rename from terminus-serial/src/hotkeys.ts rename to tabby-serial/src/hotkeys.ts index 46d2c592..b0ab3a0d 100644 --- a/terminus-serial/src/hotkeys.ts +++ b/tabby-serial/src/hotkeys.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { HotkeyDescription, HotkeyProvider } from 'terminus-core' +import { HotkeyDescription, HotkeyProvider } from 'tabby-core' /** @hidden */ @Injectable() diff --git a/terminus-serial/src/icons/serial.svg b/tabby-serial/src/icons/serial.svg similarity index 100% rename from terminus-serial/src/icons/serial.svg rename to tabby-serial/src/icons/serial.svg diff --git a/terminus-serial/src/index.ts b/tabby-serial/src/index.ts similarity index 85% rename from terminus-serial/src/index.ts rename to tabby-serial/src/index.ts index c46b4c39..5656f0d6 100644 --- a/terminus-serial/src/index.ts +++ b/tabby-serial/src/index.ts @@ -3,9 +3,9 @@ import { CommonModule } from '@angular/common' import { FormsModule } from '@angular/forms' import { NgbModule } from '@ng-bootstrap/ng-bootstrap' import { ToastrModule } from 'ngx-toastr' -import TerminusCoreModule, { ToolbarButtonProvider, ConfigProvider, TabRecoveryProvider, HotkeyProvider, CLIHandler } from 'terminus-core' -import { SettingsTabProvider } from 'terminus-settings' -import TerminusTerminalModule from 'terminus-terminal' +import TabbyCoreModule, { ToolbarButtonProvider, ConfigProvider, TabRecoveryProvider, HotkeyProvider, CLIHandler } from 'tabby-core' +import { SettingsTabProvider } from 'tabby-settings' +import TabbyTerminalModule from 'tabby-terminal' import { EditConnectionModalComponent } from './components/editConnectionModal.component' import { SerialSettingsTabComponent } from './components/serialSettingsTab.component' @@ -25,8 +25,8 @@ import { SerialCLIHandler } from './cli' CommonModule, FormsModule, ToastrModule, - TerminusCoreModule, - TerminusTerminalModule, + TabbyCoreModule, + TabbyTerminalModule, ], providers: [ { provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true }, diff --git a/terminus-serial/src/recoveryProvider.ts b/tabby-serial/src/recoveryProvider.ts similarity index 97% rename from terminus-serial/src/recoveryProvider.ts rename to tabby-serial/src/recoveryProvider.ts index e47bc410..ee5e2ea6 100644 --- a/terminus-serial/src/recoveryProvider.ts +++ b/tabby-serial/src/recoveryProvider.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { TabRecoveryProvider, RecoveredTab, RecoveryToken } from 'terminus-core' +import { TabRecoveryProvider, RecoveredTab, RecoveryToken } from 'tabby-core' import { SerialTabComponent } from './components/serialTab.component' diff --git a/terminus-serial/src/services/serial.service.ts b/tabby-serial/src/services/serial.service.ts similarity index 98% rename from terminus-serial/src/services/serial.service.ts rename to tabby-serial/src/services/serial.service.ts index a6537548..5e73699e 100644 --- a/terminus-serial/src/services/serial.service.ts +++ b/tabby-serial/src/services/serial.service.ts @@ -1,7 +1,7 @@ import { Injectable, NgZone } from '@angular/core' import SerialPort from 'serialport' -import { LogService, AppService, SelectorOption, ConfigService, NotificationsService, SelectorService } from 'terminus-core' -import { SettingsTabComponent } from 'terminus-settings' +import { LogService, AppService, SelectorOption, ConfigService, NotificationsService, SelectorService } from 'tabby-core' +import { SettingsTabComponent } from 'tabby-settings' import { SerialConnection, SerialSession, SerialPortInfo, BAUD_RATES } from '../api' import { SerialTabComponent } from '../components/serialTab.component' diff --git a/terminus-serial/src/settings.ts b/tabby-serial/src/settings.ts similarity index 86% rename from terminus-serial/src/settings.ts rename to tabby-serial/src/settings.ts index aa6623e3..7df98c2e 100644 --- a/terminus-serial/src/settings.ts +++ b/tabby-serial/src/settings.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { SettingsTabProvider } from 'terminus-settings' +import { SettingsTabProvider } from 'tabby-settings' import { SerialSettingsTabComponent } from './components/serialSettingsTab.component' diff --git a/terminus-serial/tsconfig.json b/tabby-serial/tsconfig.json similarity index 100% rename from terminus-serial/tsconfig.json rename to tabby-serial/tsconfig.json diff --git a/terminus-serial/tsconfig.typings.json b/tabby-serial/tsconfig.typings.json similarity index 88% rename from terminus-serial/tsconfig.typings.json rename to tabby-serial/tsconfig.typings.json index 95da756c..891a0f24 100644 --- a/terminus-serial/tsconfig.typings.json +++ b/tabby-serial/tsconfig.typings.json @@ -8,7 +8,7 @@ "declaration": true, "declarationDir": "./typings", "paths": { - "terminus-*": ["../../terminus-*"], + "tabby-*": ["../../tabby-*"], "*": ["../../app/node_modules/*"] } } diff --git a/terminus-serial/webpack.config.js b/tabby-serial/webpack.config.js similarity index 100% rename from terminus-serial/webpack.config.js rename to tabby-serial/webpack.config.js diff --git a/terminus-serial/yarn.lock b/tabby-serial/yarn.lock similarity index 100% rename from terminus-serial/yarn.lock rename to tabby-serial/yarn.lock diff --git a/terminus-settings/.gitignore b/tabby-settings/.gitignore similarity index 100% rename from terminus-settings/.gitignore rename to tabby-settings/.gitignore diff --git a/terminus-settings/README.md b/tabby-settings/README.md similarity index 75% rename from terminus-settings/README.md rename to tabby-settings/README.md index 88706262..2bcb29a9 100644 --- a/terminus-settings/README.md +++ b/tabby-settings/README.md @@ -1,4 +1,4 @@ -Terminus Settings Plugin +Tabby Settings Plugin ------------------------ * tabbed settings interface @@ -6,7 +6,7 @@ Terminus Settings Plugin Using the API: ```ts -import { SettingsTabProvider } from 'terminus-settings' +import { SettingsTabProvider } from 'tabby-settings' ``` Exporting your subclasses: diff --git a/terminus-settings/package.json b/tabby-settings/package.json similarity index 83% rename from terminus-settings/package.json rename to tabby-settings/package.json index 560089f5..fe61486d 100644 --- a/terminus-settings/package.json +++ b/tabby-settings/package.json @@ -1,9 +1,9 @@ { - "name": "terminus-settings", + "name": "tabby-settings", "version": "1.0.140", - "description": "Terminus terminal settings page", + "description": "Tabby terminal settings page", "keywords": [ - "terminus-builtin-plugin" + "tabby-builtin-plugin" ], "main": "dist/index.js", "typings": "typings/index.d.ts", @@ -28,6 +28,6 @@ "@angular/platform-browser": "^9.1.11", "@ng-bootstrap/ng-bootstrap": "^6.1.0", "rxjs": "^6.5.5", - "terminus-core": "*" + "tabby-core": "*" } } diff --git a/terminus-settings/src/api.ts b/tabby-settings/src/api.ts similarity index 100% rename from terminus-settings/src/api.ts rename to tabby-settings/src/api.ts diff --git a/terminus-settings/src/buttonProvider.ts b/tabby-settings/src/buttonProvider.ts similarity index 96% rename from terminus-settings/src/buttonProvider.ts rename to tabby-settings/src/buttonProvider.ts index 375efd59..1c20c806 100644 --- a/terminus-settings/src/buttonProvider.ts +++ b/tabby-settings/src/buttonProvider.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { ToolbarButtonProvider, ToolbarButton, AppService, HostAppService, HotkeysService } from 'terminus-core' +import { ToolbarButtonProvider, ToolbarButton, AppService, HostAppService, HotkeysService } from 'tabby-core' import { SettingsTabComponent } from './components/settingsTab.component' diff --git a/terminus-settings/src/components/hotkeyInputModal.component.pug b/tabby-settings/src/components/hotkeyInputModal.component.pug similarity index 100% rename from terminus-settings/src/components/hotkeyInputModal.component.pug rename to tabby-settings/src/components/hotkeyInputModal.component.pug diff --git a/terminus-settings/src/components/hotkeyInputModal.component.scss b/tabby-settings/src/components/hotkeyInputModal.component.scss similarity index 100% rename from terminus-settings/src/components/hotkeyInputModal.component.scss rename to tabby-settings/src/components/hotkeyInputModal.component.scss diff --git a/terminus-settings/src/components/hotkeyInputModal.component.ts b/tabby-settings/src/components/hotkeyInputModal.component.ts similarity index 97% rename from terminus-settings/src/components/hotkeyInputModal.component.ts rename to tabby-settings/src/components/hotkeyInputModal.component.ts index 62d7755d..ec815281 100644 --- a/terminus-settings/src/components/hotkeyInputModal.component.ts +++ b/tabby-settings/src/components/hotkeyInputModal.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core' import { trigger, transition, style, animate } from '@angular/animations' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { HotkeysService, BaseComponent } from 'terminus-core' +import { HotkeysService, BaseComponent } from 'tabby-core' const INPUT_TIMEOUT = 1000 diff --git a/terminus-settings/src/components/hotkeySettingsTab.component.pug b/tabby-settings/src/components/hotkeySettingsTab.component.pug similarity index 100% rename from terminus-settings/src/components/hotkeySettingsTab.component.pug rename to tabby-settings/src/components/hotkeySettingsTab.component.pug diff --git a/terminus-settings/src/components/hotkeySettingsTab.component.scss b/tabby-settings/src/components/hotkeySettingsTab.component.scss similarity index 100% rename from terminus-settings/src/components/hotkeySettingsTab.component.scss rename to tabby-settings/src/components/hotkeySettingsTab.component.scss diff --git a/terminus-settings/src/components/hotkeySettingsTab.component.ts b/tabby-settings/src/components/hotkeySettingsTab.component.ts similarity index 98% rename from terminus-settings/src/components/hotkeySettingsTab.component.ts rename to tabby-settings/src/components/hotkeySettingsTab.component.ts index f2b9e2c8..50487afb 100644 --- a/terminus-settings/src/components/hotkeySettingsTab.component.ts +++ b/tabby-settings/src/components/hotkeySettingsTab.component.ts @@ -5,7 +5,7 @@ import { HotkeyDescription, HotkeysService, HostAppService, -} from 'terminus-core' +} from 'tabby-core' /** @hidden */ @Component({ diff --git a/terminus-settings/src/components/multiHotkeyInput.component.pug b/tabby-settings/src/components/multiHotkeyInput.component.pug similarity index 100% rename from terminus-settings/src/components/multiHotkeyInput.component.pug rename to tabby-settings/src/components/multiHotkeyInput.component.pug diff --git a/terminus-settings/src/components/multiHotkeyInput.component.scss b/tabby-settings/src/components/multiHotkeyInput.component.scss similarity index 100% rename from terminus-settings/src/components/multiHotkeyInput.component.scss rename to tabby-settings/src/components/multiHotkeyInput.component.scss diff --git a/terminus-settings/src/components/multiHotkeyInput.component.ts b/tabby-settings/src/components/multiHotkeyInput.component.ts similarity index 100% rename from terminus-settings/src/components/multiHotkeyInput.component.ts rename to tabby-settings/src/components/multiHotkeyInput.component.ts diff --git a/terminus-settings/src/components/setVaultPassphraseModal.component.pug b/tabby-settings/src/components/setVaultPassphraseModal.component.pug similarity index 100% rename from terminus-settings/src/components/setVaultPassphraseModal.component.pug rename to tabby-settings/src/components/setVaultPassphraseModal.component.pug diff --git a/terminus-settings/src/components/setVaultPassphraseModal.component.ts b/tabby-settings/src/components/setVaultPassphraseModal.component.ts similarity index 100% rename from terminus-settings/src/components/setVaultPassphraseModal.component.ts rename to tabby-settings/src/components/setVaultPassphraseModal.component.ts diff --git a/terminus-settings/src/components/settingsTab.component.pug b/tabby-settings/src/components/settingsTab.component.pug similarity index 96% rename from terminus-settings/src/components/settingsTab.component.pug rename to tabby-settings/src/components/settingsTab.component.pug index 7264987b..54da97d7 100644 --- a/terminus-settings/src/components/settingsTab.component.pug +++ b/tabby-settings/src/components/settingsTab.component.pug @@ -7,8 +7,8 @@ button.btn.btn-outline-warning.btn-block(*ngIf='config.restartRequested', '(clic i.fas.fa-fw.fa-window-maximize.mr-2 | Application ng-template(ngbNavContent) - .terminus-logo.mt-3 - h1.terminus-title Terminus + .tabby-logo.mt-3 + h1.tabby-title Tabby sup α .text-center @@ -49,7 +49,7 @@ button.btn.btn-outline-warning.btn-block(*ngIf='config.restartRequested', '(clic .form-line(*ngIf='hostApp.platform !== Platform.Web') .header .title Enable analytics - .description We're only tracking your Terminus and OS versions. + .description We're only tracking your Tabby and OS versions. toggle( [(ngModel)]='config.store.enableAnalytics', (ngModelChange)='saveConfiguration(true)', diff --git a/terminus-settings/src/components/settingsTab.component.scss b/tabby-settings/src/components/settingsTab.component.scss similarity index 100% rename from terminus-settings/src/components/settingsTab.component.scss rename to tabby-settings/src/components/settingsTab.component.scss diff --git a/terminus-settings/src/components/settingsTab.component.ts b/tabby-settings/src/components/settingsTab.component.ts similarity index 99% rename from terminus-settings/src/components/settingsTab.component.ts rename to tabby-settings/src/components/settingsTab.component.ts index 38dc1403..b140245f 100644 --- a/terminus-settings/src/components/settingsTab.component.ts +++ b/tabby-settings/src/components/settingsTab.component.ts @@ -11,7 +11,7 @@ import { UpdaterService, PlatformService, HostWindowService, -} from 'terminus-core' +} from 'tabby-core' import { SettingsTabProvider } from '../api' diff --git a/terminus-settings/src/components/settingsTabBody.component.ts b/tabby-settings/src/components/settingsTabBody.component.ts similarity index 100% rename from terminus-settings/src/components/settingsTabBody.component.ts rename to tabby-settings/src/components/settingsTabBody.component.ts diff --git a/terminus-settings/src/components/vaultSettingsTab.component.pug b/tabby-settings/src/components/vaultSettingsTab.component.pug similarity index 95% rename from terminus-settings/src/components/vaultSettingsTab.component.pug rename to tabby-settings/src/components/vaultSettingsTab.component.pug index c2ecaaf5..16585bc8 100644 --- a/terminus-settings/src/components/vaultSettingsTab.component.pug +++ b/tabby-settings/src/components/vaultSettingsTab.component.pug @@ -34,7 +34,7 @@ div(*ngIf='vault.isEnabled()') .form-line .header .title Encrypt config file - .description Puts all of Terminus configuration into the vault + .description Puts all of Tabby's configuration into the vault toggle( [ngModel]='config.store.encrypted', (click)='toggleConfigEncrypted()', diff --git a/terminus-settings/src/components/vaultSettingsTab.component.ts b/tabby-settings/src/components/vaultSettingsTab.component.ts similarity index 97% rename from terminus-settings/src/components/vaultSettingsTab.component.ts rename to tabby-settings/src/components/vaultSettingsTab.component.ts index a4c24f7f..15e097c8 100644 --- a/terminus-settings/src/components/vaultSettingsTab.component.ts +++ b/tabby-settings/src/components/vaultSettingsTab.component.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { Component } from '@angular/core' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' -import { BaseComponent, VaultService, VaultSecret, Vault, PlatformService, ConfigService, VAULT_SECRET_TYPE_FILE } from 'terminus-core' +import { BaseComponent, VaultService, VaultSecret, Vault, PlatformService, ConfigService, VAULT_SECRET_TYPE_FILE } from 'tabby-core' import { SetVaultPassphraseModalComponent } from './setVaultPassphraseModal.component' diff --git a/terminus-settings/src/components/windowSettingsTab.component.pug b/tabby-settings/src/components/windowSettingsTab.component.pug similarity index 100% rename from terminus-settings/src/components/windowSettingsTab.component.pug rename to tabby-settings/src/components/windowSettingsTab.component.pug diff --git a/terminus-settings/src/components/windowSettingsTab.component.ts b/tabby-settings/src/components/windowSettingsTab.component.ts similarity index 98% rename from terminus-settings/src/components/windowSettingsTab.component.ts rename to tabby-settings/src/components/windowSettingsTab.component.ts index 646f10c3..6fda45d5 100644 --- a/terminus-settings/src/components/windowSettingsTab.component.ts +++ b/tabby-settings/src/components/windowSettingsTab.component.ts @@ -12,7 +12,7 @@ import { BaseComponent, Screen, PlatformService, -} from 'terminus-core' +} from 'tabby-core' /** @hidden */ diff --git a/terminus-settings/src/config.ts b/tabby-settings/src/config.ts similarity index 89% rename from terminus-settings/src/config.ts rename to tabby-settings/src/config.ts index 4ac51d6e..553f2bb3 100644 --- a/terminus-settings/src/config.ts +++ b/tabby-settings/src/config.ts @@ -1,4 +1,4 @@ -import { ConfigProvider, Platform } from 'terminus-core' +import { ConfigProvider, Platform } from 'tabby-core' /** @hidden */ export class SettingsConfigProvider extends ConfigProvider { diff --git a/terminus-settings/src/hotkeys.ts b/tabby-settings/src/hotkeys.ts similarity index 84% rename from terminus-settings/src/hotkeys.ts rename to tabby-settings/src/hotkeys.ts index db62ec24..71837897 100644 --- a/terminus-settings/src/hotkeys.ts +++ b/tabby-settings/src/hotkeys.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { HotkeyDescription, HotkeyProvider } from 'terminus-core' +import { HotkeyDescription, HotkeyProvider } from 'tabby-core' /** @hidden */ @Injectable() diff --git a/terminus-settings/src/icons/cog.svg b/tabby-settings/src/icons/cog.svg similarity index 100% rename from terminus-settings/src/icons/cog.svg rename to tabby-settings/src/icons/cog.svg diff --git a/terminus-settings/src/index.ts b/tabby-settings/src/index.ts similarity index 95% rename from terminus-settings/src/index.ts rename to tabby-settings/src/index.ts index 66b001bb..6930625f 100644 --- a/terminus-settings/src/index.ts +++ b/tabby-settings/src/index.ts @@ -3,7 +3,7 @@ import { BrowserModule } from '@angular/platform-browser' import { FormsModule } from '@angular/forms' import { NgbModule } from '@ng-bootstrap/ng-bootstrap' -import TerminusCorePlugin, { ToolbarButtonProvider, HotkeyProvider, ConfigProvider } from 'terminus-core' +import TabbyCorePlugin, { ToolbarButtonProvider, HotkeyProvider, ConfigProvider } from 'tabby-core' import { HotkeyInputModalComponent } from './components/hotkeyInputModal.component' import { HotkeySettingsTabComponent } from './components/hotkeySettingsTab.component' @@ -26,7 +26,7 @@ import { HotkeySettingsTabProvider, WindowSettingsTabProvider, VaultSettingsTabP BrowserModule, FormsModule, NgbModule, - TerminusCorePlugin, + TabbyCorePlugin, ], providers: [ { provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true }, diff --git a/terminus-settings/src/settings.ts b/tabby-settings/src/settings.ts similarity index 100% rename from terminus-settings/src/settings.ts rename to tabby-settings/src/settings.ts diff --git a/terminus-settings/tsconfig.json b/tabby-settings/tsconfig.json similarity index 100% rename from terminus-settings/tsconfig.json rename to tabby-settings/tsconfig.json diff --git a/tabby-settings/tsconfig.typings.json b/tabby-settings/tsconfig.typings.json new file mode 100644 index 00000000..9188bdf7 --- /dev/null +++ b/tabby-settings/tsconfig.typings.json @@ -0,0 +1,14 @@ +{ + "extends": "../tsconfig.json", + "exclude": ["node_modules", "dist", "typings"], + "compilerOptions": { + "baseUrl": "src", + "emitDeclarationOnly": true, + "declaration": true, + "declarationDir": "./typings", + "paths": { + "tabby-*": ["../../tabby-*"], + "*": ["../../app/node_modules/*"] + } + } +} diff --git a/terminus-settings/webpack.config.js b/tabby-settings/webpack.config.js similarity index 100% rename from terminus-settings/webpack.config.js rename to tabby-settings/webpack.config.js diff --git a/terminus-settings/yarn.lock b/tabby-settings/yarn.lock similarity index 100% rename from terminus-settings/yarn.lock rename to tabby-settings/yarn.lock diff --git a/terminus-ssh/.gitignore b/tabby-ssh/.gitignore similarity index 100% rename from terminus-ssh/.gitignore rename to tabby-ssh/.gitignore diff --git a/terminus-ssh/package.json b/tabby-ssh/package.json similarity index 85% rename from terminus-ssh/package.json rename to tabby-ssh/package.json index d851f347..a1535340 100644 --- a/terminus-ssh/package.json +++ b/tabby-ssh/package.json @@ -1,9 +1,9 @@ { - "name": "terminus-ssh", + "name": "tabby-ssh", "version": "1.0.140", - "description": "SSH connection manager for Terminus", + "description": "SSH connection manager for Tabby", "keywords": [ - "terminus-builtin-plugin" + "tabby-builtin-plugin" ], "main": "dist/index.js", "typings": "typings/index.d.ts", @@ -42,8 +42,8 @@ "@angular/platform-browser": "^9.1.11", "@ng-bootstrap/ng-bootstrap": "^6.1.0", "rxjs": "^6.5.5", - "terminus-core": "*", - "terminus-settings": "*", - "terminus-terminal": "*" + "tabby-core": "*", + "tabby-settings": "*", + "tabby-terminal": "*" } } diff --git a/terminus-ssh/src/api.ts b/tabby-ssh/src/api.ts similarity index 99% rename from terminus-ssh/src/api.ts rename to tabby-ssh/src/api.ts index 0a75d2e0..0016e501 100644 --- a/terminus-ssh/src/api.ts +++ b/tabby-ssh/src/api.ts @@ -10,8 +10,8 @@ import stripAnsi from 'strip-ansi' import socksv5 from 'socksv5' import { Injector, NgZone } from '@angular/core' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' -import { ConfigService, FileProvidersService, HostAppService, Logger, NotificationsService, Platform, PlatformService, wrapPromise } from 'terminus-core' -import { BaseSession } from 'terminus-terminal' +import { ConfigService, FileProvidersService, HostAppService, Logger, NotificationsService, Platform, PlatformService, wrapPromise } from 'tabby-core' +import { BaseSession } from 'tabby-terminal' import { Server, Socket, createServer, createConnection } from 'net' import { Client, ClientChannel, SFTPWrapper } from 'ssh2' import type { FileEntry, Stats } from 'ssh2-streams' @@ -491,7 +491,7 @@ export class SSHSession extends BaseSession { socket.on('error', e => { // eslint-disable-next-line @typescript-eslint/no-base-to-string this.emitServiceMessage(colors.bgRed.black(' X ') + ` Could not connect to the X server: ${e}`) - this.emitServiceMessage(` Terminus tried to connect to ${xHost}:${xPort} based on the DISPLAY environment var (${displaySpec})`) + this.emitServiceMessage(` Tabby tried to connect to ${xHost}:${xPort} based on the DISPLAY environment var (${displaySpec})`) if (process.platform === 'win32') { this.emitServiceMessage(' To use X forwarding, you need a local X server, e.g.:') this.emitServiceMessage(' * VcXsrv: https://sourceforge.net/projects/vcxsrv/') diff --git a/terminus-ssh/src/buttonProvider.ts b/tabby-ssh/src/buttonProvider.ts similarity index 91% rename from terminus-ssh/src/buttonProvider.ts rename to tabby-ssh/src/buttonProvider.ts index 592b1ce0..c0ef0f1d 100644 --- a/terminus-ssh/src/buttonProvider.ts +++ b/tabby-ssh/src/buttonProvider.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { Injectable } from '@angular/core' -import { HotkeysService, ToolbarButtonProvider, ToolbarButton, HostAppService, Platform } from 'terminus-core' +import { HotkeysService, ToolbarButtonProvider, ToolbarButton, HostAppService, Platform } from 'tabby-core' import { SSHService } from './services/ssh.service' /** @hidden */ @@ -26,7 +26,7 @@ export class ButtonProvider extends ToolbarButtonProvider { provide (): ToolbarButton[] { if (this.hostApp.platform === Platform.Web) { return [{ - icon: require('../../terminus-local/src/icons/plus.svg'), + icon: require('../../tabby-local/src/icons/plus.svg'), title: 'SSH connections', click: () => this.activate(), }] diff --git a/terminus-ssh/src/cli.ts b/tabby-ssh/src/cli.ts similarity index 91% rename from terminus-ssh/src/cli.ts rename to tabby-ssh/src/cli.ts index c68e6e1f..1c6f4004 100644 --- a/terminus-ssh/src/cli.ts +++ b/tabby-ssh/src/cli.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { CLIHandler, CLIEvent, ConfigService } from 'terminus-core' +import { CLIHandler, CLIEvent, ConfigService } from 'tabby-core' import { SSHService } from './services/ssh.service' @Injectable() diff --git a/terminus-ssh/src/components/editConnectionModal.component.pug b/tabby-ssh/src/components/editConnectionModal.component.pug similarity index 100% rename from terminus-ssh/src/components/editConnectionModal.component.pug rename to tabby-ssh/src/components/editConnectionModal.component.pug diff --git a/terminus-ssh/src/components/editConnectionModal.component.ts b/tabby-ssh/src/components/editConnectionModal.component.ts similarity index 99% rename from terminus-ssh/src/components/editConnectionModal.component.ts rename to tabby-ssh/src/components/editConnectionModal.component.ts index f5f389e6..2d47fb75 100644 --- a/terminus-ssh/src/components/editConnectionModal.component.ts +++ b/tabby-ssh/src/components/editConnectionModal.component.ts @@ -4,7 +4,7 @@ import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' import { Observable } from 'rxjs' import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators' -import { ConfigService, PlatformService, FileProvidersService, Platform, HostAppService } from 'terminus-core' +import { ConfigService, PlatformService, FileProvidersService, Platform, HostAppService } from 'tabby-core' import { PasswordStorageService } from '../services/passwordStorage.service' import { SSHConnection, LoginScript, ForwardedPortConfig, SSHAlgorithmType, ALGORITHM_BLACKLIST } from '../api' import { PromptModalComponent } from './promptModal.component' diff --git a/terminus-ssh/src/components/promptModal.component.pug b/tabby-ssh/src/components/promptModal.component.pug similarity index 100% rename from terminus-ssh/src/components/promptModal.component.pug rename to tabby-ssh/src/components/promptModal.component.pug diff --git a/terminus-ssh/src/components/promptModal.component.ts b/tabby-ssh/src/components/promptModal.component.ts similarity index 100% rename from terminus-ssh/src/components/promptModal.component.ts rename to tabby-ssh/src/components/promptModal.component.ts diff --git a/terminus-ssh/src/components/sftpDeleteModal.component.pug b/tabby-ssh/src/components/sftpDeleteModal.component.pug similarity index 100% rename from terminus-ssh/src/components/sftpDeleteModal.component.pug rename to tabby-ssh/src/components/sftpDeleteModal.component.pug diff --git a/terminus-ssh/src/components/sftpDeleteModal.component.ts b/tabby-ssh/src/components/sftpDeleteModal.component.ts similarity index 96% rename from terminus-ssh/src/components/sftpDeleteModal.component.ts rename to tabby-ssh/src/components/sftpDeleteModal.component.ts index 1ae3f03c..b134c4b2 100644 --- a/terminus-ssh/src/components/sftpDeleteModal.component.ts +++ b/tabby-ssh/src/components/sftpDeleteModal.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { BaseComponent } from 'terminus-core' +import { BaseComponent } from 'tabby-core' import { SFTPFile, SFTPSession } from '../api' /** @hidden */ diff --git a/terminus-ssh/src/components/sftpPanel.component.pug b/tabby-ssh/src/components/sftpPanel.component.pug similarity index 96% rename from terminus-ssh/src/components/sftpPanel.component.pug rename to tabby-ssh/src/components/sftpPanel.component.pug index 40a3be80..54df59f9 100644 --- a/terminus-ssh/src/components/sftpPanel.component.pug +++ b/tabby-ssh/src/components/sftpPanel.component.pug @@ -10,7 +10,7 @@ i.fas.fa-upload.mr-1 div Upload - button.btn.btn-link.btn-close((click)='close()') !{require('../../../terminus-core/src/icons/times.svg')} + button.btn.btn-link.btn-close((click)='close()') !{require('../../../tabby-core/src/icons/times.svg')} .body(dropZone, (transfer)='uploadOne($event)') div(*ngIf='!sftp') Connecting diff --git a/terminus-ssh/src/components/sftpPanel.component.scss b/tabby-ssh/src/components/sftpPanel.component.scss similarity index 100% rename from terminus-ssh/src/components/sftpPanel.component.scss rename to tabby-ssh/src/components/sftpPanel.component.scss diff --git a/terminus-ssh/src/components/sftpPanel.component.ts b/tabby-ssh/src/components/sftpPanel.component.ts similarity index 98% rename from terminus-ssh/src/components/sftpPanel.component.ts rename to tabby-ssh/src/components/sftpPanel.component.ts index 8e0893cf..26067792 100644 --- a/terminus-ssh/src/components/sftpPanel.component.ts +++ b/tabby-ssh/src/components/sftpPanel.component.ts @@ -3,7 +3,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { SSHSession, SFTPSession, SFTPFile } from '../api' import { posix as path } from 'path' import * as C from 'constants' -import { FileUpload, PlatformService } from 'terminus-core' +import { FileUpload, PlatformService } from 'tabby-core' import { SFTPDeleteModalComponent } from './sftpDeleteModal.component' interface PathSegment { diff --git a/terminus-ssh/src/components/sshPortForwardingConfig.component.pug b/tabby-ssh/src/components/sshPortForwardingConfig.component.pug similarity index 100% rename from terminus-ssh/src/components/sshPortForwardingConfig.component.pug rename to tabby-ssh/src/components/sshPortForwardingConfig.component.pug diff --git a/terminus-ssh/src/components/sshPortForwardingConfig.component.ts b/tabby-ssh/src/components/sshPortForwardingConfig.component.ts similarity index 100% rename from terminus-ssh/src/components/sshPortForwardingConfig.component.ts rename to tabby-ssh/src/components/sshPortForwardingConfig.component.ts diff --git a/terminus-ssh/src/components/sshPortForwardingModal.component.pug b/tabby-ssh/src/components/sshPortForwardingModal.component.pug similarity index 100% rename from terminus-ssh/src/components/sshPortForwardingModal.component.pug rename to tabby-ssh/src/components/sshPortForwardingModal.component.pug diff --git a/terminus-ssh/src/components/sshPortForwardingModal.component.ts b/tabby-ssh/src/components/sshPortForwardingModal.component.ts similarity index 100% rename from terminus-ssh/src/components/sshPortForwardingModal.component.ts rename to tabby-ssh/src/components/sshPortForwardingModal.component.ts diff --git a/terminus-ssh/src/components/sshSettingsTab.component.pug b/tabby-ssh/src/components/sshSettingsTab.component.pug similarity index 100% rename from terminus-ssh/src/components/sshSettingsTab.component.pug rename to tabby-ssh/src/components/sshSettingsTab.component.pug diff --git a/terminus-ssh/src/components/sshSettingsTab.component.scss b/tabby-ssh/src/components/sshSettingsTab.component.scss similarity index 100% rename from terminus-ssh/src/components/sshSettingsTab.component.scss rename to tabby-ssh/src/components/sshSettingsTab.component.scss diff --git a/terminus-ssh/src/components/sshSettingsTab.component.ts b/tabby-ssh/src/components/sshSettingsTab.component.ts similarity index 99% rename from terminus-ssh/src/components/sshSettingsTab.component.ts rename to tabby-ssh/src/components/sshSettingsTab.component.ts index 49db496a..7d6dd0ba 100644 --- a/terminus-ssh/src/components/sshSettingsTab.component.ts +++ b/tabby-ssh/src/components/sshSettingsTab.component.ts @@ -2,7 +2,7 @@ import deepClone from 'clone-deep' import { Component } from '@angular/core' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' -import { ConfigService, HostAppService, Platform, PlatformService } from 'terminus-core' +import { ConfigService, HostAppService, Platform, PlatformService } from 'tabby-core' import { PasswordStorageService } from '../services/passwordStorage.service' import { SSHConnection } from '../api' import { EditConnectionModalComponent } from './editConnectionModal.component' diff --git a/terminus-ssh/src/components/sshTab.component.pug b/tabby-ssh/src/components/sshTab.component.pug similarity index 100% rename from terminus-ssh/src/components/sshTab.component.pug rename to tabby-ssh/src/components/sshTab.component.pug diff --git a/terminus-ssh/src/components/sshTab.component.scss b/tabby-ssh/src/components/sshTab.component.scss similarity index 100% rename from terminus-ssh/src/components/sshTab.component.scss rename to tabby-ssh/src/components/sshTab.component.scss diff --git a/terminus-ssh/src/components/sshTab.component.ts b/tabby-ssh/src/components/sshTab.component.ts similarity index 98% rename from terminus-ssh/src/components/sshTab.component.ts rename to tabby-ssh/src/components/sshTab.component.ts index 46756976..db24fbf9 100644 --- a/terminus-ssh/src/components/sshTab.component.ts +++ b/tabby-ssh/src/components/sshTab.component.ts @@ -3,8 +3,8 @@ import { Spinner } from 'cli-spinner' import { Component, Injector, HostListener } from '@angular/core' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { first } from 'rxjs/operators' -import { Platform, RecoveryToken } from 'terminus-core' -import { BaseTerminalTabComponent } from 'terminus-terminal' +import { Platform, RecoveryToken } from 'tabby-core' +import { BaseTerminalTabComponent } from 'tabby-terminal' import { SSHService } from '../services/ssh.service' import { SSHConnection, SSHSession } from '../api' import { SSHPortForwardingModalComponent } from './sshPortForwardingModal.component' diff --git a/terminus-ssh/src/config.ts b/tabby-ssh/src/config.ts similarity index 90% rename from terminus-ssh/src/config.ts rename to tabby-ssh/src/config.ts index dc459bed..21a9c8d6 100644 --- a/terminus-ssh/src/config.ts +++ b/tabby-ssh/src/config.ts @@ -1,4 +1,4 @@ -import { ConfigProvider } from 'terminus-core' +import { ConfigProvider } from 'tabby-core' /** @hidden */ export class SSHConfigProvider extends ConfigProvider { diff --git a/terminus-ssh/src/hotkeys.ts b/tabby-ssh/src/hotkeys.ts similarity index 89% rename from terminus-ssh/src/hotkeys.ts rename to tabby-ssh/src/hotkeys.ts index 44df6267..88666113 100644 --- a/terminus-ssh/src/hotkeys.ts +++ b/tabby-ssh/src/hotkeys.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { HotkeyDescription, HotkeyProvider } from 'terminus-core' +import { HotkeyDescription, HotkeyProvider } from 'tabby-core' /** @hidden */ @Injectable() diff --git a/terminus-ssh/src/icons/globe.svg b/tabby-ssh/src/icons/globe.svg similarity index 100% rename from terminus-ssh/src/icons/globe.svg rename to tabby-ssh/src/icons/globe.svg diff --git a/terminus-ssh/src/index.ts b/tabby-ssh/src/index.ts similarity index 88% rename from terminus-ssh/src/index.ts rename to tabby-ssh/src/index.ts index 0d979cf7..078c31bd 100644 --- a/terminus-ssh/src/index.ts +++ b/tabby-ssh/src/index.ts @@ -4,9 +4,9 @@ import { FormsModule } from '@angular/forms' import { NgbModule } from '@ng-bootstrap/ng-bootstrap' import { ToastrModule } from 'ngx-toastr' import { NgxFilesizeModule } from 'ngx-filesize' -import TerminusCoreModule, { ToolbarButtonProvider, ConfigProvider, TabRecoveryProvider, HotkeyProvider, TabContextMenuItemProvider, CLIHandler } from 'terminus-core' -import { SettingsTabProvider } from 'terminus-settings' -import TerminusTerminalModule from 'terminus-terminal' +import TabbyCoreModule, { ToolbarButtonProvider, ConfigProvider, TabRecoveryProvider, HotkeyProvider, TabContextMenuItemProvider, CLIHandler } from 'tabby-core' +import { SettingsTabProvider } from 'tabby-settings' +import TabbyTerminalModule from 'tabby-terminal' import { EditConnectionModalComponent } from './components/editConnectionModal.component' import { SSHPortForwardingModalComponent } from './components/sshPortForwardingModal.component' @@ -33,8 +33,8 @@ import { SSHCLIHandler } from './cli' CommonModule, FormsModule, ToastrModule, - TerminusCoreModule, - TerminusTerminalModule, + TabbyCoreModule, + TabbyTerminalModule, ], providers: [ { provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true }, diff --git a/terminus-ssh/src/recoveryProvider.ts b/tabby-ssh/src/recoveryProvider.ts similarity index 98% rename from terminus-ssh/src/recoveryProvider.ts rename to tabby-ssh/src/recoveryProvider.ts index c99ba7dd..0081460f 100644 --- a/terminus-ssh/src/recoveryProvider.ts +++ b/tabby-ssh/src/recoveryProvider.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { TabRecoveryProvider, RecoveredTab, RecoveryToken } from 'terminus-core' +import { TabRecoveryProvider, RecoveredTab, RecoveryToken } from 'tabby-core' import { SSHTabComponent } from './components/sshTab.component' diff --git a/terminus-ssh/src/services/passwordStorage.service.ts b/tabby-ssh/src/services/passwordStorage.service.ts similarity index 98% rename from terminus-ssh/src/services/passwordStorage.service.ts rename to tabby-ssh/src/services/passwordStorage.service.ts index d4212a1d..ac785f58 100644 --- a/terminus-ssh/src/services/passwordStorage.service.ts +++ b/tabby-ssh/src/services/passwordStorage.service.ts @@ -1,7 +1,7 @@ import * as keytar from 'keytar' import { Injectable } from '@angular/core' import { SSHConnection } from '../api' -import { VaultService } from 'terminus-core' +import { VaultService } from 'tabby-core' export const VAULT_SECRET_TYPE_PASSWORD = 'ssh:password' export const VAULT_SECRET_TYPE_PASSPHRASE = 'ssh:key-passphrase' diff --git a/terminus-ssh/src/services/ssh.service.ts b/tabby-ssh/src/services/ssh.service.ts similarity index 99% rename from terminus-ssh/src/services/ssh.service.ts rename to tabby-ssh/src/services/ssh.service.ts index 6415a5d9..40544c90 100644 --- a/terminus-ssh/src/services/ssh.service.ts +++ b/tabby-ssh/src/services/ssh.service.ts @@ -5,8 +5,8 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { Client } from 'ssh2' import { exec } from 'child_process' import { Subject, Observable } from 'rxjs' -import { Logger, LogService, AppService, SelectorOption, ConfigService, NotificationsService, HostAppService, Platform, PlatformService, SelectorService } from 'terminus-core' -import { SettingsTabComponent } from 'terminus-settings' +import { Logger, LogService, AppService, SelectorOption, ConfigService, NotificationsService, HostAppService, Platform, PlatformService, SelectorService } from 'tabby-core' +import { SettingsTabComponent } from 'tabby-settings' import { ALGORITHM_BLACKLIST, ForwardedPort, SSHConnection, SSHSession } from '../api' import { PromptModalComponent } from '../components/promptModal.component' import { PasswordStorageService } from './passwordStorage.service' diff --git a/terminus-ssh/src/settings.ts b/tabby-ssh/src/settings.ts similarity index 86% rename from terminus-ssh/src/settings.ts rename to tabby-ssh/src/settings.ts index e71b9c4b..3e08ae33 100644 --- a/terminus-ssh/src/settings.ts +++ b/tabby-ssh/src/settings.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { SettingsTabProvider } from 'terminus-settings' +import { SettingsTabProvider } from 'tabby-settings' import { SSHSettingsTabComponent } from './components/sshSettingsTab.component' diff --git a/terminus-ssh/src/tabContextMenu.ts b/tabby-ssh/src/tabContextMenu.ts similarity index 93% rename from terminus-ssh/src/tabContextMenu.ts rename to tabby-ssh/src/tabContextMenu.ts index 91a8dde6..b5cec59a 100644 --- a/terminus-ssh/src/tabContextMenu.ts +++ b/tabby-ssh/src/tabContextMenu.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { BaseTabComponent, TabContextMenuItemProvider, TabHeaderComponent, HostAppService, Platform, MenuItemOptions } from 'terminus-core' +import { BaseTabComponent, TabContextMenuItemProvider, TabHeaderComponent, HostAppService, Platform, MenuItemOptions } from 'tabby-core' import { SSHTabComponent } from './components/sshTab.component' import { SSHService } from './services/ssh.service' diff --git a/terminus-ssh/tsconfig.json b/tabby-ssh/tsconfig.json similarity index 100% rename from terminus-ssh/tsconfig.json rename to tabby-ssh/tsconfig.json diff --git a/terminus-ssh/tsconfig.typings.json b/tabby-ssh/tsconfig.typings.json similarity index 88% rename from terminus-ssh/tsconfig.typings.json rename to tabby-ssh/tsconfig.typings.json index 95da756c..891a0f24 100644 --- a/terminus-ssh/tsconfig.typings.json +++ b/tabby-ssh/tsconfig.typings.json @@ -8,7 +8,7 @@ "declaration": true, "declarationDir": "./typings", "paths": { - "terminus-*": ["../../terminus-*"], + "tabby-*": ["../../tabby-*"], "*": ["../../app/node_modules/*"] } } diff --git a/terminus-ssh/webpack.config.js b/tabby-ssh/webpack.config.js similarity index 100% rename from terminus-ssh/webpack.config.js rename to tabby-ssh/webpack.config.js diff --git a/terminus-ssh/yarn.lock b/tabby-ssh/yarn.lock similarity index 100% rename from terminus-ssh/yarn.lock rename to tabby-ssh/yarn.lock diff --git a/terminus-terminal/.gitignore b/tabby-terminal/.gitignore similarity index 100% rename from terminus-terminal/.gitignore rename to tabby-terminal/.gitignore diff --git a/terminus-terminal/README.md b/tabby-terminal/README.md similarity index 77% rename from terminus-terminal/README.md rename to tabby-terminal/README.md index 33027a85..5e4acbf0 100644 --- a/terminus-terminal/README.md +++ b/tabby-terminal/README.md @@ -1,4 +1,4 @@ -Terminus Terminal Plugin +Tabby Terminal Plugin ------------------------ * terminal tabs diff --git a/terminus-terminal/package.json b/tabby-terminal/package.json similarity index 88% rename from terminus-terminal/package.json rename to tabby-terminal/package.json index 9f253a1d..2f87d78e 100644 --- a/terminus-terminal/package.json +++ b/tabby-terminal/package.json @@ -1,9 +1,9 @@ { - "name": "terminus-terminal", + "name": "tabby-terminal", "version": "1.0.140", - "description": "Terminus' terminal emulation core", + "description": "Tabby's terminal emulation core", "keywords": [ - "terminus-builtin-plugin" + "tabby-builtin-plugin" ], "main": "dist/index.js", "typings": "typings/index.d.ts", @@ -48,7 +48,7 @@ "@angular/platform-browser": "^9.1.11", "@ng-bootstrap/ng-bootstrap": "^6.1.0", "rxjs": "^6.5.5", - "terminus-core": "*", - "terminus-settings": "*" + "tabby-core": "*", + "tabby-settings": "*" } } diff --git a/terminus-terminal/src/api/baseTerminalTab.component.ts b/tabby-terminal/src/api/baseTerminalTab.component.ts similarity index 99% rename from terminus-terminal/src/api/baseTerminalTab.component.ts rename to tabby-terminal/src/api/baseTerminalTab.component.ts index a8e77e9f..cbfafcea 100644 --- a/terminus-terminal/src/api/baseTerminalTab.component.ts +++ b/tabby-terminal/src/api/baseTerminalTab.component.ts @@ -3,7 +3,7 @@ import { first } from 'rxjs/operators' import colors from 'ansi-colors' import { NgZone, OnInit, OnDestroy, Injector, ViewChild, HostBinding, Input, ElementRef, InjectFlags } from '@angular/core' import { trigger, transition, style, animate, AnimationTriggerMetadata } from '@angular/animations' -import { AppService, ConfigService, BaseTabComponent, HostAppService, HotkeysService, NotificationsService, Platform, LogService, Logger, TabContextMenuItemProvider, SplitTabComponent, SubscriptionContainer, MenuItemOptions, PlatformService, HostWindowService } from 'terminus-core' +import { AppService, ConfigService, BaseTabComponent, HostAppService, HotkeysService, NotificationsService, Platform, LogService, Logger, TabContextMenuItemProvider, SplitTabComponent, SubscriptionContainer, MenuItemOptions, PlatformService, HostWindowService } from 'tabby-core' import { BaseSession } from '../session' import { TerminalFrontendService } from '../services/terminalFrontend.service' diff --git a/terminus-terminal/src/api/colorSchemeProvider.ts b/tabby-terminal/src/api/colorSchemeProvider.ts similarity index 100% rename from terminus-terminal/src/api/colorSchemeProvider.ts rename to tabby-terminal/src/api/colorSchemeProvider.ts diff --git a/terminus-terminal/src/api/contextMenuProvider.ts b/tabby-terminal/src/api/contextMenuProvider.ts similarity index 85% rename from terminus-terminal/src/api/contextMenuProvider.ts rename to tabby-terminal/src/api/contextMenuProvider.ts index df26ac89..790c568b 100644 --- a/terminus-terminal/src/api/contextMenuProvider.ts +++ b/tabby-terminal/src/api/contextMenuProvider.ts @@ -1,4 +1,4 @@ -import type { MenuItemOptions } from 'terminus-core' +import type { MenuItemOptions } from 'tabby-core' import { BaseTerminalTabComponent } from './baseTerminalTab.component' /** diff --git a/terminus-terminal/src/api/decorator.ts b/tabby-terminal/src/api/decorator.ts similarity index 100% rename from terminus-terminal/src/api/decorator.ts rename to tabby-terminal/src/api/decorator.ts diff --git a/terminus-terminal/src/api/interfaces.ts b/tabby-terminal/src/api/interfaces.ts similarity index 100% rename from terminus-terminal/src/api/interfaces.ts rename to tabby-terminal/src/api/interfaces.ts diff --git a/terminus-terminal/src/bell.ogg b/tabby-terminal/src/bell.ogg similarity index 100% rename from terminus-terminal/src/bell.ogg rename to tabby-terminal/src/bell.ogg diff --git a/terminus-terminal/src/cli.ts b/tabby-terminal/src/cli.ts similarity index 98% rename from terminus-terminal/src/cli.ts rename to tabby-terminal/src/cli.ts index d3c0de86..43435370 100644 --- a/terminus-terminal/src/cli.ts +++ b/tabby-terminal/src/cli.ts @@ -1,6 +1,6 @@ import shellEscape from 'shell-escape' import { Injectable } from '@angular/core' -import { CLIHandler, CLIEvent, AppService, HostWindowService } from 'terminus-core' +import { CLIHandler, CLIEvent, AppService, HostWindowService } from 'tabby-core' import { BaseTerminalTabComponent } from './api/baseTerminalTab.component' @Injectable() diff --git a/terminus-terminal/src/components/appearanceSettingsTab.component.pug b/tabby-terminal/src/components/appearanceSettingsTab.component.pug similarity index 100% rename from terminus-terminal/src/components/appearanceSettingsTab.component.pug rename to tabby-terminal/src/components/appearanceSettingsTab.component.pug diff --git a/terminus-terminal/src/components/appearanceSettingsTab.component.scss b/tabby-terminal/src/components/appearanceSettingsTab.component.scss similarity index 100% rename from terminus-terminal/src/components/appearanceSettingsTab.component.scss rename to tabby-terminal/src/components/appearanceSettingsTab.component.scss diff --git a/terminus-terminal/src/components/appearanceSettingsTab.component.ts b/tabby-terminal/src/components/appearanceSettingsTab.component.ts similarity index 98% rename from terminus-terminal/src/components/appearanceSettingsTab.component.ts rename to tabby-terminal/src/components/appearanceSettingsTab.component.ts index 9c961a8e..f192cd74 100644 --- a/terminus-terminal/src/components/appearanceSettingsTab.component.ts +++ b/tabby-terminal/src/components/appearanceSettingsTab.component.ts @@ -4,7 +4,7 @@ import { debounce } from 'utils-decorators/dist/cjs' import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators' import { Component } from '@angular/core' -import { ConfigService, getCSSFontFamily, PlatformService } from 'terminus-core' +import { ConfigService, getCSSFontFamily, PlatformService } from 'tabby-core' /** @hidden */ @Component({ diff --git a/terminus-terminal/src/components/baseTerminalTab.component.pug b/tabby-terminal/src/components/baseTerminalTab.component.pug similarity index 100% rename from terminus-terminal/src/components/baseTerminalTab.component.pug rename to tabby-terminal/src/components/baseTerminalTab.component.pug diff --git a/terminus-terminal/src/components/baseTerminalTab.component.scss b/tabby-terminal/src/components/baseTerminalTab.component.scss similarity index 100% rename from terminus-terminal/src/components/baseTerminalTab.component.scss rename to tabby-terminal/src/components/baseTerminalTab.component.scss diff --git a/terminus-terminal/src/components/colorPicker.component.pug b/tabby-terminal/src/components/colorPicker.component.pug similarity index 100% rename from terminus-terminal/src/components/colorPicker.component.pug rename to tabby-terminal/src/components/colorPicker.component.pug diff --git a/terminus-terminal/src/components/colorPicker.component.scss b/tabby-terminal/src/components/colorPicker.component.scss similarity index 100% rename from terminus-terminal/src/components/colorPicker.component.scss rename to tabby-terminal/src/components/colorPicker.component.scss diff --git a/terminus-terminal/src/components/colorPicker.component.ts b/tabby-terminal/src/components/colorPicker.component.ts similarity index 100% rename from terminus-terminal/src/components/colorPicker.component.ts rename to tabby-terminal/src/components/colorPicker.component.ts diff --git a/terminus-terminal/src/components/colorSchemePreview.component.pug b/tabby-terminal/src/components/colorSchemePreview.component.pug similarity index 100% rename from terminus-terminal/src/components/colorSchemePreview.component.pug rename to tabby-terminal/src/components/colorSchemePreview.component.pug diff --git a/terminus-terminal/src/components/colorSchemePreview.component.scss b/tabby-terminal/src/components/colorSchemePreview.component.scss similarity index 100% rename from terminus-terminal/src/components/colorSchemePreview.component.scss rename to tabby-terminal/src/components/colorSchemePreview.component.scss diff --git a/terminus-terminal/src/components/colorSchemePreview.component.ts b/tabby-terminal/src/components/colorSchemePreview.component.ts similarity index 98% rename from terminus-terminal/src/components/colorSchemePreview.component.ts rename to tabby-terminal/src/components/colorSchemePreview.component.ts index cf1f0d36..31acf2cc 100644 --- a/terminus-terminal/src/components/colorSchemePreview.component.ts +++ b/tabby-terminal/src/components/colorSchemePreview.component.ts @@ -1,5 +1,5 @@ import { Component, Input, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core' -import { BaseComponent, ConfigService, getCSSFontFamily } from 'terminus-core' +import { BaseComponent, ConfigService, getCSSFontFamily } from 'tabby-core' import { TerminalColorScheme } from '../api/interfaces' /** @hidden */ diff --git a/terminus-terminal/src/components/colorSchemeSettingsTab.component.pug b/tabby-terminal/src/components/colorSchemeSettingsTab.component.pug similarity index 100% rename from terminus-terminal/src/components/colorSchemeSettingsTab.component.pug rename to tabby-terminal/src/components/colorSchemeSettingsTab.component.pug diff --git a/terminus-terminal/src/components/colorSchemeSettingsTab.component.scss b/tabby-terminal/src/components/colorSchemeSettingsTab.component.scss similarity index 100% rename from terminus-terminal/src/components/colorSchemeSettingsTab.component.scss rename to tabby-terminal/src/components/colorSchemeSettingsTab.component.scss diff --git a/terminus-terminal/src/components/colorSchemeSettingsTab.component.ts b/tabby-terminal/src/components/colorSchemeSettingsTab.component.ts similarity index 98% rename from terminus-terminal/src/components/colorSchemeSettingsTab.component.ts rename to tabby-terminal/src/components/colorSchemeSettingsTab.component.ts index 49dfbd73..4c20cc7c 100644 --- a/terminus-terminal/src/components/colorSchemeSettingsTab.component.ts +++ b/tabby-terminal/src/components/colorSchemeSettingsTab.component.ts @@ -2,7 +2,7 @@ import deepEqual from 'deep-equal' import { Component, Inject, Input, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core' -import { ConfigService, PlatformService } from 'terminus-core' +import { ConfigService, PlatformService } from 'tabby-core' import { TerminalColorSchemeProvider } from '../api/colorSchemeProvider' import { TerminalColorScheme } from '../api/interfaces' diff --git a/terminus-terminal/src/components/searchPanel.component.pug b/tabby-terminal/src/components/searchPanel.component.pug similarity index 100% rename from terminus-terminal/src/components/searchPanel.component.pug rename to tabby-terminal/src/components/searchPanel.component.pug diff --git a/terminus-terminal/src/components/searchPanel.component.scss b/tabby-terminal/src/components/searchPanel.component.scss similarity index 100% rename from terminus-terminal/src/components/searchPanel.component.scss rename to tabby-terminal/src/components/searchPanel.component.scss diff --git a/terminus-terminal/src/components/searchPanel.component.ts b/tabby-terminal/src/components/searchPanel.component.ts similarity index 96% rename from terminus-terminal/src/components/searchPanel.component.ts rename to tabby-terminal/src/components/searchPanel.component.ts index d21ccc98..832aa2c4 100644 --- a/terminus-terminal/src/components/searchPanel.component.ts +++ b/tabby-terminal/src/components/searchPanel.component.ts @@ -1,6 +1,6 @@ import { Component, Input, Output, EventEmitter } from '@angular/core' import { Frontend, SearchOptions } from '../frontends/frontend' -import { ConfigService, NotificationsService } from 'terminus-core' +import { ConfigService, NotificationsService } from 'tabby-core' @Component({ selector: 'search-panel', diff --git a/terminus-terminal/src/components/terminalSettingsTab.component.pug b/tabby-terminal/src/components/terminalSettingsTab.component.pug similarity index 100% rename from terminus-terminal/src/components/terminalSettingsTab.component.pug rename to tabby-terminal/src/components/terminalSettingsTab.component.pug diff --git a/terminus-terminal/src/components/terminalSettingsTab.component.ts b/tabby-terminal/src/components/terminalSettingsTab.component.ts similarity index 95% rename from terminus-terminal/src/components/terminalSettingsTab.component.ts rename to tabby-terminal/src/components/terminalSettingsTab.component.ts index 855487db..b865809c 100644 --- a/terminus-terminal/src/components/terminalSettingsTab.component.ts +++ b/tabby-terminal/src/components/terminalSettingsTab.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core' -import { ConfigService, HostAppService, Platform, PlatformService } from 'terminus-core' +import { ConfigService, HostAppService, Platform, PlatformService } from 'tabby-core' /** @hidden */ @Component({ diff --git a/terminus-terminal/src/config.ts b/tabby-terminal/src/config.ts similarity index 98% rename from terminus-terminal/src/config.ts rename to tabby-terminal/src/config.ts index ec21f15b..5e17f6d0 100644 --- a/terminus-terminal/src/config.ts +++ b/tabby-terminal/src/config.ts @@ -1,4 +1,4 @@ -import { ConfigProvider, Platform } from 'terminus-core' +import { ConfigProvider, Platform } from 'tabby-core' /** @hidden */ export class TerminalConfigProvider extends ConfigProvider { diff --git a/terminus-terminal/src/features/debug.ts b/tabby-terminal/src/features/debug.ts similarity index 98% rename from terminus-terminal/src/features/debug.ts rename to tabby-terminal/src/features/debug.ts index 064d1d09..e06b665c 100644 --- a/terminus-terminal/src/features/debug.ts +++ b/tabby-terminal/src/features/debug.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core' import { TerminalDecorator } from '../api/decorator' import { BaseTerminalTabComponent } from '../api/baseTerminalTab.component' -import { PlatformService } from 'terminus-core' +import { PlatformService } from 'tabby-core' /** @hidden */ @Injectable() diff --git a/terminus-terminal/src/features/pathDrop.ts b/tabby-terminal/src/features/pathDrop.ts similarity index 100% rename from terminus-terminal/src/features/pathDrop.ts rename to tabby-terminal/src/features/pathDrop.ts diff --git a/terminus-terminal/src/features/zmodem.ts b/tabby-terminal/src/features/zmodem.ts similarity index 99% rename from terminus-terminal/src/features/zmodem.ts rename to tabby-terminal/src/features/zmodem.ts index 8df0c33e..2a418736 100644 --- a/terminus-terminal/src/features/zmodem.ts +++ b/tabby-terminal/src/features/zmodem.ts @@ -5,7 +5,7 @@ import { filter, first } from 'rxjs/operators' import { Injectable } from '@angular/core' import { TerminalDecorator } from '../api/decorator' import { BaseTerminalTabComponent } from '../api/baseTerminalTab.component' -import { LogService, Logger, HotkeysService, PlatformService, FileUpload } from 'terminus-core' +import { LogService, Logger, HotkeysService, PlatformService, FileUpload } from 'tabby-core' const SPACER = ' ' diff --git a/terminus-terminal/src/fonts/SourceCodePro.otf b/tabby-terminal/src/fonts/SourceCodePro.otf similarity index 100% rename from terminus-terminal/src/fonts/SourceCodePro.otf rename to tabby-terminal/src/fonts/SourceCodePro.otf diff --git a/terminus-terminal/src/frontends/frontend.ts b/tabby-terminal/src/frontends/frontend.ts similarity index 100% rename from terminus-terminal/src/frontends/frontend.ts rename to tabby-terminal/src/frontends/frontend.ts diff --git a/terminus-terminal/src/frontends/hterm.ts b/tabby-terminal/src/frontends/hterm.ts similarity index 100% rename from terminus-terminal/src/frontends/hterm.ts rename to tabby-terminal/src/frontends/hterm.ts diff --git a/terminus-terminal/src/frontends/hterm.userCSS.scss b/tabby-terminal/src/frontends/hterm.userCSS.scss similarity index 100% rename from terminus-terminal/src/frontends/hterm.userCSS.scss rename to tabby-terminal/src/frontends/hterm.userCSS.scss diff --git a/terminus-terminal/src/frontends/htermFrontend.ts b/tabby-terminal/src/frontends/htermFrontend.ts similarity index 99% rename from terminus-terminal/src/frontends/htermFrontend.ts rename to tabby-terminal/src/frontends/htermFrontend.ts index 3c9ce4ca..85dd857c 100644 --- a/terminus-terminal/src/frontends/htermFrontend.ts +++ b/tabby-terminal/src/frontends/htermFrontend.ts @@ -1,5 +1,5 @@ import { Injector } from '@angular/core' -import { ConfigService, getCSSFontFamily, ThemesService } from 'terminus-core' +import { ConfigService, getCSSFontFamily, ThemesService } from 'tabby-core' import { Frontend, SearchOptions } from './frontend' import { hterm, preferenceManager } from './hterm' diff --git a/terminus-terminal/src/frontends/xterm.css b/tabby-terminal/src/frontends/xterm.css similarity index 100% rename from terminus-terminal/src/frontends/xterm.css rename to tabby-terminal/src/frontends/xterm.css diff --git a/terminus-terminal/src/frontends/xtermFrontend.ts b/tabby-terminal/src/frontends/xtermFrontend.ts similarity index 99% rename from terminus-terminal/src/frontends/xtermFrontend.ts rename to tabby-terminal/src/frontends/xtermFrontend.ts index 56e0bce1..ba20d8d3 100644 --- a/terminus-terminal/src/frontends/xtermFrontend.ts +++ b/tabby-terminal/src/frontends/xtermFrontend.ts @@ -1,5 +1,5 @@ import { Injector } from '@angular/core' -import { ConfigService, getCSSFontFamily, HostAppService, HotkeysService, Platform, PlatformService } from 'terminus-core' +import { ConfigService, getCSSFontFamily, HostAppService, HotkeysService, Platform, PlatformService } from 'tabby-core' import { Frontend, SearchOptions } from './frontend' import { Terminal, ITheme } from 'xterm' import { FitAddon } from 'xterm-addon-fit' diff --git a/terminus-terminal/src/hotkeys.ts b/tabby-terminal/src/hotkeys.ts similarity index 96% rename from terminus-terminal/src/hotkeys.ts rename to tabby-terminal/src/hotkeys.ts index 9cba8f6f..dcaac5fc 100644 --- a/terminus-terminal/src/hotkeys.ts +++ b/tabby-terminal/src/hotkeys.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { HotkeyDescription, HotkeyProvider } from 'terminus-core' +import { HotkeyDescription, HotkeyProvider } from 'tabby-core' /** @hidden */ @Injectable() diff --git a/terminus-terminal/src/index.ts b/tabby-terminal/src/index.ts similarity index 95% rename from terminus-terminal/src/index.ts rename to tabby-terminal/src/index.ts index 4d6b9fa5..83aa84c1 100644 --- a/terminus-terminal/src/index.ts +++ b/tabby-terminal/src/index.ts @@ -4,8 +4,8 @@ import { FormsModule } from '@angular/forms' import { NgbModule } from '@ng-bootstrap/ng-bootstrap' import { ToastrModule } from 'ngx-toastr' -import TerminusCorePlugin, { ConfigProvider, HotkeysService, HotkeyProvider, TabContextMenuItemProvider, CLIHandler } from 'terminus-core' -import { SettingsTabProvider } from 'terminus-settings' +import TabbyCorePlugin, { ConfigProvider, HotkeysService, HotkeyProvider, TabContextMenuItemProvider, CLIHandler } from 'tabby-core' +import { SettingsTabProvider } from 'tabby-settings' import { AppearanceSettingsTabComponent } from './components/appearanceSettingsTab.component' import { ColorSchemeSettingsTabComponent } from './components/colorSchemeSettingsTab.component' @@ -40,7 +40,7 @@ import { TerminalCLIHandler } from './cli' FormsModule, NgbModule, ToastrModule, - TerminusCorePlugin, + TabbyCorePlugin, ], providers: [ { provide: SettingsTabProvider, useClass: AppearanceSettingsTabProvider, multi: true }, diff --git a/terminus-terminal/src/services/terminalFrontend.service.ts b/tabby-terminal/src/services/terminalFrontend.service.ts similarity index 96% rename from terminus-terminal/src/services/terminalFrontend.service.ts rename to tabby-terminal/src/services/terminalFrontend.service.ts index 6bed5c21..f6d7ffd6 100644 --- a/terminus-terminal/src/services/terminalFrontend.service.ts +++ b/tabby-terminal/src/services/terminalFrontend.service.ts @@ -1,5 +1,5 @@ import { Injectable, Injector } from '@angular/core' -import { ConfigService } from 'terminus-core' +import { ConfigService } from 'tabby-core' import { Frontend } from '../frontends/frontend' import { HTermFrontend } from '../frontends/htermFrontend' import { XTermFrontend, XTermWebGLFrontend } from '../frontends/xtermFrontend' diff --git a/terminus-terminal/src/session.ts b/tabby-terminal/src/session.ts similarity index 100% rename from terminus-terminal/src/session.ts rename to tabby-terminal/src/session.ts diff --git a/terminus-terminal/src/settings.ts b/tabby-terminal/src/settings.ts similarity index 95% rename from terminus-terminal/src/settings.ts rename to tabby-terminal/src/settings.ts index c791fd84..72d4cdd7 100644 --- a/terminus-terminal/src/settings.ts +++ b/tabby-terminal/src/settings.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { SettingsTabProvider } from 'terminus-settings' +import { SettingsTabProvider } from 'tabby-settings' import { AppearanceSettingsTabComponent } from './components/appearanceSettingsTab.component' import { TerminalSettingsTabComponent } from './components/terminalSettingsTab.component' diff --git a/terminus-terminal/src/tabContextMenu.ts b/tabby-terminal/src/tabContextMenu.ts similarity index 96% rename from terminus-terminal/src/tabContextMenu.ts rename to tabby-terminal/src/tabContextMenu.ts index 7c096b2f..2c895b39 100644 --- a/terminus-terminal/src/tabContextMenu.ts +++ b/tabby-terminal/src/tabContextMenu.ts @@ -1,5 +1,5 @@ import { Injectable, Optional, Inject } from '@angular/core' -import { BaseTabComponent, TabContextMenuItemProvider, TabHeaderComponent, NotificationsService, MenuItemOptions } from 'terminus-core' +import { BaseTabComponent, TabContextMenuItemProvider, TabHeaderComponent, NotificationsService, MenuItemOptions } from 'tabby-core' import { BaseTerminalTabComponent } from './api/baseTerminalTab.component' import { TerminalContextMenuItemProvider } from './api/contextMenuProvider' diff --git a/terminus-terminal/tsconfig.json b/tabby-terminal/tsconfig.json similarity index 100% rename from terminus-terminal/tsconfig.json rename to tabby-terminal/tsconfig.json diff --git a/terminus-terminal/tsconfig.typings.json b/tabby-terminal/tsconfig.typings.json similarity index 89% rename from terminus-terminal/tsconfig.typings.json rename to tabby-terminal/tsconfig.typings.json index 1ebf239f..2cfc4fd8 100644 --- a/terminus-terminal/tsconfig.typings.json +++ b/tabby-terminal/tsconfig.typings.json @@ -7,7 +7,7 @@ "declaration": true, "declarationDir": "./typings", "paths": { - "terminus-*": ["../../terminus-*"], + "tabby-*": ["../../tabby-*"], "*": [ "../../app/node_modules/*", "../node_modules/xterm/src/*" diff --git a/terminus-terminal/webpack.config.js b/tabby-terminal/webpack.config.js similarity index 100% rename from terminus-terminal/webpack.config.js rename to tabby-terminal/webpack.config.js diff --git a/terminus-terminal/yarn.lock b/tabby-terminal/yarn.lock similarity index 100% rename from terminus-terminal/yarn.lock rename to tabby-terminal/yarn.lock diff --git a/terminus-uac/.gitignore b/tabby-uac/.gitignore similarity index 100% rename from terminus-uac/.gitignore rename to tabby-uac/.gitignore diff --git a/terminus-uac/UAC.sln b/tabby-uac/UAC.sln similarity index 100% rename from terminus-uac/UAC.sln rename to tabby-uac/UAC.sln diff --git a/terminus-uac/UAC/UAC.cpp b/tabby-uac/UAC/UAC.cpp similarity index 100% rename from terminus-uac/UAC/UAC.cpp rename to tabby-uac/UAC/UAC.cpp diff --git a/terminus-uac/UAC/UAC.vcxproj b/tabby-uac/UAC/UAC.vcxproj similarity index 100% rename from terminus-uac/UAC/UAC.vcxproj rename to tabby-uac/UAC/UAC.vcxproj diff --git a/terminus-uac/UAC/UAC.vcxproj.filters b/tabby-uac/UAC/UAC.vcxproj.filters similarity index 100% rename from terminus-uac/UAC/UAC.vcxproj.filters rename to tabby-uac/UAC/UAC.vcxproj.filters diff --git a/terminus-uac/UAC/UAC.vcxproj.user b/tabby-uac/UAC/UAC.vcxproj.user similarity index 100% rename from terminus-uac/UAC/UAC.vcxproj.user rename to tabby-uac/UAC/UAC.vcxproj.user diff --git a/terminus-uac/UAC/app.manifest b/tabby-uac/UAC/app.manifest similarity index 100% rename from terminus-uac/UAC/app.manifest rename to tabby-uac/UAC/app.manifest diff --git a/terminus-uac/UAC/stdafx.cpp b/tabby-uac/UAC/stdafx.cpp similarity index 100% rename from terminus-uac/UAC/stdafx.cpp rename to tabby-uac/UAC/stdafx.cpp diff --git a/terminus-uac/UAC/stdafx.h b/tabby-uac/UAC/stdafx.h similarity index 100% rename from terminus-uac/UAC/stdafx.h rename to tabby-uac/UAC/stdafx.h diff --git a/terminus-uac/UAC/targetver.h b/tabby-uac/UAC/targetver.h similarity index 100% rename from terminus-uac/UAC/targetver.h rename to tabby-uac/UAC/targetver.h diff --git a/terminus-web/.gitignore b/tabby-web/.gitignore similarity index 100% rename from terminus-web/.gitignore rename to tabby-web/.gitignore diff --git a/terminus-web/package.json b/tabby-web/package.json similarity index 90% rename from terminus-web/package.json rename to tabby-web/package.json index 6d51c3ed..22634be1 100644 --- a/terminus-web/package.json +++ b/tabby-web/package.json @@ -1,9 +1,9 @@ { - "name": "terminus-web", + "name": "tabby-web", "version": "1.0.140", "description": "Web-specific bindings", "keywords": [ - "terminus-builtin-plugin" + "tabby-builtin-plugin" ], "main": "dist/index.js", "typings": "typings/index.d.ts", diff --git a/terminus-web/src/components/messageBoxModal.component.pug b/tabby-web/src/components/messageBoxModal.component.pug similarity index 100% rename from terminus-web/src/components/messageBoxModal.component.pug rename to tabby-web/src/components/messageBoxModal.component.pug diff --git a/terminus-web/src/components/messageBoxModal.component.ts b/tabby-web/src/components/messageBoxModal.component.ts similarity index 98% rename from terminus-web/src/components/messageBoxModal.component.ts rename to tabby-web/src/components/messageBoxModal.component.ts index 8bbc4b6f..e58a100e 100644 --- a/terminus-web/src/components/messageBoxModal.component.ts +++ b/tabby-web/src/components/messageBoxModal.component.ts @@ -1,6 +1,6 @@ import { Component, Input, ElementRef } from '@angular/core' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { BaseComponent, HotkeysService, MessageBoxOptions } from 'terminus-core' +import { BaseComponent, HotkeysService, MessageBoxOptions } from 'tabby-core' /** @hidden */ @Component({ diff --git a/terminus-web/src/index.ts b/tabby-web/src/index.ts similarity index 96% rename from terminus-web/src/index.ts rename to tabby-web/src/index.ts index 33b8e405..fc846641 100644 --- a/terminus-web/src/index.ts +++ b/tabby-web/src/index.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core' import { CommonModule } from '@angular/common' -import { HostAppService, HostWindowService, LogService, PlatformService, UpdaterService } from 'terminus-core' +import { HostAppService, HostWindowService, LogService, PlatformService, UpdaterService } from 'tabby-core' import { WebPlatformService } from './platform' import { ConsoleLogService } from './services/log.service' diff --git a/terminus-web/src/platform.ts b/tabby-web/src/platform.ts similarity index 97% rename from terminus-web/src/platform.ts rename to tabby-web/src/platform.ts index 44cae1dd..4bdf4c5f 100644 --- a/terminus-web/src/platform.ts +++ b/tabby-web/src/platform.ts @@ -1,11 +1,11 @@ -import '@vaadin/vaadin-context-menu/vaadin-context-menu.js' +import '@vaadin/vaadin-context-menu' import copyToClipboard from 'copy-text-to-clipboard' import { Injectable, Inject } from '@angular/core' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' -import { PlatformService, ClipboardContent, MenuItemOptions, MessageBoxOptions, MessageBoxResult, FileUpload, FileUploadOptions, FileDownload, HTMLFileUpload } from 'terminus-core' +import { PlatformService, ClipboardContent, MenuItemOptions, MessageBoxOptions, MessageBoxResult, FileUpload, FileUploadOptions, FileDownload, HTMLFileUpload } from 'tabby-core' // eslint-disable-next-line no-duplicate-imports -import type { ContextMenuElement, ContextMenuItem } from '@vaadin/vaadin-context-menu/vaadin-context-menu.js' +import type { ContextMenuElement, ContextMenuItem } from '@vaadin/vaadin-context-menu' import { MessageBoxModalComponent } from './components/messageBoxModal.component' import './styles.scss' diff --git a/terminus-web/src/services/hostApp.service.ts b/tabby-web/src/services/hostApp.service.ts similarity index 91% rename from terminus-web/src/services/hostApp.service.ts rename to tabby-web/src/services/hostApp.service.ts index 963a78a8..e3fb8c9a 100644 --- a/terminus-web/src/services/hostApp.service.ts +++ b/tabby-web/src/services/hostApp.service.ts @@ -1,5 +1,5 @@ import { Injectable, Injector } from '@angular/core' -import { HostAppService, Platform } from 'terminus-core' +import { HostAppService, Platform } from 'tabby-core' @Injectable() export class WebHostApp extends HostAppService { diff --git a/terminus-web/src/services/hostWindow.service.ts b/tabby-web/src/services/hostWindow.service.ts similarity index 90% rename from terminus-web/src/services/hostWindow.service.ts rename to tabby-web/src/services/hostWindow.service.ts index ac768f17..5e1c2267 100644 --- a/terminus-web/src/services/hostWindow.service.ts +++ b/tabby-web/src/services/hostWindow.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { HostWindowService } from 'terminus-core' +import { HostWindowService } from 'tabby-core' @Injectable({ providedIn: 'root' }) export class WebHostWindow extends HostWindowService { @@ -16,7 +16,7 @@ export class WebHostWindow extends HostWindowService { } setTitle (title?: string): void { - document.title = title ?? 'Terminus' + document.title = title ?? 'Tabby' } toggleFullscreen (): void { diff --git a/terminus-web/src/services/log.service.ts b/tabby-web/src/services/log.service.ts similarity index 78% rename from terminus-web/src/services/log.service.ts rename to tabby-web/src/services/log.service.ts index 1bd76b23..c7cd762c 100644 --- a/terminus-web/src/services/log.service.ts +++ b/tabby-web/src/services/log.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core' -import { ConsoleLogger, Logger } from 'terminus-core' +import { ConsoleLogger, Logger } from 'tabby-core' @Injectable({ providedIn: 'root' }) export class ConsoleLogService { diff --git a/terminus-web/src/services/updater.service.ts b/tabby-web/src/services/updater.service.ts similarity index 83% rename from terminus-web/src/services/updater.service.ts rename to tabby-web/src/services/updater.service.ts index 3dcc2a26..e3716cc4 100644 --- a/terminus-web/src/services/updater.service.ts +++ b/tabby-web/src/services/updater.service.ts @@ -1,4 +1,4 @@ -import { UpdaterService } from 'terminus-core' +import { UpdaterService } from 'tabby-core' export class NullUpdaterService extends UpdaterService { async check (): Promise { diff --git a/terminus-web/src/styles.scss b/tabby-web/src/styles.scss similarity index 82% rename from terminus-web/src/styles.scss rename to tabby-web/src/styles.scss index a85d8aef..a32216c8 100644 --- a/terminus-web/src/styles.scss +++ b/tabby-web/src/styles.scss @@ -1,6 +1,6 @@ -@import "../../terminus-core/src/theme.vars.scss"; +@import "../../tabby-core/src/theme.vars.scss"; -html.terminus { +html.tabby { --lumo-primary-text-color: #{$body-color}; --lumo-base-color: #{$body-bg}; --lumo-body-text-color: #{$body-color}; diff --git a/terminus-web/tsconfig.json b/tabby-web/tsconfig.json similarity index 100% rename from terminus-web/tsconfig.json rename to tabby-web/tsconfig.json diff --git a/tabby-web/tsconfig.typings.json b/tabby-web/tsconfig.typings.json new file mode 100644 index 00000000..9188bdf7 --- /dev/null +++ b/tabby-web/tsconfig.typings.json @@ -0,0 +1,14 @@ +{ + "extends": "../tsconfig.json", + "exclude": ["node_modules", "dist", "typings"], + "compilerOptions": { + "baseUrl": "src", + "emitDeclarationOnly": true, + "declaration": true, + "declarationDir": "./typings", + "paths": { + "tabby-*": ["../../tabby-*"], + "*": ["../../app/node_modules/*"] + } + } +} diff --git a/terminus-web/webpack.config.js b/tabby-web/webpack.config.js similarity index 100% rename from terminus-web/webpack.config.js rename to tabby-web/webpack.config.js diff --git a/terminus-web/yarn.lock b/tabby-web/yarn.lock similarity index 100% rename from terminus-web/yarn.lock rename to tabby-web/yarn.lock diff --git a/terminus-core/src/components/safeModeModal.component.pug b/terminus-core/src/components/safeModeModal.component.pug deleted file mode 100644 index 5d55cc7c..00000000 --- a/terminus-core/src/components/safeModeModal.component.pug +++ /dev/null @@ -1,7 +0,0 @@ -.modal-body - .alert.alert-danger Terminus could not start with your plugins, so all third party plugins have been disabled in this session. The error was: - - pre {{error}} - -.modal-footer - button.btn.btn-outline-primary((click)='close()') Close diff --git a/terminus-core/src/components/titleBar.component.pug b/terminus-core/src/components/titleBar.component.pug deleted file mode 100644 index 55133783..00000000 --- a/terminus-core/src/components/titleBar.component.pug +++ /dev/null @@ -1,2 +0,0 @@ -.title((dblclick)='hostApp.toggleMaximize()') Terminus -window-controls diff --git a/terminus-serial/src/components/serialTab.component.scss b/terminus-serial/src/components/serialTab.component.scss deleted file mode 100644 index b4e10533..00000000 --- a/terminus-serial/src/components/serialTab.component.scss +++ /dev/null @@ -1,7 +0,0 @@ -@import '../../../terminus-ssh/src/components/sshTab.component.scss'; - -:host { - select { - width: auto; - } -} diff --git a/terminus-settings/tsconfig.typings.json b/terminus-settings/tsconfig.typings.json deleted file mode 100644 index c0d2273c..00000000 --- a/terminus-settings/tsconfig.typings.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../tsconfig.json", - "exclude": ["node_modules", "dist", "typings"], - "compilerOptions": { - "baseUrl": "src", - "emitDeclarationOnly": true, - "declaration": true, - "declarationDir": "./typings", - "paths": { - "terminus-*": ["../../terminus-*"], - "*": ["../../app/node_modules/*"] - } - } -} diff --git a/terminus-web/tsconfig.typings.json b/terminus-web/tsconfig.typings.json deleted file mode 100644 index c0d2273c..00000000 --- a/terminus-web/tsconfig.typings.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../tsconfig.json", - "exclude": ["node_modules", "dist", "typings"], - "compilerOptions": { - "baseUrl": "src", - "emitDeclarationOnly": true, - "declaration": true, - "declarationDir": "./typings", - "paths": { - "terminus-*": ["../../terminus-*"], - "*": ["../../app/node_modules/*"] - } - } -} diff --git a/tsconfig.json b/tsconfig.json index 6adbaf95..31ead206 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -27,7 +27,7 @@ "es2019" ], "paths": { - "terminus-*": ["../../terminus-*/src"] + "tabby-*": ["../../tabby-*/src"] } } } diff --git a/web/entry.preload.ts b/web/entry.preload.ts index 2c8c2201..79cdb3a5 100644 --- a/web/entry.preload.ts +++ b/web/entry.preload.ts @@ -43,7 +43,7 @@ async function webRequire (url) { return window['module'].exports } -const Terminus = { +const Tabby = { registerMock: (name, mod) => { mocks[name] = mod }, @@ -54,11 +54,11 @@ const Terminus = { const pkg = await (await fetch(url + '/package.json')).json() url += '/' + pkg.main const module = await webRequire(url) - Terminus.registerModule(`resources/builtin-plugins/${pkg.name}`, module) - Terminus.registerModule(pkg.name, module) + Tabby.registerModule(`resources/builtin-plugins/${pkg.name}`, module) + Tabby.registerModule(pkg.name, module) return module }, - bootstrap: (...args) => window['bootstrapTerminus'](...args), + bootstrap: (...args) => window['bootstrapTabby'](...args), webRequire, } @@ -67,10 +67,10 @@ Object.assign(window, { module: { paths: [], }, - Terminus, + Tabby, process: { env: { }, - argv: ['terminus'], + argv: ['tabby'], platform: 'darwin', on: () => null, stdout: {}, diff --git a/web/entry.ts b/web/entry.ts index 082d2cd0..ce6799a6 100644 --- a/web/entry.ts +++ b/web/entry.ts @@ -13,7 +13,7 @@ import { enableDebugTools } from '@angular/platform-browser' import { platformBrowserDynamic } from '@angular/platform-browser-dynamic' import { getRootModule } from '../app/src/app.module' -import { BootstrapData, BOOTSTRAP_DATA } from '../terminus-core/src/api/mainProcess' +import { BootstrapData, BOOTSTRAP_DATA } from '../tabby-core/src/api/mainProcess' interface BootstrapOptions { packageModules: any[] @@ -22,7 +22,7 @@ interface BootstrapOptions { connector: any } -window['bootstrapTerminus'] = async function bootstrap (options: BootstrapOptions): Promise> { +window['bootstrapTabby'] = async function bootstrap (options: BootstrapOptions): Promise> { window.parent.postMessage('request-connector', '*') const pluginModules = [] diff --git a/web/polyfills.ts b/web/polyfills.ts index cfe600e9..444d1951 100644 --- a/web/polyfills.ts +++ b/web/polyfills.ts @@ -15,7 +15,7 @@ import * as ngxToastrModule from 'ngx-toastr' import './polyfills.buffer' import { Duplex } from 'stream-browserify' -const Terminus = window['Terminus'] +const Tabby = window['Tabby'] export class SocketProxy extends Duplex { socket: any @@ -51,47 +51,47 @@ export class SocketProxy extends Duplex { } } -Terminus.registerMock('fs', { +Tabby.registerMock('fs', { realpathSync: () => null, readdir: () => null, stat: () => null, appendFile: () => null, constants: {}, }) -Terminus.registerMock('readline', { +Tabby.registerMock('readline', { cursorTo: () => null, clearLine: stream => stream.write('\r'), }) -Terminus.registerMock('any-promise', Promise) -Terminus.registerMock('tls', {}) -Terminus.registerMock('module', { +Tabby.registerMock('any-promise', Promise) +Tabby.registerMock('tls', {}) +Tabby.registerMock('module', { globalPaths: [], prototype: { require: window['require'] }, }) -Terminus.registerMock('url', { +Tabby.registerMock('url', { parse: () => null, }) -Terminus.registerMock('http', { +Tabby.registerMock('http', { Agent: class {}, request: {}, }) -Terminus.registerMock('https', { +Tabby.registerMock('https', { Agent: class {}, request: {}, }) -Terminus.registerMock('querystring', {}) -Terminus.registerMock('tty', { isatty: () => false }) -Terminus.registerMock('child_process', {}) -Terminus.registerMock('readable-stream', {}) -Terminus.registerMock('os', { +Tabby.registerMock('querystring', {}) +Tabby.registerMock('tty', { isatty: () => false }) +Tabby.registerMock('child_process', {}) +Tabby.registerMock('readable-stream', {}) +Tabby.registerMock('os', { platform: () => 'web', homedir: () => '/home', }) -Terminus.registerModule('buffer', { +Tabby.registerModule('buffer', { Buffer: window['Buffer'], }) -Terminus.registerModule('crypto', { +Tabby.registerModule('crypto', { ...require('crypto-browserify'), getHashes () { return ['sha1', 'sha224', 'sha256', 'sha384', 'sha512', 'md5', 'rmd160'] @@ -100,7 +100,7 @@ Terminus.registerModule('crypto', { return a.equals(b) }, }) -Terminus.registerMock('hterm-umdjs', { +Tabby.registerMock('hterm-umdjs', { hterm: { PreferenceManager: class { set () {} }, VT: { @@ -118,47 +118,47 @@ Terminus.registerMock('hterm-umdjs', { }, }, }) -Terminus.registerMock('dns', {}) -Terminus.registerMock('socksv5', {}) -Terminus.registerMock('util', require('util/')) -Terminus.registerMock('keytar', { +Tabby.registerMock('dns', {}) +Tabby.registerMock('socksv5', {}) +Tabby.registerMock('util', require('util/')) +Tabby.registerMock('keytar', { getPassword: () => null, }) -Terminus.registerModule('net', { +Tabby.registerModule('net', { Socket: SocketProxy, }) -Terminus.registerModule('events', require('events')) -Terminus.registerModule('path', require('path-browserify')) -Terminus.registerModule('zlib', { +Tabby.registerModule('events', require('events')) +Tabby.registerModule('path', require('path-browserify')) +Tabby.registerModule('zlib', { ...require('browserify-zlib'), constants: require('browserify-zlib'), }) -Terminus.registerModule('assert', Object.assign( +Tabby.registerModule('assert', Object.assign( require('assert'), { assertNotStrictEqual: () => true, notStrictEqual: () => true, }, )) -Terminus.registerModule('constants', require('constants-browserify')) -Terminus.registerModule('stream', require('stream-browserify')) +Tabby.registerModule('constants', require('constants-browserify')) +Tabby.registerModule('stream', require('stream-browserify')) -Terminus.registerModule('@angular/core', angularCoreModule) -Terminus.registerModule('@angular/compiler', angularCompilerModule) -Terminus.registerModule('@angular/common', angularCommonModule) -Terminus.registerModule('@angular/forms', angularFormsModule) -Terminus.registerModule('@angular/platform-browser', angularPlatformBrowserModule) -Terminus.registerModule('@angular/platform-browser/animations', angularPlatformBrowserAnimationsModule) -Terminus.registerModule('@angular/platform-browser-dynamic', angularPlatformBrowserDynamicModule) -Terminus.registerModule('@angular/animations', angularAnimationsModule) -Terminus.registerModule('@ng-bootstrap/ng-bootstrap', ngBootstrapModule) -Terminus.registerModule('ngx-toastr', ngxToastrModule) -Terminus.registerModule('deepmerge', require('deepmerge')) -Terminus.registerModule('rxjs', require('rxjs')) -Terminus.registerModule('rxjs/operators', require('rxjs/operators')) -Terminus.registerModule('js-yaml', require('js-yaml')) -Terminus.registerModule('zone.js/dist/zone.js', require('zone.js/dist/zone.js')) +Tabby.registerModule('@angular/core', angularCoreModule) +Tabby.registerModule('@angular/compiler', angularCompilerModule) +Tabby.registerModule('@angular/common', angularCommonModule) +Tabby.registerModule('@angular/forms', angularFormsModule) +Tabby.registerModule('@angular/platform-browser', angularPlatformBrowserModule) +Tabby.registerModule('@angular/platform-browser/animations', angularPlatformBrowserAnimationsModule) +Tabby.registerModule('@angular/platform-browser-dynamic', angularPlatformBrowserDynamicModule) +Tabby.registerModule('@angular/animations', angularAnimationsModule) +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('js-yaml', require('js-yaml')) +Tabby.registerModule('zone.js/dist/zone.js', require('zone.js/dist/zone.js')) Object.assign(window, { __dirname: '__dirname', diff --git a/web/tsconfig.json b/web/tsconfig.json index 5016e108..13c64b18 100644 --- a/web/tsconfig.json +++ b/web/tsconfig.json @@ -30,7 +30,7 @@ "dist", "node_modules", "*/node_modules", - "terminus*", + "tabby*", "platforms" ] } diff --git a/web/webpack.config.js b/web/webpack.config.js index de908f03..f691b37d 100644 --- a/web/webpack.config.js +++ b/web/webpack.config.js @@ -22,13 +22,13 @@ for (const key of [ } module.exports = { - name: 'terminus-web-entry', + name: 'tabby-web-entry', target: 'web', entry: { preload: path.resolve(__dirname, 'entry.preload.ts'), bundle: path.resolve(__dirname, 'entry.ts'), }, - mode: process.env.TERMINUS_DEV ? 'development' : 'production', + mode: process.env.TABBY_DEV ? 'development' : 'production', optimization:{ minimize: false, }, diff --git a/webpack.config.js b/webpack.config.js index 656131c9..f2f5a52b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,16 +1,16 @@ module.exports = [ require('./app/webpack.config.js'), require('./app/webpack.main.config.js'), - require('./terminus-core/webpack.config.js'), - require('./terminus-electron/webpack.config.js'), - require('./terminus-web/webpack.config.js'), - require('./terminus-settings/webpack.config.js'), - require('./terminus-terminal/webpack.config.js'), - require('./terminus-local/webpack.config.js'), - require('./terminus-community-color-schemes/webpack.config.js'), - require('./terminus-plugin-manager/webpack.config.js'), - require('./terminus-ssh/webpack.config.js'), - require('./terminus-serial/webpack.config.js'), - require('./terminus-web/webpack.config.js'), + require('./tabby-core/webpack.config.js'), + require('./tabby-electron/webpack.config.js'), + require('./tabby-web/webpack.config.js'), + require('./tabby-settings/webpack.config.js'), + require('./tabby-terminal/webpack.config.js'), + require('./tabby-local/webpack.config.js'), + require('./tabby-community-color-schemes/webpack.config.js'), + require('./tabby-plugin-manager/webpack.config.js'), + require('./tabby-ssh/webpack.config.js'), + require('./tabby-serial/webpack.config.js'), + require('./tabby-web/webpack.config.js'), require('./web/webpack.config.js'), ] diff --git a/webpack.plugin.config.js b/webpack.plugin.config.js index e81a819d..f01dbab2 100644 --- a/webpack.plugin.config.js +++ b/webpack.plugin.config.js @@ -10,14 +10,14 @@ module.exports = options => { const sourceMapOptions = { exclude: [/node_modules/, /vendor/], filename: '[file].map', - moduleFilenameTemplate: `webpack-terminus-${options.name}:///[resource-path]`, + moduleFilenameTemplate: `webpack-tabby-${options.name}:///[resource-path]`, } if (process.env.CI) { sourceMapOptions.append = '\n//# sourceMappingURL=../../../app.asar.unpacked/assets/webpack/[url]' } - const isDev = !!process.env.TERMINUS_DEV + const isDev = !!process.env.TABBY_DEV const config = { target: 'node', entry: 'src/index.ts', @@ -57,7 +57,7 @@ module.exports = options => { path.resolve(options.dirname, '../node_modules/@types'), ], paths: { - 'terminus-*': [path.resolve(options.dirname, '../terminus-*')], + 'tabby-*': [path.resolve(options.dirname, '../tabby-*')], '*': [ path.resolve(options.dirname, '../app/node_modules/*'), path.resolve(options.dirname, '../node_modules/*'), @@ -109,7 +109,7 @@ module.exports = options => { /^@angular/, /^@ng-bootstrap/, /^rxjs/, - /^terminus-/, + /^tabby-/, ...options.externals || [], ], plugins: [