Merge branch 'master' into upstream_master

Author: aminya

.github/pull.yml

@@ -0,0 +1,7 @@
+version: "1"
+rules:                      # Array of rules
+  - base: upstream_master   # Required. Target branch
+    upstream: atom:master   # Required. Must be in the same fork network.
+    mergeMethod: hardreset  # Optional, one of [none, merge, squash, rebase, hardreset], Default: none.
+    mergeUnstable: false    # Optional, merge pull request even when the mergeable_state is not clean. Default: false
+label: ":arrow_heading_down: pull upstream"  # Optional

package-lock.json

@@ -12,11 +12,11 @@
     "url": "https://github.com/atom/atom/issues"
   },
   "license": "MIT",
-  "electronVersion": "5.0.13",
+  "electronVersion": "6.1.12",
   "dependencies": {
     "@atom/nsfw": "1.0.26",
     "@atom/source-map-support": "^0.3.4",
-    "@atom/watcher": "1.3.1",
+    "@atom/watcher": "1.3.4-0",
     "about": "file:packages/about",
     "archive-view": "https://www.atom.io/api/packages/archive-view/versions/0.65.2/tarball",
     "async": "0.2.6",
@@ -50,13 +50,13 @@
     "deprecation-cop": "file:packages/deprecation-cop",
     "dev-live-reload": "file:packages/dev-live-reload",
     "devtron": "1.3.0",
-    "electron-notarize": "0.2.1",
-    "electron-osx-sign": "0.4.15",
+    "electron-notarize": "0.3.0",
+    "electron-osx-sign": "0.4.16",
     "encoding-selector": "https://www.atom.io/api/packages/encoding-selector/versions/0.23.9/tarball",
     "etch": "^0.12.6",
     "event-kit": "^2.5.3",
     "exception-reporting": "file:packages/exception-reporting",
-    "find-and-replace": "https://www.atom.io/api/packages/find-and-replace/versions/0.219.3/tarball",
+    "find-and-replace": "https://www.atom.io/api/packages/find-and-replace/versions/0.219.5/tarball",
     "find-parent-dir": "^0.3.0",
     "first-mate": "7.4.1",
     "focus-trap": "2.4.5",
@@ -143,11 +143,11 @@
     "resolve": "1.17.0",
     "scandal": "^3.2.0",
     "scoped-property-store": "^0.17.0",
-    "scrollbar-style": "^3.2",
+    "scrollbar-style": "3.2.1",
     "season": "^6.0.2",
     "semver": "7.3.2",
     "service-hub": "^0.7.4",
-    "settings-view": "https://www.atom.io/api/packages/settings-view/versions/0.261.4/tarball",
+    "settings-view": "https://www.atom.io/api/packages/settings-view/versions/0.261.5/tarball",
     "sinon": "1.17.4",
     "snippets": "https://www.atom.io/api/packages/snippets/versions/1.5.1/tarball",
     "solarized-dark-syntax": "file:packages/solarized-dark-syntax",
@@ -202,7 +202,7 @@
     "dev-live-reload": "file:./packages/dev-live-reload",
     "encoding-selector": "0.23.9",
     "exception-reporting": "file:./packages/exception-reporting",
-    "find-and-replace": "0.219.3",
+    "find-and-replace": "0.219.5",
     "fuzzy-finder": "1.14.2",
     "github": "0.34.2",
     "git-diff": "file:./packages/git-diff",
@@ -218,7 +218,7 @@
     "notifications": "0.71.0",
     "open-on-github": "1.3.2",
     "package-generator": "1.3.0",
-    "settings-view": "0.261.4",
+    "settings-view": "0.261.5",
     "snippets": "1.5.1",
     "spell-check": "0.76.1",
     "status-bar": "1.8.17",

package.json

@@ -4,7 +4,7 @@ const assert = require('assert');
 const childProcess = require('child_process');
 const electronPackager = require('electron-packager');
 const fs = require('fs-extra');
-const hostArch = require('electron-packager/targets').hostArch;
+const hostArch = require('@electron/get').getHostArch;
 const includePathInPackagedApp = require('./include-path-in-packaged-app');
 const getLicenseText = require('./get-license-text');
 const path = require('path');