Chore/upgrade-electron-12 (#4232)

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
Kong · Dec 21, 2021 · 21ab3dd · 21ab3dd
1 parent 3960c2d
commit 21ab3dd
Show file tree

Hide file tree

Showing 16 changed files with 1,358 additions and 992 deletions.
diff --git a/.github/workflows/release-core.yml b/.github/workflows/release-core.yml
@@ -205,7 +205,7 @@ jobs:
     name: Windows
     runs-on: windows-2016
     env:
-      NPM_CONFIG_TARGET: 11.2.3
+      NPM_CONFIG_TARGET: 12.2.3
       NPM_CONFIG_DISTURL: https://electronjs.org/headers
       NPM_CONFIG_RUNTIME: electron
     steps:
@@ -232,7 +232,7 @@ jobs:
     name: Mac
     runs-on: macos-latest
     env:
-      NPM_CONFIG_TARGET: 11.2.3
+      NPM_CONFIG_TARGET: 12.2.3
       NPM_CONFIG_DISTURL: https://electronjs.org/headers
       NPM_CONFIG_RUNTIME: electron
     steps:
@@ -261,7 +261,7 @@ jobs:
     name: Linux
     runs-on: ubuntu-latest
     env:
-      NPM_CONFIG_TARGET: 11.2.3
+      NPM_CONFIG_TARGET: 12.2.3
       NPM_CONFIG_DISTURL: https://electronjs.org/headers
       NPM_CONFIG_RUNTIME: electron
     steps:

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-12.18.3
+14.16.0
diff --git a/packages/insomnia-app/.babelrc.js b/packages/insomnia-app/.babelrc.js
@@ -1,7 +1,7 @@
 /** @type { import('@babel/core').TransformOptions } */
 module.exports = {
   presets: [
-    ['@babel/preset-env',{targets: {electron: '11.2.3'}}],
+    ['@babel/preset-env',{targets: {electron: '12.2.3'}}],
     '@babel/preset-typescript',
     '@babel/preset-react',
   ],

diff --git a/packages/insomnia-app/.npmrc b/packages/insomnia-app/.npmrc
@@ -1,3 +1,3 @@
 runtime = electron
-target = 11.2.3
+target = 12.2.3
 disturl = https://electronjs.org/headers
diff --git a/packages/insomnia-app/app/main.development.ts b/packages/insomnia-app/app/main.development.ts
@@ -1,7 +1,5 @@
-import 'core-js/stable';
-import 'regenerator-runtime/runtime';
-
 import * as electron from 'electron';
+import contextMenu from 'electron-context-menu';
 import installExtension, { REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS } from 'electron-devtools-installer';
 import path from 'path';
 
@@ -43,6 +41,8 @@ if (!isDevelopment()) {
 // So if (window) checks don't throw
 global.window = global.window || undefined;
 
+contextMenu();
+
 // When the app is first launched
 app.on('ready', async () => {
   const { error } = validateInsomniaConfig();

diff --git a/packages/insomnia-app/app/main/window-utils.ts b/packages/insomnia-app/app/main/window-utils.ts
@@ -42,7 +42,6 @@ interface Bounds {
 
 export function init() {
   initLocalStorage();
-  initContextMenus();
 }
 
 export function createWindow() {
@@ -584,8 +583,3 @@ function initLocalStorage() {
   const localStoragePath = path.join(getDataDirectory(), 'localStorage');
   localStorage = new LocalStorage(localStoragePath);
 }
-
-function initContextMenus() {
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  require('electron-context-menu')({});
-}
diff --git a/packages/insomnia-app/app/renderer.ts b/packages/insomnia-app/app/renderer.ts
@@ -1,3 +1 @@
-import 'core-js/stable';
-import 'regenerator-runtime/runtime';
 import './ui';