diff --git a/.eslintignore b/.eslintignore
index 2c1ef701c..b54c3b8df 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,4 @@
 **/spec/fixtures/**/*.js
 node_modules
 /vendor/
-/out/
\ No newline at end of file
+/out/
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
deleted file mode 100644
index 5b85299a6..000000000
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-
-<!--
-
-Have you read Atom's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/atom/atom/blob/master/CODE_OF_CONDUCT.md
-
-Do you want to ask a question? Are you looking for support? The Atom message board is the best place for getting support: https://discuss.atom.io
-
----
-
-Keep in mind that Atom is highly customizable in a number of ways and we strongly prefer that you consider these options before filing this issue:
-
-* https://flight-manual.atom.io/using-atom/sections/basic-customization/: tweak Atom's configuration, styles, and keybindings.
-* https://flight-manual.atom.io/using-atom/sections/atom-packages/: install a community package.
-* https://flight-manual.atom.io/hacking-atom/: use the Atom API in your init script, to create a package, or to enhance an existing package.
-
-If you're convinced that none of these options are appropriate for the feature you want, please explain why that's the case by completely filling out the issue template below.
-
-Also note that the Atom team has finite resources so it's unlikely that we'll work on feature requests. If we're interested in a particular feature however, we'll follow up and ask you to submit an RFC to talk about it in more detail.
-
--->
-
-## Summary
-
-One paragraph explanation of the feature.
-
-## Motivation
-
-Why are we doing this? What use cases does it support? What is the expected outcome?
-
-## Describe alternatives you've considered
-
-A clear and concise description of the alternative solutions you've considered. Be sure to explain why Atom's existing customizability isn't suitable for this feature.
-
-## Additional context
-
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 293c66c18..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-
-<!--
-
-Have you read Atom's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/atom/atom/blob/master/CODE_OF_CONDUCT.md
-
-Do you want to ask a question? Are you looking for support? The Atom message board is the best place for getting support: https://discuss.atom.io
-
--->
-
-### Prerequisites
-
-* [ ] Put an X between the brackets on this line if you have done all of the following:
-    * Reproduced the problem in Safe Mode: https://flight-manual.atom.io/hacking-atom/sections/debugging/#using-safe-mode
-    * Followed all applicable steps in the debugging guide: https://flight-manual.atom.io/hacking-atom/sections/debugging/
-    * Checked the FAQs on the message board for common solutions: https://discuss.atom.io/c/faq
-    * Checked that your issue isn't already filed: https://github.com/issues?utf8=✓&q=is%3Aissue+user%3Aatom
-    * Checked that there is not already an Atom package that provides the described functionality: https://atom.io/packages
-
-### Description
-
-[Description of the issue]
-
-### Steps to Reproduce
-
-1. [First Step]
-2. [Second Step]
-3. [and so on...]
-
-**Expected behavior:** [What you expect to happen]
-
-**Actual behavior:** [What actually happens]
-
-**Reproduces how often:** [What percentage of the time does it reproduce?]
-
-### Versions
-
-You can get this information from copy and pasting the output of `atom --version` and `apm --version` from the command line. Also, please include the OS and what version of the OS you're running.
-
-### Additional Information
-
-Any additional information, configuration or data that might be necessary to reproduce the issue.
diff --git a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md b/.github/PULL_REQUEST_TEMPLATE/bug_fix.md
deleted file mode 100644
index e6a293012..000000000
--- a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md
+++ /dev/null
@@ -1,59 +0,0 @@
-### Requirements for Contributing a Bug Fix
-
-* Fill out the template below. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
-* The pull request must only fix an existing bug. To contribute other changes, you must use a different template. You can see all templates at https://github.com/atom/atom/tree/master/.github/PULL_REQUEST_TEMPLATE.
-* The pull request must update the test suite to demonstrate the changed functionality. For guidance, please see https://flight-manual.atom.io/hacking-atom/sections/writing-specs/.
-* After you create the pull request, all status checks must be pass before a maintainer reviews your contribution. For more details, please see https://github.com/atom/atom/tree/master/CONTRIBUTING.md#pull-requests.
-
-### Identify the Bug
-
-<!--
-
-Link to the issue describing the bug that you're fixing.
-
-If there is not yet an issue for your bug, please open a new issue and then link to that issue in your pull request.
-Note: In some cases, one person's "bug" is another person's "feature." If the pull request does not address an existing issue with the "bug" label, the maintainers have the final say on whether the current behavior is a bug.
-
--->
-
-### Description of the Change
-
-<!--
-
-We must be able to understand the design of your change from this description. If we can't get a good idea of what the code will be doing from the description here, the pull request may be closed at the maintainers' discretion. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code here recently, so please walk us through the concepts.
-
--->
-
-### Alternate Designs
-
-<!-- Explain what other alternates were considered and why the proposed version was selected -->
-
-### Possible Drawbacks
-
-<!-- What are the possible side-effects or negative impacts of the code change? -->
-
-### Verification Process
-
-<!--
-
-What process did you follow to verify that the change has not introduced any regressions? Describe the actions you performed (including buttons you clicked, text you typed, commands you ran, etc.), and describe the results you observed.
-
--->
-
-### Release Notes
-
-<!--
-
-Please describe the changes in a single line that explains this improvement in
-terms that a user can understand.  This text will be used in Atom's release notes.
-
-If this change is not user-facing or notable enough to be included in release notes
-you may use the strings "Not applicable" or "N/A" here.
-
-Examples:
-
-- The GitHub package now allows you to add co-authors to commits.
-- Fixed an issue where multiple cursors did not work in a file with a single line.
-- Increased the performance of searching and replacing across a whole project.
-
--->
diff --git a/.github/PULL_REQUEST_TEMPLATE/documentation.md b/.github/PULL_REQUEST_TEMPLATE/documentation.md
deleted file mode 100644
index 3fc1e4072..000000000
--- a/.github/PULL_REQUEST_TEMPLATE/documentation.md
+++ /dev/null
@@ -1,30 +0,0 @@
-### Requirements for Contributing Documentation
-
-* Fill out the template below. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
-* The pull request must only contribute documentation (for example, markdown files or API docs). To contribute other changes, you must use a different template. You can see all templates at https://github.com/atom/atom/tree/master/.github/PULL_REQUEST_TEMPLATE.
-
-### Description of the Change
-
-<!--
-
-We must be able to understand the purpose of your change from this description. If we can't get a good idea of the benefits of the change from the description here, the pull request may be closed at the maintainers' discretion.
-
--->
-
-### Release Notes
-
-<!--
-
-Please describe the changes in a single line that explains this improvement in
-terms that a user can understand.  This text will be used in Atom's release notes.
-
-If this change is not user-facing or notable enough to be included in release notes
-you may use the strings "Not applicable" or "N/A" here.
-
-Examples:
-
-- The GitHub package now allows you to add co-authors to commits.
-- Fixed an issue where multiple cursors did not work in a file with a single line.
-- Increased the performance of searching and replacing across a whole project.
-
--->
diff --git a/.github/PULL_REQUEST_TEMPLATE/feature_change.md b/.github/PULL_REQUEST_TEMPLATE/feature_change.md
deleted file mode 100644
index cc6ed68af..000000000
--- a/.github/PULL_REQUEST_TEMPLATE/feature_change.md
+++ /dev/null
@@ -1,70 +0,0 @@
-### Requirements for Adding, Changing, or Removing a Feature
-
-* Fill out the template below. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
-* The pull request must contribute a change that has been endorsed by the maintainer team. See details in the template below.
-* The pull request must update the test suite to exercise the updated functionality. For guidance, please see https://flight-manual.atom.io/hacking-atom/sections/writing-specs/.
-* After you create the pull request, all status checks must be pass before a maintainer reviews your contribution. For more details, please see https://github.com/atom/atom/tree/master/CONTRIBUTING.md#pull-requests.
-
-### Issue or RFC Endorsed by Atom's Maintainers
-
-<!--
-
-Link to the issue or RFC that your change relates to. This must be one of the following:
-
-* An open issue with the `help-wanted` label
-* An open issue with the `triaged` label
-* An RFC with "accepted" status
-
-To contribute an enhancement that isn't covered by one of the items above, please follow our guide for suggesting an enhancement: https://github.com/atom/atom/blob/master/CONTRIBUTING.md#suggesting-enhancements
-
-To contribute other changes, you must use a different template. You can see all templates at https://github.com/atom/atom/tree/master/.github/PULL_REQUEST_TEMPLATE.
-
--->
-
-### Description of the Change
-
-<!--
-
-We must be able to understand the design of your change from this description. If we can't get a good idea of what the code will be doing from the description here, the pull request may be closed at the maintainers' discretion. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code here recently, so please walk us through the concepts.
-
--->
-
-### Alternate Designs
-
-<!-- Explain what other alternates were considered and why the proposed version was selected -->
-
-### Possible Drawbacks
-
-<!-- What are the possible side-effects or negative impacts of the code change? -->
-
-### Verification Process
-
-<!--
-
-What process did you follow to verify that your change has the desired effects?
-
-- How did you verify that all new functionality works as expected?
-- How did you verify that all changed functionality works as expected?
-- How did you verify that the change has not introduced any regressions?
-
-Describe the actions you performed (including buttons you clicked, text you typed, commands you ran, etc.), and describe the results you observed.
-
--->
-
-### Release Notes
-
-<!--
-
-Please describe the changes in a single line that explains this improvement in
-terms that a user can understand.  This text will be used in Atom's release notes.
-
-If this change is not user-facing or notable enough to be included in release notes
-you may use the strings "Not applicable" or "N/A" here.
-
-Examples:
-
-- The GitHub package now allows you to add co-authors to commits.
-- Fixed an issue where multiple cursors did not work in a file with a single line.
-- Increased the performance of searching and replacing across a whole project.
-
--->
diff --git a/.github/PULL_REQUEST_TEMPLATE/performance_improvement.md b/.github/PULL_REQUEST_TEMPLATE/performance_improvement.md
deleted file mode 100644
index f75f5fb28..000000000
--- a/.github/PULL_REQUEST_TEMPLATE/performance_improvement.md
+++ /dev/null
@@ -1,55 +0,0 @@
-### Requirements for Contributing a Performance Improvement
-
-* Fill out the template below. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
-* The pull request must only affect performance of existing functionality. To contribute other changes, you must use a different template. You can see all templates at https://github.com/atom/atom/tree/master/.github/PULL_REQUEST_TEMPLATE.
-* After you create the pull request, all status checks must be pass before a maintainer reviews your contribution. For more details, please see https://github.com/atom/atom/tree/master/CONTRIBUTING.md#pull-requests.
-
-### Description of the Change
-
-<!--
-
-We must be able to understand the design of your change from this description. If we can't get a good idea of what the code will be doing from the description here, the pull request may be closed at the maintainers' discretion. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code here recently, so please walk us through the concepts.
-
--->
-
-### Quantitative Performance Benefits
-
-<!--
-
-Describe the exact performance improvement observed (for example, reduced time to complete an operation, reduced memory use, etc.). Describe how you measured this change. Bonus points for including graphs that demonstrate the improvement or attached dumps from the built-in profiling tools.
-
--->
-
-### Possible Drawbacks
-
-<!-- What are the possible side-effects or negative impacts of the code change? -->
-
-### Verification Process
-
-<!--
-
-What process did you follow to verify that the change has not introduced any regressions? Describe the actions you performed (including buttons you clicked, text you typed, commands you ran, etc.), and describe the results you observed.
-
--->
-
-### Applicable Issues
-
-<!-- Enter any applicable Issues here -->
-
-### Release Notes
-
-<!--
-
-Please describe the changes in a single line that explains this improvement in
-terms that a user can understand.  This text will be used in Atom's release notes.
-
-If this change is not user-facing or notable enough to be included in release notes
-you may use the strings "Not applicable" or "N/A" here.
-
-Examples:
-
-- The GitHub package now allows you to add co-authors to commits.
-- Fixed an issue where multiple cursors did not work in a file with a single line.
-- Increased the performance of searching and replacing across a whole project.
-
--->
diff --git a/.github/lock.yml b/.github/lock.yml
index 39319ee90..ba43e69a4 100644
--- a/.github/lock.yml
+++ b/.github/lock.yml
@@ -8,7 +8,7 @@ lockComment: >
   any recent activity after it was closed. If you can still reproduce this issue in
   [Safe Mode](https://flight-manual.atom.io/hacking-atom/sections/debugging/#using-safe-mode)
   then please open a new issue and fill out
-  [the entire issue template](https://github.com/atom/atom/blob/master/ISSUE_TEMPLATE.md)
+  [the entire issue template](https://github.com/atom/.github/blob/master/.github/ISSUE_TEMPLATE/bug_report.md)
   to ensure that we have enough information to address your issue. Thanks!
 # Issues or pull requests with these labels will not be locked
 exemptLabels:
diff --git a/.gitignore b/.gitignore
index ae3a28e59..5457617c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ Thumbs.db
 .project
 .svn
 .nvm-version
+.vscode
 node_modules
 npm-debug.log
 debug.log
diff --git a/.travis.yml b/.travis.yml
index f32e2721c..2d4fd2d1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,25 @@
 language: python
 
 python:
-  - "2.7.13"
+  - '2.7.13'
 
 git:
   depth: 10
 
 branches:
   only:
-  - master
-  - /^[0-9.]+-releases$/
-  - /.*-test-travis$/
+    - master
+    - /^[0-9.]+-releases$/
+    - /.*-test-travis$/
 
 matrix:
   include:
     - os: linux
       dist: trusty
-      env: NODE_VERSION=8.9.3 DISPLAY=:99.0 CC=clang CXX=clang++ npm_config_clang=1 ATOM_JASMINE_REPORTER=list
+      env: NODE_VERSION=10.2.1 DISPLAY=:99.0 CC=clang CXX=clang++ npm_config_clang=1 ATOM_JASMINE_REPORTER=list
 
 before_install:
-  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
+  - '/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16'
 
 install:
   - git clone https://github.com/creationix/nvm.git /tmp/.nvm
@@ -57,11 +57,11 @@ addons:
     target_paths: travis-artifacts/$TRAVIS_BUILD_ID
   apt:
     packages:
-    - build-essential
-    - clang-3.3
-    - fakeroot
-    - git
-    - libsecret-1-dev
-    - rpm
-    - libx11-dev
-    - libxkbfile-dev
+      - build-essential
+      - clang-3.3
+      - fakeroot
+      - git
+      - libsecret-1-dev
+      - rpm
+      - libx11-dev
+      - libxkbfile-dev
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d57e61ab1..83b59fcb5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -113,7 +113,7 @@ When we make a significant decision in how we maintain the project and what we c
 
 This section guides you through submitting a bug report for Atom. Following these guidelines helps maintainers and the community understand your report :pencil:, reproduce the behavior :computer: :computer:, and find related reports :mag_right:.
 
-Before creating bug reports, please check [this list](#before-submitting-a-bug-report) as you might find out that you don't need to create one. When you are creating a bug report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out [the required template](ISSUE_TEMPLATE.md), the information it asks for helps us resolve issues faster.
+Before creating bug reports, please check [this list](#before-submitting-a-bug-report) as you might find out that you don't need to create one. When you are creating a bug report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out [the required template](https://github.com/atom/.github/blob/master/.github/ISSUE_TEMPLATE/bug_report.md), the information it asks for helps us resolve issues faster.
 
 > **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
 
@@ -126,7 +126,7 @@ Before creating bug reports, please check [this list](#before-submitting-a-bug-r
 
 #### How Do I Submit A (Good) Bug Report?
 
-Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). After you've determined [which repository](#atom-and-packages) your bug is related to, create an issue on that repository and provide the following information by filling in [the template](ISSUE_TEMPLATE.md).
+Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). After you've determined [which repository](#atom-and-packages) your bug is related to, create an issue on that repository and provide the following information by filling in [the template](https://github.com/atom/.github/blob/master/.github/ISSUE_TEMPLATE/bug_report.md).
 
 Explain the problem and include additional details to help maintainers reproduce the problem:
 
@@ -163,7 +163,7 @@ Include details about your configuration and environment:
 
 This section guides you through submitting an enhancement suggestion for Atom, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion :pencil: and find related suggestions :mag_right:.
 
-Before creating enhancement suggestions, please check [this list](#before-submitting-an-enhancement-suggestion) as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-enhancement-suggestion). Fill in [the template](ISSUE_TEMPLATE.md), including the steps that you imagine you would take if the feature you're requesting existed.
+Before creating enhancement suggestions, please check [this list](#before-submitting-an-enhancement-suggestion) as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-enhancement-suggestion). Fill in [the template](https://github.com/atom/.github/blob/master/.github/ISSUE_TEMPLATE/feature_request.md), including the steps that you imagine you would take if the feature you're requesting existed.
 
 #### Before Submitting An Enhancement Suggestion
 
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index cf1773856..000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-
-Have you read Atom's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/atom/atom/blob/master/CODE_OF_CONDUCT.md
-
-Do you want to ask a question? Are you looking for support? The Atom message board is the best place for getting support: https://discuss.atom.io
-
--->
-
-### Prerequisites
-
-* [ ] Put an X between the brackets on this line if you have done all of the following:
-    * Reproduced the problem in Safe Mode: https://flight-manual.atom.io/hacking-atom/sections/debugging/#using-safe-mode
-    * Followed all applicable steps in the debugging guide: https://flight-manual.atom.io/hacking-atom/sections/debugging/
-    * Checked the FAQs on the message board for common solutions: https://discuss.atom.io/c/faq
-    * Checked that your issue isn't already filed: https://github.com/issues?utf8=✓&q=is%3Aissue+user%3Aatom
-    * Checked that there is not already an Atom package that provides the described functionality: https://atom.io/packages
-
-### Description
-
-[Description of the issue]
-
-### Steps to Reproduce
-
-1. [First Step]
-2. [Second Step]
-3. [and so on...]
-
-**Expected behavior:** [What you expect to happen]
-
-**Actual behavior:** [What actually happens]
-
-**Reproduces how often:** [What percentage of the time does it reproduce?]
-
-### Versions
-
-You can get this information from copy and pasting the output of `atom --version` and `apm --version` from the command line. Also, please include the OS and what version of the OS you're running.
-
-### Additional Information
-
-Any additional information, configuration or data that might be necessary to reproduce the issue.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 7414fa3b1..cdf247b79 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +1,10 @@
 ⚛👋 Hello there! Welcome. Please follow the steps below to tell us about your contribution.
 
 1. Copy the correct template for your contribution
-  - 🐛 Are you fixing a bug? Copy the template from https://bit.ly/atom-bugfix
-  - 📈 Are you improving performance? Copy the template from https://bit.ly/atom-perf
-  - 📝 Are you updating documentation? Copy the template from https://bit.ly/atom-docs
-  - 💻 Are you changing functionality? Copy the template from https://bit.ly/atom-behavior
+  - 🐛 Are you fixing a bug? Copy the template from <https://bit.ly/atom-bugfix-pr>
+  - 📈 Are you improving performance? Copy the template from <https://bit.ly/atom-perf-pr>
+  - 📝 Are you updating documentation? Copy the template from <https://bit.ly/atom-docs-pr>
+  - 💻 Are you changing functionality? Copy the template from <https://bit.ly/atom-behavior-pr>
 2. Replace this text with the contents of the template
 3. Fill in all sections of the template
 4. Click "Create pull request"
diff --git a/README.md b/README.md
index 4fa635259..f3ffb0ebb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Atom
 
-[![Build status](https://dev.azure.com/github/Atom/_apis/build/status/Atom%20Production%20Branches?branchName=master)](https://dev.azure.com/github/Atom/_build/latest?definitionId=32&branchName=master) [![Linux Build Status](https://travis-ci.org/atom/atom.svg?branch=master)](https://travis-ci.org/atom/atom) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/1tkktwh654w07eim?svg=true)](https://ci.appveyor.com/project/Atom/atom)
+[![Build status](https://dev.azure.com/github/Atom/_apis/build/status/Atom%20Production%20Branches?branchName=master)](https://dev.azure.com/github/Atom/_build/latest?definitionId=32&branchName=master) [![Linux Build Status](https://travis-ci.org/atom/atom.svg?branch=master)](https://travis-ci.org/atom/atom)
 [![Dependency Status](https://david-dm.org/atom/atom.svg)](https://david-dm.org/atom/atom)
 [![Join the Atom Community on Slack](https://atom-slack.herokuapp.com/badge.svg)](https://atom-slack.herokuapp.com)
 
diff --git a/apm/package-lock.json b/apm/package-lock.json
index e4a1cd064..c21d2488a 100644
--- a/apm/package-lock.json
+++ b/apm/package-lock.json
@@ -4,9 +4,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "atom-package-manager": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/atom-package-manager/-/atom-package-manager-2.2.4.tgz",
-      "integrity": "sha512-Iyfs8FNPH+fDLm2DlzE+71TGGZt0fAO2fchJKUHbMLqxFPBPjOgigViQZxDhb2eBRYi2jLKkbalCa4m21Q8CRA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/atom-package-manager/-/atom-package-manager-2.3.1.tgz",
+      "integrity": "sha512-CAys5szBJbqhkizMm32o0+uOTpT9rgPh9TdFX0R//usjOAgDr8iJ7oGNfULPvJzaKnBhrokuniKNumAxVyuauA==",
       "requires": {
         "@atom/plist": "0.4.4",
         "asar-require": "0.3.0",
@@ -834,19 +834,12 @@
           }
         },
         "keytar": {
-          "version": "4.7.0",
-          "resolved": "https://registry.npmjs.org/keytar/-/keytar-4.7.0.tgz",
-          "integrity": "sha512-0hLlRRkhdR0068fVQo21hnIndGvacsh9PtAHGAPMPzxFjJwP8idAkVAcbdb1P5B+gterCBa3+4hxL0NPMDlZtw==",
+          "version": "4.9.0",
+          "resolved": "https://registry.npmjs.org/keytar/-/keytar-4.9.0.tgz",
+          "integrity": "sha512-5aKEpnxRWUIhSlRXckqTxomqokV1/tOBe3EdbCDyMjDaoa5AkVHVa1yK+fa2CgJR5MadbJndFWmcDMCq812F4A==",
           "requires": {
-            "nan": "2.13.2",
+            "nan": "2.14.0",
             "prebuild-install": "5.3.0"
-          },
-          "dependencies": {
-            "nan": {
-              "version": "2.13.2",
-              "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
-              "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="
-            }
           }
         },
         "klaw": {
@@ -3876,9 +3869,9 @@
           }
         },
         "psl": {
-          "version": "1.1.31",
-          "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
-          "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="
+          "version": "1.1.32",
+          "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz",
+          "integrity": "sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="
         },
         "pump": {
           "version": "2.0.1",
diff --git a/apm/package.json b/apm/package.json
index 4e6b47e9c..8b8da2214 100644
--- a/apm/package.json
+++ b/apm/package.json
@@ -6,6 +6,6 @@
     "url": "https://github.com/atom/atom.git"
   },
   "dependencies": {
-    "atom-package-manager": "2.2.4"
+    "atom-package-manager": "2.3.1"
   }
 }
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 5ca67c824..000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-image: Visual Studio 2015
-
-version: "{build}"
-
-skip_tags: true
-clone_folder: c:\projects\atom
-clone_depth: 10
-
-branches:
-  only:
-  - master
-  - /^[0-9.]+-releases$/
-  - /^electron-[0-9.]+$/
-
-platform:
-  - x64
-  - x86
-
-environment:
-  global:
-    ATOM_DEV_RESOURCE_PATH: c:\projects\atom
-    ATOM_JASMINE_REPORTER: list
-    CI: true
-    NODE_VERSION: 8.9.3
-
-  matrix:
-  - TASK: test
-  - TASK: installer
-
-matrix:
-  fast_finish: true
-  exclude:
-    - platform: x86
-      TASK: test
-
-install:
-  - SET PATH=C:\Program Files\Atom\resources\cli;%PATH%
-  - ps: Install-Product node $env:NODE_VERSION $env:PLATFORM
-  - npm install --global npm@6.2.0
-
-build_script:
-  - CD %APPVEYOR_BUILD_FOLDER%
-  - IF NOT EXIST C:\tmp MKDIR C:\tmp
-  - SET SQUIRREL_TEMP=C:\tmp
-  - IF [%APPVEYOR_REPO_BRANCH:~-9%]==[-releases] IF NOT DEFINED APPVEYOR_PULL_REQUEST_NUMBER SET IS_RELEASE_BRANCH=true
-  - IF [%APPVEYOR_REPO_BRANCH%]==[master] IF NOT DEFINED APPVEYOR_PULL_REQUEST_NUMBER SET IS_SIGNED_ZIP_BRANCH=true
-  - IF [%APPVEYOR_REPO_BRANCH:~0,9%]==[electron-] IF NOT DEFINED APPVEYOR_PULL_REQUEST_NUMBER SET IS_SIGNED_ZIP_BRANCH=true
-  - IF [%TASK%]==[installer] (
-      IF [%IS_RELEASE_BRANCH%]==[true] (
-        ECHO Building on release branch - Creating production artifacts &&
-        script\build.cmd --code-sign --compress-artifacts --create-windows-installer
-      ) ELSE (
-        IF [%IS_SIGNED_ZIP_BRANCH%]==[true] (
-          ECHO Building on %APPVEYOR_REPO_BRANCH% branch - Creating signed zips &&
-          script\build.cmd --code-sign --compress-artifacts
-        ) ELSE (
-          ECHO Skipping installer build for non-release/non-master branch
-        )
-      )
-    ) ELSE (
-      ECHO Test build only - Not creating artifacts &&
-      script\build.cmd
-    )
-
-test_script:
-  - IF [%TASK%]==[test] (
-      script\lint.cmd &&
-      script\test.cmd
-    ) ELSE (
-      ECHO Skipping tests on installer build matrix row
-    )
-
-deploy: off
-artifacts:
-  - path: out\AtomSetup.exe
-    name: AtomSetup.exe
-  - path: out\atom-windows.zip
-    name: atom-windows.zip
-  - path: out\RELEASES
-    name: RELEASES
-  - path: out\AtomSetup-x64.exe
-    name: AtomSetup-x64.exe
-  - path: out\atom-x64-windows.zip
-    name: atom-x64-windows.zip
-  - path: out\RELEASES-x64
-    name: RELEASES-x64
-  - path: out\atom-*-delta.nupkg
-    name: atom-delta.nupkg
-  - path: out\atom-*-full.nupkg
-    name: atom-full.nupkg
-
-cache:
-  - '%APPVEYOR_BUILD_FOLDER%\electron'
-  - '%USERPROFILE%\.atom\.apm'
-  - '%USERPROFILE%\.atom\compile-cache'
diff --git a/docs/build-instructions/build-status.md b/docs/build-instructions/build-status.md
index a6f7fdfd6..2dc9d3b02 100644
--- a/docs/build-instructions/build-status.md
+++ b/docs/build-instructions/build-status.md
@@ -2,7 +2,7 @@
 
 | System | Travis | AppVeyor/Win | VSTS | Dependencies |
 |--------|--------|--------------|------------|--------------|
-| [Atom](https://github.com/atom/atom)   | [![Travis Build Status](https://travis-ci.org/atom/atom.svg?branch=master)](https://travis-ci.org/atom/atom) | [![AppVeyor/Wi Build Status](https://ci.appveyor.com/api/projects/status/1tkktwh654w07eim?svg=true)](https://ci.appveyor.com/project/Atom/atom) | [![Build status](https://github.visualstudio.com/Atom/_apis/build/status/Atom%20Production%20Branches?branch=master)](https://github.visualstudio.com/Atom/_build/latest?definitionId=32&branch=master) | [![Dependency Status](https://david-dm.org/atom/atom.svg)](https://david-dm.org/atom/atom) |
+| [Atom](https://github.com/atom/atom)   | [![Travis Build Status](https://travis-ci.org/atom/atom.svg?branch=master)](https://travis-ci.org/atom/atom) | | [![Build status](https://github.visualstudio.com/Atom/_apis/build/status/Atom%20Production%20Branches?branch=master)](https://github.visualstudio.com/Atom/_build/latest?definitionId=32&branch=master) | [![Dependency Status](https://david-dm.org/atom/atom.svg)](https://david-dm.org/atom/atom) |
 | [APM](https://github.com/atom/apm) | [![Travis Build Status](https://travis-ci.org/atom/apm.svg?branch=master)](https://travis-ci.org/atom/apm) | [![AppVeyor/Wi Build Status](https://ci.appveyor.com/api/projects/status/j6ixw374a397ugkb/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/apm/branch/master) | | [![Dependency Status](https://david-dm.org/atom/apm.svg)](https://david-dm.org/atom/apm) |
 | [Electron](https://github.com/electron/electron) | [![Travis Build Status](https://travis-ci.org/electron/electron.svg?branch=master)](https://travis-ci.org/electron/electron) | [![AppVeyor/Wi Build Status](https://ci.appveyor.com/api/projects/status/kvxe4byi7jcxbe26/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/electron) | | [![Dependency Status](https://david-dm.org/electron/electron/dev-status.svg)](https://david-dm.org/electron/electron)
 
diff --git a/package-lock.json b/package-lock.json
index 88609dc09..3109d65ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,24 +29,12 @@
       }
     },
     "@atom/nsfw": {
-      "version": "1.0.23",
-      "resolved": "https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.23.tgz",
-      "integrity": "sha512-mo6G3eYzQzmdUWjCHO/2a4dWPPYYOZjAXjA4QtLGVXlnTMn08gC7JUEuztjAld1Qk+MYyV613O3ACj8xZ4KEog==",
+      "version": "1.0.25",
+      "resolved": "https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.25.tgz",
+      "integrity": "sha512-V7g509EVRCCkzoQW/QA7lQsROrjsfYYEJRHzEuc6+PAH88Z4oAs7D3W8MOJrBPo+6e06gxEwfxZjIq7BQbpfwQ==",
       "requires": {
         "fs-extra": "^7.0.0",
         "nan": "^2.10.0"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        }
       }
     },
     "@atom/source-map-support": {
@@ -68,16 +56,6 @@
         "prebuild-install": "5.2.4"
       },
       "dependencies": {
-        "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
         "nan": {
           "version": "2.12.1",
           "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
@@ -1358,8 +1336,8 @@
       "integrity": "sha512-AHEZOz7RcIdPWlGQByHGUE9yVhn1O9qJQRHehvkN8riiUyJpNpaImk7dloH8Nw/JX14tKJhjT+EadY2u/+j7IQ=="
     },
     "autocomplete-plus": {
-      "version": "https://www.atom.io/api/packages/autocomplete-plus/versions/2.42.2/tarball",
-      "integrity": "sha512-DtjYUHXRZRgAv604C8YAhj2p7+6oPz7molJnurE2mHvhvWA7wxwojKzJejNQMKwc/Up4mA/CcZBeuCVRMckgzw==",
+      "version": "https://www.atom.io/api/packages/autocomplete-plus/versions/2.42.3/tarball",
+      "integrity": "sha512-/5Ou9lH8Yc7F7Hfl7UDu8zpVZCEYfYCGs0FxR+Z6+yS0O5k7TfYoJE74KgHHhW3vGAgDPph8/JIPptc5/a1YbQ==",
       "requires": {
         "atom-slick": "^2.0.0",
         "dompurify": "^1.0.8",
@@ -1715,8 +1693,8 @@
       }
     },
     "bracket-matcher": {
-      "version": "https://www.atom.io/api/packages/bracket-matcher/versions/0.91.0/tarball",
-      "integrity": "sha512-bgAsyS23bu3Y9LqRul4/IjOIqUZxpnIZGBEaxBHGcC5vW/ZHCr3SYsPsN2hLXwTHvXArwgcBt1Uylc0tz25FSQ==",
+      "version": "https://www.atom.io/api/packages/bracket-matcher/versions/0.91.1/tarball",
+      "integrity": "sha512-aBbNNVfEAzzNu71ZZ4+P9Y0AxBUB74wseVF/Mu88wCrOQq889IHdiW+wzayfli0F6MXNH1wIh/zYPeZHzvU/MQ==",
       "requires": {
         "first-mate": "^7.0.1",
         "underscore-plus": "1.x"
@@ -1727,11 +1705,6 @@
       "resolved": "https://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz",
       "integrity": "sha1-eEp5eRWjjq0nutRWtVcstLuqeME="
     },
-    "browser-stdout": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-      "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8="
-    },
     "browserslist": {
       "version": "4.5.6",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.6.tgz",
@@ -2481,11 +2454,6 @@
         "humanize-plus": "^1.8.1"
       }
     },
-    "diff": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-      "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k="
-    },
     "dom-serializer": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
@@ -2873,8 +2841,8 @@
       }
     },
     "find-and-replace": {
-      "version": "https://www.atom.io/api/packages/find-and-replace/versions/0.218.12/tarball",
-      "integrity": "sha512-ykte8V/n4L+kLrm1tXK0SODYLtPa9go9O0GOoOC5JOhErYMnTP9MRSygUug1bDkiyWOJ2brYrua4abSz/GPajA==",
+      "version": "https://www.atom.io/api/packages/find-and-replace/versions/0.218.13/tarball",
+      "integrity": "sha512-pLWj62GTg/i2p3IKYLz3sbYtY7SDJvR6ZSOFBJuYNsGde6GBxIY5RLuITmgaHISbwt3q/jIy8DVYGbxVpeFm6A==",
       "requires": {
         "binary-search": "^1.3.3",
         "element-resize-detector": "^1.1.10",
@@ -2981,69 +2949,17 @@
       "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4="
     },
     "fs-admin": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.7.tgz",
-      "integrity": "sha512-EQNioqUHgtnX9ErMiPuvHCAx0M1VSa9u4oxGF+EGVYBL15Mg5BxEzGBrTAYHUQDDobqw1Yc+6YqZWwSIIe+EwQ==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/fs-admin/-/fs-admin-0.5.0.tgz",
+      "integrity": "sha512-jU0x86bI6wmhdGGcpaO1rI7EpNx/44cEXPsHqFIRgs9SVsk3HSWn9Zd5fd7bdDw3LcmdnazOcJFK9PZsoNecAA==",
       "requires": {
-        "mocha": "^3.5.0",
-        "nan": "^2.10.0"
+        "nan": "^2.13.2"
       },
       "dependencies": {
-        "commander": {
-          "version": "2.9.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-          "requires": {
-            "graceful-readlink": ">= 1.0.0"
-          }
-        },
-        "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-          "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.2",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "mocha": {
-          "version": "3.5.3",
-          "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
-          "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==",
-          "requires": {
-            "browser-stdout": "1.3.0",
-            "commander": "2.9.0",
-            "debug": "2.6.8",
-            "diff": "3.2.0",
-            "escape-string-regexp": "1.0.5",
-            "glob": "7.1.1",
-            "growl": "1.9.2",
-            "he": "1.1.1",
-            "json3": "3.3.2",
-            "lodash.create": "3.1.1",
-            "mkdirp": "0.5.1",
-            "supports-color": "3.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-          "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
+        "nan": {
+          "version": "2.14.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
         }
       }
     },
@@ -3053,9 +2969,9 @@
       "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0="
     },
     "fs-extra": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-      "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
       "requires": {
         "graceful-fs": "^4.1.2",
         "jsonfile": "^4.0.0",
@@ -3132,8 +3048,8 @@
       "integrity": "sha1-gy9kifvodnaUWVmckUpnDsIpR+4="
     },
     "fuzzy-finder": {
-      "version": "https://www.atom.io/api/packages/fuzzy-finder/versions/1.13.7/tarball",
-      "integrity": "sha512-79C7IWrHrPk5UKL48KlcHoFy8T+FGfh/HXRwChkxrLYCrUZSl8a+Bj956j2xIRVanO+lNAnLR5QVyrDhbJ2McA==",
+      "version": "https://www.atom.io/api/packages/fuzzy-finder/versions/1.13.8/tarball",
+      "integrity": "sha512-uhBHzD0B42k4KQ+CktomP16nxH/0fxlM9of3r/1bEAAxK4i0+/4Z22Qmxv3qsawo+4DxFUc3P9KCTgjxZHTaBA==",
       "requires": {
         "@atom/fuzzy-native": "^1.0.3",
         "async": "0.2.6",
@@ -3254,9 +3170,9 @@
       }
     },
     "git-utils": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/git-utils/-/git-utils-5.5.0.tgz",
-      "integrity": "sha512-4t3f2pU4HPgKOyTXyaEdMHTBwa24ubC4FykCXlqnsPgHlupSq66d0/aq0h92BgnyGwI3ogqx9D0a+Uw/jNckOg==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/git-utils/-/git-utils-5.6.0.tgz",
+      "integrity": "sha512-eOBROJEQPQtkqzZe5V0m43YhKjhmzXTqULxlhoaCwORClnHtZIwkJQTS6THXRbvIqDq/cRHta85IqTbVzdvB5g==",
       "requires": {
         "fs-plus": "^3.0.0",
         "nan": "^2.0.0"
@@ -3308,6 +3224,16 @@
           "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
           "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
         },
+        "fs-extra": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+          "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
         "moment": {
           "version": "2.24.0",
           "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
@@ -3359,11 +3285,6 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
-    },
     "grammar-selector": {
       "version": "file:packages/grammar-selector",
       "requires": {
@@ -3435,11 +3356,6 @@
         "sntp": "1.x.x"
       }
     },
-    "he": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
-    },
     "highlight.js": {
       "version": "9.12.0",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
@@ -3852,11 +3768,6 @@
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
-    "json3": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE="
-    },
     "json5": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
@@ -3963,11 +3874,11 @@
       }
     },
     "language-c": {
-      "version": "https://www.atom.io/api/packages/language-c/versions/0.60.17/tarball",
-      "integrity": "sha512-jGu5Eo/QqqmMM1r62nYJhLdgop/pf4RUUK+udYyp0mOQpU3qPRT+9lVv14/9SDpwkiBB1DQSLJekhVobcD0McQ==",
+      "version": "https://www.atom.io/api/packages/language-c/versions/0.60.18/tarball",
+      "integrity": "sha512-q+oTv3QtnLGP8L3qIuWdOQ9XVKskVTsCp8hvURaSz9MGIIjKIK1ssO/r/gkCiBF/AWqaBuglYix4E6RmytHlVg==",
       "requires": {
-        "tree-sitter-c": "^0.13.13",
-        "tree-sitter-cpp": "^0.13.15"
+        "tree-sitter-c": "^0.15.0",
+        "tree-sitter-cpp": "^0.15.0"
       }
     },
     "language-clojure": {
@@ -3998,19 +3909,19 @@
       "integrity": "sha512-xvsGO/d3/XsKJmwdAz9VGHo6t7A13VuJeuEoZaoLmvzwkVpFdpJcK8PNwVMPHav+lpNeu73qiXmqS+YIlvLwLQ=="
     },
     "language-go": {
-      "version": "https://www.atom.io/api/packages/language-go/versions/0.47.0/tarball",
-      "integrity": "sha512-41lrL5fCPKJSxZ+GUkOemPcDSfme2E2KULuhJGnWLUun5vTrqevtkLgQGAnqH+M/D9zOqJH6H3Lc2kYPrLdUaA==",
+      "version": "https://www.atom.io/api/packages/language-go/versions/0.47.1/tarball",
+      "integrity": "sha512-SiySXDxMZ0nUvNCBAClB8sbil0VQi6MJq2ut+jNuNLKtXvO+PtuHxohtbfsSwSYeET0a8ylVahLv1lo0HBgUjw==",
       "requires": {
-        "tree-sitter-go": "^0.13.3"
+        "tree-sitter-go": "^0.15.0"
       }
     },
     "language-html": {
-      "version": "https://www.atom.io/api/packages/language-html/versions/0.52.1/tarball",
-      "integrity": "sha512-39BmsxqzTJcb6u5bSqv/k/bigdZibbMm3BHascMuWHHl5swIQlJhYf+QPR3ozaojNK/aFbx4hj4zDolmlFEKlA==",
+      "version": "https://www.atom.io/api/packages/language-html/versions/0.52.3/tarball",
+      "integrity": "sha512-NcEU2LTS76VgnLJIc7sN8QGpiYqTmIPwB+jAv7Wg6kzbt7H0GGZwlUCtHqo7OUFnF9dc++BtDLNKUCNchnh6UA==",
       "requires": {
         "atom-grammar-test": "^0.6.3",
-        "tree-sitter-embedded-template": "^0.13.0",
-        "tree-sitter-html": "^0.13.2"
+        "tree-sitter-embedded-template": "^0.15.0",
+        "tree-sitter-html": "^0.15.0"
       }
     },
     "language-hyperlink": {
@@ -4022,17 +3933,17 @@
       "integrity": "sha512-QXVHoj0eJDbl3pJK+Dm0+vnR1yRB80lSrvThwoVnnxsNphovsglXSGkhHoZ6RbEwkX9fEhtwOrhLUspT2NkG3A=="
     },
     "language-javascript": {
-      "version": "https://www.atom.io/api/packages/language-javascript/versions/0.130.0/tarball",
-      "integrity": "sha512-PHuHeuHivsm8gYZR2FopxhBMIbapFFLdztyao7E9D/qDlayyTGHoGzBVPMBPXWCOh/JUnco8JArhOCAOv83Mng==",
+      "version": "https://www.atom.io/api/packages/language-javascript/versions/0.130.1/tarball",
+      "integrity": "sha512-KLz0V7EjpoYQxihWXYiNqFIdbZrOO4lMXg2K7ZA5y8/vb44reOQu1UnOwiC3f6kd1bPyJfv9zR2dUYoXVREy1Q==",
       "requires": {
-        "tree-sitter-javascript": "^0.13.10",
-        "tree-sitter-jsdoc": "^0.13.4",
-        "tree-sitter-regex": "^0.13.1"
+        "tree-sitter-javascript": "^0.15.0",
+        "tree-sitter-jsdoc": "^0.15.0",
+        "tree-sitter-regex": "^0.15.0"
       }
     },
     "language-json": {
-      "version": "https://www.atom.io/api/packages/language-json/versions/1.0.3/tarball",
-      "integrity": "sha512-EQ34IMibK2hcchIWHOyu9pYZS9N+EFlYaw7YRZq0M7AJCIs/FSFLjbNxb+jRmBNqsfioL9bDWFh7lupLrK9Bnw==",
+      "version": "https://www.atom.io/api/packages/language-json/versions/1.0.4/tarball",
+      "integrity": "sha512-NNFpsa8vNwB7W3iZp0oljMusKR+kGiqDlJNa31G6Z+rh+VNshv3cbih7oiQYXD6ZkaMtTJyFUBdQVOw9yiQiPw==",
       "requires": {
         "tree-sitter-json": "^0.14.0"
       }
@@ -4066,18 +3977,18 @@
       "integrity": "sha512-HD6HI41u57i0/Tu9catiriURhJsef0RDrzJDkGDtdFkE9F9KPxC9Fayq2JBLJrhIyADRVXFxwxsfwQ2Jmh6hxg=="
     },
     "language-python": {
-      "version": "https://www.atom.io/api/packages/language-python/versions/0.53.2/tarball",
-      "integrity": "sha512-ACNHWQWlRUfWrOb5MTvjP2wMTFdAq8Wnd3tWXYEd/TcfECtmCGy+6h33dt9X6SmAZz6OGKQ7V8lnVbOlh3X+Fw==",
+      "version": "https://www.atom.io/api/packages/language-python/versions/0.53.3/tarball",
+      "integrity": "sha512-oZJ1WLqpdkpx8ca08jG6BmP/S6YNyu15Q0qMQKAle6ucbK0MagdmpaEcTP/1PkIIncCLaYa1Kdi15QZ+mCva8Q==",
       "requires": {
         "atom-grammar-test": "^0.6.4",
-        "tree-sitter-python": "^0.14.0"
+        "tree-sitter-python": "^0.15.0"
       }
     },
     "language-ruby": {
-      "version": "https://www.atom.io/api/packages/language-ruby/versions/0.72.16/tarball",
-      "integrity": "sha512-7Ju9OP+fIo5qvFWFLuSR8KJe7wldZYI8m3ToBcds4v0+Q8i7+xNO2marC0JD72uEiK/x26xP9pYv/isSqTQ4dg==",
+      "version": "https://www.atom.io/api/packages/language-ruby/versions/0.72.17/tarball",
+      "integrity": "sha512-Yz+Kq06P07qz6KrC3I9vkMf60HjWTFGZBr8XTZOFs1AyLlHdxhXOnm67Rimlb4deCbGjzLda2JhqRkbUq6Y9FQ==",
       "requires": {
-        "tree-sitter-ruby": "^0.13.12"
+        "tree-sitter-ruby": "^0.15.0"
       }
     },
     "language-ruby-on-rails": {
@@ -4087,7 +3998,7 @@
     "language-rust-bundled": {
       "version": "file:packages/language-rust-bundled",
       "requires": {
-        "tree-sitter-rust": "^0.13.7"
+        "tree-sitter-rust": "^0.15.1"
       }
     },
     "language-sass": {
@@ -4095,10 +4006,10 @@
       "integrity": "sha512-qaH8BDNBOkpbR4thmcRimEphnrzzhpDxeQM+WCM3Unp3a8r3aV2xcY9LlvbZxpclz8TOUyvuc5qgj1YI//ge9w=="
     },
     "language-shellscript": {
-      "version": "https://www.atom.io/api/packages/language-shellscript/versions/0.27.11/tarball",
-      "integrity": "sha512-SgVIqPfJz47jaJOe8d6INI6dIJUhznSsyF3rIyePQoDzimjPIOsgrMQEXYjfHicVts/q4Pa6D6x8v/sn2fTgog==",
+      "version": "https://www.atom.io/api/packages/language-shellscript/versions/0.27.12/tarball",
+      "integrity": "sha512-qulEv2pSginsKhMuIrqjBLmuNIEHorAjhNQZRsycW+cKR4c4Py+NEoMoGETEJhzIgxDs7bw7vffbFNRHUCPLgA==",
       "requires": {
-        "tree-sitter-bash": "^0.13.9"
+        "tree-sitter-bash": "^0.15.0"
       }
     },
     "language-source": {
@@ -4122,10 +4033,10 @@
       "integrity": "sha512-6xFDqM6nZpynmxGKUS85iUWY0yeub7GYvLyzSOqDejMuOL5UXAITnSNcb7jhr+hQA8KTj5dCmRjphkAQER4Ucg=="
     },
     "language-typescript": {
-      "version": "https://www.atom.io/api/packages/language-typescript/versions/0.5.0/tarball",
-      "integrity": "sha512-rRArdgBSjIxfMceapfPil4n5fraIr3lBWGWuXpRqGvYkmB7scvt01MpbCvdKlJGz/KAd7wKG8criIYqBvy2QDg==",
+      "version": "https://www.atom.io/api/packages/language-typescript/versions/0.5.2/tarball",
+      "integrity": "sha512-ji8aJg5QOueUHwwljnhDX/MkGSNReAJ2U0JyrB1HHZSJuYz89w1uSYYkoUfwK05FOkMLQr8kPi6SruZyIcRCUQ==",
       "requires": {
-        "tree-sitter-typescript": "^0.14.0"
+        "tree-sitter-typescript": "^0.15.1"
       }
     },
     "language-xml": {
@@ -4355,65 +4266,6 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
       "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
     },
-    "lodash._baseassign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-      "requires": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash.keys": "^3.0.0"
-      }
-    },
-    "lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
-    },
-    "lodash._basecreate": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
-      "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE="
-    },
-    "lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
-    },
-    "lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
-    },
-    "lodash.create": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
-      "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
-      "requires": {
-        "lodash._baseassign": "^3.0.0",
-        "lodash._basecreate": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0"
-      }
-    },
-    "lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
-    },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
-    },
-    "lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "requires": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -5187,9 +5039,9 @@
       "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
     },
     "pathwatcher": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.2.tgz",
