From 1fdb49f314927208d4fa43f15bd61d65b0fe2dc3 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 6 Mar 2014 08:50:18 -0800 Subject: [PATCH 01/21] Avoid using the atom- prefix --- docs/your-first-package.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/your-first-package.md b/docs/your-first-package.md index aea24456b..38dd01a96 100644 --- a/docs/your-first-package.md +++ b/docs/your-first-package.md @@ -20,7 +20,8 @@ The final package can be viewed at To begin, press `cmd-shift-P` to bring up the [Command Palette](https://github.com/atom/command-palette). Type "generate package" and select the "Package Generator: Generate Package" command. Now we need to name -the package. Let's call it _ascii-art_. +the package. Try to avoid naming your package with the *atom-* prefix, for +example we are going to call this package _ascii-art_. Atom will open a new window with the contents of our new _ascii-art_ package displayed in the Tree View. Because this window is opened **after** the package From e592528937b8d0de2e74c088d35e57a532573895 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 09:06:59 -0800 Subject: [PATCH 02/21] Upgrade to snippets@0.35.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b1cc1b99c..9091d1f75 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "package-generator": "0.30.0", "release-notes": "0.26.0", "settings-view": "0.89.0", - "snippets": "0.34.0", + "snippets": "0.35.0", "spell-check": "0.27.0", "status-bar": "0.35.0", "styleguide": "0.26.0", From 22c47ac648619a6488e9b4cc5db94ac0ad7508f3 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 09:41:01 -0800 Subject: [PATCH 03/21] Prepare 0.69.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9091d1f75..6e99a44f0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "0.68.0", + "version": "0.69.0", "main": "./src/browser/main.js", "repository": { "type": "git", From ef92cca9dbbabc2cc6cb1991494e76f7d1dc39d2 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 10:00:57 -0800 Subject: [PATCH 04/21] Upgrade to first-mate 1.2.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e99a44f0..c912c73d1 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "coffeestack": "0.7.0", "delegato": "1.x", "emissary": "1.x", - "first-mate": ">=1.2 <2.0", + "first-mate": ">=1.2.1 <2.0", "fs-plus": "2.x", "fstream": "0.1.24", "fuzzaldrin": "~1.1", From f86ce48d6553d5cd0baa6e39bf262e9d403aec97 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 10:12:58 -0800 Subject: [PATCH 05/21] Upgrade to grammar-selector@0.23.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c912c73d1..227624a10 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "fuzzy-finder": "0.39.0", "git-diff": "0.25.0", "go-to-line": "0.18.0", - "grammar-selector": "0.22.0", + "grammar-selector": "0.23.0", "image-view": "0.29.0", "keybinding-resolver": "0.11.0", "link": "0.20.0", From 626ebe380e09935494d5d5c84e3d465f749d469b Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 6 Mar 2014 10:13:19 -0800 Subject: [PATCH 06/21] Use proper variable name --- src/browser/atom-application.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index ac0d13f4e..c0bfb247c 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -143,10 +143,10 @@ class AtomApplication autoUpdater.on 'update-available', => @applicationMenu.showDownloadingUpdateItem(true) - autoUpdater.on 'update-downloaded', (event, releaseNotes, releaseName, releaseDate, releaseURL) => - atomWindow.sendCommand('window:update-available', [releaseName, releaseNotes]) for atomWindow in @windows + autoUpdater.on 'update-downloaded', (event, releaseNotes, releaseVersion, releaseDate, releaseURL) => @applicationMenu.showInstallUpdateItem(true) - @updateVersion = releaseName + @updateVersion = releaseVersion + atomWindow.sendCommand('window:update-available', [releaseVersion, releaseNotes]) for atomWindow in @windows autoUpdater.on 'error', (event, message) => @applicationMenu.showCheckForUpdateItem(true) From 272dd4a0767ad47a79a7b058bff624e72648633a Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 6 Mar 2014 10:25:12 -0800 Subject: [PATCH 07/21] Don't trigger `window:update-available` on new windows This was causing people to see `undefined` release notes. In the future we can store the release notes, but since anything related to updates and the browser process takes a lot of time to fix I'm holding off on that improvement. --- src/browser/atom-application.coffee | 9 +-------- src/browser/atom-window.coffee | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index c0bfb247c..c96c20230 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -30,7 +30,6 @@ socketPath = module.exports = class AtomApplication _.extend @prototype, EventEmitter.prototype - updateVersion: null # Public: The entry point into the Atom application. @open: (options) -> @@ -144,9 +143,8 @@ class AtomApplication @applicationMenu.showDownloadingUpdateItem(true) autoUpdater.on 'update-downloaded', (event, releaseNotes, releaseVersion, releaseDate, releaseURL) => - @applicationMenu.showInstallUpdateItem(true) - @updateVersion = releaseVersion atomWindow.sendCommand('window:update-available', [releaseVersion, releaseNotes]) for atomWindow in @windows + @applicationMenu.showInstallUpdateItem(true) autoUpdater.on 'error', (event, message) => @applicationMenu.showCheckForUpdateItem(true) @@ -417,8 +415,3 @@ class AtomApplication promptForPath: ({devMode}={}) -> dialog.showOpenDialog title: 'Open', properties: ['openFile', 'openDirectory', 'multiSelections', 'createDirectory'], (pathsToOpen) => @openPaths({pathsToOpen, devMode}) - - # Public: If an update is available, it returns the new version string - # otherwise it returns null. - getUpdateVersion: -> - @updateVersion diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee index e153a166a..b844bc519 100644 --- a/src/browser/atom-window.coffee +++ b/src/browser/atom-window.coffee @@ -121,7 +121,6 @@ class AtomWindow if @loaded @focus() @sendCommand('window:open-path', {pathToOpen, initialLine}) - @sendCommand('window:update-available', global.atomApplication.getUpdateVersion()) if global.atomApplication.getUpdateVersion() else @browserWindow.once 'window:loaded', => @openPath(pathToOpen, initialLine) From 6c92d45ff37f94fb4a945d5fee3e249ea7df3af2 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 10:34:57 -0800 Subject: [PATCH 08/21] Upgrade to first-mate 1.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 227624a10..1db534ad5 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "coffeestack": "0.7.0", "delegato": "1.x", "emissary": "1.x", - "first-mate": ">=1.2.1 <2.0", + "first-mate": ">=1.3 <2.0", "fs-plus": "2.x", "fstream": "0.1.24", "fuzzaldrin": "~1.1", From decae725a61815f9a9efdde5c2c0d08743c7395a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 10:44:21 -0800 Subject: [PATCH 09/21] Upgrade to bracket-matcher@0.25.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1db534ad5..65865b5c6 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "autosave": "0.12.0", "background-tips": "0.9.0", "bookmarks": "0.21.0", - "bracket-matcher": "0.24.0", + "bracket-matcher": "0.25.0", "command-palette": "0.19.0", "dev-live-reload": "0.28.0", "exception-reporting": "0.17.0", From 1dd59204e980a40cf40bb5e62469211870511753 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 6 Mar 2014 10:51:42 -0800 Subject: [PATCH 10/21] Only released versions should check for updates Fixes atom/release-notes#6 --- src/browser/atom-application.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index c96c20230..e09428b25 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -129,6 +129,8 @@ class AtomApplication # Enable updates unless running from a local build of Atom. setupAutoUpdater: -> + return if /\w{7}/.test(@version) # Only released versions should check for updates. + autoUpdater.setFeedUrl "https://atom.io/api/updates?version=#{@version}" autoUpdater.on 'checking-for-update', => From 01851523a052a259be7ff61d8bca0ff6fdd7e628 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 6 Mar 2014 14:13:06 -0800 Subject: [PATCH 11/21] Upgrade to text-buffer@1.4.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 65865b5c6..e1457a1f3 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "serializable": "1.x", "space-pen": "3.1.1", "temp": "0.5.0", - "text-buffer": "^1.2.0", + "text-buffer": "^1.4.0", "theorist": "1.x", "underscore-plus": ">=1.0.2 <2.0", "vm-compatibility-layer": "0.1.0" From 7ba520fea192c972446b7e209350c3072055d43b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 11:29:00 -0800 Subject: [PATCH 12/21] Upgrade to language-javascript@0.16.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e1457a1f3..7d3b8eab1 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "language-html": "0.10.0", "language-hyperlink": "0.8.0", "language-java": "0.8.0", - "language-javascript": "0.15.0", + "language-javascript": "0.16.0", "language-json": "0.8.0", "language-less": "0.6.0", "language-make": "0.9.0", From 750b57859ae8d1bad6252d40fac1a5893f99d081 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 14:27:24 -0800 Subject: [PATCH 13/21] Upgrade apm for theme convert fix --- vendor/apm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/apm b/vendor/apm index c286aada1..9ca4f9ffc 160000 --- a/vendor/apm +++ b/vendor/apm @@ -1 +1 @@ -Subproject commit c286aada10366aac2f46f33d792846542b864df7 +Subproject commit 9ca4f9ffc7ce3f6b5d1dfe46013fbd765869b0ec From e3cc400ac29d5240e2aecfdd9a99506390cef610 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 14:37:55 -0800 Subject: [PATCH 14/21] Upgrade to language-java@0.9.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7d3b8eab1..767bf2588 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "language-go": "0.7.0", "language-html": "0.10.0", "language-hyperlink": "0.8.0", - "language-java": "0.8.0", + "language-java": "0.9.0", "language-javascript": "0.16.0", "language-json": "0.8.0", "language-less": "0.6.0", From 1eda9a839a0e3ccabd9b48c18a6122c5d245df03 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 14:40:31 -0800 Subject: [PATCH 15/21] Upgrade to first-mate 1.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 767bf2588..8022e75b8 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "coffeestack": "0.7.0", "delegato": "1.x", "emissary": "1.x", - "first-mate": ">=1.3 <2.0", + "first-mate": ">=1.4 <2.0", "fs-plus": "2.x", "fstream": "0.1.24", "fuzzaldrin": "~1.1", From 1800438a7766cc67bcb15e91f85b70c3c6f72391 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 15:04:47 -0800 Subject: [PATCH 16/21] Upgrade to spell-check@0.28.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8022e75b8..60996f256 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "release-notes": "0.26.0", "settings-view": "0.89.0", "snippets": "0.35.0", - "spell-check": "0.27.0", + "spell-check": "0.28.0", "status-bar": "0.35.0", "styleguide": "0.26.0", "symbols-view": "0.41.0", From 211ce4b2d36b29a06fb85e9e1e59357c7c5aa306 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 15:21:34 -0800 Subject: [PATCH 17/21] Prepare 0.70.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 60996f256..ff49da55c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "0.69.0", + "version": "0.70.0", "main": "./src/browser/main.js", "repository": { "type": "git", From d530d0a4d59682c66a74e5c8ce1b4f7cfdde2035 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 15:36:05 -0800 Subject: [PATCH 18/21] Upgrade to language-html@0.11.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ff49da55c..dce581f77 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "language-gfm": "0.19.0", "language-git": "0.9.0", "language-go": "0.7.0", - "language-html": "0.10.0", + "language-html": "0.11.0", "language-hyperlink": "0.8.0", "language-java": "0.9.0", "language-javascript": "0.16.0", From 5b6f8ff0f6039d7e5e31b428b9fdd5385cbeb63f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 15:59:03 -0800 Subject: [PATCH 19/21] Upgrade to wrap-guide@0.17.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dce581f77..f2f122550 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "update-package-dependencies": "0.6.0", "welcome": "0.11.0", "whitespace": "0.18.0", - "wrap-guide": "0.16.0", + "wrap-guide": "0.17.0", "language-c": "0.13.0", "language-coffee-script": "0.15.0", "language-css": "0.12.0", From b5acc9b093a935eb729f19ec4353a2d5d1af3900 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 16:17:42 -0800 Subject: [PATCH 20/21] Upgrade to language-css@0.13.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2f122550..76c01457f 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "wrap-guide": "0.17.0", "language-c": "0.13.0", "language-coffee-script": "0.15.0", - "language-css": "0.12.0", + "language-css": "0.13.0", "language-gfm": "0.19.0", "language-git": "0.9.0", "language-go": "0.7.0", From c591a2e0980f246f5712d7d90e6cec4af8f242ce Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 6 Mar 2014 16:26:12 -0800 Subject: [PATCH 21/21] Upgrade to language-javascript@0.17.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 76c01457f..60f07652f 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "language-html": "0.11.0", "language-hyperlink": "0.8.0", "language-java": "0.9.0", - "language-javascript": "0.16.0", + "language-javascript": "0.17.0", "language-json": "0.8.0", "language-less": "0.6.0", "language-make": "0.9.0",