From 768d222d05a5d576db57145f433f3df7d9a6b2c2 Mon Sep 17 00:00:00 2001 From: Mike MacCana Date: Wed, 10 Oct 2018 10:29:16 +0100 Subject: [PATCH 1/6] README tweaks Put newer/default shells first, HACKING isn't just for plugin development --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 12bceb72..f11ba216 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ * Full Unicode support including double-width characters * Doesn't choke on fast-flowing outputs * Proper shell-like experience on Windows including tab completion (via Clink) - * CMD, PowerShell, PowerShell Core, Cygwin, Cmder, Git-Bash and WSL (Bash on Windows) support + * PowerShell Core, WSL (Bash on Windows), PowerShell, Git-Bash, Cygwin, Cmder and CMD support * Tab persistence on macOS and Linux --- @@ -34,9 +34,9 @@ Plugins can be installed directly from the Settings view inside Terminus. # Contributing -Pull requests and plugins are welcome! Publish your plugin on NPM with a `terminus-plugin` keyword to make it appear in the Plugin Manager. +Pull requests and plugins are welcome! -See [HACKING.md](https://github.com/Eugeny/terminus/blob/master/HACKING.md) for a very brief plugin development tutorial! +See [HACKING.md](https://github.com/Eugeny/terminus/blob/master/HACKING.md) information of how the project is laid out, and a very brief plugin development tutorial. ## License From addf57960df37f7a3da219f36a7646ed4b89de46 Mon Sep 17 00:00:00 2001 From: Mike MacCana Date: Wed, 10 Oct 2018 10:30:43 +0100 Subject: [PATCH 2/6] Move info about publishing plugins to HACKING --- HACKING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HACKING.md b/HACKING.md index d0a62d1d..31e89587 100644 --- a/HACKING.md +++ b/HACKING.md @@ -118,3 +118,5 @@ export default class MyModule { } See `terminus-core/src/api.ts`, `terminus-settings/src/api.ts` and `terminus-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. From 5bd8fb63e5e120d6a2bb2c86e43baa210bcd0ff5 Mon Sep 17 00:00:00 2001 From: Mike MacCana Date: Wed, 10 Oct 2018 11:10:51 +0100 Subject: [PATCH 3/6] Make Windows icon more consistent with other Windows 10 icons (fixes #461) --- build/windows/icon.ico | Bin 108975 -> 114194 bytes build/windows/icon.svg | 104 ++++++----------------------------------- 2 files changed, 14 insertions(+), 90 deletions(-) diff --git a/build/windows/icon.ico b/build/windows/icon.ico index 1671a0c09066a1bb2cca937421c06b2605a63f97..b11dd07f3f02153b97e438a20f8f4efd4e1e5b17 100644 GIT binary patch literal 114194 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 diff --git a/build/windows/icon.svg b/build/windows/icon.svg index 5d6ef18e..f6028687 100644 --- a/build/windows/icon.svg +++ b/build/windows/icon.svg @@ -1,92 +1,16 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - - + + + + + + + + + + + + + + From ef7b1ad5d913c8e606c508331aa79b1cd73859f8 Mon Sep 17 00:00:00 2001 From: Mike MacCana Date: Wed, 10 Oct 2018 11:28:06 +0100 Subject: [PATCH 4/6] Run an npm audit and fix vulnerabilities $ npm audit fix --force npm WARN using --force I sure hope you know what you are doing. > fsevents@1.2.4 install C:\Users\mikem\OneDrive\Documents\terminus-new\terminus\node_modules\fsevents > node install npm WARN ajv-keywords@3.2.0 requires a peer of ajv@^6.0.0 but none is installed. You must install peer dependencies yourself. npm WARN term@ No license field. + npx@10.2.0 + url-loader@1.1.1 + electron-builder-squirrel-windows@20.28.3 added 83 packages from 35 contributors, removed 39 packages and updated 37 packages in 90.502s fixed 31 of 39 vulnerabilities in 21449 scanned packages 8 vulnerabilities required manual review and could not be updated 3 package updates for 31 vulns involved breaking changes (installed due to `--force` option) --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index f77b889d..2db44663 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "css-loader": "0.28.0", "electron": "3.0.0", "electron-builder": "^20.27.1", - "electron-builder-squirrel-windows": "17.0.1", + "electron-builder-squirrel-windows": "^20.28.3", "electron-installer-snap": "^3.0.0", "electron-rebuild": "^1.8.2", "eslint": "^5.4.0", @@ -38,7 +38,7 @@ "node-gyp": "^3.6.2", "node-sass": "^4.5.3", "npmlog": "4.1.0", - "npx": "^9.7.1", + "npx": "^10.2.0", "pug": "^2.0.3", "pug-html-loader": "1.0.9", "pug-lint": "^2.5.0", @@ -56,7 +56,7 @@ "tslint-config-standard": "5.0.2", "tslint-eslint-rules": "4.0.0", "typescript": "^2.8.3", - "url-loader": "0.5.7", + "url-loader": "^1.1.1", "val-loader": "0.5.0", "webpack": "^4.8.3", "webpack-cli": "^2.1.3", From ffc68401a73792058af0abff0bfba9a44a5e3f7c Mon Sep 17 00:00:00 2001 From: Mike MacCana Date: Wed, 10 Oct 2018 11:41:21 +0100 Subject: [PATCH 5/6] Make more room for tab titles (fixes #458) Making drag area only expand if tabs aren't using the space, 2 squares wide minimum. --- terminus-core/src/components/appRoot.component.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/terminus-core/src/components/appRoot.component.scss b/terminus-core/src/components/appRoot.component.scss index a0f298b8..102f2ab9 100644 --- a/terminus-core/src/components/appRoot.component.scss +++ b/terminus-core/src/components/appRoot.component.scss @@ -61,8 +61,7 @@ $tab-border-radius: 4px; -webkit-app-region: drag; &.persistent { - min-width: 100px; - flex: 1 0 25%; + min-width: 72px; // 2 x 36 px height, ie 2 squares } } From 649eb63f9b90f736604dea341b215b81d78510c6 Mon Sep 17 00:00:00 2001 From: Mike MacCana Date: Wed, 10 Oct 2018 13:52:28 +0100 Subject: [PATCH 6/6] Fix missing word in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f11ba216..edf2bd46 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Plugins can be installed directly from the Settings view inside Terminus. Pull requests and plugins are welcome! -See [HACKING.md](https://github.com/Eugeny/terminus/blob/master/HACKING.md) information of how the project is laid out, and a very brief plugin development tutorial. +See [HACKING.md](https://github.com/Eugeny/terminus/blob/master/HACKING.md) for information of how the project is laid out, and a very brief plugin development tutorial. ## License