-      "integrity": "sha512-zuP+fLmB2IB6z89ikcehA+vG/ITx3Cmhaj3DJrBgnbdss6dwPolSq7cDBjgZ78Vl+SXmG7CHGIOM5mqdT9h7BQ==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.1.0.tgz",
+      "integrity": "sha512-CF6M8W3kR4sEF2wzwRLAN/J+MfstclhRhfd0+SP83vQyrIsuKDSxd6r2TVG16sXpKCzo/ieAQ+GD0yYZ1380Nw==",
       "requires": {
         "async": "~0.2.10",
         "emissary": "^1.3.2",
@@ -5803,12 +5655,12 @@
       "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc="
     },
     "scandal": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/scandal/-/scandal-3.1.0.tgz",
-      "integrity": "sha1-m0AkuXxxm74lAIzAm6rHn7tdNQE=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/scandal/-/scandal-3.2.0.tgz",
+      "integrity": "sha512-kXICe3ygxwyyO3Ur+k49UzQlu8yrdQgzD03eMgV8sMWDom9q4qpEvZuQRUcbyAujC1TpISPRUPoirOIO1bRxcQ==",
       "requires": {
         "argparse": "^1.0.2",
-        "git-utils": "^5.0.0",
+        "git-utils": "^5.6.0",
         "isbinaryfile": "^2.0.4",
         "minimatch": "^2.0.9",
         "split": "^1.0.0",
@@ -6311,16 +6163,6 @@
             "ms": "^2.1.1"
           }
         },
