diff --git a/desktop/package.json b/desktop/package.json index ea2354b3e..397029ab8 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -135,7 +135,7 @@ "cross-env": "^7.0.2", "detect-port": "^1.1.1", "dotenv": "^8.2.0", - "electron": "11.2.3", + "electron": "12.0.1", "electron-builder": "22.9.1", "eslint": "^7.12.1", "eslint-config-fbjs": "^3.1.1", @@ -201,7 +201,7 @@ "resolutions": { "**/metro/**/temp": "0.9.0", "**/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-dom": "17.0.1", "acorn": "7.1.1", @@ -219,12 +219,12 @@ "scripts": { "build": "cross-env NODE_ENV=production ./ts-node scripts/build-release.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: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: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", + "bundle-all-plugins": "./ts-node scripts/bundle-all-plugins.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", "fix": "eslint . --fix --ext .js,.ts,.tsx", diff --git a/desktop/static/main.ts b/desktop/static/main.ts index 098ec85b5..ed7526505 100644 --- a/desktop/static/main.ts +++ b/desktop/static/main.ts @@ -288,6 +288,7 @@ function createWindow() { nodeIntegration: true, webviewTag: true, nativeWindowOpen: true, + contextIsolation: false, }, }); win.once('ready-to-show', () => { diff --git a/desktop/yarn.lock b/desktop/yarn.lock index 4e6545291..a3ee2055b 100644 --- a/desktop/yarn.lock +++ b/desktop/yarn.lock @@ -2353,10 +2353,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.31.tgz#72286bd33d137aa0d152d47ec7c1762563d34055" integrity sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g== -"@types/node@^12.0.12": - version "12.12.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.5.tgz#66103d2eddc543d44a04394abb7be52506d7f290" - integrity sha512-KEjODidV4XYUlJBF3XdjSH5FWoMCtO0utnhtdLf1AgeuZLOrRbvmU/gaRCVg7ZaQDjVf3l84egiY0mRNe5xE4A== +"@types/node@^14.6.2": + version "14.14.35" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.35.tgz#42c953a4e2b18ab931f72477e7012172f4ffa313" + integrity sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag== "@types/normalize-package-data@^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" integrity sha512-E5ha1pE9+aWWrT2fUD5wdPBWUnYtKnEnloewbtVyrkAs79HvodOiNO4rMR94+hKbxgMFQG4fnPQACOc1cfMfBg== -electron@11.2.3: - version "11.2.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb" - integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ== +electron@12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.1.tgz#11afa81dae858cc7cd79107c2f789e8a7f93a31b" + integrity sha512-4bTfLSTmuFkMxq3RMyjd8DxuzbxI1Bde879XDrBA4kFWbKhZ3hfXqHXQz3129eCmcLre5odcNsWq7/xzyJilMA== dependencies: "@electron/get" "^1.0.1" - "@types/node" "^12.0.12" + "@types/node" "^14.6.2" extract-zip "^1.0.3" emittery@^0.7.1: