Update eslint and a few ZEIT references to Vercel

Author: Stanzilla

.eslintrc.json

@@ -93,9 +93,11 @@
       ],
       "rules": {
         "@typescript-eslint/explicit-function-return-type": "off",
+        "@typescript-eslint/explicit-module-boundary-types": "off",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/no-non-null-assertion": "off",
-        "@typescript-eslint/prefer-optional-chain": "error"
+        "@typescript-eslint/prefer-optional-chain": "error",
+        "@typescript-eslint/ban-types": "off"
       }
     }
   ]

.github/issue_template.md

@@ -7,8 +7,8 @@
 -->
 
 <!-- Checked checkbox should look like this: [x] -->
-- [ ] I am on the [latest](https://github.com/zeit/hyper/releases/latest) Hyper.app version
-- [ ] I have searched the [issues](https://github.com/zeit/hyper/issues) of this repo and believe that this is not a duplicate
+- [ ] I am on the [latest](https://github.com/vercel/hyper/releases/latest) Hyper.app version
+- [ ] I have searched the [issues](https://github.com/vercel/hyper/issues) of this repo and believe that this is not a duplicate
 
 <!--
   Once those are done, if you're able to fill in the following list with your information,
@@ -22,4 +22,4 @@
 - **The issue is reproducible in vanilla Hyper.app**: <!-- Replace with info if applicable, or `Is Vanilla`. (Vanilla means Hyper.app without any add-ons or extras. Straight out of the box.) -->
 
 ## Issue
-<!-- Now feel free to write your issue, but please be descriptive! Thanks again 🙌 ❤️ -->
+<!-- Now feel free to write your issue, but please be descriptive! Thanks again 🙌 ❤︝ -->

.github/pull_request_template.md

@@ -3,6 +3,6 @@
 - To help whoever reviews your PR, it'd be extremely helpful for you to list whether your PR is ready to be merged,
 If there's anything left to do and if there are any related PRs
 - It'd also be extremely helpful to enable us to update your PR incase we need to rebase or what-not by checking `Allow edits from maintainers`
-- If your PR changes some API, please make a PR for hyper website too: https://github.com/zeit/hyper-site.
+- If your PR changes some API, please make a PR for hyper website too: https://github.com/vercel/hyper-site.
 
 Thanks, again! -->

LICENSE

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2018 ZEIT, Inc.
+Copyright (c) 2018 Vercel, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

PLUGINS.md

@@ -3,11 +3,11 @@
 ## Workflow
 
 ### Run Hyper in dev mode
-Hyper can be run in dev mode by cloning this repository and following the ["Contributing" section of our README](https://github.com/zeit/hyper#contribute).
+Hyper can be run in dev mode by cloning this repository and following the ["Contributing" section of our README](https://github.com/vercel/hyper#contribute).
 
 In dev mode you'll get more ouput and access to React/Redux dev-tools in Electron.
 
-Prerequisites and steps are described in the ["Contributing" section of our README](https://github.com/zeit/hyper#contribute).
+Prerequisites and steps are described in the ["Contributing" section of our README](https://github.com/vercel/hyper#contribute).
 Be sure to use the `canary` branch.
 
 ### Create a dev config file
@@ -30,7 +30,7 @@ module.exports = {
 ```
 
 ### Running your plugin
-To load, your plugin should expose at least one API method. All possible methods are listed [here](https://github.com/zeit/hyper/blob/canary/app/plugins/extensions.ts).
+To load, your plugin should expose at least one API method. All possible methods are listed [here](https://github.com/vercel/hyper/blob/canary/app/plugins/extensions.ts).
 
 After launching Hyper in dev mode, run `yarn run app`, it should log that your plugin has been correcty loaded: `Plugin hyper-awesome-plugin (0.1.0) loaded.`. Name and version printed are the ones in your plugins `package.json` file.
 
@@ -70,7 +70,7 @@ exports.decorateTerms = (Terms, {React}) => {
       // <Terms onDecorated={this.onDecorated} />
     }
   }
-``` 
+```
 :warning: Note that you have to execute `this.props.onDecorated` to not break the handler chain. Without this, you could break other plugins that decorate the same component.
 
 ### Keymaps

app/auto-updater-linux.ts

@@ -26,14 +26,12 @@ class AutoUpdater extends EventEmitter implements Electron.AutoUpdater {
           this.emit('update-not-available');
           return;
         }
-        // eslint-disable-next-line @typescript-eslint/camelcase
         return res.json().then(({name, notes, pub_date}) => {
           // Only name is mandatory, needed to construct release URL.
           if (!name) {
             throw new Error('Malformed server response: release name is missing.');
           }
           // If `null` is passed to Date constructor, current time will be used. This doesn't work with `undefined`
-          // eslint-disable-next-line @typescript-eslint/camelcase
           const date = new Date(pub_date || null);
           this.emit('update-available', {}, notes, name, date);
         });

app/config.ts

@@ -15,7 +15,7 @@ export const getDeprecatedCSS = (config: configOptions) => {
   const deprecated: string[] = [];
   const deprecatedCSS = ['x-screen', 'x-row', 'cursor-node', '::selection'];
   deprecatedCSS.forEach((css) => {
-    if ((config.css && config.css.includes(css)) || (config.termCSS && config.termCSS.includes(css))) {
+    if (config.css?.includes(css) || config.termCSS?.includes(css)) {
       deprecated.push(css);
     }
   });
@@ -52,7 +52,7 @@ const _watch = () => {
   // Windows
   if (process.platform === 'win32') {
     // watch for changes on config every 2s on Windows
-    // https://github.com/zeit/hyper/pull/1772
+    // https://github.com/vercel/hyper/pull/1772
     _watcher = fs.watchFile(cfgPath, {interval: 2000}, (curr, prev) => {
       if (!curr.mtime || curr.mtime.getTime() === 0) {
         console.error('error watching config');
@@ -144,8 +144,8 @@ export const htermConfigTranslate = (config: configOptions) => {
   Object.keys(cssReplacements).forEach((pattern) => {
     const searchvalue = new RegExp(pattern, 'g');
     const newvalue = cssReplacements[pattern];
-    config.css = config.css && config.css.replace(searchvalue, newvalue);
-    config.termCSS = config.termCSS && config.termCSS.replace(searchvalue, newvalue);
+    config.css = config.css?.replace(searchvalue, newvalue);
+    config.termCSS = config.termCSS?.replace(searchvalue, newvalue);
   });
   return config;
 };

app/config/open.ts

@@ -12,6 +12,7 @@ export default () => {
     } catch (err) {
       console.error(err);
     }
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
     const {exec} = require('child_process') as typeof import('child_process');
 
     const getUserChoiceKey = async () => {

app/index.ts

@@ -119,6 +119,7 @@ function installDevExtensions(isDev_: boolean) {
   if (!isDev_) {
     return Promise.resolve([]);
   }
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
   const installer = require('electron-devtools-installer') as typeof import('electron-devtools-installer');
 
   const extensions = ['REACT_DEVELOPER_TOOLS', 'REDUX_DEVTOOLS'] as const;

app/menus/menu.ts

@@ -54,7 +54,7 @@ export const createMenu = (
     dialog.showMessageBox({
       title: `About ${appName}`,
       message: `${appName} ${appVersion} (${updateChannel})`,
-      detail: `Renderers: ${renderers}\nPlugins: ${pluginList}\n\nCreated by Guillermo Rauch\nCopyright © 2020 ZEIT, Inc.`,
+      detail: `Renderers: ${renderers}\nPlugins: ${pluginList}\n\nCreated by Guillermo Rauch\nCopyright © 2020 Vercel, Inc.`,
       buttons: [],
       icon: icon as any
     });

app/menus/menus/help.ts

@@ -22,8 +22,8 @@ export default (commands: Record<string, string>, showAbout: () => void): MenuIt
   If not, please try and fulfil these first.
 -->
 <!-- 👉 Checked checkbox should look like this: [x] -->
-- [ ] Your Hyper.app version is **${version}**. Please verify your using the [latest](https://github.com/zeit/hyper/releases/latest) Hyper.app version
-- [ ] I have searched the [issues](https://github.com/zeit/hyper/issues) of this repo and believe that this is not a duplicate
+- [ ] Your Hyper.app version is **${version}**. Please verify your using the [latest](https://github.com/vercel/hyper/releases/latest) Hyper.app version
+- [ ] I have searched the [issues](https://github.com/vercel/hyper/issues) of this repo and believe that this is not a duplicate
 ---
 - **Any relevant information from devtools?** _(CMD+OPTION+I on macOS, CTRL+SHIFT+I elsewhere)_:
 <!-- 👉 Replace with info if applicable, or N/A -->
@@ -57,11 +57,11 @@ ${JSON.stringify(getPlugins(), null, 2)}
 \`\`\`
 </details>`;
 
-        const issueURL = `https://github.com/zeit/hyper/issues/new?body=${encodeURIComponent(body)}`;
+        const issueURL = `https://github.com/vercel/hyper/issues/new?body=${encodeURIComponent(body)}`;
         const copyAndSend = () => {
           clipboard.writeText(body);
           shell.openExternal(
-            `https://github.com/zeit/hyper/issues/new?body=${encodeURIComponent(
+            `https://github.com/vercel/hyper/issues/new?body=${encodeURIComponent(
               '<!-- We have written the needed data into your clipboard because it was too large to send. ' +
                 'Please paste. -->\n'
             )}`

app/plugins.ts

@@ -1,5 +1,3 @@
-// eslint-disable-next-line eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/no-use-before-define */
 import {app, dialog, BrowserWindow, App} from 'electron';
 import {resolve, basename} from 'path';
 import {writeFileSync} from 'fs';
@@ -51,7 +49,7 @@ config.subscribe(() => {
 
 // patching Module._load
 // so plugins can `require` them without needing their own version
-// https://github.com/zeit/hyper/issues/619
+// https://github.com/vercel/hyper/issues/619
 function patchModuleLoad() {
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   const Module = require('module');
@@ -144,6 +142,7 @@ function getPluginVersions() {
   return paths_.map((path_) => {
     let version = null;
     try {
+      // eslint-disable-next-line @typescript-eslint/no-var-requires
       version = require(resolve(path_, 'package.json')).version;
       //eslint-disable-next-line no-empty
     } catch (err) {}
@@ -199,7 +198,7 @@ function syncPackageJSON() {
     description: 'Auto-generated from `~/.hyper.js`!',
     private: true,
     version: '0.0.1',
-    repository: 'zeit/hyper',
+    repository: 'vercel/hyper',
     license: 'MIT',
     homepage: 'https://hyper.is',
     dependencies
@@ -282,6 +281,7 @@ function requirePlugins(): any[] {
       // populate the name for internal errors here
       mod._name = basename(path_);
       try {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
         mod._version = require(resolve(path_, 'package.json')).version;
       } catch (err) {
         console.warn(`No package.json found in ${path_}`);

app/session.ts

@@ -13,6 +13,7 @@ const createNodePtyError = () =>
 
 let spawn: typeof npSpawn;
 try {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
   spawn = require('node-pty').spawn;
 } catch (err) {
   throw createNodePtyError();
@@ -100,6 +101,7 @@ export default class Session extends EventEmitter {
   }
 
   init({uid, rows, cols: columns, cwd, shell, shellArgs}: SessionOptions) {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
     const osLocale = require('os-locale') as typeof import('os-locale');
     const baseEnv = Object.assign(
       {},
@@ -116,7 +118,7 @@ export default class Session extends EventEmitter {
 
     // Electron has a default value for process.env.GOOGLE_API_KEY
     // We don't want to leak this to the shell
-    // See https://github.com/zeit/hyper/issues/696
+    // See https://github.com/vercel/hyper/issues/696
     if (baseEnv.GOOGLE_API_KEY && process.env.GOOGLE_API_KEY === baseEnv.GOOGLE_API_KEY) {
       delete baseEnv.GOOGLE_API_KEY;
     }

app/updater.ts

@@ -74,7 +74,7 @@ export default (win: BrowserWindow) => {
     updateUrl: string,
     onQuitAndInstall: any
   ) => {
-    const releaseUrl = updateUrl || `https://github.com/zeit/hyper/releases/tag/${releaseName}`;
+    const releaseUrl = updateUrl || `https://github.com/vercel/hyper/releases/tag/${releaseName}`;
     rpc.emit('update available', {releaseNotes, releaseName, releaseUrl, canInstall: !!onQuitAndInstall});
   };
 

lib/components/notifications.tsx

@@ -81,7 +81,7 @@ export default class Notifications extends React.PureComponent<NotificationsProp
                 window.require('electron').shell.openExternal(ev.currentTarget.href);
                 ev.preventDefault();
               }}
-              href={`https://github.com/zeit/hyper/releases/tag/${this.props.updateVersion}`}
+              href={`https://github.com/vercel/hyper/releases/tag/${this.props.updateVersion}`}
             >
               notes
             </a>

lib/components/term-group.tsx

@@ -9,7 +9,6 @@ import {HyperState, HyperDispatch, TermGroupProps, TermGroupOwnProps} from '../h
 const Term = decorate(Term_, 'Term');
 const SplitPane = decorate(SplitPane_, 'SplitPane');
 
-// eslint-disable-next-line @typescript-eslint/class-name-casing
 class TermGroup_ extends React.PureComponent<TermGroupProps> {
   bound: WeakMap<(uid: string, ...args: any[]) => any, Record<string, (...args: any[]) => any>>;
   term?: Term_ | null;

lib/containers/hyper.tsx

@@ -89,7 +89,7 @@ class Hyper extends React.PureComponent<HyperProps> {
 
   componentWillUnmount() {
     document.body.style.backgroundColor = 'inherit';
-    this.mousetrap && this.mousetrap.reset();
+    this.mousetrap?.reset();
   }
 
   render() {

lib/ext-modules.d.ts

@@ -1,5 +1,4 @@
 declare module 'php-escape-shell' {
-  // eslint-disable-next-line @typescript-eslint/camelcase
   export function php_escapeshellcmd(path: string): string;
 }
 

lib/reducers/sessions.ts

@@ -81,7 +81,7 @@ const reducer = (state: ImmutableType<sessionState> = initialState, action: Hype
     case SESSION_PTY_DATA:
       // we avoid a direct merge for perf reasons
       // as this is the most common action
-      if (state.sessions[action.uid] && state.sessions[action.uid].cleared) {
+      if (state.sessions[action.uid]?.cleared) {
         return state.merge(
           {
             sessions: {

lib/utils/plugins.ts

@@ -6,7 +6,7 @@ import {basename} from 'path';
 
 // patching Module._load
 // so plugins can `require` them without needing their own version
-// https://github.com/zeit/hyper/issues/619
+// https://github.com/vercel/hyper/issues/619
 import React, {PureComponent} from 'react';
 import ReactDOM from 'react-dom';
 import Notification from '../components/notification';
@@ -66,7 +66,7 @@ let reducersDecorators: {
 // expose decorated component instance to the higher-order components
 function exposeDecorated<P extends Record<string, any>>(
   Component_: React.ComponentType<P>
-): React.ComponentClass<P, {}> {
+): React.ComponentClass<P, unknown> {
   return class DecoratedComponent extends React.Component<P> {
     constructor(props: P, context: any) {
       super(props, context);
@@ -155,6 +155,7 @@ export function decorate<P>(
   };
 }
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const Module = require('module') as typeof import('module') & {_load: Function};
 const originalLoad = Module._load;
 Module._load = function _load(path: string) {

package.json

@@ -90,8 +90,8 @@
     "@types/terser-webpack-plugin": "3.0.0",
     "@types/uuid": "8.0.0",
     "@types/webpack": "4.41.21",
-    "@typescript-eslint/eslint-plugin": "2.34.0",
-    "@typescript-eslint/parser": "2.34.0",
+    "@typescript-eslint/eslint-plugin": "3.6.0",
+    "@typescript-eslint/parser": "3.6.0",
     "ava": "3.10.1",
     "babel-loader": "8.1.0",
     "concurrently": "5.2.0",
@@ -103,7 +103,7 @@
     "electron-builder-squirrel-windows": "22.7.0",
     "electron-devtools-installer": "3.1.0",
     "electron-rebuild": "1.11.0",
-    "eslint": "6.8.0",
+    "eslint": "7.4.0",
     "eslint-config-prettier": "6.11.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-prettier": "3.1.4",

test/unit/cli-api.test.ts

@@ -1,4 +1,5 @@
 import test from 'ava';
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const proxyquire = require('proxyquire').noCallThru();
 
 test('existsOnNpm() builds the url for non-scoped packages', (t) => {

test/unit/window-utils.test.ts

@@ -1,4 +1,5 @@
 import test from 'ava';
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const proxyquire = require('proxyquire').noCallThru();
 
 test('positionIsValid() returns true when window is on only screen', (t) => {