-        "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
         "lodash": {
           "version": "4.17.11",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
@@ -6397,9 +6239,9 @@
       }
     },
     "superstring": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/superstring/-/superstring-2.3.6.tgz",
-      "integrity": "sha512-kDTXCXArhHL1lRk2zBW7ByRJByqVwoLK3E3jlf8+LcwQLZgSMs9dwrDHDpBdoOm89kstSBSrGcW8OJqNkxjWrQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/superstring/-/superstring-2.4.0.tgz",
+      "integrity": "sha512-dg1jpBBvxL2pBpCkTfAABYj0AXcVC05wQ2CHz/AVY786BC9wwzgZmkbjVQ2s/PI9Se9QMRwURJ2UE3MF4EygOg==",
       "requires": {
         "nan": "^2.10.0"
       }
@@ -6565,9 +6407,9 @@
       }
     },
     "text-buffer": {
-      "version": "13.16.1",
-      "resolved": "https://registry.npmjs.org/text-buffer/-/text-buffer-13.16.1.tgz",
-      "integrity": "sha512-/P3D92KLtyrB+P+cc2W7i8jOEw6/1l72tblKobECCXOxkmJJuEqzyt7Kdw9RySJwQYIh9YRllksQ7IQJOp+XeA==",
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/text-buffer/-/text-buffer-13.17.0.tgz",
+      "integrity": "sha512-6KWUrAUp/fLnAX3i8nPiBAzFzNPMLevybVsS6WnvMc6W1Azod8RNMIw7fSsgcpwPgGjkZUg2HIIEKUgGveC7ZQ==",
       "requires": {
         "delegato": "^1.0.0",
         "diff": "^2.2.1",
@@ -6577,9 +6419,9 @@
         "fs-plus": "^3.0.0",
         "grim": "^2.0.2",
         "mkdirp": "^0.5.1",
-        "pathwatcher": "8.0.2",
+        "pathwatcher": "^8.1.0",
         "serializable": "^1.0.3",
-        "superstring": "2.3.6",
+        "superstring": "2.4.0",
         "underscore-plus": "^1.0.0"
       },
       "dependencies": {
@@ -6608,6 +6450,14 @@
           "version": "2.14.0",
           "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
           "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
+        },
+        "superstring": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/superstring/-/superstring-2.4.0.tgz",
+          "integrity": "sha512-dg1jpBBvxL2pBpCkTfAABYj0AXcVC05wQ2CHz/AVY786BC9wwzgZmkbjVQ2s/PI9Se9QMRwURJ2UE3MF4EygOg==",
+          "requires": {
+            "nan": "^2.10.0"
+          }
         }
       }
     },
@@ -6660,42 +6510,42 @@
       "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q=="
     },
     "tree-sitter": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.15.0.tgz",
-      "integrity": "sha512-3CDZ7X4hSJgMXOo8WWhYIwS06hFDmI3x6/3rX+i+LP4ykL3UWVt5TgNKYjAkgBxbpFEHGkaSBe5LRQu5LHOQ3A==",
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.15.5.tgz",
+      "integrity": "sha512-3rrww3lc9NNbbVPT1uGkvbom5Ivr/lZqpzru/x+S0Jnh/jHKACNz7ED1JiAPKfR89eLRJxBGh+ZV5g+QqQrQaw==",
       "requires": {
         "nan": "^2.13.2",
         "prebuild-install": "^5.0.0"
       },
       "dependencies": {
         "nan": {
-          "version": "2.13.2",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
-          "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="
+          "version": "2.14.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
         }
       }
     },
     "tree-sitter-bash": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/tree-sitter-bash/-/tree-sitter-bash-0.13.9.tgz",
-      "integrity": "sha512-b0L+QLS2eeIVrHnnbkFlvO1nElhPwqTxLIwyTeJytPYT0TS50Pe7bP+uPi3gkHT1YajxcauCxX1aDWDiZK1h5Q==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/tree-sitter-bash/-/tree-sitter-bash-0.15.0.tgz",
+      "integrity": "sha512-rqXLK1S7ILV2W/mHrugruycDIJE/LXZzIqOUAWBXN4cTiFTcCnLlreTAu8nRqpxfPk76qQeJ9Os5D14Comg21Q==",
       "requires": {
         "nan": "^2.10.0",
         "prebuild-install": "^5.0.0"
       }
     },
     "tree-sitter-c": {
-      "version": "0.13.13",
-      "resolved": "https://registry.npmjs.org/tree-sitter-c/-/tree-sitter-c-0.13.13.tgz",
-      "integrity": "sha512-ToGn+YgTnidSN7Y1qYoEUlk6kws+WKsEL7G3GmQ62ZUhxE7Oumom65l+QS0JuQXpLeic4BWhXEhOKugOkYpqzA==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/tree-sitter-c/-/tree-sitter-c-0.15.0.tgz",
+      "integrity": "sha512-TCae6lqrzIoOL0LAbAoC//zrdzqyouJO7zp9qTfVJmlz/BEw5Z6UrnDYNt6n1t1ENPDVgUAjPI8dU0TuZfjF2A==",
       "requires": {
         "nan": "^2.10.0"
       }
     },
     "tree-sitter-cpp": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmjs.org/tree-sitter-cpp/-/tree-sitter-cpp-0.13.15.tgz",
-      "integrity": "sha512-S+29FaAfWFCkG02Lw0p4dVFRYnFua9Ua8tY+oFM9ZTgZMaBc7o5rfXVCxNIv5kXKdkHVq0TJWybsFJhtLlQuAw==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/tree-sitter-cpp/-/tree-sitter-cpp-0.15.0.tgz",
+      "integrity": "sha512-ckK6eIGljzEaOrGRR+5aQGQTXgkTcV6iiqZJoSlPSCNbbSjQHztNRFFlV5yWwQxHnpGfgNUdHnQgnEqd3ffObQ==",
       "requires": {
         "nan": "^2.10.0"
       }
@@ -6716,49 +6566,56 @@
       }
     },
     "tree-sitter-embedded-template": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/tree-sitter-embedded-template/-/tree-sitter-embedded-template-0.13.0.tgz",
-      "integrity": "sha512-IJVjMcL2Bg+qF+HibtEXTF4CE6A66ppGSqU8E+2ddn2pCqDtZGREhI+KfqerF9NpKSo1OtbvhXiEXPdXQANLGg==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/tree-sitter-embedded-template/-/tree-sitter-embedded-template-0.15.0.tgz",
+      "integrity": "sha512-LyDtwopMlAHg3T4qeBCywKIMGC4A+a59Y4OaE0LO+UtPVgm5xC3kY+Rq3A9T3Dp6L4ZxZl+zL6LBQA5D0mMnlg==",
       "requires": {
         "nan": "^2.0.0"
       }
     },
     "tree-sitter-go": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/tree-sitter-go/-/tree-sitter-go-0.13.3.tgz",
-      "integrity": "sha512-pXnlEDMwrCdnYaOzfEzlMlWqZEKDJXEG4bPvc9j5JSd7IYDWBrwxo+XXuraLSlbj1mJL2kKLIDO8cKDNxUscHw==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/tree-sitter-go/-/tree-sitter-go-0.15.0.tgz",
+      "integrity": "sha512-booht80IETCTTj79Yeicr0UmH9DhZeg8IA58Cf8evuARatbebsUQdh4Zg49Ye+15zVD663/LM+NxkmnJLfq2Rw==",
       "requires": {
         "nan": "^2.10.0"
       }
     },
     "tree-sitter-html": {
-      "version": "0.13.5",
-      "resolved": "https://registry.npmjs.org/tree-sitter-html/-/tree-sitter-html-0.13.5.tgz",
-      "integrity": "sha512-lawojfDlj/9ujEYvLoW4+WTTh2ocrYCYP2Dw5LmwxuvvE2lHr/D4RWA8W1N4jpR58tVef0SSqnnQwJkl1pNIeA==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/tree-sitter-html/-/tree-sitter-html-0.15.0.tgz",
+      "integrity": "sha512-i8pUX4hNljVpo35D4S+8iopJBU6mS8XRbupjEycjsI7+FSBhr8tnMrx9hjjYhgKYCHdxTnYGTi9K7jc0p3gVDA==",
       "requires": {
         "nan": "^2.10.0"
       }
     },
     "tree-sitter-javascript": {
-      "version": "0.13.10",
-      "resolved": "https://registry.npmjs.org/tree-sitter-javascript/-/tree-sitter-javascript-0.13.10.tgz",
-      "integrity": "sha512-ku/841Nu7k/VXwI2ifm7xxv2cUiiYztLlIeYTYZXpjaIHMfFer5XZRgmZldJHVthTQ9uRMEr7UQ0qeqnWKzOlg==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/tree-sitter-javascript/-/tree-sitter-javascript-0.15.0.tgz",
+      "integrity": "sha512-1MJ1gO2Bp///UNexxUfGfh5A75Gb5qFxklAhQPgrbWSK6OgjgaHRiYMmW5tRMqoexSp3U2+9bp4j4Nc3Q2lEpg==",
       "requires": {
-        "nan": "^2.4.0"
+        "nan": "^2.12.1"
+      },
+      "dependencies": {
+        "nan": {
+          "version": "2.14.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
+        }
       }
     },
     "tree-sitter-jsdoc": {
-      "version": "0.13.4",
-      "resolved": "https://registry.npmjs.org/tree-sitter-jsdoc/-/tree-sitter-jsdoc-0.13.4.tgz",
-      "integrity": "sha512-823BIawpN3JegYIhP3tTUlVO+Qc1iaGSl9CEiXt5Lun58TOV56HMnqq6iWgtdcMVcykO24C6Yeovqk+3y20FFw==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/tree-sitter-jsdoc/-/tree-sitter-jsdoc-0.15.0.tgz",
+      "integrity": "sha512-Z5jPAYpB0ofLJYwXTr8oQLBMHqIzMNnpGYKaMVIMpt+wa6ee9pSyy4Uq/tMUQB3qxiYT+66Ij8hu4ou1TNW2CA==",
       "requires": {
         "nan": "^2.11.1"
       },
       "dependencies": {
         "nan": {
-          "version": "2.13.2",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
-          "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="
+          "version": "2.14.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
         }
       }
     },
@@ -6771,49 +6628,49 @@
       }
     },
     "tree-sitter-python": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/tree-sitter-python/-/tree-sitter-python-0.14.0.tgz",
-      "integrity": "sha512-Kcj5AUdeI4/c/JLsQV8OFI0zLrwcQ1nKoqCRr+W73Tp5SIK+Dd1ILNC5TFHPw1IqOGstcg8AH0XTeU0uq3boZg==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/tree-sitter-python/-/tree-sitter-python-0.15.0.tgz",
+      "integrity": "sha512-lOV84DUTsyab8xRfU0o8pBQOKAZPjIJsGL7q0buuORHQvvwnvy3iwF/83OGSyiNYRJzPz6gW+E1N/VgNNavMHA==",
       "requires": {
         "nan": "^2.4.0"
       }
     },
     "tree-sitter-regex": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/tree-sitter-regex/-/tree-sitter-regex-0.13.1.tgz",
-      "integrity": "sha512-A+ULuVOc37NOjmmmddqXMRwUq8g51FCRZ7YSupLdFcHngl1adI3nBRPskC9A8e++9jF+5fLytwA4X6uHW/v/mg==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/tree-sitter-regex/-/tree-sitter-regex-0.15.0.tgz",
+      "integrity": "sha512-e6SWC2vvDwFlTrKZMiqrKz5+6YpOawjb4wh7VyQClpF5fjOC6AeQO0EB0+oWXXKcveFZK0Xdn+cB/zY0GHwYrg==",
       "requires": {
         "nan": "^2.10.0"
       }
     },
     "tree-sitter-ruby": {
-      "version": "0.13.14",
-      "resolved": "https://registry.npmjs.org/tree-sitter-ruby/-/tree-sitter-ruby-0.13.14.tgz",
-      "integrity": "sha512-ye0Bpzp12HifMoocwhDVR0Adqo7DdR44anPHkx1qhhmdpzMdzsW7WzQYBTJjQo/iFXsgahl/Q9L7AwNI+2cKLw==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/tree-sitter-ruby/-/tree-sitter-ruby-0.15.0.tgz",
+      "integrity": "sha512-DWLepimzxB6miFLS2dRUQHvQKxEyd3nkzl4WuYvGZEeqiVb3Y4KbzCgk4LCuhmqb+nhONZEgHsNBSN0G6hcpGw==",
       "requires": {
         "nan": "^2.12.1",
         "prebuild-install": "^5.0.0"
       },
       "dependencies": {
         "nan": {
-          "version": "2.13.2",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
-          "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="
+          "version": "2.14.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
         }
       }
     },
     "tree-sitter-rust": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/tree-sitter-rust/-/tree-sitter-rust-0.13.7.tgz",
-      "integrity": "sha512-OX7VlqNhw67yIB69ZhgtJb6sXhwLVwGx991EjLf4PP2bY4dWBgmZ+KxwxN7HBwk9RdUsNLf0KbTwzVRadKhPGw==",
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/tree-sitter-rust/-/tree-sitter-rust-0.15.1.tgz",
+      "integrity": "sha512-nkuVgr/1QS/IkC1IE9DhjMKbGUUNymrMnRlV6HcOOOsW8s4ubCaL9Yu0M+eyVwSGjiD92xWEZMtt1I5ekUILYg==",
       "requires": {
         "nan": "^2.8.0"
       }
     },
     "tree-sitter-typescript": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/tree-sitter-typescript/-/tree-sitter-typescript-0.14.0.tgz",
-      "integrity": "sha512-gx54LvIbjIdqSYGwau5G4Kr7j1oEwfWoZDKrR3jUlINEwskNOXaOzgsSdIM92JnFyqdBU+N6mBHpzjafbJ8EFw==",
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/tree-sitter-typescript/-/tree-sitter-typescript-0.15.1.tgz",
+      "integrity": "sha512-xntREG9BE+zknNgcwmeVuq5/AT+lVCSUKvhX6T6KoZLk5OPY5EfHrTqGTxS97KDlSRiGfGPheOPMNzIgk/kwNQ==",
       "requires": {
         "nan": "^2.10.0"
       }
