Upgrade ESLint to the latest

salomvary · Oct 25, 2019 · b7a5658 · b7a5658
1 parent 600a7f4
commit b7a5658
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 60 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,7 +1,7 @@
 {
   "extends": ["airbnb-base", "prettier"],
   "parserOptions": {
-    "sourceType": "scripts"
+    "sourceType": "script"
   },
   "env": {
     "browser": true,

diff --git a/app/soundcloud.js b/app/soundcloud.js
@@ -103,7 +103,7 @@ function getTrackMetadata() {
     ipcMain.once('trackMetadata', (_, trackMetadata) => {
       const title = parseTitle(this.window.getTitle())
       if (title) {
-        resolve(Object.assign({}, title, trackMetadata))
+        resolve({ ...title, ...trackMetadata })
       } else {
         resolve()
       }

diff --git a/app/window-open-policy.js b/app/window-open-policy.js
@@ -28,9 +28,10 @@ function onNewWindow(event, url, frameName, disposition, options) {
     /* eslint no-param-reassign: off */
     delete options.minWidth
     delete options.minHeight
-    options.webPreferences = Object.assign({}, options.webPreferences, {
+    options.webPreferences = {
+      ...options.webPreferences,
       preload: `${__dirname}/preload-popup.js`
-    })
+    }
   } else {
     event.preventDefault()
     shell.openExternal(url)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,9 +58,9 @@
     "electron": "^7.0.0",
     "electron-builder": "22.0.0",
     "electron-builder-squirrel-windows": "^22.0.0",
-    "eslint": "^5.16.0",
-    "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-config-prettier": "^4.2.0",
+    "eslint": "^6.5.1",
+    "eslint-config-airbnb-base": "^14.0.0",
+    "eslint-config-prettier": "^6.4.0",
     "eslint-plugin-import": "^2.17.2",
     "gulp": "^4.0.1",
     "gulp-rename": "^1.4.0",