1.1.3: upgrade to electron 12

kirjavascript · kirjavascript · commit 075296a219b5 · 2021-04-10T20:03:13.000+01:00
diff --git a/app/components/import/state.js b/app/components/import/state.js
@@ -1,5 +1,5 @@
 import { observable, computed, action, autorun, toJS } from 'mobx';
-const { dialog } = require('electron').remote;
+const { dialog } = require('@electron/remote');
 import { errorMsg } from '#util/dialog';
 import { removeBackground } from './remove-background';
 import { colorMatch } from './color-match';
diff --git a/app/components/project/object-menu.js b/app/components/project/object-menu.js
@@ -1,8 +1,7 @@
-import { remote } from 'electron';
 import { toJS } from 'mobx';
 import { uuid } from '#util/uuid';
 import { workspace } from '#store/workspace';
-const { getCurrentWindow, Menu, MenuItem } = remote;
+const { getCurrentWindow, Menu, MenuItem } = require('@electron/remote');
 
 export default function(node) {
     const menu = new Menu();
diff --git a/app/components/ui/file/index.js b/app/components/ui/file/index.js
@@ -3,7 +3,7 @@ import { observer } from 'mobx-react';
 import { workspace } from '#store/workspace';
 import { Input } from '#ui';
 
-const { dialog } = require('electron').remote;
+const { dialog } = require('@electron/remote');
 
 @observer
 export class File extends Component {
diff --git a/app/controls/commands.js b/app/controls/commands.js
@@ -43,7 +43,7 @@ export const commands = [
         {
             map: 'f12', name: 'DevTools', hidden: true,
             func: () => {
-                require('electron').remote
+                require('@electron/remote')
                     .getCurrentWindow()
                     .webContents
                     .toggleDevTools();
diff --git a/app/formats/image.js b/app/formats/image.js
@@ -1,5 +1,5 @@
 import { environment } from '#store/environment';
-const { dialog } = require('electron').remote;
+const { dialog } = require('@electron/remote');
 import { writeFile } from 'fs';
 import { errorMsg } from '#util/dialog';
 import { colorMatch } from '#components/import/color-match';
diff --git a/app/main.js b/app/main.js
@@ -8,7 +8,6 @@ import React from 'react';
 import { render } from 'react-dom';
 import { Layout } from '#components/layout';
 import './components/import';
-import './util/debugger';
 
 render(
     <Layout/>,
diff --git a/app/util/debugger.js b/app/util/debugger.js
diff --git a/app/util/dialog.js b/app/util/dialog.js
@@ -1,4 +1,4 @@
-const { dialog } = require('electron').remote;
+const { dialog } = require('@electron/remote');
 
 export function errorMsg(title, message) {
     dialog.showMessageBox({
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.1.2",
+    "version": "1.1.3",
     "scripts": {
         "start": "electron ./static --dev"
     },
@@ -9,8 +9,9 @@
         "@babel/plugin-proposal-decorators": "^7.8.3",
         "@babel/preset-env": "^7.9.0",
         "@babel/preset-react": "^7.9.4",
+        "@electron/remote": "^1.1.0",
         "babel-loader": "^8.1.0",
-        "electron": "^8.5.5",
+        "electron": "^12.0.2",
         "node-sass": "git+https://github.com/TomiBelan/node-sass-wasm#built/master",
         "raw-loader": "^4.0.0",
         "sass-variables-loader": "^0.1.3",
@@ -26,7 +27,6 @@
         "d3-dispatch": "^1.0.3",
         "d3-drag": "^1.2.5",
         "d3-selection": "^1.1.0",
-        "electron-unhandled": "^3.0.2",
         "flexlayout-react": "^0.4.5",
         "lodash": "^4.17.19",
         "marked": "^0.3.6",
diff --git a/static/index.html b/static/index.html
@@ -4,6 +4,7 @@
 <head>
     <title>Flex 2</title>
     <link rel="stylesheet" href="bundles/main.css" type="text/css" charset="utf-8">
+    <script>if (!crossOriginIsolated) SharedArrayBuffer = ArrayBuffer;</script>
 </head>
 <body>
     <img src="images/nuke.png" class="nuke"/>
diff --git a/static/index.js b/static/index.js
@@ -2,6 +2,7 @@ const { app, BrowserWindow } = require('electron');
 const devMode = process.argv.includes('--dev');
 
 function createWindow() {
+    require('@electron/remote/main').initialize();
     const mainWindow = new BrowserWindow({
         title: 'Flex 2',
         backgroundColor: '#282C34',
@@ -13,6 +14,8 @@ function createWindow() {
         show: false,
         webPreferences: {
             nodeIntegration: true,
+            contextIsolation: false,
+            enableRemoteModule: true,
         },
     });
 
diff --git a/yarn.lock b/yarn.lock
@@ -926,6 +926,11 @@
     global-agent "^2.0.2"
     global-tunnel-ng "^2.7.1"
 
+"@electron/remote@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-1.1.0.tgz#167d119c7c03c7778b556fdc4f1f38a44b23f1c2"
+  integrity sha512-yr8gZTkIgJYKbFqExI4QZqMSjn1kL/us9Dl46+TH1EZdhgRtsJ6HDfdsIxu0QEc6Hv+DMAXs69rgquH+8FDk4w==
+
 "@icons/material@^0.2.4":
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
@@ -966,10 +971,10 @@
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
 
-"@types/node@^12.0.12":
-  version "12.12.30"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.30.tgz#3501e6f09b954de9c404671cefdbcc5d9d7c45f6"
-  integrity sha512-sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg==
+"@types/node@^14.6.2":
+  version "14.14.37"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e"
+  integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==
 
 "@types/prop-types@*":
   version "15.7.3"
@@ -2156,13 +2161,13 @@ electron-unhandled@^3.0.2:
     ensure-error "^2.0.0"
     lodash.debounce "^4.0.8"
 
-electron@^8.5.5:
-  version "8.5.5"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-8.5.5.tgz#17b12bd70139c0099f750fc5de0d480bf03acb96"
-  integrity sha512-e355H+tRDial0m+X2v+l+0SnaATAPw4sNjv9qmdk/6MJz/glteVJwVJEnxTjPfEELIJSChrBWDBVpjdDvoBF4Q==
+electron@^12.0.2:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.2.tgz#d92be205f1937627bd6718aad44ac161382b4c2d"
+  integrity sha512-14luh9mGzfL4e0sncyy0+kW37IU7Y0Y1tvI97FDRSW0ZBQxi5cmAwSs5dmPmNBFBIGtzkaGaEB01j9RjZuCmow==
   dependencies:
     "@electron/get" "^1.0.1"
-    "@types/node" "^12.0.12"
+    "@types/node" "^14.6.2"
     extract-zip "^1.0.3"
 
 element-resize-detector@^1.1.9:
@@ -3981,17 +3986,7 @@ react-dnd@^11.1.3:
     dnd-core "^11.1.3"
     hoist-non-react-statics "^3.3.0"
 
-react-dom@^16.13.1:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f"
-  integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    scheduler "^0.19.1"
-
-react-dom@^16.3.0:
+react-dom@^16.13.1, react-dom@^16.3.0:
   version "16.14.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
   integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
@@ -4070,16 +4065,7 @@ react-virtualized@^9.21.2:
     prop-types "^15.7.2"
     react-lifecycles-compat "^3.0.4"
 
-react@^16.13.1:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
-  integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-
-react@^16.3.0:
+react@^16.13.1, react@^16.3.0:
   version "16.14.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
   integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export const commands = [`
`43`	`43`	`{`
`44`	`44`	`map: 'f12', name: 'DevTools', hidden: true,`
`45`	`45`	`func: () => {`
`46`		`- require('electron').remote`
	`46`	`+ require('@electron/remote')`
`47`	`47`	`.getCurrentWindow()`
`48`	`48`	`.webContents`
`49`	`49`	`.toggleDevTools();`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const { dialog } = require('electron').remote;`
	`1`	`+const { dialog } = require('@electron/remote');`
`2`	`2`
`3`	`3`	`export function errorMsg(title, message) {`
`4`	`4`	`dialog.showMessageBox({`