diff --git a/package.json b/package.json
index d2f7fe19f..7594bad3d 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   "license": "MIT",
   "electronVersion": "3.1.10",
   "dependencies": {
-    "@atom/nsfw": "1.0.23",
+    "@atom/nsfw": "1.0.25",
     "@atom/source-map-support": "^0.3.4",
     "@atom/watcher": "1.3.1",
     "about": "file:packages/about",
@@ -29,7 +29,7 @@
     "autocomplete-atom-api": "https://www.atom.io/api/packages/autocomplete-atom-api/versions/0.10.7/tarball",
     "autocomplete-css": "https://www.atom.io/api/packages/autocomplete-css/versions/0.17.5/tarball",
     "autocomplete-html": "https://www.atom.io/api/packages/autocomplete-html/versions/0.8.8/tarball",
-    "autocomplete-plus": "https://www.atom.io/api/packages/autocomplete-plus/versions/2.42.2/tarball",
+    "autocomplete-plus": "https://www.atom.io/api/packages/autocomplete-plus/versions/2.42.3/tarball",
     "autocomplete-snippets": "https://www.atom.io/api/packages/autocomplete-snippets/versions/1.12.1/tarball",
     "autoflow": "file:packages/autoflow",
     "autosave": "https://www.atom.io/api/packages/autosave/versions/0.24.6/tarball",
@@ -38,7 +38,7 @@
     "base16-tomorrow-dark-theme": "file:packages/base16-tomorrow-dark-theme",
     "base16-tomorrow-light-theme": "file:packages/base16-tomorrow-light-theme",
     "bookmarks": "https://www.atom.io/api/packages/bookmarks/versions/0.46.0/tarball",
-    "bracket-matcher": "https://www.atom.io/api/packages/bracket-matcher/versions/0.91.0/tarball",
+    "bracket-matcher": "https://www.atom.io/api/packages/bracket-matcher/versions/0.91.1/tarball",
     "chai": "3.5.0",
     "chart.js": "^2.3.0",
     "clear-cut": "^2.0.2",
@@ -54,17 +54,17 @@
     "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.218.12/tarball",
+    "find-and-replace": "https://www.atom.io/api/packages/find-and-replace/versions/0.218.13/tarball",
     "find-parent-dir": "^0.3.0",
     "first-mate": "7.4.0",
     "focus-trap": "2.4.5",
-    "fs-admin": "^0.1.7",
+    "fs-admin": "^0.5.0",
     "fs-plus": "^3.1.1",
     "fstream": "0.1.24",
     "fuzzaldrin": "^2.1",
-    "fuzzy-finder": "https://www.atom.io/api/packages/fuzzy-finder/versions/1.13.7/tarball",
+    "fuzzy-finder": "https://www.atom.io/api/packages/fuzzy-finder/versions/1.13.8/tarball",
     "git-diff": "file:packages/git-diff",
-    "git-utils": "5.5.0",
+    "git-utils": "5.6.0",
     "github": "https://www.atom.io/api/packages/github/versions/0.29.0/tarball",
     "glob": "^7.1.1",
     "go-to-line": "file:packages/go-to-line",
@@ -77,19 +77,19 @@
     "jasmine-tagged": "^1.1.4",
     "key-path-helpers": "^0.4.0",
     "keybinding-resolver": "https://www.atom.io/api/packages/keybinding-resolver/versions/0.39.0/tarball",
-    "language-c": "https://www.atom.io/api/packages/language-c/versions/0.60.17/tarball",
+    "language-c": "https://www.atom.io/api/packages/language-c/versions/0.60.18/tarball",
     "language-clojure": "https://www.atom.io/api/packages/language-clojure/versions/0.22.8/tarball",
     "language-coffee-script": "https://www.atom.io/api/packages/language-coffee-script/versions/0.50.0/tarball",
     "language-csharp": "https://www.atom.io/api/packages/language-csharp/versions/1.1.0/tarball",
     "language-css": "https://www.atom.io/api/packages/language-css/versions/0.44.0/tarball",
     "language-gfm": "https://www.atom.io/api/packages/language-gfm/versions/0.90.6/tarball",
     "language-git": "https://www.atom.io/api/packages/language-git/versions/0.19.1/tarball",
-    "language-go": "https://www.atom.io/api/packages/language-go/versions/0.47.0/tarball",
-    "language-html": "https://www.atom.io/api/packages/language-html/versions/0.52.1/tarball",
+    "language-go": "https://www.atom.io/api/packages/language-go/versions/0.47.1/tarball",
+    "language-html": "https://www.atom.io/api/packages/language-html/versions/0.52.3/tarball",
     "language-hyperlink": "https://www.atom.io/api/packages/language-hyperlink/versions/0.17.1/tarball",
     "language-java": "https://www.atom.io/api/packages/language-java/versions/0.31.3/tarball",
-    "language-javascript": "https://www.atom.io/api/packages/language-javascript/versions/0.130.0/tarball",
-    "language-json": "https://www.atom.io/api/packages/language-json/versions/1.0.3/tarball",
+    "language-javascript": "https://www.atom.io/api/packages/language-javascript/versions/0.130.1/tarball",
+    "language-json": "https://www.atom.io/api/packages/language-json/versions/1.0.4/tarball",
     "language-less": "https://www.atom.io/api/packages/language-less/versions/0.34.3/tarball",
     "language-make": "https://www.atom.io/api/packages/language-make/versions/0.23.0/tarball",
     "language-mustache": "https://www.atom.io/api/packages/language-mustache/versions/0.14.5/tarball",
@@ -97,18 +97,18 @@
     "language-perl": "https://www.atom.io/api/packages/language-perl/versions/0.38.1/tarball",
     "language-php": "https://www.atom.io/api/packages/language-php/versions/0.44.1/tarball",
     "language-property-list": "https://www.atom.io/api/packages/language-property-list/versions/0.9.1/tarball",
-    "language-python": "https://www.atom.io/api/packages/language-python/versions/0.53.2/tarball",
-    "language-ruby": "https://www.atom.io/api/packages/language-ruby/versions/0.72.16/tarball",
+    "language-python": "https://www.atom.io/api/packages/language-python/versions/0.53.3/tarball",
+    "language-ruby": "https://www.atom.io/api/packages/language-ruby/versions/0.72.17/tarball",
     "language-ruby-on-rails": "https://www.atom.io/api/packages/language-ruby-on-rails/versions/0.25.3/tarball",
     "language-rust-bundled": "file:packages/language-rust-bundled",
     "language-sass": "https://www.atom.io/api/packages/language-sass/versions/0.62.0/tarball",
-    "language-shellscript": "https://www.atom.io/api/packages/language-shellscript/versions/0.27.11/tarball",
+    "language-shellscript": "https://www.atom.io/api/packages/language-shellscript/versions/0.27.12/tarball",
     "language-source": "https://www.atom.io/api/packages/language-source/versions/0.9.0/tarball",
     "language-sql": "https://www.atom.io/api/packages/language-sql/versions/0.25.10/tarball",
     "language-text": "https://www.atom.io/api/packages/language-text/versions/0.7.4/tarball",
     "language-todo": "https://www.atom.io/api/packages/language-todo/versions/0.29.4/tarball",
     "language-toml": "https://www.atom.io/api/packages/language-toml/versions/0.20.0/tarball",
-    "language-typescript": "https://www.atom.io/api/packages/language-typescript/versions/0.5.0/tarball",
+    "language-typescript": "https://www.atom.io/api/packages/language-typescript/versions/0.5.2/tarball",
     "language-xml": "https://www.atom.io/api/packages/language-xml/versions/0.35.3/tarball",
     "language-yaml": "https://www.atom.io/api/packages/language-yaml/versions/0.32.0/tarball",
     "less-cache": "1.1.0",
@@ -132,13 +132,13 @@
     "one-light-ui": "file:packages/one-light-ui",
     "open-on-github": "https://www.atom.io/api/packages/open-on-github/versions/1.3.1/tarball",
     "package-generator": "https://www.atom.io/api/packages/package-generator/versions/1.3.0/tarball",
-    "pathwatcher": "8.0.2",
+    "pathwatcher": "8.1.0",
     "postcss": "5.2.4",
     "postcss-selector-parser": "2.2.1",
     "property-accessors": "^1.1.3",
     "random-words": "0.0.1",
     "resolve": "^1.1.6",
-    "scandal": "^3.1.0",
+    "scandal": "^3.2.0",
     "scoped-property-store": "^0.17.0",
     "scrollbar-style": "^3.2",
     "season": "^6.0.2",
@@ -155,9 +155,9 @@
     "symbols-view": "https://www.atom.io/api/packages/symbols-view/versions/0.118.2/tarball",
     "tabs": "https://www.atom.io/api/packages/tabs/versions/0.110.0/tarball",
     "temp": "^0.9.0",
-    "text-buffer": "13.16.1",
+    "text-buffer": "13.17.0",
     "timecop": "https://www.atom.io/api/packages/timecop/versions/0.36.2/tarball",
-    "tree-sitter": "0.15.0",
+    "tree-sitter": "0.15.5",
     "tree-sitter-css": "^0.13.7",
     "tree-view": "https://www.atom.io/api/packages/tree-view/versions/0.228.0/tarball",
     "typescript-simple": "1.0.0",
@@ -187,21 +187,21 @@
     "autocomplete-atom-api": "0.10.7",
     "autocomplete-css": "0.17.5",
     "autocomplete-html": "0.8.8",
-    "autocomplete-plus": "2.42.2",
+    "autocomplete-plus": "2.42.3",
     "autocomplete-snippets": "1.12.1",
     "autoflow": "file:./packages/autoflow",
     "autosave": "0.24.6",
     "background-tips": "0.28.0",
     "bookmarks": "0.46.0",
-    "bracket-matcher": "0.91.0",
+    "bracket-matcher": "0.91.1",
     "command-palette": "0.43.5",
     "dalek": "file:./packages/dalek",
     "deprecation-cop": "file:./packages/deprecation-cop",
     "dev-live-reload": "file:./packages/dev-live-reload",
     "encoding-selector": "0.23.9",
     "exception-reporting": "file:./packages/exception-reporting",
-    "find-and-replace": "0.218.12",
-    "fuzzy-finder": "1.13.7",
+    "find-and-replace": "0.218.13",
+    "fuzzy-finder": "1.13.8",
     "github": "0.29.0",
     "git-diff": "file:./packages/git-diff",
     "go-to-line": "file:./packages/go-to-line",
@@ -229,19 +229,19 @@
     "welcome": "0.36.9",
     "whitespace": "0.37.7",
     "wrap-guide": "0.41.0",
-    "language-c": "0.60.17",
+    "language-c": "0.60.18",
     "language-clojure": "0.22.8",
     "language-coffee-script": "0.50.0",
     "language-csharp": "1.1.0",
     "language-css": "0.44.0",
     "language-gfm": "0.90.6",
     "language-git": "0.19.1",
-    "language-go": "0.47.0",
-    "language-html": "0.52.1",
+    "language-go": "0.47.1",
+    "language-html": "0.52.3",
     "language-hyperlink": "0.17.1",
     "language-java": "0.31.3",
-    "language-javascript": "0.130.0",
-    "language-json": "1.0.3",
+    "language-javascript": "0.130.1",
+    "language-json": "1.0.4",
     "language-less": "0.34.3",
     "language-make": "0.23.0",
     "language-mustache": "0.14.5",
@@ -249,18 +249,18 @@
     "language-perl": "0.38.1",
     "language-php": "0.44.1",
     "language-property-list": "0.9.1",
-    "language-python": "0.53.2",
-    "language-ruby": "0.72.16",
+    "language-python": "0.53.3",
+    "language-ruby": "0.72.17",
     "language-ruby-on-rails": "0.25.3",
     "language-rust-bundled": "file:./packages/language-rust-bundled",
     "language-sass": "0.62.0",
-    "language-shellscript": "0.27.11",
+    "language-shellscript": "0.27.12",
     "language-source": "0.9.0",
     "language-sql": "0.25.10",
     "language-text": "0.7.4",
     "language-todo": "0.29.4",
     "language-toml": "0.20.0",
-    "language-typescript": "0.5.0",
+    "language-typescript": "0.5.2",
     "language-xml": "0.35.3",
     "language-yaml": "0.32.0"
   },
diff --git a/packages/language-rust-bundled/grammars/tree-sitter-rust.cson b/packages/language-rust-bundled/grammars/tree-sitter-rust.cson
index 6f77d1b90..651e2e247 100644
--- a/packages/language-rust-bundled/grammars/tree-sitter-rust.cson
+++ b/packages/language-rust-bundled/grammars/tree-sitter-rust.cson
@@ -2,6 +2,7 @@ name: 'Rust'
 scopeName: 'source.rust'
 type: 'tree-sitter'
 parser: 'tree-sitter-rust'
+injectionRegex: 'rust'
 
 fileTypes: [
   'rs'
diff --git a/packages/language-rust-bundled/lib/main.js b/packages/language-rust-bundled/lib/main.js
new file mode 100644
index 000000000..7a996b689
--- /dev/null
+++ b/packages/language-rust-bundled/lib/main.js
@@ -0,0 +1,14 @@
+exports.activate = function() {
+  for (const nodeType of ['macro_invocation', 'macro_rule']) {
+    atom.grammars.addInjectionPoint('source.rust', {
+      type: nodeType,
+      language() {
+        return 'rust';
+      },
+      content(node) {
+        return node.lastChild;
+      },
+      includeChildren: true
+    });
+  }
+};
diff --git a/packages/language-rust-bundled/package.json b/packages/language-rust-bundled/package.json
index 91c1662ab..ca6e7bdda 100644
--- a/packages/language-rust-bundled/package.json
+++ b/packages/language-rust-bundled/package.json
@@ -7,10 +7,11 @@
     "grammar",
     "rust"
   ],
+  "main": "lib/main.js",
   "repository": "https://github.com/atom/atom",
   "license": "MIT",
   "dependencies": {
-    "tree-sitter-rust": "^0.13.7"
+    "tree-sitter-rust": "^0.15.1"
   },
   "engines": {
     "atom": ">=1.0.0 <2.0.0"
diff --git a/script/build b/script/build
index 193eb7310..9219edad2 100755
--- a/script/build
+++ b/script/build
@@ -109,7 +109,7 @@ if (!argv.generateApiDocs) {
           if (argv.codeSign) {
             const executablesToSign = [ path.join(packagedAppPath, 'Atom.exe') ]
             if (argv.createWindowsInstaller) {
-              executablesToSign.push(path.join(__dirname, 'node_modules', 'electron-winstaller', 'vendor', 'Update.exe'))
+              executablesToSign.push(path.join(__dirname, 'node_modules', '@atom', 'electron-winstaller', 'vendor', 'Squirrel.exe'))
             }
             codeSignOnWindows(executablesToSign)
           } else {
diff --git a/script/lib/code-sign-on-windows.js b/script/lib/code-sign-on-windows.js
index 93bd3e65d..181f58c15 100644
--- a/script/lib/code-sign-on-windows.js
+++ b/script/lib/code-sign-on-windows.js
@@ -40,6 +40,7 @@ module.exports = function(filesToSign) {
       __dirname,
       '..',
       'node_modules',
+      '@atom',
       'electron-winstaller',
       'vendor',
       'signtool.exe'
diff --git a/script/lib/create-windows-installer.js b/script/lib/create-windows-installer.js
index 9308a3c2b..17171546a 100644
--- a/script/lib/create-windows-installer.js
+++ b/script/lib/create-windows-installer.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const electronInstaller = require('electron-winstaller');
+const electronInstaller = require('@atom/electron-winstaller');
 const fs = require('fs');
 const glob = require('glob');
 const path = require('path');
@@ -25,7 +25,6 @@ module.exports = packagedAppPath => {
     ),
     outputDirectory: CONFIG.buildOutputPath,
     noMsi: true,
-    noDelta: CONFIG.channel === 'nightly', // Delta packages are broken for nightly versions past nightly9 due to Squirrel/NuGet limitations
     remoteReleases: `${updateUrlPrefix}/api/updates${archSuffix}?version=${
       CONFIG.computedAppVersion
     }`,
diff --git a/script/lib/include-path-in-packaged-app.js b/script/lib/include-path-in-packaged-app.js
index 3bb80fd6c..f8caac357 100644
--- a/script/lib/include-path-in-packaged-app.js
+++ b/script/lib/include-path-in-packaged-app.js
@@ -16,7 +16,6 @@ const EXCLUDE_REGEXPS_SOURCES = [
   escapeRegExp('.npmignore'),
   escapeRegExp('.pairs'),
   escapeRegExp('.travis.yml'),
-  escapeRegExp('appveyor.yml'),
   escapeRegExp('.idea'),
   escapeRegExp('.editorconfig'),
   escapeRegExp('.lint'),
diff --git a/script/package-lock.json b/script/package-lock.json
index cfe723743..9b3839dae 100644
--- a/script/package-lock.json
+++ b/script/package-lock.json
@@ -8,6 +8,66 @@
       "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-4.0.2.tgz",
       "integrity": "sha512-XtGk+IF57pr852UK1AhQJXqmm1WmSgS5uISL+LPs0z/iAxXouMvdlLJrHPeukP6gd7yR2rDTMSMkHNODgwIq7A=="
     },
+    "@atom/electron-winstaller": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/@atom/electron-winstaller/-/electron-winstaller-0.0.1.tgz",
+      "integrity": "sha512-E8bGTBrhf4HsZZS5oPxQgx8XL2wCz04vi0gtYzQH+i9gpxdkuGuV+RHGAtQY+k+wbG5RVR89sB6ICMmhUYNi2Q==",
+      "requires": {
+        "@babel/runtime": "^7.3.4",
+        "asar": "^1.0.0",
+        "debug": "^4.1.1",
+        "fs-extra": "^7.0.1",
+        "lodash.template": "^4.2.2",
+        "pify": "^4.0.1",
+        "temp": "^0.9.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "fs-extra": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        },
+        "temp": {
+          "version": "0.9.0",
+          "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.0.tgz",
+          "integrity": "sha512-YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==",
+          "requires": {
+            "rimraf": "~2.6.2"
+          }
+        }
+      }
+    },
     "@babel/code-frame": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
@@ -119,6 +179,14 @@
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.4.tgz",
       "integrity": "sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w=="
     },
+    "@babel/runtime": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz",
+      "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==",
+      "requires": {
+        "regenerator-runtime": "^0.13.2"
+      }
+    },
     "@babel/template": {
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
@@ -507,27 +575,34 @@
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
     },
     "asar": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/asar/-/asar-0.11.0.tgz",
-      "integrity": "sha1-uSbnksMV+MBIxDNx4yWwnJenZGQ=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/asar/-/asar-1.0.0.tgz",
+      "integrity": "sha512-MBiDU5cDr9UWuY2F0zq2fZlnyRq1aOPmJGMas22Qa14K1odpRXL3xkMHPN3uw2hAK5mD89Q+/KidOUtpi4V0Cg==",
       "requires": {
-        "chromium-pickle-js": "^0.1.0",
-        "commander": "^2.9.0",
-        "cuint": "^0.2.1",
-        "glob": "^6.0.4",
-        "minimatch": "^3.0.0",
-        "mkdirp": "^0.5.0",
-        "mksnapshot": "^0.3.0"
+        "chromium-pickle-js": "^0.2.0",
+        "commander": "^2.19.0",
+        "cuint": "^0.2.2",
+        "glob": "^7.1.3",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "pify": "^4.0.1",
+        "tmp-promise": "^1.0.5"
       },
       "dependencies": {
+        "commander": {
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+        },
         "glob": {
-          "version": "6.0.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "requires": {
+            "fs.realpath": "^1.0.0",
             "inflight": "^1.0.4",
             "inherits": "2",
-            "minimatch": "2 || 3",
+            "minimatch": "^3.0.4",
             "once": "^1.3.0",
             "path-is-absolute": "^1.0.0"
           }
@@ -539,6 +614,11 @@
           "requires": {
             "brace-expansion": "^1.1.7"
           }
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
         }
       }
     },
@@ -984,11 +1064,6 @@
       "resolved": "https://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz",
       "integrity": "sha1-eEp5eRWjjq0nutRWtVcstLuqeME="
     },
-    "browser-stdout": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-      "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8="
-    },
     "browserslist": {
       "version": "3.2.8",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
@@ -1179,9 +1254,9 @@
       "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="
     },
     "chromium-pickle-js": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.1.0.tgz",
-      "integrity": "sha1-HUixB9ghJqLz4hHC6iX4A7pVGyE="
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
+      "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU="
     },
     "circular-json": {
       "version": "0.3.3",
@@ -1819,11 +1894,6 @@
         "wrappy": "1"
       }
     },
-    "diff": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-      "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k="
-    },
     "dir-glob": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
@@ -2290,38 +2360,6 @@
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.52.tgz",
       "integrity": "sha1-0tnxJwuko7lnuDHEDvcftNmrXOA="
     },
