From 76e59a25f4657ff80553324ff3aa8e13f24e31a9 Mon Sep 17 00:00:00 2001 From: Geoff Greer Date: Wed, 22 Jun 2016 14:32:40 -0700 Subject: [PATCH 1/8] Don't erase NODE_ENV from environment. Atom sets this to 'production' earlier, but some code paths can cause it to be un-set. This degrades performance and sometimes crashes React. Fixes #12024. --- src/environment-helpers.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/environment-helpers.js b/src/environment-helpers.js index 5a9ef8e3a..f4224fbe4 100644 --- a/src/environment-helpers.js +++ b/src/environment-helpers.js @@ -72,7 +72,10 @@ function needsPatching (options = { platform: process.platform, env: process.env // underlying functionality. function clone (to, from) { for (var key in to) { - delete to[key] + // Don't erase NODE_ENV. Fixes #12024 + if (key !== 'NODE_ENV') { + delete to[key] + } } Object.assign(to, from) From 341a9602b293b4fdcf69f62ced2c50fc6f615eae Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Mon, 27 Jun 2016 22:34:37 -0700 Subject: [PATCH 2/8] Use in-path 7z on AppVeyor, tidy-up publish --- build/tasks/publish-build-task.coffee | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/build/tasks/publish-build-task.coffee b/build/tasks/publish-build-task.coffee index 0a18c9c23..2802f827d 100644 --- a/build/tasks/publish-build-task.coffee +++ b/build/tasks/publish-build-task.coffee @@ -11,6 +11,7 @@ AWS = require 'aws-sdk' grunt = null token = process.env.ATOM_ACCESS_TOKEN +repo = process.env.ATOM_REPO ? 'atom/atom' defaultHeaders = Authorization: "token #{token}" 'User-Agent': 'Atom' @@ -119,7 +120,8 @@ logError = (message, error, details) -> zipAssets = (buildDir, assets, callback) -> zip = (directory, sourcePath, assetName, callback) -> if process.platform is 'win32' - zipCommand = "C:/psmodules/7z.exe a -r #{assetName} \"#{sourcePath}\"" + sevenZipPath = if process.env.JANKY_SHA1? then "C:/psmodules/" else "" + zipCommand = "#{sevenZipPath}7z.exe a -r \"#{assetName}\" \"#{sourcePath}\"" else zipCommand = "zip -r --symlinks '#{assetName}' '#{sourcePath}'" options = {cwd: directory, maxBuffer: Infinity} @@ -134,10 +136,10 @@ zipAssets = (buildDir, assets, callback) -> async.parallel(tasks, callback) getAtomDraftRelease = (isPrerelease, branchName, callback) -> - atomRepo = new GitHub({repo: 'atom/atom', token}) + atomRepo = new GitHub({repo: repo, token}) atomRepo.getReleases {prerelease: isPrerelease}, (error, releases=[]) -> if error? - logError('Fetching atom/atom releases failed', error, releases) + logError("Fetching #{repo} #{if isPrerelease then "pre" else "" }releases failed", error, releases) callback(error) else [firstDraft] = releases.filter ({draft}) -> draft @@ -160,7 +162,7 @@ getAtomDraftRelease = (isPrerelease, branchName, callback) -> createAtomDraftRelease = (isPrerelease, branchName, callback) -> {version} = require('../../package.json') options = - uri: 'https://api.github.com/repos/atom/atom/releases' + uri: "https://api.github.com/repos/#{repo}/releases" method: 'POST' headers: defaultHeaders json: @@ -177,7 +179,7 @@ createAtomDraftRelease = (isPrerelease, branchName, callback) -> request options, (error, response, body='') -> if error? or response.statusCode isnt 201 - logError("Creating atom/atom draft release failed", error, body) + logError("Creating #{repo} draft release failed", error, body) callback(error ? new Error(response.statusCode)) else callback(null, body) From afad72216a9d5d5f5d8f25bca8d3e7840b47d0aa Mon Sep 17 00:00:00 2001 From: simurai Date: Sat, 2 Jul 2016 16:55:43 +0900 Subject: [PATCH 3/8] :arrow_up: about@v1.5.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5fcc8de0e..4b9b0f5ba 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "one-light-syntax": "1.3.0", "solarized-dark-syntax": "1.0.2", "solarized-light-syntax": "1.0.2", - "about": "1.5.2", + "about": "1.5.3", "archive-view": "0.61.1", "autocomplete-atom-api": "0.10.0", "autocomplete-css": "0.11.2", From a08a8ea66416ae1d626238828c0f509ff16de263 Mon Sep 17 00:00:00 2001 From: simurai Date: Sat, 2 Jul 2016 17:02:45 +0900 Subject: [PATCH 4/8] :arrow_up: settings-view@v0.240.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b9b0f5ba..4b4fca29f 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "notifications": "0.65.0", "open-on-github": "1.1.0", "package-generator": "1.0.0", - "settings-view": "0.239.0", + "settings-view": "0.240.0", "snippets": "1.0.2", "spell-check": "0.67.1", "status-bar": "1.3.1", From e81c805e05837e83fb49fc882dd200e9a02510b6 Mon Sep 17 00:00:00 2001 From: simurai Date: Sat, 2 Jul 2016 17:37:00 +0900 Subject: [PATCH 5/8] :arrow_up: autocomplete-plus@v2.31.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b4fca29f..7aa699a51 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "autocomplete-atom-api": "0.10.0", "autocomplete-css": "0.11.2", "autocomplete-html": "0.7.2", - "autocomplete-plus": "2.31.0", + "autocomplete-plus": "2.31.1", "autocomplete-snippets": "1.11.0", "autoflow": "0.27.0", "autosave": "0.23.1", From 7f61f4388e621a4e041e500911fb69723729ce14 Mon Sep 17 00:00:00 2001 From: Thomas Johansen Date: Mon, 4 Jul 2016 06:34:11 +0200 Subject: [PATCH 6/8] :arrow_up: image-view@0.58.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7aa699a51..3c7ccbd19 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "git-diff": "1.0.1", "go-to-line": "0.31.0", "grammar-selector": "0.48.1", - "image-view": "0.58.1", + "image-view": "0.58.2", "incompatible-packages": "0.26.1", "keybinding-resolver": "0.35.0", "line-ending-selector": "0.5.0", From 6f78d5c0f9dc1a2a24698840eff2a81b7d9e0669 Mon Sep 17 00:00:00 2001 From: Ammar Najjar Date: Mon, 4 Jul 2016 10:47:31 +0200 Subject: [PATCH 7/8] update nodejs installation instructions link for Fedora/Centos/RHEL --- docs/build-instructions/linux.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build-instructions/linux.md b/docs/build-instructions/linux.md index 126604c49..f737a6cda 100644 --- a/docs/build-instructions/linux.md +++ b/docs/build-instructions/linux.md @@ -25,7 +25,7 @@ Ubuntu LTS 12.04 64-bit is the recommended platform. ### Fedora / CentOS / RHEL * `sudo dnf --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools` -* Instructions for [Node.js](https://github.com/nodejs/node-v0.x-archive/wiki/Installing-Node.js-via-package-manager#enterprise-linux-and-fedora). +* Instructions for [Node.js](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora). ### Arch From 98fc8db3daa2021d391f03f93b1de8f40e424cb4 Mon Sep 17 00:00:00 2001 From: Lee Dohm Date: Tue, 5 Jul 2016 10:23:02 -0700 Subject: [PATCH 8/8] :arrow_up: find-and-replace@0.201.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3c7ccbd19..29152f4ad 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "dev-live-reload": "0.47.0", "encoding-selector": "0.22.0", "exception-reporting": "0.38.1", - "find-and-replace": "0.200.0", + "find-and-replace": "0.201.0", "fuzzy-finder": "1.2.0", "git-diff": "1.0.1", "go-to-line": "0.31.0",