From e82d6461ec5319b5e5774d2fa59fc1608af62e82 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 Jun 2015 08:53:49 -0700 Subject: [PATCH 1/9] Prepare 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2ef1addaf..bbf3974ce 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "0.212.0", + "version": "1.0.0", "description": "A hackable text editor for the 21st Century.", "main": "./src/browser/main.js", "repository": { From 40534fa6d73af616ca55a2a861be798583fc3c0c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 22 Jun 2015 09:41:16 -0700 Subject: [PATCH 2/9] Remove 1.0 roadmap link from README --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 18d4e78ab..13f7374f2 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,6 @@ Visit [atom.io](https://atom.io) to learn more or visit the [Atom forum](https:/ Follow [@AtomEditor](https://twitter.com/atomeditor) on Twitter for important announcements. -Visit [issue #3684](https://github.com/atom/atom/issues/3684) to learn more -about the Atom 1.0 roadmap. - ## Documentation If you want to read about using Atom or developing packages in Atom, the [Atom Flight Manual](https://atom.io/docs/latest/) is free and available online, along with ePub, PDF and mobi versions. You can find the source to the manual in [atom/docs](https://github.com/atom/docs). From 367322ef26269e91249a1c9f10e73426123f5900 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 22 Jun 2015 09:42:17 -0700 Subject: [PATCH 3/9] Remove react/reactionary --- exports/atom.coffee | 8 -------- package.json | 2 -- 2 files changed, 10 deletions(-) diff --git a/exports/atom.coffee b/exports/atom.coffee index 67cd23741..5a3d9673e 100644 --- a/exports/atom.coffee +++ b/exports/atom.coffee @@ -120,14 +120,6 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE """ require '../src/select-list-view' - Object.defineProperty module.exports, 'React', get: -> - deprecate "Please require `react-atom-fork` instead: `React = require 'react-atom-fork'`. Add `\"react-atom-fork\": \"^0.11\"` to your package dependencies." - require 'react-atom-fork' - - Object.defineProperty module.exports, 'Reactionary', get: -> - deprecate "Please require `reactionary-atom-fork` instead: `Reactionary = require 'reactionary-atom-fork'`. Add `\"reactionary-atom-fork\": \"^0.9\"` to your package dependencies." - require 'reactionary-atom-fork' - if includeDeprecatedAPIs Object.defineProperty module.exports, 'Git', get: -> deprecate "Please require `GitRepository` instead of `Git`: `{GitRepository} = require 'atom'`" diff --git a/package.json b/package.json index bbf3974ce..e1bbac5fe 100644 --- a/package.json +++ b/package.json @@ -51,8 +51,6 @@ "property-accessors": "^1.1.3", "q": "^1.1.2", "random-words": "0.0.1", - "react-atom-fork": "^0.11.5", - "reactionary-atom-fork": "^1.0.0", "runas": "2.0.0", "scandal": "2.0.3", "scoped-property-store": "^0.17.0", From 0fa514b6e1c740ae45915878f698378d2f35cca7 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 22 Jun 2015 09:45:42 -0700 Subject: [PATCH 4/9] Remove open with deprecated APIs commands --- src/browser/atom-application.coffee | 2 -- src/workspace-element.coffee | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index b35bd5b5b..907828b6f 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -172,8 +172,6 @@ class AtomApplication @on 'application:open-folder', -> @promptForPathToOpen('folder', getLoadSettings()) @on 'application:open-dev', -> @promptForPathToOpen('all', devMode: true) @on 'application:open-safe', -> @promptForPathToOpen('all', safeMode: true) - @on 'application:open-with-deprecated-apis', -> @promptForPathToOpen('all', includeDeprecatedAPIs: true) - @on 'application:open-dev-with-deprecated-apis', -> @promptForPathToOpen('all', {includeDeprecatedAPIs: true, devMode: true}) @on 'application:inspect', ({x, y, atomWindow}) -> atomWindow ?= @focusedWindow() atomWindow?.browserWindow.inspectElement(x, y) diff --git a/src/workspace-element.coffee b/src/workspace-element.coffee index 6a276a7fc..028a6e561 100644 --- a/src/workspace-element.coffee +++ b/src/workspace-element.coffee @@ -140,8 +140,6 @@ atom.commands.add 'atom-workspace', 'application:open-folder': -> ipc.send('command', 'application:open-folder') 'application:open-dev': -> ipc.send('command', 'application:open-dev') 'application:open-safe': -> ipc.send('command', 'application:open-safe') - 'application:open-with-deprecated-apis': -> ipc.send('command', 'application:open-with-deprecated-apis') - 'application:open-dev-with-deprecated-apis': -> ipc.send('command', 'application:open-dev-with-deprecated-apis') 'application:add-project-folder': -> atom.addProjectFolder() 'application:minimize': -> ipc.send('command', 'application:minimize') 'application:zoom': -> ipc.send('command', 'application:zoom') From 85a4ae7fea820f5846edec4fc7438d089ef33b0b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 22 Jun 2015 09:48:25 -0700 Subject: [PATCH 5/9] Remove --include-deprecated-apis command line option --- src/browser/atom-application.coffee | 35 +++++++++++++---------------- src/browser/atom-window.coffee | 3 +-- src/browser/main.coffee | 4 +--- static/index.js | 2 +- 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index 907828b6f..29996f33d 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -61,7 +61,7 @@ class AtomApplication exit: (status) -> app.exit(status) constructor: (options) -> - {@resourcePath, @version, @devMode, @safeMode, @includeDeprecatedAPIs, @socketPath} = options + {@resourcePath, @version, @devMode, @safeMode, @socketPath} = options # Normalize to make sure drive letter case is consistent on Windows @resourcePath = path.normalize(@resourcePath) if @resourcePath @@ -86,16 +86,16 @@ class AtomApplication else @loadState() or @openPath(options) - openWithOptions: ({pathsToOpen, urlsToOpen, test, pidToKillWhenClosed, devMode, safeMode, includeDeprecatedAPIs, newWindow, specDirectory, logFile, profileStartup}) -> + openWithOptions: ({pathsToOpen, urlsToOpen, test, pidToKillWhenClosed, devMode, safeMode, newWindow, specDirectory, logFile, profileStartup}) -> if test - @runSpecs({exitWhenDone: true, @resourcePath, specDirectory, logFile, includeDeprecatedAPIs}) + @runSpecs({exitWhenDone: true, @resourcePath, specDirectory, logFile}) else if pathsToOpen.length > 0 - @openPaths({pathsToOpen, pidToKillWhenClosed, newWindow, devMode, safeMode, includeDeprecatedAPIs, profileStartup}) + @openPaths({pathsToOpen, pidToKillWhenClosed, newWindow, devMode, safeMode, profileStartup}) else if urlsToOpen.length > 0 - @openUrl({urlToOpen, devMode, safeMode, includeDeprecatedAPIs}) for urlToOpen in urlsToOpen + @openUrl({urlToOpen, devMode, safeMode}) for urlToOpen in urlsToOpen else # Always open a editor window if this is the first instance of Atom. - @openPath({pidToKillWhenClosed, newWindow, devMode, safeMode, includeDeprecatedAPIs, profileStartup}) + @openPath({pidToKillWhenClosed, newWindow, devMode, safeMode, profileStartup}) # Public: Removes the {AtomWindow} from the global window list. removeWindow: (window) -> @@ -160,7 +160,6 @@ class AtomApplication getLoadSettings = => devMode: @focusedWindow()?.devMode safeMode: @focusedWindow()?.safeMode - includeDeprecatedAPIs: @focusedWindow()?.includeDeprecatedAPIs @on 'application:run-all-specs', -> @runSpecs(exitWhenDone: false, resourcePath: global.devResourcePath, safeMode: @focusedWindow()?.safeMode) @on 'application:run-benchmarks', -> @runBenchmarks() @@ -229,7 +228,7 @@ class AtomApplication app.on 'open-url', (event, urlToOpen) => event.preventDefault() - @openUrl({urlToOpen, @devMode, @safeMode, @includeDeprecatedAPIs}) + @openUrl({urlToOpen, @devMode, @safeMode}) app.on 'activate-with-no-open-windows', (event) => event.preventDefault() @@ -356,11 +355,10 @@ class AtomApplication # :newWindow - Boolean of whether this should be opened in a new window. # :devMode - Boolean to control the opened window's dev mode. # :safeMode - Boolean to control the opened window's safe mode. - # :includeDeprecatedAPIs - Boolean to control the opened window's included deprecated APIs. # :profileStartup - Boolean to control creating a profile of the startup time. # :window - {AtomWindow} to open file paths in. - openPath: ({pathToOpen, pidToKillWhenClosed, newWindow, devMode, safeMode, includeDeprecatedAPIs, profileStartup, window}) -> - @openPaths({pathsToOpen: [pathToOpen], pidToKillWhenClosed, newWindow, devMode, safeMode, includeDeprecatedAPIs, profileStartup, window}) + openPath: ({pathToOpen, pidToKillWhenClosed, newWindow, devMode, safeMode, profileStartup, window}) -> + @openPaths({pathsToOpen: [pathToOpen], pidToKillWhenClosed, newWindow, devMode, safeMode, profileStartup, window}) # Public: Opens multiple paths, in existing windows if possible. # @@ -370,10 +368,9 @@ class AtomApplication # :newWindow - Boolean of whether this should be opened in a new window. # :devMode - Boolean to control the opened window's dev mode. # :safeMode - Boolean to control the opened window's safe mode. - # :includeDeprecatedAPIs - Boolean to control the opened window's included deprecated APIs. # :windowDimensions - Object with height and width keys. # :window - {AtomWindow} to open file paths in. - openPaths: ({pathsToOpen, pidToKillWhenClosed, newWindow, devMode, safeMode, includeDeprecatedAPIs, windowDimensions, profileStartup, window}={}) -> + openPaths: ({pathsToOpen, pidToKillWhenClosed, newWindow, devMode, safeMode, windowDimensions, profileStartup, window}={}) -> pathsToOpen = pathsToOpen.map (pathToOpen) -> if fs.existsSync(pathToOpen) fs.normalize(pathToOpen) @@ -408,7 +405,7 @@ class AtomApplication bootstrapScript ?= require.resolve('../window-bootstrap') resourcePath ?= @resourcePath - openedWindow = new AtomWindow({locationsToOpen, bootstrapScript, resourcePath, devMode, safeMode, includeDeprecatedAPIs, windowDimensions, profileStartup}) + openedWindow = new AtomWindow({locationsToOpen, bootstrapScript, resourcePath, devMode, safeMode, windowDimensions, profileStartup}) if pidToKillWhenClosed? @pidsToOpenWindows[pidToKillWhenClosed] = openedWindow @@ -455,7 +452,6 @@ class AtomApplication urlsToOpen: [] devMode: @devMode safeMode: @safeMode - includeDeprecatedAPIs: @includeDeprecatedAPIs }) true else @@ -501,7 +497,7 @@ class AtomApplication # :specPath - The directory to load specs from. # :safeMode - A Boolean that, if true, won't run specs from ~/.atom/packages # and ~/.atom/dev/packages, defaults to false. - runSpecs: ({exitWhenDone, resourcePath, specDirectory, logFile, safeMode, includeDeprecatedAPIs}) -> + runSpecs: ({exitWhenDone, resourcePath, specDirectory, logFile, safeMode}) -> if resourcePath isnt @resourcePath and not fs.existsSync(resourcePath) resourcePath = @resourcePath @@ -513,8 +509,7 @@ class AtomApplication isSpec = true devMode = true safeMode ?= false - includeDeprecatedAPIs ?= true - new AtomWindow({bootstrapScript, resourcePath, exitWhenDone, isSpec, devMode, specDirectory, logFile, safeMode, includeDeprecatedAPIs}) + new AtomWindow({bootstrapScript, resourcePath, exitWhenDone, isSpec, devMode, specDirectory, logFile, safeMode}) runBenchmarks: ({exitWhenDone, specDirectory}={}) -> try @@ -557,9 +552,9 @@ class AtomApplication # :safeMode - A Boolean which controls whether any newly opened windows # should be in safe mode or not. # :window - An {AtomWindow} to use for opening a selected file path. - promptForPathToOpen: (type, {devMode, safeMode, includeDeprecatedAPIs, window}) -> + promptForPathToOpen: (type, {devMode, safeMode, window}) -> @promptForPath type, (pathsToOpen) => - @openPaths({pathsToOpen, devMode, safeMode, includeDeprecatedAPIs, window}) + @openPaths({pathsToOpen, devMode, safeMode, window}) promptForPath: (type, callback) -> properties = diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee index eaa58ffa5..f20e69c5a 100644 --- a/src/browser/atom-window.coffee +++ b/src/browser/atom-window.coffee @@ -18,7 +18,7 @@ class AtomWindow isSpec: null constructor: (settings={}) -> - {@resourcePath, pathToOpen, locationsToOpen, @isSpec, @exitWhenDone, @safeMode, @devMode, @includeDeprecatedAPIs} = settings + {@resourcePath, pathToOpen, locationsToOpen, @isSpec, @exitWhenDone, @safeMode, @devMode} = settings locationsToOpen ?= [{pathToOpen}] if pathToOpen locationsToOpen ?= [] @@ -47,7 +47,6 @@ class AtomWindow loadSettings.resourcePath = @resourcePath loadSettings.devMode ?= false loadSettings.safeMode ?= false - loadSettings.includeDeprecatedAPIs ?= false # Only send to the first non-spec window created if @constructor.includeShellLoadTime and not @isSpec diff --git a/src/browser/main.coffee b/src/browser/main.coffee index eb08ebe61..392fd1995 100644 --- a/src/browser/main.coffee +++ b/src/browser/main.coffee @@ -137,7 +137,6 @@ parseCommandLine = -> executedFrom = args['executed-from'] devMode = args['dev'] safeMode = args['safe'] - includeDeprecatedAPIs = args['include-deprecated-apis'] pathsToOpen = args._ test = args['test'] specDirectory = args['spec-directory'] @@ -171,7 +170,6 @@ parseCommandLine = -> process.env.PATH = args['path-environment'] if args['path-environment'] {resourcePath, pathsToOpen, executedFrom, test, version, pidToKillWhenClosed, - devMode, includeDeprecatedAPIs, safeMode, newWindow, specDirectory, logFile, - socketPath, profileStartup} + devMode, safeMode, newWindow, specDirectory, logFile, socketPath, profileStartup} start() diff --git a/static/index.js b/static/index.js index 24c59c975..c0ee749eb 100644 --- a/static/index.js +++ b/static/index.js @@ -75,7 +75,7 @@ var setupWindow = function(loadSettings) { ModuleCache.register(loadSettings); ModuleCache.add(loadSettings.resourcePath); - require('grim').includeDeprecatedAPIs = !!loadSettings.includeDeprecatedAPIs; + require('grim').includeDeprecatedAPIs = false; // Start the crash reporter before anything else. require('crash-reporter').start({ From 0c4e052247c8891378a2517a5b696661220ce2af Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 22 Jun 2015 09:49:40 -0700 Subject: [PATCH 6/9] Remove --include-deprecated-apis from apm test commands --- build/tasks/spec-task.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/tasks/spec-task.coffee b/build/tasks/spec-task.coffee index 6f1476556..bfd5a8604 100644 --- a/build/tasks/spec-task.coffee +++ b/build/tasks/spec-task.coffee @@ -95,7 +95,7 @@ module.exports = (grunt) -> if process.platform in ['darwin', 'linux'] options = cmd: appPath - args: ['--test', "--resource-path=#{resourcePath}", "--spec-directory=#{coreSpecsPath}", '--include-deprecated-apis'] + args: ['--test', "--resource-path=#{resourcePath}", "--spec-directory=#{coreSpecsPath}"] opts: env: _.extend({}, process.env, ATOM_INTEGRATION_TESTS_ENABLED: true @@ -104,7 +104,7 @@ module.exports = (grunt) -> else if process.platform is 'win32' options = cmd: process.env.comspec - args: ['/c', appPath, '--test', "--resource-path=#{resourcePath}", "--spec-directory=#{coreSpecsPath}", '--log-file=ci.log', '--include-deprecated-apis'] + args: ['/c', appPath, '--test', "--resource-path=#{resourcePath}", "--spec-directory=#{coreSpecsPath}", '--log-file=ci.log'] opts: env: _.extend({}, process.env, ATOM_INTEGRATION_TESTS_ENABLED: true From 993d702ce986af14cfb76e588fe8d802fbc3753f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 22 Jun 2015 13:41:27 -0700 Subject: [PATCH 7/9] Include deprecated APIs when running core specs --- static/index.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/static/index.js b/static/index.js index c0ee749eb..8fe71a6a9 100644 --- a/static/index.js +++ b/static/index.js @@ -75,7 +75,8 @@ var setupWindow = function(loadSettings) { ModuleCache.register(loadSettings); ModuleCache.add(loadSettings.resourcePath); - require('grim').includeDeprecatedAPIs = false; + // Only include deprecated APIs when running core spec + require('grim').includeDeprecatedAPIs = isRunningCoreSpecs(loadSettings); // Start the crash reporter before anything else. require('crash-reporter').start({ @@ -219,6 +220,14 @@ var setupWindowBackground = function() { }, false); } +var isRunningCoreSpecs = function(loadSettings) { + return !!(loadSettings && + loadSettings.isSpec && + loadSettings.specDirectory && + loadSettings.resourcePath && + path.dirname(loadSettings.specDirectory) === loadSettings.resourcePath); +} + parseLoadSettings(); setupWindowBackground(); From 4d75175bdd8824a037cc626941420ec94d96ef3a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 22 Jun 2015 15:36:03 -0700 Subject: [PATCH 8/9] :arrow_up: apm@1.0.0 --- apm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm/package.json b/apm/package.json index bb9fd4647..66462db4e 100644 --- a/apm/package.json +++ b/apm/package.json @@ -6,6 +6,6 @@ "url": "https://github.com/atom/atom.git" }, "dependencies": { - "atom-package-manager": "0.171.0" + "atom-package-manager": "1.0.0" } } From 3e1c18ed409d97ad209cab8b223071dd64ee5ba6 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 22 Jun 2015 15:36:49 -0700 Subject: [PATCH 9/9] :arrow_up: apm@1.0.1 --- apm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm/package.json b/apm/package.json index 66462db4e..d1f210f29 100644 --- a/apm/package.json +++ b/apm/package.json @@ -6,6 +6,6 @@ "url": "https://github.com/atom/atom.git" }, "dependencies": { - "atom-package-manager": "1.0.0" + "atom-package-manager": "1.0.1" } }