-    "electron-winstaller": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-2.6.4.tgz",
-      "integrity": "sha1-a0gHboc6bqNWJR8Ve2i55dwDtak=",
-      "requires": {
-        "asar": "^0.11.0",
-        "bluebird": "^3.3.4",
-        "debug": "^2.2.0",
-        "fs-extra": "^0.26.7",
-        "lodash.template": "^4.2.2",
-        "temp": "^0.8.3"
-      },
-      "dependencies": {
-        "bluebird": {
-          "version": "3.5.1",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-          "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
-        },
-        "fs-extra": {
-          "version": "0.26.7",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
-          "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^2.1.0",
-            "klaw": "^1.0.0",
-            "path-is-absolute": "^1.0.0",
-            "rimraf": "^2.2.8"
-          }
-        }
-      }
-    },
     "emoji-regex": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
@@ -3501,12 +3539,11 @@
       }
     },
     "fs-admin": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.7.tgz",
-      "integrity": "sha512-EQNioqUHgtnX9ErMiPuvHCAx0M1VSa9u4oxGF+EGVYBL15Mg5BxEzGBrTAYHUQDDobqw1Yc+6YqZWwSIIe+EwQ==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/fs-admin/-/fs-admin-0.5.0.tgz",
+      "integrity": "sha512-jU0x86bI6wmhdGGcpaO1rI7EpNx/44cEXPsHqFIRgs9SVsk3HSWn9Zd5fd7bdDw3LcmdnazOcJFK9PZsoNecAA==",
       "requires": {
-        "mocha": "^3.5.0",
-        "nan": "^2.10.0"
+        "nan": "^2.13.2"
       }
     },
     "fs-constants": {
@@ -3806,21 +3843,11 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
-    },
     "grapheme-splitter": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
       "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
     },
-    "growl": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-      "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8="
-    },
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -3920,11 +3947,6 @@
         }
       }
     },
-    "he": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
-    },
     "home-or-tmp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-1.0.0.tgz",
@@ -4584,11 +4606,6 @@
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
-    "json3": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE="
-    },
     "json5": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
@@ -4808,35 +4825,6 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
       "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
     },
-    "lodash._baseassign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-      "requires": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash.keys": "^3.0.0"
-      }
-    },
-    "lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
-    },
-    "lodash._basecreate": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
-      "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE="
-    },
-    "lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
-    },
-    "lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
-    },
     "lodash._reinterpolate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
@@ -4847,31 +4835,11 @@
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
       "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
     },
-    "lodash.create": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
-      "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
-      "requires": {
-        "lodash._baseassign": "^3.0.0",
-        "lodash._basecreate": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0"
-      }
-    },
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
       "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
     },
-    "lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
-    },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
-    },
     "lodash.isobject": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
@@ -4882,16 +4850,6 @@
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
       "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
     },
-    "lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "requires": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
     "lodash.merge": {
       "version": "4.6.1",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
@@ -5186,96 +5144,6 @@
       "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz",
       "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE="
     },
-    "mksnapshot": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz",
-      "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=",
-      "requires": {
-        "decompress-zip": "0.3.0",
-        "fs-extra": "0.26.7",
-        "request": "^2.79.0"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "0.26.7",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
-          "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^2.1.0",
-            "klaw": "^1.0.0",
-            "path-is-absolute": "^1.0.0",
-            "rimraf": "^2.2.8"
-          }
-        }
-      }
-    },
-    "mocha": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
-      "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==",
-      "requires": {
-        "browser-stdout": "1.3.0",
-        "commander": "2.9.0",
-        "debug": "2.6.8",
-        "diff": "3.2.0",
-        "escape-string-regexp": "1.0.5",
-        "glob": "7.1.1",
-        "growl": "1.9.2",
-        "he": "1.1.1",
-        "json3": "3.3.2",
-        "lodash.create": "3.1.1",
-        "mkdirp": "0.5.1",
-        "supports-color": "3.1.2"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.9.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-          "requires": {
-            "graceful-readlink": ">= 1.0.0"
-          }
-        },
-        "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-          "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.2",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "supports-color": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-          "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -5287,9 +5155,9 @@
       "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
     },
     "nan": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -9180,6 +9048,11 @@
         "through": "~2.3.8"
       }
     },
+    "regenerator-runtime": {
+      "version": "0.13.2",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
+      "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA=="
+    },
     "regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
@@ -10581,6 +10454,59 @@
         "os-tmpdir": "~1.0.2"
       }
     },
+    "tmp-promise": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.1.0.tgz",
+      "integrity": "sha512-8+Ah9aB1IRXCnIOxXZ0uFozV1nMU5xiu7hhFVUSxZ3bYu+psD4TzagCzVbexUCgNNGJnsmNDQlS4nG3mTyoNkw==",
+      "requires": {
+        "bluebird": "^3.5.0",
+        "tmp": "0.1.0"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.5.5",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="
+        },
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "tmp": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz",
+          "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==",
+          "requires": {
+            "rimraf": "^2.6.3"
+          }
+        }
+      }
+    },
     "to-buffer": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
diff --git a/script/package.json b/script/package.json
index 2cdedfcb0..35d0cf00e 100644
--- a/script/package.json
+++ b/script/package.json
@@ -14,7 +14,7 @@
     "electron-link": "0.4.0",
     "electron-mksnapshot": "^3.1.10",
     "electron-packager": "12.2.0",
-    "electron-winstaller": "2.6.4",
+    "@atom/electron-winstaller": "0.0.1",
     "eslint": "^5.16.0",
     "eslint-config-prettier": "^4.2.0",
     "eslint-config-standard": "^12.0.0",
@@ -23,7 +23,7 @@
     "eslint-plugin-prettier": "^3.0.1",
     "eslint-plugin-promise": "^4.1.1",
     "eslint-plugin-standard": "^4.0.0",
-    "fs-admin": "^0.1.5",
+    "fs-admin": "^0.5.0",
     "fs-extra": "0.30.0",
     "glob": "7.0.3",
     "joanna": "0.0.10",
diff --git a/script/vsts/lib/release-notes.js b/script/vsts/lib/release-notes.js
index c76c23317..144518d17 100644
--- a/script/vsts/lib/release-notes.js
+++ b/script/vsts/lib/release-notes.js
@@ -97,32 +97,60 @@ module.exports.generateForNightly = async function(
   releaseVersion,
   githubToken
 ) {
-  const releases = await octokit.repos.getReleases({
-    owner: 'atom',
-    repo: 'atom-nightly-releases'
-  });
-  const previousRelease = getPreviousRelease(releaseVersion, releases.data);
-  const oldReleaseNotes = previousRelease ? previousRelease.body : undefined;
-
   const latestCommitResult = childProcess.spawnSync('git', [
     'rev-parse',
     '--short',
     'HEAD'
   ]);
+  if (!latestCommitResult) {
+    console.log("Couldn't get the current commmit from git.");
 
-  if (latestCommitResult && oldReleaseNotes) {
-    const latestCommit = latestCommitResult.stdout.toString().trim();
-    const extractMatch = oldReleaseNotes.match(
-      /atom\/atom\/compare\/([0-9a-f]{5,40})\.\.\.([0-9a-f]{5,40})/
-    );
-    if (extractMatch) {
-      return `### Click [here](https://github.com/atom/atom/compare/${
-        extractMatch[2]
-      }...${latestCommit}) to see the changes included with this release! :atom: :night_with_stars:`;
-    }
+    return undefined;
   }
 
-  return undefined;
+  const latestCommit = latestCommitResult.stdout.toString().trim();
+  const output = [
+    `### This nightly release is based on https://github.com/atom/atom/commit/${latestCommit} :atom: :night_with_stars:`
+  ];
+
+  try {
+    const releases = await octokit.repos.getReleases({
+      owner: 'atom',
+      repo: 'atom-nightly-releases'
+    });
+
+    const previousRelease = getPreviousRelease(releaseVersion, releases.data);
+    const oldReleaseNotes = previousRelease ? previousRelease.body : undefined;
+
+    if (oldReleaseNotes) {
+      const extractMatch = oldReleaseNotes.match(
+        /atom\/atom\/commit\/([0-9a-f]{5,40})/
+      );
+      if (extractMatch.length > 1 && extractMatch[1]) {
+        output.push('', '---', '');
+        const previousCommit = extractMatch[1];
+
+        if (
+          previousCommit === latestCommit ||
+          previousCommit.startsWith(latestCommit) ||
+          latestCommit.startsWith(previousCommit)
+        ) {
+          // TODO: Maybe we can bail out and not publish a release if it contains no commits?
+          output.push('No changes have been included in this release');
+        } else {
+          output.push(
+            `Click [here](https://github.com/atom/atom/compare/${previousCommit}...${latestCommit}) to see the changes included with this release!`
+          );
+        }
+      }
+    }
+  } catch (e) {
+    console.log(
+      'Error when trying to find the previous nightly release: ' + e.message
+    );
+  }
+
+  return output.join('\n');
 };
 
 function extractWrittenReleaseNotes(oldReleaseNotes) {
diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml
index 2bacc55a4..2faacf724 100644
--- a/script/vsts/nightly-release.yml
+++ b/script/vsts/nightly-release.yml
@@ -1,65 +1,64 @@
 resources:
   containers:
-  - container: atom-linux-ci
-    image: atomeditor/atom-linux-ci:latest
+    - container: atom-linux-ci
+      image: atomeditor/atom-linux-ci:latest
 
 jobs:
+  - job: GetReleaseVersion
+    steps:
+      # This has to be done separately because VSTS inexplicably
+      # exits the script block after `npm install` completes.
+      - script: |
+          cd script\vsts
+          npm install
+        displayName: npm install
+      - script: node script\vsts\get-release-version.js --nightly
+        name: Version
 
-- job: GetReleaseVersion
-  steps:
-  # This has to be done separately because VSTS inexplicably
-  # exits the script block after `npm install` completes.
-  - script: |
-      cd script\vsts
-      npm install
-    displayName: npm install
-  - script: node script\vsts\get-release-version.js --nightly
-    name: Version
+  # Import OS-specific build definitions
+  - template: platforms/windows.yml
+  - template: platforms/macos.yml
+  - template: platforms/linux.yml
 
-# Import OS-specific build definitions
-- template: platforms/windows.yml
-- template: platforms/macos.yml
-- template: platforms/linux.yml
+  - job: Release
+    pool:
+      vmImage: vs2015-win2012r2 # needed for Python 2.7 and gyp
 
-- job: Release
-  pool:
-    vmImage: vs2015-win2012r2 # needed for Python 2.7 and gyp
+    dependsOn:
+      - GetReleaseVersion
+      - Windows
+      - Linux
+      - macOS_tests
 
-  dependsOn:
-  - GetReleaseVersion
-  - Windows
-  - Linux
-  - macOS_tests
+    variables:
+      ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
 
-  variables:
-    ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
+    steps:
+      - task: NodeTool@0
+        inputs:
+          versionSpec: 10.2.1
+        displayName: Install Node.js 10.2.1
 
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: 8.9.3
-    displayName: Install Node.js 8.9.3
+      # This has to be done separately because VSTS inexplicably
+      # exits the script block after `npm install` completes.
+      - script: |
+          cd script\vsts
+          npm install
+        displayName: npm install
 
-  # This has to be done separately because VSTS inexplicably
-  # exits the script block after `npm install` completes.
-  - script: |
-      cd script\vsts
-      npm install
-    displayName: npm install
+      - task: DownloadBuildArtifacts@0
+        inputs:
+          itemPattern: '**'
+          downloadType: 'specific'
+        displayName: Download Release Artifacts
 
-  - task: DownloadBuildArtifacts@0
-    inputs:
-      itemPattern: '**'
-      downloadType: 'specific'
-    displayName: Download Release Artifacts
-
-  - script: |
-      node $(Build.SourcesDirectory)\script\vsts\upload-artifacts.js --create-github-release --assets-path "$(System.ArtifactsDirectory)"
-    env:
-      GITHUB_TOKEN: $(GITHUB_TOKEN)
-      ATOM_RELEASE_VERSION: $(ReleaseVersion)
-      ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)
-      ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
-      ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
-      PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY)
-    displayName: Create Nightly Release
+      - script: |
+          node $(Build.SourcesDirectory)\script\vsts\upload-artifacts.js --create-github-release --assets-path "$(System.ArtifactsDirectory)" --linux-repo-name "atom"
+        env:
+          GITHUB_TOKEN: $(GITHUB_TOKEN)
+          ATOM_RELEASE_VERSION: $(ReleaseVersion)
+          ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)
+          ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
+          ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
+          PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY)
+        displayName: Create Nightly Release
diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml
index e820ef921..cd26d081b 100644
--- a/script/vsts/platforms/linux.yml
+++ b/script/vsts/platforms/linux.yml
@@ -1,91 +1,99 @@
 jobs:
-- job: Linux
-  dependsOn: GetReleaseVersion
-  timeoutInMinutes: 180
+  - job: Linux
+    dependsOn: GetReleaseVersion
+    timeoutInMinutes: 180
 
-  variables:
-    ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
-  pool:
-    # This image is used to host the Docker container that runs the build
-    vmImage: ubuntu-16.04
+    variables:
+      ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
+    pool:
+      # This image is used to host the Docker container that runs the build
+      vmImage: ubuntu-16.04
 
-  container: atom-linux-ci
+    container: atom-linux-ci
 
-  steps:
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    displayName: Restore node_modules cache
-    inputs:
-      keyfile: 'package.json, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
-      targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-      vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
+    steps:
+      - task: NodeTool@0
+        inputs:
+          versionSpec: 10.2.1
+        displayName: Install Node.js 10.2.1
 
-  - script: script/bootstrap
-    displayName: Bootstrap build environment
-    env:
-      CI: true
-      CI_PROVIDER: VSTS
-    condition: ne(variables['CacheRestored'], 'true')
+      - script: npm install --global npm@6.2.0
+        displayName: Update npm
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    displayName: Save node_modules cache
-    inputs:
-      keyfile: 'package.json, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
-      targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-      vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
+      - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+        displayName: Restore node_modules cache
+        inputs:
+          keyfile: 'package.json, script/vsts/platforms/linux.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
+          targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+          vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
 
-  - script: script/lint
-    displayName: Run linter
+      - script: script/bootstrap
+        displayName: Bootstrap build environment
+        env:
+          CI: true
+          CI_PROVIDER: VSTS
+        condition: ne(variables['CacheRestored'], 'true')
 
-  - script: script/build --no-bootstrap --create-debian-package --create-rpm-package --compress-artifacts
-    env:
-      GITHUB_TOKEN: $(GITHUB_TOKEN)
-      ATOM_RELEASE_VERSION: $(ReleaseVersion)
-    displayName: Build Atom
+      - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+        displayName: Save node_modules cache
+        inputs:
+          keyfile: 'package.json, script/vsts/platforms/linux.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
+          targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+          vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
 
-  - script: script/test
-    env:
-      CI: true
-      CI_PROVIDER: VSTS
-      ATOM_JASMINE_REPORTER: list
-      TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit
-    displayName: Run tests
-    condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))
+      - script: script/lint
+        displayName: Run linter
 
-  - script: script/postprocess-junit-results --search-folder "${TEST_JUNIT_XML_ROOT}" --test-results-files "**/*.xml"
-    env:
-      TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit
-    displayName: Post-process test results
-    condition: ne(variables['Atom.SkipTests'], 'true')
+      - script: script/build --no-bootstrap --create-debian-package --create-rpm-package --compress-artifacts
+        env:
+          GITHUB_TOKEN: $(GITHUB_TOKEN)
+          ATOM_RELEASE_VERSION: $(ReleaseVersion)
+        displayName: Build Atom
 
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFormat: JUnit
-      searchFolder: $(Common.TestResultsDirectory)/junit
-      testResultsFiles: "**/*.xml"
-      mergeTestResults: true
-      testRunTitle: Linux
-    condition: ne(variables['Atom.SkipTests'], 'true')
+      - script: script/test
+        env:
+          CI: true
+          CI_PROVIDER: VSTS
+          ATOM_JASMINE_REPORTER: list
+          TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit
+        displayName: Run tests
+        condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/atom.x86_64.rpm
-      ArtifactName: atom.x86_64.rpm
-      ArtifactType: Container
-    displayName: Upload atom.x84_64.rpm
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+      - script: script/postprocess-junit-results --search-folder "${TEST_JUNIT_XML_ROOT}" --test-results-files "**/*.xml"
+        env:
+          TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit
+        displayName: Post-process test results
+        condition: ne(variables['Atom.SkipTests'], 'true')
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/atom-amd64.deb
-      ArtifactName: atom-amd64.deb
-      ArtifactType: Container
-    displayName: Upload atom-amd64.deb
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+      - task: PublishTestResults@2
+        inputs:
+          testResultsFormat: JUnit
+          searchFolder: $(Common.TestResultsDirectory)/junit
+          testResultsFiles: '**/*.xml'
+          mergeTestResults: true
+          testRunTitle: Linux
+        condition: ne(variables['Atom.SkipTests'], 'true')
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/atom-amd64.tar.gz
-      ArtifactName: atom-amd64.tar.gz
-      ArtifactType: Container
-    displayName: Upload atom-amd64.tar.gz
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.SourcesDirectory)/out/atom.x86_64.rpm
+          ArtifactName: atom.x86_64.rpm
+          ArtifactType: Container
+        displayName: Upload atom.x84_64.rpm
+        condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.SourcesDirectory)/out/atom-amd64.deb
+          ArtifactName: atom-amd64.deb
+          ArtifactType: Container
+        displayName: Upload atom-amd64.deb
+        condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.SourcesDirectory)/out/atom-amd64.tar.gz
+          ArtifactName: atom-amd64.tar.gz
+          ArtifactType: Container
+        displayName: Upload atom-amd64.tar.gz
+        condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml
index 253b22203..a3f11c712 100644
--- a/script/vsts/platforms/macos.yml
+++ b/script/vsts/platforms/macos.yml
@@ -1,182 +1,192 @@
 jobs:
-- job: macOS_build
-  displayName: macOS build
-  dependsOn: GetReleaseVersion
-  timeoutInMinutes: 180
+  - job: macOS_build
+    displayName: macOS build
+    dependsOn: GetReleaseVersion
+    timeoutInMinutes: 180
 
-  variables:
-    ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
-    IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
-    IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
-  pool:
-    vmImage: macos-10.13
+    variables:
+      ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
+      IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
+      IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
+    pool:
+      vmImage: macos-10.13
 
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: 8.9.3
-    displayName: Install Node.js 8.9.3
+    steps:
+      - task: NodeTool@0
+        inputs:
+          versionSpec: 10.2.1
+        displayName: Install Node.js 10.2.1
 
-  - script: npm install --global npm@6.2.0
-    displayName: Update npm
+      - script: npm install --global npm@6.2.0
+        displayName: Update npm
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    displayName: Restore node_modules cache
-    inputs:
-      keyfile: 'package.json, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
-      targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-      vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
+      - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+        displayName: Restore node_modules cache
+        inputs:
+          keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
+          targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+          vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
 
-  - script: script/bootstrap
-    displayName: Bootstrap build environment
-    env:
-      CI: true
-      CI_PROVIDER: VSTS
-      NPM_BIN_PATH: /usr/local/bin/npm
-    condition: ne(variables['CacheRestored'], 'true')
+      - script: script/bootstrap
+        displayName: Bootstrap build environment
+        env:
+          CI: true
+          CI_PROVIDER: VSTS
+          NPM_BIN_PATH: /usr/local/bin/npm
+        condition: ne(variables['CacheRestored'], 'true')
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    displayName: Save node_modules cache
-    inputs:
-      keyfile: 'package.json, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
-      targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-      vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
+      - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+        displayName: Save node_modules cache
+        inputs:
+          keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
+          targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+          vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
 
-  - script: script/lint
-    displayName: Run linter
+      - script: script/lint
+        displayName: Run linter
 
-  - script: |
-      if [ $IS_RELEASE_BRANCH == "true" ] || [ $IS_SIGNED_ZIP_BRANCH == "true" ]; then
-        script/build --no-bootstrap --code-sign --compress-artifacts
-      else
-        script/build --no-bootstrap --compress-artifacts
-      fi
-    displayName: Build Atom
-    env:
-      GITHUB_TOKEN: $(GITHUB_TOKEN)
-      IS_RELEASE_BRANCH: $(IsReleaseBranch)
-      IS_SIGNED_ZIP_BRANCH: $(IsSignedZipBranch)
-      ATOM_RELEASE_VERSION: $(ReleaseVersion)
-      ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL)
-      ATOM_MAC_CODE_SIGNING_CERT_PASSWORD: $(ATOM_MAC_CODE_SIGNING_CERT_PASSWORD)
-      ATOM_MAC_CODE_SIGNING_KEYCHAIN: $(ATOM_MAC_CODE_SIGNING_KEYCHAIN)
-      ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD: $(ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD)
+      - script: |
+          if [ $IS_RELEASE_BRANCH == "true" ] || [ $IS_SIGNED_ZIP_BRANCH == "true" ]; then
+            script/build --no-bootstrap --code-sign --compress-artifacts
+          else
+            script/build --no-bootstrap --compress-artifacts
+          fi
+        displayName: Build Atom
+        env:
+          GITHUB_TOKEN: $(GITHUB_TOKEN)
+          IS_RELEASE_BRANCH: $(IsReleaseBranch)
+          IS_SIGNED_ZIP_BRANCH: $(IsSignedZipBranch)
+          ATOM_RELEASE_VERSION: $(ReleaseVersion)
+          ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL)
+          ATOM_MAC_CODE_SIGNING_CERT_PASSWORD: $(ATOM_MAC_CODE_SIGNING_CERT_PASSWORD)
+          ATOM_MAC_CODE_SIGNING_KEYCHAIN: $(ATOM_MAC_CODE_SIGNING_KEYCHAIN)
+          ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD: $(ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD)
 
