jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to Electron 12.0.1

Browse Source 
Summary: Changelog: Upgraded to Electron 12.0.1

Reviewed By: fabiomassimo

Differential Revision: D27084184

fbshipit-source-id: 5d45c632f7fec78635287f1919ef1cf0b2b458ad
This commit is contained in:
Pascal Hartig
2021-03-17 16:31:07 -07:00
committed by Facebook GitHub Bot
parent f468f0e07d
commit 81252edf33
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/package.json
View File

@@ -135,7 +135,7 @@
"cross-env": "^7.0.2", "cross-env": "^7.0.2",
"detect-port": "^1.1.1", "detect-port": "^1.1.1",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"electron": "11.2.3", "electron": "12.0.1",
"electron-builder": "22.9.1", "electron-builder": "22.9.1",
"eslint": "^7.12.1", "eslint": "^7.12.1",
"eslint-config-fbjs": "^3.1.1", "eslint-config-fbjs": "^3.1.1",
@@ -201,7 +201,7 @@
"resolutions": { "resolutions": {
"**/metro/**/temp": "0.9.0", "**/metro/**/temp": "0.9.0",
"**/metro/**/ws": "1.1.5", "**/metro/**/ws": "1.1.5",
"@jest-runner/electron/electron": "11.2.3", "@jest-runner/electron/electron": "12.0.1",
"@types/react": "17.0.0", "@types/react": "17.0.0",
"@types/react-dom": "17.0.1", "@types/react-dom": "17.0.1",
"acorn": "7.1.1", "acorn": "7.1.1",
@@ -219,12 +219,12 @@
"scripts": { "scripts": {
"build": "cross-env NODE_ENV=production ./ts-node scripts/build-release.ts $@", "build": "cross-env NODE_ENV=production ./ts-node scripts/build-release.ts $@",
"build-plugin": "./ts-node scripts/build-plugin.ts", "build-plugin": "./ts-node scripts/build-plugin.ts",
"bundle-all-plugins": "./ts-node scripts/bundle-all-plugins.ts",
"build:dev": "cross-env NODE_ENV=development ./ts-node scripts/build-release.ts $@", "build:dev": "cross-env NODE_ENV=development ./ts-node scripts/build-release.ts $@",
"build:eslint": "cd eslint-plugin-flipper && yarn build", "build:eslint": "cd eslint-plugin-flipper && yarn build",
"build:themes": "lessc --js themes/light.less static/themes/light.css && lessc --js themes/dark.less static/themes/dark.css", "build:themes": "lessc --js themes/light.less static/themes/light.css && lessc --js themes/dark.less static/themes/dark.css",
"build:tsc": "tsc -b tsc-root/tsconfig.json && ./ts-node ./scripts/compute-package-checksum.ts -d ./babel-transformer -o ./lib/checksum.txt", "build:tsc": "tsc -b tsc-root/tsconfig.json && ./ts-node ./scripts/compute-package-checksum.ts -d ./babel-transformer -o ./lib/checksum.txt",
"bump-versions": "./ts-node scripts/bump-versions.ts", "bump-versions": "./ts-node scripts/bump-versions.ts",
"bundle-all-plugins": "./ts-node scripts/bundle-all-plugins.ts",
"dev-server": "cross-env NODE_ENV=development ./ts-node scripts/start-dev-server.ts", "dev-server": "cross-env NODE_ENV=development ./ts-node scripts/start-dev-server.ts",
"everything": "yarn reset && yarn install && yarn lint && yarn test && yarn test-electron && yarn build --mac --mac-dmg --win --linux --linux-deb && yarn start", "everything": "yarn reset && yarn install && yarn lint && yarn test && yarn test-electron && yarn build --mac --mac-dmg --win --linux --linux-deb && yarn start",
"fix": "eslint . --fix --ext .js,.ts,.tsx", "fix": "eslint . --fix --ext .js,.ts,.tsx",

1
desktop/static/main.ts
View File

@@ -288,6 +288,7 @@ function createWindow() {
nodeIntegration: true, nodeIntegration: true,
webviewTag: true, webviewTag: true,
nativeWindowOpen: true, nativeWindowOpen: true,
contextIsolation: false,
}, },
}); });
win.once('ready-to-show', () => { win.once('ready-to-show', () => {

18
desktop/yarn.lock
View File

@@ -2353,10 +2353,10 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.31.tgz#72286bd33d137aa0d152d47ec7c1762563d34055" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.31.tgz#72286bd33d137aa0d152d47ec7c1762563d34055"
integrity sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g== integrity sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==
"@types/node@^12.0.12": "@types/node@^14.6.2":
version "12.12.5" version "14.14.35"
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.5.tgz#66103d2eddc543d44a04394abb7be52506d7f290" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.35.tgz#42c953a4e2b18ab931f72477e7012172f4ffa313"
integrity sha512-KEjODidV4XYUlJBF3XdjSH5FWoMCtO0utnhtdLf1AgeuZLOrRbvmU/gaRCVg7ZaQDjVf3l84egiY0mRNe5xE4A== integrity sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==
"@types/normalize-package-data@^2.4.0": "@types/normalize-package-data@^2.4.0":
version "2.4.0" version "2.4.0"
@@ -5128,13 +5128,13 @@ electron-to-chromium@^1.3.649:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.678.tgz#c7c6960463167126b7ed076fade14cac6223bfff" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.678.tgz#c7c6960463167126b7ed076fade14cac6223bfff"
integrity sha512-E5ha1pE9+aWWrT2fUD5wdPBWUnYtKnEnloewbtVyrkAs79HvodOiNO4rMR94+hKbxgMFQG4fnPQACOc1cfMfBg== integrity sha512-E5ha1pE9+aWWrT2fUD5wdPBWUnYtKnEnloewbtVyrkAs79HvodOiNO4rMR94+hKbxgMFQG4fnPQACOc1cfMfBg==
electron@11.2.3: electron@12.0.1:
version "11.2.3" version "12.0.1"
resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb" resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.1.tgz#11afa81dae858cc7cd79107c2f789e8a7f93a31b"
integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ== integrity sha512-4bTfLSTmuFkMxq3RMyjd8DxuzbxI1Bde879XDrBA4kFWbKhZ3hfXqHXQz3129eCmcLre5odcNsWq7/xzyJilMA==
dependencies: dependencies:
"@electron/get" "^1.0.1" "@electron/get" "^1.0.1"
"@types/node" "^12.0.12" "@types/node" "^14.6.2"
extract-zip "^1.0.3" extract-zip "^1.0.3"
emittery@^0.7.1: emittery@^0.7.1: