Merge pull request #17675 from atom/aw/apm-up

apm upgrade

apm/package.json

@@ -6,6 +6,6 @@
     "url": "https://github.com/atom/atom.git"
   },
   "dependencies": {
-    "atom-package-manager": "1.19.0"
+    "atom-package-manager": "2.0.0"
   }
 }

package.json

@@ -15,23 +15,48 @@
   "electronVersion": "2.0.5",
   "dependencies": {
     "@atom/nsfw": "^1.0.18",
-    "@atom/watcher": "1.0.3",
     "@atom/source-map-support": "^0.3.4",
+    "@atom/watcher": "1.0.3",
+    "about": "https://www.atom.io/api/packages/about/versions/1.10.0/tarball",
+    "archive-view": "https://www.atom.io/api/packages/archive-view/versions/0.65.1/tarball",
     "async": "0.2.6",
+    "atom-dark-syntax": "https://www.atom.io/api/packages/atom-dark-syntax/versions/0.29.0/tarball",
+    "atom-dark-ui": "https://www.atom.io/api/packages/atom-dark-ui/versions/0.53.2/tarball",
     "atom-keymap": "8.2.10",
+    "atom-light-syntax": "https://www.atom.io/api/packages/atom-light-syntax/versions/0.29.0/tarball",
+    "atom-light-ui": "https://www.atom.io/api/packages/atom-light-ui/versions/0.46.2/tarball",
     "atom-select-list": "^0.7.0",
     "atom-ui": "0.4.1",
+    "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.4/tarball",
+    "autocomplete-plus": "https://www.atom.io/api/packages/autocomplete-plus/versions/2.40.6/tarball",
+    "autocomplete-snippets": "https://www.atom.io/api/packages/autocomplete-snippets/versions/1.12.0/tarball",
+    "autoflow": "https://www.atom.io/api/packages/autoflow/versions/0.29.4/tarball",
+    "autosave": "https://www.atom.io/api/packages/autosave/versions/0.24.6/tarball",
     "babel-core": "5.8.38",
+    "background-tips": "https://www.atom.io/api/packages/background-tips/versions/0.28.0/tarball",
+    "base16-tomorrow-dark-theme": "https://www.atom.io/api/packages/base16-tomorrow-dark-theme/versions/1.5.0/tarball",
+    "base16-tomorrow-light-theme": "https://www.atom.io/api/packages/base16-tomorrow-light-theme/versions/1.5.0/tarball",
+    "bookmarks": "https://www.atom.io/api/packages/bookmarks/versions/0.45.1/tarball",
+    "bracket-matcher": "https://www.atom.io/api/packages/bracket-matcher/versions/0.89.2/tarball",
     "cached-run-in-this-context": "0.4.1",
     "chai": "3.5.0",
     "chart.js": "^2.3.0",
     "clear-cut": "^2.0.2",
     "coffee-script": "1.12.7",
     "color": "^0.7.3",
+    "command-palette": "https://www.atom.io/api/packages/command-palette/versions/0.43.5/tarball",
+    "dalek": "https://www.atom.io/api/packages/dalek/versions/0.2.2/tarball",
     "dedent": "^0.7.0",
+    "deprecation-cop": "https://www.atom.io/api/packages/deprecation-cop/versions/0.56.9/tarball",
+    "dev-live-reload": "https://www.atom.io/api/packages/dev-live-reload/versions/0.48.1/tarball",
     "devtron": "1.3.0",
+    "encoding-selector": "https://www.atom.io/api/packages/encoding-selector/versions/0.23.9/tarball",
     "etch": "^0.12.6",
     "event-kit": "^2.5.0",
+    "exception-reporting": "https://www.atom.io/api/packages/exception-reporting/versions/0.43.1/tarball",
+    "find-and-replace": "https://www.atom.io/api/packages/find-and-replace/versions/0.215.11/tarball",
     "find-parent-dir": "^0.3.0",
     "first-mate": "7.1.1",
     "focus-trap": "2.4.5",
@@ -39,24 +64,76 @@
     "fs-plus": "^3.0.1",
     "fstream": "0.1.24",
     "fuzzaldrin": "^2.1",
+    "fuzzy-finder": "https://www.atom.io/api/packages/fuzzy-finder/versions/1.8.2/tarball",
+    "git-diff": "https://www.atom.io/api/packages/git-diff/versions/1.3.9/tarball",
     "git-utils": "5.4.0",
+    "github": "https://www.atom.io/api/packages/github/versions/0.18.2/tarball",
     "glob": "^7.1.1",
+    "go-to-line": "https://www.atom.io/api/packages/go-to-line/versions/0.33.0/tarball",
+    "grammar-selector": "https://www.atom.io/api/packages/grammar-selector/versions/0.50.1/tarball",
     "grim": "1.5.0",
+    "image-view": "https://www.atom.io/api/packages/image-view/versions/0.63.0/tarball",
+    "incompatible-packages": "https://www.atom.io/api/packages/incompatible-packages/versions/0.27.3/tarball",
     "jasmine-json": "~0.0",
     "jasmine-reporters": "1.1.0",
     "jasmine-tagged": "^1.1.4",
     "key-path-helpers": "^0.4.0",
+    "keybinding-resolver": "https://www.atom.io/api/packages/keybinding-resolver/versions/0.38.2/tarball",
+    "language-c": "https://www.atom.io/api/packages/language-c/versions/0.60.0/tarball",
+    "language-clojure": "https://www.atom.io/api/packages/language-clojure/versions/0.22.7/tarball",
+    "language-coffee-script": "https://www.atom.io/api/packages/language-coffee-script/versions/0.49.3/tarball",
+    "language-csharp": "https://www.atom.io/api/packages/language-csharp/versions/1.0.4/tarball",
+    "language-css": "https://www.atom.io/api/packages/language-css/versions/0.42.11/tarball",
+    "language-gfm": "https://www.atom.io/api/packages/language-gfm/versions/0.90.5/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.46.0/tarball",
+    "language-html": "https://www.atom.io/api/packages/language-html/versions/0.51.1/tarball",
+    "language-hyperlink": "https://www.atom.io/api/packages/language-hyperlink/versions/0.16.3/tarball",
+    "language-java": "https://www.atom.io/api/packages/language-java/versions/0.30.0/tarball",
+    "language-javascript": "https://www.atom.io/api/packages/language-javascript/versions/0.129.1/tarball",
+    "language-json": "https://www.atom.io/api/packages/language-json/versions/0.19.2/tarball",
+    "language-less": "https://www.atom.io/api/packages/language-less/versions/0.34.2/tarball",
+    "language-make": "https://www.atom.io/api/packages/language-make/versions/0.22.3/tarball",
+    "language-mustache": "https://www.atom.io/api/packages/language-mustache/versions/0.14.5/tarball",
+    "language-objective-c": "https://www.atom.io/api/packages/language-objective-c/versions/0.15.1/tarball",
+    "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.0/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.51.0/tarball",
+    "language-ruby": "https://www.atom.io/api/packages/language-ruby/versions/0.72.2/tarball",
+    "language-ruby-on-rails": "https://www.atom.io/api/packages/language-ruby-on-rails/versions/0.25.3/tarball",
+    "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.0/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.18.2/tarball",
+    "language-typescript": "https://www.atom.io/api/packages/language-typescript/versions/0.4.0/tarball",
+    "language-xml": "https://www.atom.io/api/packages/language-xml/versions/0.35.2/tarball",
+    "language-yaml": "https://www.atom.io/api/packages/language-yaml/versions/0.32.0/tarball",
     "less-cache": "1.1.0",
+    "line-ending-selector": "https://www.atom.io/api/packages/line-ending-selector/versions/0.7.7/tarball",
     "line-top-index": "0.3.1",
+    "link": "https://www.atom.io/api/packages/link/versions/0.31.4/tarball",
+    "markdown-preview": "https://www.atom.io/api/packages/markdown-preview/versions/0.159.20/tarball",
     "marked": "^0.3.12",
+    "metrics": "https://www.atom.io/api/packages/metrics/versions/1.6.0/tarball",
     "minimatch": "^3.0.3",
     "mocha": "2.5.1",
     "mocha-junit-reporter": "^1.13.0",
     "mocha-multi-reporters": "^1.1.4",
     "mock-spawn": "^0.2.6",
     "normalize-package-data": "^2.0.0",
+    "notifications": "https://www.atom.io/api/packages/notifications/versions/0.70.5/tarball",
     "nslog": "^3",
+    "one-dark-syntax": "https://www.atom.io/api/packages/one-dark-syntax/versions/1.8.4/tarball",
+    "one-dark-ui": "https://www.atom.io/api/packages/one-dark-ui/versions/1.12.4/tarball",
+    "one-light-syntax": "https://www.atom.io/api/packages/one-light-syntax/versions/1.8.4/tarball",
+    "one-light-ui": "https://www.atom.io/api/packages/one-light-ui/versions/1.12.4/tarball",
     "oniguruma": "6.2.1",
+    "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.1",
     "postcss": "5.2.4",
     "postcss-selector-parser": "2.2.1",
@@ -69,13 +146,28 @@
     "season": "^6.0.2",
     "semver": "^4.3.3",
     "service-hub": "^0.7.4",
+    "settings-view": "https://www.atom.io/api/packages/settings-view/versions/0.255.0/tarball",
     "sinon": "1.17.4",
+    "snippets": "https://www.atom.io/api/packages/snippets/versions/1.3.3/tarball",
+    "solarized-dark-syntax": "https://www.atom.io/api/packages/solarized-dark-syntax/versions/1.1.5/tarball",
+    "solarized-light-syntax": "https://www.atom.io/api/packages/solarized-light-syntax/versions/1.1.5/tarball",
+    "spell-check": "https://www.atom.io/api/packages/spell-check/versions/0.74.0/tarball",
+    "status-bar": "https://www.atom.io/api/packages/status-bar/versions/1.8.15/tarball",
+    "styleguide": "https://www.atom.io/api/packages/styleguide/versions/0.49.11/tarball",
+    "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.109.2/tarball",
     "temp": "^0.8.3",
     "text-buffer": "13.14.5",
+    "timecop": "https://www.atom.io/api/packages/timecop/versions/0.36.2/tarball",
     "tree-sitter": "0.13.0",
+    "tree-view": "https://www.atom.io/api/packages/tree-view/versions/0.222.0/tarball",
     "typescript-simple": "1.0.0",
     "underscore-plus": "^1.6.8",
+    "update-package-dependencies": "https://www.atom.io/api/packages/update-package-dependencies/versions/0.13.1/tarball",
+    "welcome": "https://www.atom.io/api/packages/welcome/versions/0.36.6/tarball",
+    "whitespace": "https://www.atom.io/api/packages/whitespace/versions/0.37.6/tarball",
     "winreg": "^1.2.1",
+    "wrap-guide": "https://www.atom.io/api/packages/wrap-guide/versions/0.40.3/tarball",
     "yargs": "^3.23.0"
   },
   "packageDependencies": {

script/build

@@ -29,7 +29,6 @@ const argv = yargs
 
 const checkChromedriverVersion = require('./lib/check-chromedriver-version')
 const cleanOutputDirectory = require('./lib/clean-output-directory')
-const cleanPackageLock = require('./lib/clean-package-lock')
 const codeSignOnMac = require('./lib/code-sign-on-mac')
 const codeSignOnWindows = require('./lib/code-sign-on-windows')
 const compressArtifacts = require('./lib/compress-artifacts')
@@ -60,7 +59,6 @@ const CONFIG = require('./config')
 let binariesPromise = Promise.resolve()
 
 if (!argv.existingBinaries) {
-  cleanPackageLock()
   checkChromedriverVersion()
   cleanOutputDirectory()
   copyAssets()

script/lib/clean-package-lock.js

@@ -1,18 +0,0 @@
-// This module exports a function that deletes all `package-lock.json` files that do
-// not exist under a `node_modules` directory.
-
-'use strict'
-
-const CONFIG = require('../config')
-const fs = require('fs-extra')
-const glob = require('glob')
-const path = require('path')
-
-module.exports = function () {
-  console.log('Deleting problematic package-lock.json files')
-  let paths = glob.sync(path.join(CONFIG.repositoryRootPath, '**', 'package-lock.json'), {ignore: [path.join('**', 'node_modules', '**'), path.join('**', 'vsts', '**')]})
-
-  for (let path of paths) {
-    fs.unlinkSync(path)
-  }
-}