-  - script: |
-      cp $(Build.SourcesDirectory)/out/*.zip $(Build.ArtifactStagingDirectory)
-    displayName: Stage Artifacts
+      - script: |
+          cp $(Build.SourcesDirectory)/out/*.zip $(Build.ArtifactStagingDirectory)
+        displayName: Stage Artifacts
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac.zip
-      ArtifactName: atom-mac.zip
-      ArtifactType: Container
-    displayName: Upload atom-mac.zip
-    condition: succeeded()
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac.zip
+          ArtifactName: atom-mac.zip
+          ArtifactType: Container
+        displayName: Upload atom-mac.zip
+        condition: succeeded()
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac-symbols.zip
-      ArtifactName: atom-mac-symbols.zip
-      ArtifactType: Container
-    displayName: Upload atom-mac-symbols.zip
-    condition: succeeded()
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac-symbols.zip
+          ArtifactName: atom-mac-symbols.zip
+          ArtifactType: Container
+        displayName: Upload atom-mac-symbols.zip
+        condition: succeeded()
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/docs/output/atom-api.json
-      ArtifactName: atom-api.json
-      ArtifactType: Container
-    displayName: Upload atom-api.json
-    condition: succeeded()
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.SourcesDirectory)/docs/output/atom-api.json
+          ArtifactName: atom-api.json
+          ArtifactType: Container
+        displayName: Upload atom-api.json
+        condition: succeeded()
 
-- job: macOS_tests
-  displayName: macOS test
-  dependsOn: macOS_build
-  timeoutInMinutes: 180
-  pool:
-    vmImage: macos-10.13
-  strategy:
-    maxParallel: 3
-    matrix:
-      core:
-        RunCoreTests: true
-        RunPackageTests: false
-      packages-1:
-        RunCoreTests: false
-        RunPackageTests: 1
-      packages-2:
-        RunCoreTests: false
-        RunPackageTests: 2
+  - job: macOS_tests
+    displayName: macOS test
+    dependsOn: macOS_build
+    timeoutInMinutes: 180
+    pool:
+      vmImage: macos-10.13
+    strategy:
+      maxParallel: 3
+      matrix:
+        core:
+          RunCoreTests: true
+          RunPackageTests: false
+        packages-1:
+          RunCoreTests: false
+          RunPackageTests: 1
+        packages-2:
+          RunCoreTests: false
+          RunPackageTests: 2
 
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: 8.9.3
-    displayName: Install Node.js 8.9.3
+    steps:
+      - task: NodeTool@0
+        inputs:
+          versionSpec: 10.2.1
+        displayName: Install Node.js 10.2.1
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    displayName: Restore node_modules cache
-    inputs:
-      keyfile: 'package.json, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
-      targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-      vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
+      - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+        displayName: Restore node_modules cache
+        inputs:
+          keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
+          targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+          vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
 
-  - task: DownloadBuildArtifacts@0
-    displayName: Download atom-mac.zip
-    inputs:
-      artifactName: 'atom-mac.zip'
-      downloadPath: $(Build.SourcesDirectory)
+      # The artifact caching task does not work on forks, so we need to
+      # bootstrap again for pull requests coming from forked repositories.
+      - script: script/bootstrap
+        displayName: Bootstrap build environment
+        env:
+          CI: true
+          CI_PROVIDER: VSTS
+          NPM_BIN_PATH: /usr/local/bin/npm
+        condition: ne(variables['CacheRestored'], 'true')
 
-  - script: unzip atom-mac.zip/atom-mac.zip -d out
-    displayName: Unzip atom-mac.zip
+      - task: DownloadBuildArtifacts@0
+        displayName: Download atom-mac.zip
+        inputs:
+          artifactName: 'atom-mac.zip'
+          downloadPath: $(Build.SourcesDirectory)
 
-  - task: DownloadBuildArtifacts@0
-    displayName: Download atom-mac-symbols.zip
-    inputs:
-      artifactName: 'atom-mac-symbols.zip'
-      downloadPath: $(Build.SourcesDirectory)
+      - script: unzip atom-mac.zip/atom-mac.zip -d out
+        displayName: Unzip atom-mac.zip
 
-  - script: unzip atom-mac-symbols.zip/atom-mac-symbols.zip -d out
-    displayName: Unzip atom-mac-symbols.zip
+      - task: DownloadBuildArtifacts@0
+        displayName: Download atom-mac-symbols.zip
+        inputs:
+          artifactName: 'atom-mac-symbols.zip'
+          downloadPath: $(Build.SourcesDirectory)
 
-  - script: |
-      osascript -e 'tell application "System Events" to keystroke "x"' # clear screen saver
-      caffeinate -s script/test # Run with caffeinate to prevent screen saver
-    env:
-      CI: true
-      CI_PROVIDER: VSTS
-      ATOM_JASMINE_REPORTER: list
-      TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit
-      ATOM_RUN_CORE_TESTS: $(RunCoreTests)
-      ATOM_RUN_PACKAGE_TESTS: $(RunPackageTests)
-    displayName: Run tests
-    condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))
+      - script: unzip atom-mac-symbols.zip/atom-mac-symbols.zip -d out
+        displayName: Unzip atom-mac-symbols.zip
 
-  - script: script/postprocess-junit-results --search-folder "${TEST_JUNIT_XML_ROOT}" --test-results-files "**/*.xml"
-    env:
-      TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit
-    displayName: Post-process test results
-    condition: ne(variables['Atom.SkipTests'], 'true')
+      - script: |
+          osascript -e 'tell application "System Events" to keystroke "x"' # clear screen saver
+          caffeinate -s script/test # Run with caffeinate to prevent screen saver
+        env:
+          CI: true
+          CI_PROVIDER: VSTS
+          ATOM_JASMINE_REPORTER: list
+          TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit
+          ATOM_RUN_CORE_TESTS: $(RunCoreTests)
+          ATOM_RUN_PACKAGE_TESTS: $(RunPackageTests)
+        displayName: Run tests
+        condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))
 
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFormat: JUnit
-      searchFolder: $(Common.TestResultsDirectory)/junit
-      testResultsFiles: "**/*.xml"
-      mergeTestResults: true
-      testRunTitle: MacOS
-    condition: ne(variables['Atom.SkipTests'], 'true')
+      - script: script/postprocess-junit-results --search-folder "${TEST_JUNIT_XML_ROOT}" --test-results-files "**/*.xml"
+        env:
+          TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit
+        displayName: Post-process test results
+        condition: ne(variables['Atom.SkipTests'], 'true')
 
-  - script: |
-      mkdir -p $(Build.ArtifactStagingDirectory)/crash-reports
-      cp ${HOME}/Library/Logs/DiagnosticReports/*.crash $(Build.ArtifactStagingDirectory)/crash-reports
-    displayName: Stage Crash Reports
-    condition: failed()
+      - task: PublishTestResults@2
+        inputs:
+          testResultsFormat: JUnit
+          searchFolder: $(Common.TestResultsDirectory)/junit
+          testResultsFiles: '**/*.xml'
+          mergeTestResults: true
+          testRunTitle: MacOS
+        condition: ne(variables['Atom.SkipTests'], 'true')
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports
-      ArtifactName: crash-reports.zip
-    displayName: Upload Crash Reports
-    condition: failed()
+      - script: |
+          mkdir -p $(Build.ArtifactStagingDirectory)/crash-reports
+          cp ${HOME}/Library/Logs/DiagnosticReports/*.crash $(Build.ArtifactStagingDirectory)/crash-reports
+        displayName: Stage Crash Reports
+        condition: failed()
+
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports
+          ArtifactName: crash-reports.zip
+        displayName: Upload Crash Reports
+        condition: failed()
diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml
index 444915c5d..6432cfa17 100644
--- a/script/vsts/platforms/windows.yml
+++ b/script/vsts/platforms/windows.yml
@@ -1,249 +1,249 @@
 jobs:
-- job: Windows
-  dependsOn: GetReleaseVersion
-  timeoutInMinutes: 180
-  strategy:
-    maxParallel: 2
-    matrix:
-      x64:
-        buildArch: x64
-      x86:
-        buildArch: x86
+  - job: Windows
+    dependsOn: GetReleaseVersion
+    timeoutInMinutes: 180
+    strategy:
+      maxParallel: 2
+      matrix:
+        x64:
+          buildArch: x64
+        x86:
+          buildArch: x86
 
-  pool:
-    vmImage: vs2015-win2012r2 # needed for python 2.7 and gyp
+    pool:
+      vmImage: vs2015-win2012r2 # needed for python 2.7 and gyp
 
-  variables:
-    ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
-    IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
-    IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
+    variables:
+      ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
+      IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
+      IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
 
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: 8.9.3
-    displayName: Install Node.js 8.9.3
+    steps:
+      - task: NodeTool@0
+        inputs:
+          versionSpec: 10.2.1
+        displayName: Install Node.js 10.2.1
 
-  - script: |
-      ECHO Installing npm-windows-upgrade
-      npm install --global --production npm-windows-upgrade
-    displayName: Install npm-windows-upgrade
+      - script: |
+          ECHO Installing npm-windows-upgrade
+          npm install --global --production npm-windows-upgrade
+        displayName: Install npm-windows-upgrade
 
-  - script: |
-      ECHO Upgrading npm
-      npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.2.0
-    displayName: Install npm 6.2.0
+      - script: |
+          ECHO Upgrading npm
+          npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.2.0
+        displayName: Install npm 6.2.0
 
-  - script: |
-      cd script\vsts
-      npm install
-    displayName: Install Windows build dependencies
+      - script: |
+          cd script\vsts
+          npm install
+        displayName: Install Windows build dependencies
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    displayName: Restore node_modules cache (x64)
-    inputs:
-      keyfile: 'package.json, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x64-cache-key'
-      targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-      vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
-    condition: eq(variables['buildArch'], 'x64')
+      - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+        displayName: Restore node_modules cache (x64)
+        inputs:
+          keyfile: 'package.json, script/vsts/platforms/windows.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x64-cache-key'
+          targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+          vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
+        condition: eq(variables['buildArch'], 'x64')
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    displayName: Restore node_modules cache (x86)
-    inputs:
-      keyfile: 'package.json, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x86-cache-key'
-      targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-      vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
-    condition: eq(variables['buildArch'], 'x86')
+      - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+        displayName: Restore node_modules cache (x86)
+        inputs:
+          keyfile: 'package.json, script/vsts/platforms/windows.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x86-cache-key'
+          targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+          vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
+        condition: eq(variables['buildArch'], 'x86')
 
-  - script: |
-      node script\vsts\windows-run.js script\bootstrap.cmd
-    env:
-      BUILD_ARCH: $(buildArch)
-      CI: true
-      CI_PROVIDER: VSTS
-      NPM_BIN_PATH: "D:\\a\\_tool\\node\\8.9.3\\x64\\npm.cmd"
-    displayName: Bootstrap build environment
-    condition: ne(variables['CacheRestored'], 'true')
+      - script: |
+          node script\vsts\windows-run.js script\bootstrap.cmd
+        env:
+          BUILD_ARCH: $(buildArch)
+          CI: true
+          CI_PROVIDER: VSTS
+          NPM_BIN_PATH: "D:\\a\\_tool\\node\\10.2.1\\x64\\npm.cmd"
+        displayName: Bootstrap build environment
+        condition: ne(variables['CacheRestored'], 'true')
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    displayName: Save node_modules cache (x64)
-    inputs:
-      keyfile: 'package.json, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x64-cache-key'
-      targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-      vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
-    condition: eq(variables['buildArch'], 'x64')
+      - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+        displayName: Save node_modules cache (x64)
+        inputs:
+          keyfile: 'package.json, script/vsts/platforms/windows.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x64-cache-key'
+          targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+          vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
+        condition: eq(variables['buildArch'], 'x64')
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    displayName: Save node_modules cache (x86)
-    inputs:
-      keyfile: 'package.json, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x86-cache-key'
-      targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-      vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
-    condition: eq(variables['buildArch'], 'x86')
+      - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+        displayName: Save node_modules cache (x86)
+        inputs:
+          keyfile: 'package.json, script/vsts/platforms/windows.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x86-cache-key'
+          targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+          vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
+        condition: eq(variables['buildArch'], 'x86')
 
-  - script: node script\vsts\windows-run.js script\lint.cmd
-    env:
-      BUILD_ARCH: $(buildArch)
-    displayName: Run linter
+      - script: node script\vsts\windows-run.js script\lint.cmd
+        env:
+          BUILD_ARCH: $(buildArch)
+        displayName: Run linter
 
-  - script: |
-      IF NOT EXIST C:\tmp MKDIR C:\tmp
-      SET SQUIRREL_TEMP=C:\tmp
-      IF [%IS_RELEASE_BRANCH%]==[true] (
-        ECHO Creating production artifacts for release branch %BUILD_SOURCEBRANCHNAME%
-        node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts --create-windows-installer
-      ) ELSE (
-        IF [%IS_SIGNED_ZIP_BRANCH%]==[true] (
-          ECHO Creating signed CI artifacts for branch %BUILD_SOURCEBRANCHNAME%
-          node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts
-        ) ELSE (
-          ECHO Pull request build, no code signing will be performed
-          node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts
-        )
-      )
-    env:
-      GITHUB_TOKEN: $(GITHUB_TOKEN)
-      BUILD_ARCH: $(buildArch)
-      ATOM_RELEASE_VERSION: $(ReleaseVersion)
-      ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL)
-      ATOM_WIN_CODE_SIGNING_CERT_PASSWORD: $(ATOM_WIN_CODE_SIGNING_CERT_PASSWORD)
-      IS_RELEASE_BRANCH: $(IsReleaseBranch)
-      IS_SIGNED_ZIP_BRANCH: $(IsSignedZipBranch)
-    displayName: Build Atom
+      - script: |
+          IF NOT EXIST C:\tmp MKDIR C:\tmp
+          SET SQUIRREL_TEMP=C:\tmp
+          IF [%IS_RELEASE_BRANCH%]==[true] (
+            ECHO Creating production artifacts for release branch %BUILD_SOURCEBRANCHNAME%
+            node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts --create-windows-installer
+          ) ELSE (
+            IF [%IS_SIGNED_ZIP_BRANCH%]==[true] (
+              ECHO Creating signed CI artifacts for branch %BUILD_SOURCEBRANCHNAME%
+              node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts
+            ) ELSE (
+              ECHO Pull request build, no code signing will be performed
+              node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts
+            )
+          )
+        env:
+          GITHUB_TOKEN: $(GITHUB_TOKEN)
+          BUILD_ARCH: $(buildArch)
+          ATOM_RELEASE_VERSION: $(ReleaseVersion)
+          ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL)
+          ATOM_WIN_CODE_SIGNING_CERT_PASSWORD: $(ATOM_WIN_CODE_SIGNING_CERT_PASSWORD)
+          IS_RELEASE_BRANCH: $(IsReleaseBranch)
+          IS_SIGNED_ZIP_BRANCH: $(IsSignedZipBranch)
+        displayName: Build Atom
 
-  - script: node script\vsts\windows-run.js script\test.cmd
-    env:
-      CI: true
-      CI_PROVIDER: VSTS
-      ATOM_JASMINE_REPORTER: list
-      TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit
-      BUILD_ARCH: $(buildArch)
-    displayName: Run tests
-    condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))
+      - script: node script\vsts\windows-run.js script\test.cmd
+        env:
+          CI: true
+          CI_PROVIDER: VSTS
+          ATOM_JASMINE_REPORTER: list
+          TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit
+          BUILD_ARCH: $(buildArch)
+        displayName: Run tests
+        condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))
 
-  - script: >
-      node script\vsts\windows-run.js script\postprocess-junit-results.cmd
-      --search-folder %TEST_JUNIT_XML_ROOT% --test-results-files "**/*.xml"
-    env:
-      TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit
-    displayName: Post-process test results
-    condition: ne(variables['Atom.SkipTests'], 'true')
+      - script: >
+          node script\vsts\windows-run.js script\postprocess-junit-results.cmd
+          --search-folder %TEST_JUNIT_XML_ROOT% --test-results-files "**/*.xml"
+        env:
+          TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit
+        displayName: Post-process test results
+        condition: ne(variables['Atom.SkipTests'], 'true')
 
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFormat: JUnit
-      searchFolder: $(Common.TestResultsDirectory)\junit
-      testResultsFiles: "**/*.xml"
-      mergeTestResults: true
-      testRunTitle: Windows $(buildArch)
-    condition: ne(variables['Atom.SkipTests'], 'true')
+      - task: PublishTestResults@2
+        inputs:
+          testResultsFormat: JUnit
+          searchFolder: $(Common.TestResultsDirectory)\junit
+          testResultsFiles: '**/*.xml'
+          mergeTestResults: true
+          testRunTitle: Windows $(buildArch)
+        condition: ne(variables['Atom.SkipTests'], 'true')
 
-  - script: |
-      IF NOT EXIST "%ARTIFACT_STAGING_DIR%\crash-reports" MKDIR "%ARTIFACT_STAGING_DIR%\crash-reports"
-      IF EXIST "%Temp%\Atom Crashes" (
-        FOR %%a in ("%Temp%\Atom Crashes\*.dmp") DO XCOPY "%%a" "%ARTIFACT_STAGING_DIR%\crash-reports" /I
-      )
-    displayName: Stage crash reports
-    condition: failed()
-    env:
-      ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory)
+      - script: |
+          IF NOT EXIST "%ARTIFACT_STAGING_DIR%\crash-reports" MKDIR "%ARTIFACT_STAGING_DIR%\crash-reports"
+          IF EXIST "%Temp%\Atom Crashes" (
+            FOR %%a in ("%Temp%\Atom Crashes\*.dmp") DO XCOPY "%%a" "%ARTIFACT_STAGING_DIR%\crash-reports" /I
+          )
+        displayName: Stage crash reports
+        condition: failed()
+        env:
+          ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory)
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports
-      ArtifactName: crash-reports
-    displayName: Publish crash reports on non-release branch
-    condition: and(failed(), eq(variables['ATOM_RELEASES_S3_KEY'], ''))
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports
+          ArtifactName: crash-reports
+        displayName: Publish crash reports on non-release branch
+        condition: and(failed(), eq(variables['ATOM_RELEASES_S3_KEY'], ''))
 
