Merge branch 'canary'

.github/dependabot.yml

@@ -7,13 +7,15 @@ updates:
     time: '11:00'
   open-pull-requests-limit: 30
   target-branch: canary
+  versioning-strategy: increase
 - package-ecosystem: npm
   directory: "/app"
   schedule:
     interval: weekly
     time: '11:00'
   open-pull-requests-limit: 30
   target-branch: canary
+  versioning-strategy: increase
 - package-ecosystem: github-actions
   directory: "/"
   schedule:

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/e2e_comment.yml

@@ -14,14 +14,14 @@ jobs:
           WORKFLOW_RUN_INFO: ${{ toJSON(github.event.workflow_run) }}
         run: echo "$WORKFLOW_RUN_INFO"
       - name: Download Artifacts
-        uses: dawidd6/action-download-artifact@v2.16.0
+        uses: dawidd6/action-download-artifact@v2.17.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: nodejs.yml
           run_id: ${{ github.event.workflow_run.id }}
           name: e2e
       - name: Get PR number
-        uses: dawidd6/action-download-artifact@v2.16.0
+        uses: dawidd6/action-download-artifact@v2.17.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: nodejs.yml

.github/workflows/nodejs.yml

@@ -13,17 +13,17 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
         os:
           - macos-11.0
           - ubuntu-18.04
           - windows-latest
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn

README.md

@@ -110,7 +110,6 @@ If you have issues in the `codesign` step when running `yarn run dist` on macOS,
 
 ## Related Repositories
 
-- [Art](https://github.com/vercel/art/tree/master/hyper)
 - [Website](https://github.com/vercel/hyper-site)
 - [Sample Extension](https://github.com/vercel/hyperpower)
 - [Sample Theme](https://github.com/vercel/hyperyellow)

app/index.ts

@@ -17,7 +17,7 @@ remoteInitialize();
 import {resolve} from 'path';
 
 // Packages
-import {app, BrowserWindow, Menu} from 'electron';
+import {app, BrowserWindow, Menu, screen} from 'electron';
 import {gitDescribe} from 'git-describe';
 import isDev from 'electron-is-dev';
 import * as config from './config';
@@ -98,8 +98,6 @@ app.on('ready', () =>
         let [startX, startY] = winSet.position;
 
         const [width, height] = options.size ? options.size : cfg.windowSize || winSet.size;
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const {screen} = require('electron');
 
         const winPos = options.position;
 

app/package.json

@@ -10,15 +10,15 @@
   },
   "repository": "zeit/hyper",
   "dependencies": {
-    "@electron/remote": "2.0.4",
+    "@electron/remote": "2.0.8",
     "async-retry": "1.3.3",
     "chokidar": "^3.5.3",
-    "color": "4.2.0",
+    "color": "4.2.1",
     "default-shell": "1.0.1",
     "electron-fetch": "1.7.4",
     "electron-is-dev": "2.0.0",
     "electron-store": "8.0.1",
-    "fs-extra": "10.0.0",
+    "fs-extra": "10.0.1",
     "git-describe": "4.1.0",
     "lodash": "4.17.21",
     "mkdirp": "1.0.4",
@@ -32,6 +32,7 @@
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "semver": "7.3.5",
+    "shell-env": "3.0.1",
     "sudo-prompt": "^9.2.1",
     "uuid": "8.3.2"
   },

app/session.ts

@@ -7,6 +7,8 @@ import * as config from './config';
 import {IPty, IWindowsPtyForkOptions, spawn as npSpawn} from 'node-pty';
 import {cliScriptPath} from './config/paths';
 import {dirname} from 'path';
+import shellEnv from 'shell-env';
+import osLocale from 'os-locale';
 
 const createNodePtyError = () =>
   new Error(
@@ -105,11 +107,11 @@ export default class Session extends EventEmitter {
   }
 
   init({uid, rows, cols: columns, cwd, shell: _shell, shellArgs: _shellArgs}: SessionOptions) {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const osLocale = require('os-locale') as typeof import('os-locale');
+    const cleanEnv =
+      process.env['APPIMAGE'] && process.env['APPDIR'] ? shellEnv.sync(_shell || defaultShell) : process.env;
     const baseEnv = Object.assign(
       {},
-      process.env,
+      cleanEnv,
       {
         LANG: `${osLocale.sync().replace(/-/, '_')}.UTF-8`,
         TERM: 'xterm-256color',

app/utils/to-electron-background-color.ts

@@ -13,5 +13,5 @@ export default (bgColor: string) => {
 
   // http://stackoverflow.com/a/11019879/1202488
   const alphaHex = Math.round(color.alpha() * 255).toString(16);
-  return `#${alphaHex}${color.hex().toString().substr(1)}`;
+  return `#${alphaHex}${color.hex().toString().slice(1)}`;
 };