Merge pull request #5718 from docker/DESKTOP-3015-bump-kitematic-dependencies

DESKTOP-3015: Bump kitematic dependencies

.travis.yml

@@ -2,7 +2,6 @@ sudo: false
 
 language: node_js
 node_js:
-    - "6"
     - "8"
     - "10"
 

package.json

@@ -29,7 +29,7 @@
     "test": "jest -c jest-unit.json",
     "tslint": "tslint --fix --project ./tsconfig.json"
   },
-  "electron-version": "1.8.8",
+  "electron-version": "7.2.4",
   "dependencies": {
     "JSONStream": "1.3.2",
     "alt": "0.16.10",
@@ -65,6 +65,7 @@
   },
   "devDependencies": {
     "@types/react": "16.0.38",
+    "acorn": "^5.7.4",
     "babel-cli": "^6.26.0",
     "babel-jest": "^23.6.0",
     "babel-plugin-transform-async-to-generator": "^6.24.1",
@@ -72,7 +73,7 @@
     "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
     "braces": "^2.3.1",
-    "electron": "1.8.8",
+    "electron": "^7.2.4",
     "electron-builder": "^20.28.4",
     "electron-packager": "^12.1.1",
     "eslint": "^4.18.2",
@@ -86,7 +87,7 @@
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-less": "^2.0.0",
     "grunt-contrib-watch": "^1.1.0",
-    "grunt-electron": "^9.0.1",
+    "grunt-electron": "^11.0.0",
     "grunt-electron-installer": "^2.1.0",
     "grunt-electron-packager": "0.2.1",
     "grunt-if-missing": "1.0.1",

src/app.js

@@ -1,4 +1,3 @@
-require.main.paths.splice(0, 0, process.env.NODE_PATH);
 import 'babel-polyfill';
 import electron from 'electron';
 const remote = electron.remote;

src/browser.js

@@ -27,17 +27,20 @@ app.on('ready', function () {
   var mainWindow = new BrowserWindow({
     width: size.width || 1080,
     height: size.height || 680,
-    'min-width': os.platform() === 'win32' ? 400 : 700,
-    'min-height': os.platform() === 'win32' ? 260 : 500,
+    minWidth: os.platform() === 'win32' ? 400 : 700,
+    minHeight: os.platform() === 'win32' ? 260 : 500,
     'standard-window': false,
     resizable: true,
     frame: false,
     backgroundColor: '#fff',
-    show: false
+    show: false,
+    webPreferences: {
+      nodeIntegration: true,
+    },
   });
 
   if (process.env.NODE_ENV === 'development') {
-    mainWindow.openDevTools({detach: true});
+    mainWindow.openDevTools({mode: 'detach'});
   }
 
   mainWindow.loadURL(path.normalize('file://' + path.join(__dirname, 'index.html')));

src/components/ContainerHomeFolders.react.js

@@ -24,8 +24,8 @@ var ContainerHomeFolder = React.createClass({
       dialog.showMessageBox({
         message: `Enable all volumes to edit files? This may not work with all database containers.`,
         buttons: ['Enable Volumes', 'Cancel']
-      }, (index) => {
-        if (index === 0) {
+      }).then(({response}) => {
+        if (response === 0) {
           var mounts = _.clone(this.props.container.Mounts);
           var newSource = path.join(util.home(), util.documents(), 'Kitematic', this.props.container.Name, destination);
 

src/components/ContainerHomeLogs.react.js

@@ -104,11 +104,11 @@ module.exports = React.createClass({
       let path = `${this.props.container.Name} ${new Date().toISOString().replace(/T/, '_').replace(/\..+/, '').replace(/:/g,'-')}.txt`;
       dialog.showSaveDialog({
         defaultPath: path
-      },function(fileName) {
-        if (!fileName) return;
-        fs.writeFile(fileName, _logs, (err) => {
+      }).then(({filePath}) => {
+        if (!filePath) return;
+        fs.writeFile(filePath, _logs, (err) => {
           if(!err){
-            shell.showItemInFolder(fileName);
+            shell.showItemInFolder(filePath);
           }else{
             dialog.showErrorBox('Oops! an error occured', err.message);
           }

src/components/ContainerListItem.react.js

@@ -20,15 +20,15 @@ var ContainerListItem = React.createClass({
     dialog.showMessageBox({
       message: 'Are you sure you want to stop & remove this container?',
       buttons: ['Remove', 'Cancel']
-    }, function (index) {
-      if (index === 0) {
+    }).then(({response}) => {
+      if (response === 0) {
         metrics.track('Deleted Container', {
           from: 'list',
           type: 'existing'
         });
         containerActions.destroy(this.props.container.Name);
       }
-    }.bind(this));
+    });
   },
   render: function () {
     var self = this;

src/components/ContainerSettingsGeneral.react.js

@@ -153,8 +153,8 @@ var ContainerSettingsGeneral = React.createClass({
     dialog.showMessageBox({
       message: 'Are you sure you want to delete this container?',
       buttons: ['Delete', 'Cancel']
-    }, index => {
-      if (index === 0) {
+    }).then(({response}) => {
+      if (response === 0) {
         metrics.track('Deleted Container', {
           from: 'settings',
           type: 'existing'

src/components/ContainerSettingsVolumes.react.js

@@ -10,12 +10,12 @@ import containerActions from '../actions/ContainerActions';
 
 var ContainerSettingsVolumes = React.createClass({
   handleChooseVolumeClick: function (dockerVol) {
-    dialog.showOpenDialog({properties: ['openDirectory', 'createDirectory']}, (filenames) => {
-      if (!filenames) {
+    dialog.showOpenDialog({properties: ['openDirectory', 'createDirectory']}).then(({filePaths}) => {
+      if (!filePaths) {
         return;
       }
 
-      var directory = filenames[0];
+      var directory = filePaths[0];
 
       if (!directory || (!util.isNative() && directory.indexOf(util.home()) === -1)) {
         dialog.showMessageBox({