-  - script: >
-      node $(Build.SourcesDirectory)\script\vsts\upload-crash-reports.js --crash-report-path "%ARTIFACT_STAGING_DIR%\crash-reports" --s3-path "vsts-artifacts/%BUILD_ID%/"
-    env:
-      ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)
-      ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
-      ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
-      ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory)
-      BUILD_ID: $(Build.BuildId)
-    displayName: Upload crash reports to S3 on release branch
-    condition: and(failed(), ne(variables['ATOM_RELEASES_S3_KEY'], ''))
+      - script: >
+          node $(Build.SourcesDirectory)\script\vsts\upload-crash-reports.js --crash-report-path "%ARTIFACT_STAGING_DIR%\crash-reports" --s3-path "vsts-artifacts/%BUILD_ID%/"
+        env:
+          ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)
+          ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
+          ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
+          ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory)
+          BUILD_ID: $(Build.BuildId)
+        displayName: Upload crash reports to S3 on release branch
+        condition: and(failed(), ne(variables['ATOM_RELEASES_S3_KEY'], ''))
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/atom-x64-windows.zip
-      ArtifactName: atom-x64-windows.zip
-      ArtifactType: Container
-    displayName: Upload atom-x64-windows.zip
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['buildArch'], 'x64'))
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.SourcesDirectory)/out/atom-x64-windows.zip
+          ArtifactName: atom-x64-windows.zip
+          ArtifactType: Container
+        displayName: Upload atom-x64-windows.zip
+        condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['buildArch'], 'x64'))
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/AtomSetup-x64.exe
-      ArtifactName: AtomSetup-x64.exe
-      ArtifactType: Container
-    displayName: Upload AtomSetup-x64.exe
-    condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64'))
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.SourcesDirectory)/out/AtomSetup-x64.exe
+          ArtifactName: AtomSetup-x64.exe
+          ArtifactType: Container
+        displayName: Upload AtomSetup-x64.exe
+        condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64'))
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/atom-x64-$(ReleaseVersion)-full.nupkg
-      ArtifactName: atom-x64-$(ReleaseVersion)-full.nupkg
-      ArtifactType: Container
-    displayName: Upload atom-x64-$(ReleaseVersion)-full.nupkg
-    condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64'))
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.SourcesDirectory)/out/atom-x64-$(ReleaseVersion)-full.nupkg
+          ArtifactName: atom-x64-$(ReleaseVersion)-full.nupkg
+          ArtifactType: Container
+        displayName: Upload atom-x64-$(ReleaseVersion)-full.nupkg
+        condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64'))
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/atom-x64-$(ReleaseVersion)-delta.nupkg
-      ArtifactName: atom-x64-$(ReleaseVersion)-delta.nupkg
-      ArtifactType: Container
-    displayName: Upload atom-x64-$(ReleaseVersion)-delta.nupkg
-    condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64'))
-    continueOnError: true  # Nightly builds don't produce delta packages yet, so don't fail the build
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.SourcesDirectory)/out/atom-x64-$(ReleaseVersion)-delta.nupkg
+          ArtifactName: atom-x64-$(ReleaseVersion)-delta.nupkg
+          ArtifactType: Container
+        displayName: Upload atom-x64-$(ReleaseVersion)-delta.nupkg
+        condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64'))
+        continueOnError: true # Nightly builds don't produce delta packages yet, so don't fail the build
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/RELEASES-x64
-      ArtifactName: RELEASES-x64
-      ArtifactType: Container
-    displayName: Upload RELEASES-x64
-    condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64'))
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.SourcesDirectory)/out/RELEASES-x64
+          ArtifactName: RELEASES-x64
+          ArtifactType: Container
+        displayName: Upload RELEASES-x64
+        condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64'))
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/atom-windows.zip
-      ArtifactName: atom-windows.zip
-      ArtifactType: Container
-    displayName: Upload atom-windows.zip
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['buildArch'], 'x86'))
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.SourcesDirectory)/out/atom-windows.zip
+          ArtifactName: atom-windows.zip
+          ArtifactType: Container
+        displayName: Upload atom-windows.zip
+        condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['buildArch'], 'x86'))
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/AtomSetup.exe
-      ArtifactName: AtomSetup.exe
-      ArtifactType: Container
-    displayName: Upload AtomSetup.exe
-    condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86'))
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.SourcesDirectory)/out/AtomSetup.exe
+          ArtifactName: AtomSetup.exe
+          ArtifactType: Container
+        displayName: Upload AtomSetup.exe
+        condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86'))
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/atom-$(ReleaseVersion)-full.nupkg
-      ArtifactName: atom-$(ReleaseVersion)-full.nupkg
-      ArtifactType: Container
-    displayName: Upload atom-$(ReleaseVersion)-full.nupkg
-    condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86'))
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.SourcesDirectory)/out/atom-$(ReleaseVersion)-full.nupkg
+          ArtifactName: atom-$(ReleaseVersion)-full.nupkg
+          ArtifactType: Container
+        displayName: Upload atom-$(ReleaseVersion)-full.nupkg
+        condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86'))
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/atom-$(ReleaseVersion)-delta.nupkg
-      ArtifactName: atom-$(ReleaseVersion)-delta.nupkg
-      ArtifactType: Container
-    displayName: Upload atom-$(ReleaseVersion)-delta.nupkg
-    condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86'))
-    continueOnError: true  # Nightly builds don't produce delta packages yet, so don't fail the build
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.SourcesDirectory)/out/atom-$(ReleaseVersion)-delta.nupkg
+          ArtifactName: atom-$(ReleaseVersion)-delta.nupkg
+          ArtifactType: Container
+        displayName: Upload atom-$(ReleaseVersion)-delta.nupkg
+        condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86'))
+        continueOnError: true # Nightly builds don't produce delta packages yet, so don't fail the build
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/RELEASES
-      ArtifactName: RELEASES
-      ArtifactType: Container
-    displayName: Upload RELEASES
-    condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86'))
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.SourcesDirectory)/out/RELEASES
+          ArtifactName: RELEASES
+          ArtifactType: Container
+        displayName: Upload RELEASES
+        condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86'))
diff --git a/script/vsts/pull-requests.yml b/script/vsts/pull-requests.yml
index 5c59cec39..c09c2d816 100644
--- a/script/vsts/pull-requests.yml
+++ b/script/vsts/pull-requests.yml
@@ -1,24 +1,23 @@
-trigger: none  # No CI builds, only PR builds
+trigger: none # No CI builds, only PR builds
 
 resources:
   containers:
-  - container: atom-linux-ci
-    image: atomeditor/atom-linux-ci:latest
+    - container: atom-linux-ci
+      image: atomeditor/atom-linux-ci:latest
 
 jobs:
+  - job: GetReleaseVersion
+    steps:
+      # This has to be done separately because VSTS inexplicably
+      # exits the script block after `npm install` completes.
+      - script: |
+          cd script\vsts
+          npm install
+        displayName: npm install
+      - script: node script\vsts\get-release-version.js
+        name: Version
 
-- job: GetReleaseVersion
-  steps:
-  # This has to be done separately because VSTS inexplicably
-  # exits the script block after `npm install` completes.
-  - script: |
-      cd script\vsts
-      npm install
-    displayName: npm install
-  - script: node script\vsts\get-release-version.js
-    name: Version
-
-# Import OS-specific build definitions
-- template: platforms/windows.yml
-- template: platforms/macos.yml
-- template: platforms/linux.yml
+  # Import OS-specific build definitions
+  - template: platforms/windows.yml
+  - template: platforms/macos.yml
+  - template: platforms/linux.yml
diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml
index 8333c3d7a..52c0dfd25 100644
--- a/script/vsts/release-branch-build.yml
+++ b/script/vsts/release-branch-build.yml
@@ -1,85 +1,84 @@
 trigger:
-- master
-- 1.* # VSTS only supports wildcards at the end
-- electron-*
+  - master
+  - 1.* # VSTS only supports wildcards at the end
+  - electron-*
 
 resources:
   containers:
-  - container: atom-linux-ci
-    image: atomeditor/atom-linux-ci:latest
+    - container: atom-linux-ci
+      image: atomeditor/atom-linux-ci:latest
 
 jobs:
+  - job: GetReleaseVersion
+    steps:
+      # This has to be done separately because VSTS inexplicably
+      # exits the script block after `npm install` completes.
+      - script: |
+          cd script\vsts
+          npm install
+        displayName: npm install
+      - script: node script\vsts\get-release-version.js
+        name: Version
 
-- job: GetReleaseVersion
-  steps:
-  # This has to be done separately because VSTS inexplicably
-  # exits the script block after `npm install` completes.
-  - script: |
-      cd script\vsts
-      npm install
-    displayName: npm install
-  - script: node script\vsts\get-release-version.js
-    name: Version
+  # Import OS-specific build definitions.
+  - template: platforms/windows.yml
+  - template: platforms/macos.yml
+  - template: platforms/linux.yml
 
-# Import OS-specific build definitions.
-- template: platforms/windows.yml
-- template: platforms/macos.yml
-- template: platforms/linux.yml
+  - job: UploadArtifacts
+    pool:
+      vmImage: vs2015-win2012r2 # needed for python 2.7 and gyp
 
-- job: UploadArtifacts
-  pool:
-    vmImage: vs2015-win2012r2 # needed for python 2.7 and gyp
+    dependsOn:
+      - GetReleaseVersion
+      - Windows
+      - Linux
+      - macOS_tests
 
-  dependsOn:
-  - GetReleaseVersion
-  - Windows
-  - Linux
-  - macOS_tests
+    variables:
+      ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
+      IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
+      IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
 
-  variables:
-    ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
-    IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
-    IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
+    steps:
+      - task: NodeTool@0
+        inputs:
+          versionSpec: 10.2.1
+        displayName: Install Node.js 10.2.1
 
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: 8.9.3
-    displayName: Install Node.js 8.9.3
+      # This has to be done separately because VSTS inexplicably
+      # exits the script block after `npm install` completes.
+      - script: |
+          cd script\vsts
+          npm install
+        env:
+          GITHUB_TOKEN: $(GITHUB_TOKEN)
+        displayName: npm install
 
-  # This has to be done separately because VSTS inexplicably
-  # exits the script block after `npm install` completes.
-  - script: |
-      cd script\vsts
-      npm install
-    env:
-      GITHUB_TOKEN: $(GITHUB_TOKEN)
-    displayName: npm install
+      - task: DownloadBuildArtifacts@0
+        inputs:
+          itemPattern: '**'
+          downloadType: 'specific'
+        displayName: Download Release Artifacts
 
-  - task: DownloadBuildArtifacts@0
-    inputs:
-      itemPattern: '**'
-      downloadType: 'specific'
-    displayName: Download Release Artifacts
+      - script: |
+          node $(Build.SourcesDirectory)\script\vsts\upload-artifacts.js --create-github-release --assets-path "$(System.ArtifactsDirectory)" --linux-repo-name "atom-staging"
+        env:
+          GITHUB_TOKEN: $(GITHUB_TOKEN)
+          ATOM_RELEASE_VERSION: $(ReleaseVersion)
+          ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)
+          ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
+          ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
+          PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY)
+        displayName: Create Draft Release
+        condition: and(succeeded(), eq(variables['Atom.AutoDraftRelease'], 'true'), eq(variables['IsReleaseBranch'], 'true'))
 
-  - script: |
-      node $(Build.SourcesDirectory)\script\vsts\upload-artifacts.js --create-github-release --assets-path "$(System.ArtifactsDirectory)" --linux-repo-name "atom-staging"
-    env:
-      GITHUB_TOKEN: $(GITHUB_TOKEN)
-      ATOM_RELEASE_VERSION: $(ReleaseVersion)
-      ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)
-      ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
-      ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
-      PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY)
-    displayName: Create Draft Release
-    condition: and(succeeded(), eq(variables['Atom.AutoDraftRelease'], 'true'), eq(variables['IsReleaseBranch'], 'true'))
-
-  - script: |
-      node $(Build.SourcesDirectory)\script\vsts\upload-artifacts.js --assets-path "$(System.ArtifactsDirectory)" --s3-path "vsts-artifacts/$(Build.BuildId)/"
-    env:
-      ATOM_RELEASE_VERSION: $(ReleaseVersion)
-      ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)
-      ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
-      ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
-    displayName: Upload CI Artifacts to S3
-    condition: and(succeeded(), eq(variables['IsSignedZipBranch'], 'true'))
+      - script: |
+          node $(Build.SourcesDirectory)\script\vsts\upload-artifacts.js --assets-path "$(System.ArtifactsDirectory)" --s3-path "vsts-artifacts/$(Build.BuildId)/"
+        env:
+          ATOM_RELEASE_VERSION: $(ReleaseVersion)
+          ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)
+          ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
+          ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
+        displayName: Upload CI Artifacts to S3
+        condition: and(succeeded(), eq(variables['IsSignedZipBranch'], 'true'))
diff --git a/script/vsts/windows-run.js b/script/vsts/windows-run.js
index 2ac8760a3..d8538c287 100644
--- a/script/vsts/windows-run.js
+++ b/script/vsts/windows-run.js
@@ -5,7 +5,7 @@ const path = require('path');
 const download = require('download');
 const childProcess = require('child_process');
 
-const nodeVersion = '8.9.3';
+const nodeVersion = '10.2.1';
 const nodeFileName = `node-v${nodeVersion}-win-x86`;
 const extractedNodePath = `c:\\tmp\\${nodeFileName}`;
 
