Upgrade Electron to 11.2.3. (#3798)

* Upgrade Electron from 9.3.5 to 11.2.3.

* bump version

* update preid to alpha

* version packages lib@2.3.1-alpha.0

* Downgrade electron-builder to 22.11.3.

We tried to upgrade electron-builder to 22.11.7, but this fails
because electron-builder 22.11.4 introduces imports into fs/promises.
This module is only available in Node 14+, so we have to stick to
22.11.3 until we update to Electron 12.

* Revert npm script changes from alpha release.

Co-authored-by: Opender Singh <opender.singh@konghq.com>
This commit is contained in:
John Chadwick
2021-07-16 13:35:32 -07:00
committed by GitHub
parent d241093ec2
commit b07cd1cf16
28 changed files with 1435 additions and 1920 deletions

View File

@@ -9,7 +9,7 @@ env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_REF: ${{ github.ref }}
GITHUB_SHA: ${{ github.sha }}
NPM_CONFIG_TARGET: 9.3.5
NPM_CONFIG_TARGET: 11.2.3
NPM_CONFIG_DISTURL: https://electronjs.org/headers
NPM_CONFIG_RUNTIME: electron

View File

@@ -1,6 +1,6 @@
{
"tagVersionPrefix": "lib@",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"includeMergedTags": true,
"command": {
"version": {

View File

@@ -1,3 +1,3 @@
runtime = electron
target = 9.3.5
target = 11.2.3
disturl = https://electronjs.org/headers

View File

@@ -92,6 +92,8 @@ export function createWindow() {
nodeIntegration: true,
webviewTag: true,
enableRemoteModule: true,
// TODO: enable context isolation
contextIsolation: false,
},
});

View File

@@ -435,8 +435,9 @@ export async function _actuallySend(
} catch (err) {
// Doesn't exist yet, so write it
mkdirp.sync(baseCAPath);
// @ts-expect-error -- TSCONVERSION
fs.writeFileSync(fullCAPath, caCerts);
// TODO: Should mock cacerts module for testing. This is literally
// coercing a function to string in tests due to lack of val-loader.
fs.writeFileSync(fullCAPath, String(caCerts));
console.log('[net] Set CA to', fullCAPath);
}

View File

@@ -1,5 +1,5 @@
{
"version": "2021.4.1",
"version": "2021.4.1-alpha.1",
"name": "insomnia",
"executableName": "insomnia",
"appId": "com.insomnia.app",

View File

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"private": true,
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"name": "insomnia-app",
"homepage": "https://konghq.com",
"description": "The Collaborative API Design Tool",
@@ -87,8 +87,8 @@
"color": "^3.1.2",
"deep-equal": "^1.0.1",
"electron-context-menu": "^2.2.0",
"electron-log": "^4.2.4",
"electron-updater": "^4.2.0",
"electron-log": "^4.3.5",
"electron-updater": "^4.3.9",
"font-scanner": "^0.1.2",
"framer-motion": "^1.11.1",
"fs-extra": "^5.0.0",
@@ -100,16 +100,16 @@
"html-entities": "^1.2.0",
"httpsnippet": "^1.23.0",
"iconv-lite": "^0.4.15",
"insomnia-components": "2.3.0",
"insomnia-components": "2.3.1-alpha.0",
"insomnia-cookies": "2.3.0",
"insomnia-importers": "2.3.0",
"insomnia-importers": "2.3.1-alpha.0",
"insomnia-plugin-base64": "2.3.0",
"insomnia-plugin-cookie-jar": "2.3.0",
"insomnia-plugin-core-themes": "2.3.0",
"insomnia-plugin-file": "2.3.0",
"insomnia-plugin-hash": "2.3.0",
"insomnia-plugin-jsonpath": "2.3.0",
"insomnia-plugin-kong-bundle": "2.3.0",
"insomnia-plugin-kong-bundle": "2.3.1-alpha.0",
"insomnia-plugin-now": "2.3.0",
"insomnia-plugin-os": "2.3.0",
"insomnia-plugin-prompt": "2.3.0",
@@ -138,7 +138,7 @@
"nunjucks": "^3.2.0",
"oauth-1.0a": "^2.2.2",
"objectpath": "^2.0.0",
"openapi-2-kong": "2.3.0",
"openapi-2-kong": "2.3.1-alpha.0",
"papaparse": "^5.2.0",
"pdfjs-dist": "^2.5.207",
"react": "^16.8.3",
@@ -220,11 +220,11 @@
"concurrently": "^3.5.0",
"cross-env": "^2.0.0",
"css-loader": "^2.1.1",
"electron": "9.3.5",
"electron-builder": "^22.5.1",
"electron-builder-squirrel-windows": "^22.5.1",
"electron": "11.2.3",
"electron-builder": "22.11.3",
"electron-builder-squirrel-windows": "22.11.3",
"electron-devtools-installer": "^3.2.0",
"electron-notarize": "^0.3.0",
"electron-notarize": "^1.0.0",
"fast-glob": "^3.1.0",
"file-loader": "^3.0.1",
"jest": "^26.6.3",
@@ -236,7 +236,6 @@
"react-hot-loader": "^4.13.0",
"redux-mock-store": "^1.5.4",
"source-map-loader": "^1.0.0",
"spectron": "^11.1.0",
"style-loader": "^0.23.1",
"ts-loader": "^8.2.0",
"ts-node": "^9.1.1",

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-components",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-components",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"author": "Kong <office@konghq.com>",
"description": "Insomnia UI component library",
"license": "MIT",

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-importers",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-importers",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"author": "Kong <office@konghq.com>",
"description": "Various data importers for Insomnia",
"license": "MIT",

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-inso",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-inso",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"homepage": "https://insomnia.rest",
"description": "A CLI for Insomnia Designer - the collaborative API design tool.",
"author": "Kong <office@konghq.com>",
@@ -75,12 +75,12 @@
"insomnia-plugin-request": "2.3.0",
"insomnia-plugin-response": "2.3.0",
"insomnia-plugin-uuid": "2.3.0",
"insomnia-send-request": "2.3.0",
"insomnia-send-request": "2.3.1-alpha.0",
"insomnia-testing": "2.3.0",
"lodash.flattendeep": "^4.4.0",
"mkdirp": "^1.0.4",
"nedb": "^1.8.0",
"openapi-2-kong": "2.3.0",
"openapi-2-kong": "2.3.1-alpha.0",
"string-argv": "^0.3.1",
"yaml": "^1.10.0"
}

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-send-request",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,7 +1,7 @@
{
"name": "insomnia-send-request",
"license": "Apache-2.0",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"author": "Kong <office@konghq.com>",
"main": "dist/index.js",
"types": "dist/send-request/index.d.ts",
@@ -19,7 +19,7 @@
"hkdf": "0.0.2",
"html-entities": "^1.3.1",
"httpsnippet": "^1.22.0",
"insomnia-importers": "2.3.0",
"insomnia-importers": "2.3.1-alpha.0",
"insomnia-testing": "2.3.0",
"isomorphic-git": "^1.5.0",
"jshint": "^2.11.1",
@@ -34,7 +34,7 @@
"node-libcurl": "2.3.3",
"nunjucks": "^3.2.1",
"oauth-1.0a": "^2.2.6",
"openapi-2-kong": "2.3.0",
"openapi-2-kong": "2.3.1-alpha.0",
"tough-cookie": "^4.0.0",
"url-join": "^4.0.1",
"uuid": "^8.2.0",

View File

File diff suppressed because it is too large Load Diff

View File

@@ -11,7 +11,7 @@
"bugs": {
"url": "https://github.com/kong/insomnia/issues"
},
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"scripts": {
"bootstrap": "npm run build",
"lint": "eslint . --ext .js,.ts,.tsx",
@@ -42,7 +42,7 @@
"get-bin-path": "^5.1.0",
"jest": "^26.6.3",
"mkdirp": "^1.0.4",
"spectron": "^11.1.0",
"spectron": "^13.0.0",
"spectron-keys": "0.0.1",
"ts-node": "^9.1.1",
"xvfb-maybe": "^0.2.1"

View File

@@ -1,6 +1,6 @@
{
"name": "openapi-2-kong",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,7 +1,7 @@
{
"name": "openapi-2-kong",
"license": "Apache-2.0",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"author": "Kong <office@konghq.com>",
"main": "dist/index.js",
"types": "dist/index.d.ts",

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-plugin-kong-bundle",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-plugin-kong-bundle",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"main": "index.js",
"author": "Kong <office@konghq.com>",
"license": "Apache-2.0",
@@ -26,9 +26,9 @@
}
},
"dependencies": {
"insomnia-plugin-kong-declarative-config": "2.3.0",
"insomnia-plugin-kong-kubernetes-config": "2.3.0",
"insomnia-plugin-kong-portal": "2.3.0"
"insomnia-plugin-kong-declarative-config": "2.3.1-alpha.0",
"insomnia-plugin-kong-kubernetes-config": "2.3.1-alpha.0",
"insomnia-plugin-kong-portal": "2.3.1-alpha.0"
},
"gitHead": "d91e6735a76295166545a42c170328da4ab70dd3"
}

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-plugin-kong-declarative-config",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-plugin-kong-declarative-config",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"main": "index.js",
"author": "Kong <office@konghq.com>",
"license": "Apache-2.0",
@@ -17,7 +17,7 @@
"description": "Generate Kong Declarative Config"
},
"dependencies": {
"openapi-2-kong": "2.3.0",
"openapi-2-kong": "2.3.1-alpha.0",
"yaml": "^1.8.3"
},
"gitHead": "d91e6735a76295166545a42c170328da4ab70dd3"

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-plugin-kong-kubernetes-config",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-plugin-kong-kubernetes-config",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"main": "index.js",
"author": "Kong <office@konghq.com>",
"license": "Apache-2.0",
@@ -17,7 +17,7 @@
"description": "Generate Kong For Kubernetes configuration"
},
"dependencies": {
"openapi-2-kong": "2.3.0",
"openapi-2-kong": "2.3.1-alpha.0",
"yaml": "^1.8.3"
},
"gitHead": "d91e6735a76295166545a42c170328da4ab70dd3"

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-plugin-kong-portal",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "insomnia-plugin-kong-portal",
"version": "2.3.0",
"version": "2.3.1-alpha.0",
"main": "dist/index.js",
"author": "Kong <office@konghq.com>",
"license": "Apache-2.0",
@@ -30,7 +30,7 @@
"@babel/preset-flow": "^7.9.0",
"@babel/preset-react": "^7.9.4",
"autobind-decorator": "^2.4.0",
"insomnia-components": "2.3.0",
"insomnia-components": "2.3.1-alpha.0",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"styled-components": "^4.4.1",