diff --git a/spec/main-process/atom-application.test.js b/spec/main-process/atom-application.test.js
index be5dbd1c1..bf04be3e0 100644
--- a/spec/main-process/atom-application.test.js
+++ b/spec/main-process/atom-application.test.js
@@ -47,6 +47,10 @@ const {
 describe('AtomApplication', function() {
   let scenario, sinon;
 
+  if (process.env.CI) {
+    this.timeout(10 * 1000);
+  }
+
   beforeEach(async function() {
     sinon = sandbox.create();
     scenario = await LaunchScenario.create(sinon);
diff --git a/spec/path-watcher-spec.js b/spec/path-watcher-spec.js
index 5f97338b1..a2a9a4e6d 100644
--- a/spec/path-watcher-spec.js
+++ b/spec/path-watcher-spec.js
@@ -7,7 +7,6 @@ import { promisify } from 'util';
 
 import { CompositeDisposable } from 'event-kit';
 import { watchPath, stopAllWatchers } from '../src/path-watcher';
-import { timeoutPromise } from './async-spec-helpers';
 
 temp.track();
 
@@ -22,7 +21,6 @@ describe('watchPath', function() {
   let subs;
 
   beforeEach(function() {
-    jasmine.useRealClock();
     subs = new CompositeDisposable();
   });
 
@@ -111,12 +109,6 @@ describe('watchPath', function() {
         waitForChanges(rootWatcher, subFile),
         waitForChanges(childWatcher, subFile)
       ]);
-
-      // In Windows64, in some situations nsfw (the currently default watcher)
-      // does not trigger the change events if they happen just after start watching,
-      // so we need to wait some time. More info: https://github.com/atom/atom/issues/19442
-      await timeoutPromise(300);
-
       await writeFile(subFile, 'subfile\n', { encoding: 'utf8' });
       await firstChanges;
 
@@ -164,11 +156,6 @@ describe('watchPath', function() {
       expect(subWatcher0.native).toBe(parentWatcher.native);
       expect(subWatcher1.native).toBe(parentWatcher.native);
 
-      // In Windows64, in some situations nsfw (the currently default watcher)
-      // does not trigger the change events if they happen just after start watching,
-      // so we need to wait some time. More info: https://github.com/atom/atom/issues/19442
-      await timeoutPromise(300);
-
       // Ensure events are filtered correctly
       await Promise.all([
         appendFile(rootFile, 'change\n', { encoding: 'utf8' }),
diff --git a/spec/project-spec.js b/spec/project-spec.js
index 48d85f026..a812418c7 100644
--- a/spec/project-spec.js
+++ b/spec/project-spec.js
@@ -1042,11 +1042,12 @@ describe('Project', () => {
   });
 
   describe('.onDidChangeFiles()', () => {
-    let sub = [];
-    const events = [];
+    let sub;
+    let events;
     let checkCallback = () => {};
 
     beforeEach(() => {
+      events = [];
       sub = atom.project.onDidChangeFiles(incoming => {
         events.push(...incoming);
         checkCallback();
@@ -1058,11 +1059,13 @@ describe('Project', () => {
     const waitForEvents = paths => {
       const remaining = new Set(paths.map(p => fs.realpathSync(p)));
       return new Promise((resolve, reject) => {
+        let expireTimeoutId;
         checkCallback = () => {
           for (let event of events) {
             remaining.delete(event.path);
           }
           if (remaining.size === 0) {
+            clearTimeout(expireTimeoutId);
             resolve();
           }
         };
@@ -1075,12 +1078,13 @@ describe('Project', () => {
           );
         };
 
+        expireTimeoutId = setTimeout(expire, 2000);
         checkCallback();
-        setTimeout(expire, 2000);
       });
     };
 
-    it('reports filesystem changes within project paths', () => {
+    it('reports filesystem changes within project paths', async () => {
+      jasmine.useRealClock();
       const dirOne = temp.mkdirSync('atom-spec-project-one');
       const fileOne = path.join(dirOne, 'file-one.txt');
       const fileTwo = path.join(dirOne, 'file-two.txt');
@@ -1088,24 +1092,17 @@ describe('Project', () => {
       const fileThree = path.join(dirTwo, 'file-three.txt');
 
       // Ensure that all preexisting watchers are stopped
-      waitsForPromise(() => stopAllWatchers());
+      await stopAllWatchers();
 
-      runs(() => atom.project.setPaths([dirOne]));
-      waitsForPromise(() => atom.project.getWatcherPromise(dirOne));
+      atom.project.setPaths([dirOne]);
+      await atom.project.getWatcherPromise(dirOne);
 
-      runs(() => {
-        expect(atom.project.watcherPromisesByPath[dirTwo]).toEqual(undefined);
-
-        fs.writeFileSync(fileThree, 'three\n');
-        fs.writeFileSync(fileTwo, 'two\n');
-        fs.writeFileSync(fileOne, 'one\n');
-      });
-
-      waitsForPromise(() => waitForEvents([fileOne, fileTwo]));
-
-      runs(() =>
-        expect(events.some(event => event.path === fileThree)).toBeFalsy()
-      );
+      expect(atom.project.watcherPromisesByPath[dirTwo]).toEqual(undefined);
+      fs.writeFileSync(fileThree, 'three\n');
+      fs.writeFileSync(fileTwo, 'two\n');
+      fs.writeFileSync(fileOne, 'one\n');
+      await waitForEvents([fileOne, fileTwo]);
+      expect(events.some(event => event.path === fileThree)).toBeFalsy();
     });
   });
 
diff --git a/spec/tree-sitter-language-mode-spec.js b/spec/tree-sitter-language-mode-spec.js
index 06e7fd6de..b3ae42b1c 100644
--- a/spec/tree-sitter-language-mode-spec.js
+++ b/spec/tree-sitter-language-mode-spec.js
@@ -27,6 +27,9 @@ const ejsGrammarPath = require.resolve(
 const rubyGrammarPath = require.resolve(
   'language-ruby/grammars/tree-sitter-ruby.cson'
 );
+const rustGrammarPath = require.resolve(
+  'language-rust-bundled/grammars/tree-sitter-rust.cson'
+);
 
 describe('TreeSitterLanguageMode', () => {
   let editor, buffer;
@@ -831,6 +834,81 @@ describe('TreeSitterLanguageMode', () => {
         ]);
       });
 
+      it('respects the `includeChildren` property of injection points', async () => {
+        const rustGrammar = new TreeSitterGrammar(
+          atom.grammars,
+          rustGrammarPath,
+          {
+            scopeName: 'rust',
+            parser: 'tree-sitter-rust',
+            scopes: {
+              identifier: 'variable',
+              field_identifier: 'property',
+              'call_expression > field_expression > field_identifier':
+                'function',
+              'macro_invocation > identifier': 'macro'
+            },
+            injectionRegExp: 'rust',
+            injectionPoints: [
+              {
+                type: 'macro_invocation',
+                language() {
+                  return 'rust';
+                },
+                content(node) {
+                  return node.lastChild;
+                },
+
+                // The tokens within a `token_tree` are all parsed as separate
+                // children of the `token_tree`. By default, when adding a language
+                // injection for a node, the node's children's ranges would be
+                // excluded from the injection. But for this injection point
+                // (parsing token trees as rust code), we want to reparse all of the
+                // content of the token tree.
+                includeChildren: true
+              }
+            ]
+          }
+        );
+
+        atom.grammars.addGrammar(rustGrammar);
+
+        // Macro call within another macro call.
+        buffer.setText('assert_eq!(a.b.c(), vec![d.e()]); f.g();');
+
+        const languageMode = new TreeSitterLanguageMode({
+          buffer,
+          grammar: rustGrammar,
+          grammars: atom.grammars
+        });
+        buffer.setLanguageMode(languageMode);
+
+        // There should not be duplicate scopes due to the root layer
+        // and for the injected rust layer.
+        expectTokensToEqual(editor, [
+          [
+            { text: 'assert_eq', scopes: ['macro'] },
+            { text: '!(', scopes: [] },
+            { text: 'a', scopes: ['variable'] },
+            { text: '.', scopes: [] },
+            { text: 'b', scopes: ['property'] },
+            { text: '.', scopes: [] },
+            { text: 'c', scopes: ['function'] },
+            { text: '(), ', scopes: [] },
+            { text: 'vec', scopes: ['macro'] },
+            { text: '![', scopes: [] },
+            { text: 'd', scopes: ['variable'] },
+            { text: '.', scopes: [] },
+            { text: 'e', scopes: ['function'] },
+            { text: '()]); ', scopes: [] },
+            { text: 'f', scopes: ['variable'] },
+            { text: '.', scopes: [] },
+            { text: 'g', scopes: ['function'] },
+            { text: '();', scopes: [] }
+          ]
+        ]);
+      });
+
       it('notifies onDidTokenize listeners the first time all syntax highlighting is done', async () => {
         const promise = new Promise(resolve => {
           editor.onDidTokenize(event => {
@@ -1477,7 +1555,7 @@ describe('TreeSitterLanguageMode', () => {
           scopes: {},
           folds: [
             {
-              type: ['element', 'raw_element'],
+              type: ['element', 'script_element'],
               start: { index: 0 },
               end: { index: -1 }
             }
@@ -1618,7 +1696,7 @@ describe('TreeSitterLanguageMode', () => {
           parser: 'tree-sitter-html',
           scopes: {
             fragment: 'text.html',
-            raw_element: 'script.tag'
+            script_element: 'script.tag'
           },
           injectionRegExp: 'html',
           injectionPoints: [SCRIPT_TAG_INJECTION_POINT]
@@ -1781,7 +1859,7 @@ describe('TreeSitterLanguageMode', () => {
         'text.html',
         'fragment',
         'element',
-        'raw_element',
+        'script_element',
         'raw_text',
         'program',
         'expression_statement',
@@ -1811,7 +1889,7 @@ describe('TreeSitterLanguageMode', () => {
           [0, 5],
           [0, 8]
         ]);
-        expect(editor.bufferRangeForScopeAtPosition(null, [0, 9])).toEqual([
+        expect(editor.bufferRangeForScopeAtPosition(null, [0, 8])).toEqual([
           [0, 8],
           [0, 9]
         ]);
@@ -2210,6 +2288,47 @@ describe('TreeSitterLanguageMode', () => {
       expect(editor.getSelectedText()).toBe('html ` <b>c${def()}e${f}g</b> `');
     });
   });
+
+  describe('.tokenizedLineForRow(row)', () => {
+    it('returns a shimmed TokenizedLine with tokens', () => {
+      const grammar = new TreeSitterGrammar(atom.grammars, jsGrammarPath, {
+        parser: 'tree-sitter-javascript',
+        scopes: {
+          program: 'source',
+          'call_expression > identifier': 'function',
+          property_identifier: 'property',
+          'call_expression > member_expression > property_identifier': 'method',
+          identifier: 'variable'
+        }
+      });
+
+      buffer.setText('aa.bbb = cc(d.eee());\n\n    \n  b');
+
+      const languageMode = new TreeSitterLanguageMode({ buffer, grammar });
+      buffer.setLanguageMode(languageMode);
+
+      expect(languageMode.tokenizedLineForRow(0).tokens).toEqual([
+        { value: 'aa', scopes: ['source', 'variable'] },
+        { value: '.', scopes: ['source'] },
+        { value: 'bbb', scopes: ['source', 'property'] },
+        { value: ' = ', scopes: ['source'] },
+        { value: 'cc', scopes: ['source', 'function'] },
+        { value: '(', scopes: ['source'] },
+        { value: 'd', scopes: ['source', 'variable'] },
+        { value: '.', scopes: ['source'] },
+        { value: 'eee', scopes: ['source', 'method'] },
+        { value: '());', scopes: ['source'] }
+      ]);
+      expect(languageMode.tokenizedLineForRow(1).tokens).toEqual([]);
+      expect(languageMode.tokenizedLineForRow(2).tokens).toEqual([
+        { value: '    ', scopes: ['source'] }
+      ]);
+      expect(languageMode.tokenizedLineForRow(3).tokens).toEqual([
+        { value: '  ', scopes: ['source'] },
+        { value: 'b', scopes: ['source', 'variable'] }
+      ]);
+    });
+  });
 });
 
 function nextHighlightingUpdate(languageMode) {
@@ -2290,7 +2409,7 @@ const HTML_TEMPLATE_LITERAL_INJECTION_POINT = {
 };
 
 const SCRIPT_TAG_INJECTION_POINT = {
-  type: 'raw_element',
+  type: 'script_element',
   language() {
     return 'javascript';
   },
diff --git a/src/atom-environment.js b/src/atom-environment.js
index b4a7e8e43..36830ff76 100644
--- a/src/atom-environment.js
+++ b/src/atom-environment.js
@@ -313,6 +313,8 @@ class AtomEnvironment {
     this.attachSaveStateListeners();
     this.windowEventHandler.initialize(this.window, this.document);
 
+    this.workspace.initialize();
+
     const didChangeStyles = this.didChangeStyles.bind(this);
     this.disposables.add(this.styles.onDidAddStyleElement(didChangeStyles));
     this.disposables.add(this.styles.onDidUpdateStyleElement(didChangeStyles));
@@ -429,7 +431,7 @@ class AtomEnvironment {
     this.workspace.reset(this.packages);
     this.registerDefaultOpeners();
     this.project.reset(this.packages);
-    this.workspace.subscribeToEvents();
+    this.workspace.initialize();
     this.grammars.clear();
     this.textEditors.clear();
     this.views.clear();
diff --git a/src/initialize-application-window.js b/src/initialize-application-window.js
index d8388ab9f..f32d7633d 100644
--- a/src/initialize-application-window.js
+++ b/src/initialize-application-window.js
@@ -41,6 +41,7 @@ if (global.isGeneratingSnapshot) {
   require('language-html');
   require('language-javascript');
   require('language-ruby');
+  require('language-rust-bundled');
   require('language-typescript');
   require('line-ending-selector');
   require('link');
diff --git a/src/native-compile-cache.js b/src/native-compile-cache.js
index 5b097954c..422fbccd9 100644
--- a/src/native-compile-cache.js
+++ b/src/native-compile-cache.js
@@ -43,7 +43,7 @@ class NativeCompileCache {
     const script = new vm.Script(code, { filename, produceCachedData: true });
     return {
       result: script.runInThisContext(),
-      cacheBuffer: script.cachedData
+      cacheBuffer: script.cachedDataProduced ? script.cachedData : null
     };
   }
 
@@ -102,7 +102,7 @@ class NativeCompileCache {
           console.error(`Error running script ${filename}`);
           throw err;
         }
-        if (compilationResult.cacheBuffer !== null) {
+        if (compilationResult.cacheBuffer) {
           self.cacheStore.set(cacheKey, compilationResult.cacheBuffer);
         }
         compiledWrapper = compilationResult.result;
diff --git a/src/tokenized-line.coffee b/src/tokenized-line.coffee
index 986ec0442..abace0fcd 100644
--- a/src/tokenized-line.coffee
+++ b/src/tokenized-line.coffee
@@ -10,21 +10,25 @@ class TokenizedLine
 
     return unless properties?
 
-    {@openScopes, @text, @tags, @ruleStack, @tokenIterator, @grammar} = properties
+    {@openScopes, @text, @tags, @ruleStack, @tokenIterator, @grammar, tokens} = properties
+    @cachedTokens = tokens
 
   getTokenIterator: -> @tokenIterator.reset(this)
 
   Object.defineProperty @prototype, 'tokens', get: ->
-    iterator = @getTokenIterator()
-    tokens = []
+    if @cachedTokens
+      @cachedTokens
+    else
+      iterator = @getTokenIterator()
+      tokens = []
 
-    while iterator.next()
-      tokens.push(new Token({
-        value: iterator.getText()
-        scopes: iterator.getScopes().slice()
-      }))
+      while iterator.next()
+        tokens.push(new Token({
+          value: iterator.getText()
+          scopes: iterator.getScopes().slice()
+        }))
 
-    tokens
+      tokens
 
   tokenAtBufferColumn: (bufferColumn) ->
     @tokens[@tokenIndexAtBufferColumn(bufferColumn)]
diff --git a/src/tree-sitter-language-mode.js b/src/tree-sitter-language-mode.js
index 4391b02b2..6d8c93368 100644
--- a/src/tree-sitter-language-mode.js
+++ b/src/tree-sitter-language-mode.js
@@ -32,7 +32,7 @@ class TreeSitterLanguageMode {
     this.config = config;
     this.grammarRegistry = grammars;
     this.parser = new Parser();
-    this.rootLanguageLayer = new LanguageLayer(this, grammar);
+    this.rootLanguageLayer = new LanguageLayer(this, grammar, 0);
     this.injectionsMarkerLayer = buffer.addMarkerLayer();
 
     if (syncTimeoutMicros != null) {
@@ -488,9 +488,45 @@ class TreeSitterLanguageMode {
   */
 
   tokenizedLineForRow(row) {
+    const lineText = this.buffer.lineForRow(row);
+    const tokens = [];
+
+    const iterator = this.buildHighlightIterator();
+    let start = { row, column: 0 };
+    const scopes = iterator.seek(start, row);
+    while (true) {
+      const end = iterator.getPosition();
+      if (end.row > row) {
+        end.row = row;
+        end.column = lineText.length;
+      }
+
+      if (end.column > start.column) {
+        tokens.push(
+          new Token({
+            value: lineText.substring(start.column, end.column),
+            scopes: scopes.map(s => this.grammar.scopeNameForScopeId(s))
+          })
+        );
+      }
+
+      if (end.column < lineText.length) {
+        const closeScopeCount = iterator.getCloseScopeIds().length;
+        for (let i = 0; i < closeScopeCount; i++) {
+          scopes.pop();
+        }
+        scopes.push(...iterator.getOpenScopeIds());
+        start = end;
+        iterator.moveToSuccessor();
+      } else {
+        break;
+      }
+    }
+
     return new TokenizedLine({
       openScopes: [],
-      text: this.buffer.lineForRow(row),
+      text: lineText,
+      tokens,
       tags: [],
       ruleStack: [],
       lineEnding: this.buffer.lineEndingForRow(row),
@@ -601,13 +637,13 @@ class TreeSitterLanguageMode {
 }
 
 class LanguageLayer {
-  constructor(languageMode, grammar, contentChildTypes) {
+  constructor(languageMode, grammar, depth) {
     this.languageMode = languageMode;
     this.grammar = grammar;
     this.tree = null;
     this.currentParsePromise = null;
     this.patchSinceCurrentParseStarted = null;
-    this.contentChildTypes = contentChildTypes;
+    this.depth = depth;
   }
 
   buildHighlightIterator() {
@@ -849,7 +885,7 @@ class LanguageLayer {
           marker.languageLayer = new LanguageLayer(
             this.languageMode,
             grammar,
-            injectionPoint.contentChildTypes
+            this.depth + 1
           );
           marker.parentLanguageLayer = this;
         }
@@ -859,7 +895,8 @@ class LanguageLayer {
           new NodeRangeSet(
             nodeRangeSet,
             injectionNodes,
-            injectionPoint.newlinesBetween
+            injectionPoint.newlinesBetween,
+            injectionPoint.includeChildren
           )
         );
       }
@@ -874,7 +911,6 @@ class LanguageLayer {
     }
 
     if (markersToUpdate.size > 0) {
-      this.lastUpdateWasAsync = true;
       const promises = [];
       for (const [marker, nodeRangeSet] of markersToUpdate) {
         promises.push(marker.languageLayer.update(nodeRangeSet));
@@ -911,75 +947,131 @@ class HighlightIterator {
       }
     );
 
-    this.iterators = [
-      this.languageMode.rootLanguageLayer.buildHighlightIterator()
-    ];
-    for (const marker of injectionMarkers) {
-      this.iterators.push(marker.languageLayer.buildHighlightIterator());
-    }
-    this.iterators.sort((a, b) => b.getIndex() - a.getIndex());
-
     const containingTags = [];
     const containingTagStartIndices = [];
     const targetIndex = this.languageMode.buffer.characterIndexForPosition(
       targetPosition
     );
-    for (let i = this.iterators.length - 1; i >= 0; i--) {
-      this.iterators[i].seek(
-        targetIndex,
-        containingTags,
-        containingTagStartIndices
-      );
+
+    this.iterators = [];
+    const iterator = this.languageMode.rootLanguageLayer.buildHighlightIterator();
+    if (iterator.seek(targetIndex, containingTags, containingTagStartIndices)) {
+      this.iterators.push(iterator);
     }
-    this.iterators.sort((a, b) => b.getIndex() - a.getIndex());
+
+    // Populate the iterators array with all of the iterators whose syntax
+    // trees span the given position.
+    for (const marker of injectionMarkers) {
+      const iterator = marker.languageLayer.buildHighlightIterator();
+      if (
+        iterator.seek(targetIndex, containingTags, containingTagStartIndices)
+      ) {
+        this.iterators.push(iterator);
+      }
+    }
+
+    // Sort the iterators so that the last one in the array is the earliest
+    // in the document, and represents the current position.
+    this.iterators.sort((a, b) => b.compare(a));
+    this.detectCoveredScope();
+
     return containingTags;
   }
 
   moveToSuccessor() {
-    const lastIndex = this.iterators.length - 1;
-    const leader = this.iterators[lastIndex];
-    leader.moveToSuccessor();
-    const leaderCharIndex = leader.getIndex();
-    let i = lastIndex;
-    while (i > 0 && this.iterators[i - 1].getIndex() < leaderCharIndex) i--;
-    if (i < lastIndex) this.iterators.splice(i, 0, this.iterators.pop());
+    // Advance the earliest layer iterator to its next scope boundary.
+    let leader = last(this.iterators);
+
+    // Maintain the sorting of the iterators by their position in the document.
+    if (leader.moveToSuccessor()) {
+      const leaderIndex = this.iterators.length - 1;
+      let i = leaderIndex;
+      while (i > 0 && this.iterators[i - 1].compare(leader) < 0) i--;
+      if (i < leaderIndex) {
+        this.iterators.splice(i, 0, this.iterators.pop());
+      }
+    } else {
+      // If the layer iterator was at the end of its syntax tree, then remove
+      // it from the array.
+      this.iterators.pop();
+    }
+
+    this.detectCoveredScope();
+  }
+
+  // Detect whether or not another more deeply-nested language layer has a
+  // scope boundary at this same position. If so, the current language layer's
+  // scope boundary should not be reported.
+  detectCoveredScope() {
+    const layerCount = this.iterators.length;
+    if (layerCount > 1) {
+      const first = this.iterators[layerCount - 1];
+      const next = this.iterators[layerCount - 2];
+      if (
+        next.offset === first.offset &&
+        next.atEnd === first.atEnd &&
+        next.depth > first.depth
+      ) {
+        this.currentScopeIsCovered = true;
+        return;
+      }
+    }
+    this.currentScopeIsCovered = false;
   }
 
   getPosition() {
-    return last(this.iterators).getPosition();
+    const iterator = last(this.iterators);
+    if (iterator) {
+      return iterator.getPosition();
+    } else {
+      return Point.INFINITY;
+    }
   }
 
   getCloseScopeIds() {
-    return last(this.iterators).getCloseScopeIds();
+    const iterator = last(this.iterators);
+    if (iterator && !this.currentScopeIsCovered) {
+      return iterator.getCloseScopeIds();
+    }
+    return [];
   }
 
   getOpenScopeIds() {
-    return last(this.iterators).getOpenScopeIds();
+    const iterator = last(this.iterators);
+    if (iterator && !this.currentScopeIsCovered) {
+      return iterator.getOpenScopeIds();
+    }
+    return [];
   }
 
   logState() {
     const iterator = last(this.iterators);
-    if (iterator.treeCursor) {
+    if (iterator && iterator.treeCursor) {
       console.log(
         iterator.getPosition(),
         iterator.treeCursor.nodeType,
+        `depth=${iterator.languageLayer.depth}`,
         new Range(
           iterator.languageLayer.tree.rootNode.startPosition,
           iterator.languageLayer.tree.rootNode.endPosition
         ).toString()
       );
-      console.log(
-        'close',
-        iterator.closeTags.map(id =>
-          this.languageMode.grammar.scopeNameForScopeId(id)
-        )
-      );
-      console.log(
-        'open',
-        iterator.openTags.map(id =>
-          this.languageMode.grammar.scopeNameForScopeId(id)
-        )
-      );
+      if (this.currentScopeIsCovered) {
+        console.log('covered');
+      } else {
+        console.log(
+          'close',
+          iterator.closeTags.map(id =>
+            this.languageMode.grammar.scopeNameForScopeId(id)
+          )
+        );
+        console.log(
+          'open',
+          iterator.openTags.map(id =>
+            this.languageMode.grammar.scopeNameForScopeId(id)
+          )
+        );
+      }
     }
   }
 }
@@ -987,11 +1079,13 @@ class HighlightIterator {
 class LayerHighlightIterator {
   constructor(languageLayer, treeCursor) {
     this.languageLayer = languageLayer;
+    this.depth = this.languageLayer.depth;
 
     // The iterator is always positioned at either the start or the end of some node
     // in the syntax tree.
     this.atEnd = false;
     this.treeCursor = treeCursor;
+    this.offset = 0;
 
     // In order to determine which selectors match its current node, the iterator maintains
     // a list of the current node's ancestors. Because the selectors can use the `:nth-child`
@@ -1010,7 +1104,6 @@ class LayerHighlightIterator {
   seek(targetIndex, containingTags, containingTagStartIndices) {
     while (this.treeCursor.gotoParent()) {}
 
-    this.done = false;
     this.atEnd = true;
     this.closeTags.length = 0;
     this.openTags.length = 0;
@@ -1021,8 +1114,7 @@ class LayerHighlightIterator {
     const containingTagEndIndices = [];
 
     if (targetIndex >= this.treeCursor.endIndex) {
-      this.done = true;
-      return;
+      return false;
     }
 
     let childIndex = -1;
@@ -1055,22 +1147,24 @@ class LayerHighlightIterator {
     }
 
     if (this.atEnd) {
-      const currentIndex = this.treeCursor.endIndex;
+      this.offset = this.treeCursor.endIndex;
       for (let i = 0, { length } = containingTags; i < length; i++) {
-        if (containingTagEndIndices[i] === currentIndex) {
+        if (containingTagEndIndices[i] === this.offset) {
           this.closeTags.push(containingTags[i]);
         }
       }
+    } else {
+      this.offset = this.treeCursor.startIndex;
     }
 
-    return containingTags;
+    return true;
   }
 
   moveToSuccessor() {
     this.closeTags.length = 0;
     this.openTags.length = 0;
 
-    while (!this.done && !this.closeTags.length && !this.openTags.length) {
+    while (!this.closeTags.length && !this.openTags.length) {
       if (this.atEnd) {
         if (this._moveRight()) {
           const scopeId = this._currentScopeId();
@@ -1080,7 +1174,7 @@ class LayerHighlightIterator {
         } else if (this._moveUp(true)) {
           this.atEnd = true;
         } else {
-          this.done = true;
+          return false;
         }
       } else if (!this._moveDown()) {
         const scopeId = this._currentScopeId();
@@ -1089,26 +1183,30 @@ class LayerHighlightIterator {
         this._moveUp(false);
       }
     }
+
+    if (this.atEnd) {
+      this.offset = this.treeCursor.endIndex;
+    } else {
+      this.offset = this.treeCursor.startIndex;
+    }
+
+    return true;
   }
 
   getPosition() {
-    if (this.done) {
-      return Point.INFINITY;
-    } else if (this.atEnd) {
+    if (this.atEnd) {
       return this.treeCursor.endPosition;
     } else {
       return this.treeCursor.startPosition;
     }
   }
 
-  getIndex() {
-    if (this.done) {
-      return Infinity;
-    } else if (this.atEnd) {
-      return this.treeCursor.endIndex;
-    } else {
-      return this.treeCursor.startIndex;
-    }
+  compare(other) {
+    const result = this.offset - other.offset;
+    if (result !== 0) return result;
+    if (this.atEnd && !other.atEnd) return -1;
+    if (other.atEnd && !this.atEnd) return 1;
+    return this.languageLayer.depth - other.languageLayer.depth;
   }
 
   getCloseScopeIds() {
@@ -1120,6 +1218,7 @@ class LayerHighlightIterator {
   }
 
   // Private methods
+
   _moveUp(atLastChild) {
     let result = false;
     const { endIndex } = this.treeCursor;
@@ -1227,10 +1326,10 @@ class NullHighlightIterator {
   seek() {
     return [];
   }
-  moveToSuccessor() {}
-  getIndex() {
-    return Infinity;
+  compare() {
+    return 1;
   }
+  moveToSuccessor() {}
   getPosition() {
     return Point.INFINITY;
   }
@@ -1243,10 +1342,11 @@ class NullHighlightIterator {
 }
 
 class NodeRangeSet {
-  constructor(previous, nodes, newlinesBetween) {
+  constructor(previous, nodes, newlinesBetween, includeChildren) {
     this.previous = previous;
     this.nodes = nodes;
     this.newlinesBetween = newlinesBetween;
+    this.includeChildren = includeChildren;
   }
 
   getRanges(buffer) {
@@ -1257,18 +1357,20 @@ class NodeRangeSet {
       let position = node.startPosition;
       let index = node.startIndex;
 
-      for (const child of node.children) {
-        const nextIndex = child.startIndex;
-        if (nextIndex > index) {
-          this._pushRange(buffer, previousRanges, result, {
-            startIndex: index,
-            endIndex: nextIndex,
-            startPosition: position,
-            endPosition: child.startPosition
-          });
+      if (!this.includeChildren) {
+        for (const child of node.children) {
+          const nextIndex = child.startIndex;
+          if (nextIndex > index) {
+            this._pushRange(buffer, previousRanges, result, {
+              startIndex: index,
+              endIndex: nextIndex,
+              startPosition: position,
+              endPosition: child.startPosition
+            });
+          }
+          position = child.endPosition;
+          index = child.endIndex;
         }
-        position = child.endPosition;
-        index = child.endIndex;
       }
 
       if (node.endIndex > index) {
diff --git a/src/workspace.js b/src/workspace.js
index 9262e45f7..1299187dd 100644
--- a/src/workspace.js
+++ b/src/workspace.js
@@ -256,8 +256,6 @@ module.exports = class Workspace extends Model {
     };
 
     this.incoming = new Map();
-
-    this.subscribeToEvents();
   }
 
   get paneContainer() {
@@ -375,9 +373,9 @@ module.exports = class Workspace extends Model {
     this.consumeServices(this.packageManager);
   }
 
-  subscribeToEvents() {
+  initialize() {
+    this.originalFontSize = this.config.get('editor.fontSize');
     this.project.onDidChangePaths(this.updateWindowTitle);
-    this.subscribeToFontSize();
     this.subscribeToAddedItems();
     this.subscribeToMovedItems();
     this.subscribeToDockToggling();
@@ -1753,14 +1751,6 @@ module.exports = class Workspace extends Model {
     }
   }
 
-  subscribeToFontSize() {
-    return this.config.onDidChange('editor.fontSize', () => {
-      if (this.originalFontSize == null) {
-        this.originalFontSize = this.config.get('editor.fontSize');
-      }
-    });
-  }
-
   // Removes the item's uri from the list of potential items to reopen.
   itemOpened(item) {
     let uri;