From 5339e5d528b07718fc69a6ca12da5acb09b81a7d Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Mon, 13 Sep 2021 21:04:18 -0400 Subject: [PATCH 1/4] bootstrap: Fix syntax error for Node older than 10 We don't actually support Node older than 10 for successfully bootstrapping an Atom build, but we should support older Node in the system requirements checker script so that we can print useful errors, like ones to tell the user their system's copy of Node is too old! (It was me that introduced this Node 10.0.0 or above-only syntax about a year ago... My mistake. It's as good a time as any to fix it!) --- script/lib/verify-machine-requirements.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/lib/verify-machine-requirements.js b/script/lib/verify-machine-requirements.js index ccc4a68411c..4bb13a6d7a2 100644 --- a/script/lib/verify-machine-requirements.js +++ b/script/lib/verify-machine-requirements.js @@ -94,7 +94,7 @@ function verifyPython() { env: process.env, stdio: ['ignore', 'pipe', 'ignore'] }); - } catch {} + } catch (e) {} if (stdout) { if (stdout.indexOf('+') !== -1) From 17daccf502e742a7ff4b49c25e6842ae63edec92 Mon Sep 17 00:00:00 2001 From: steven nguyen Date: Sat, 18 Sep 2021 13:26:18 -0500 Subject: [PATCH 2/4] Remove duplicate `to` The periods for return types are inconsistent --- src/grammar-registry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/grammar-registry.js b/src/grammar-registry.js index c5973e1aa3e..aa530b6a9c4 100644 --- a/src/grammar-registry.js +++ b/src/grammar-registry.js @@ -169,7 +169,7 @@ module.exports = class GrammarRegistry { } // Extended: Get the `languageId` that has been explicitly assigned to - // to the given buffer, if any. + // the given buffer, if any. // // Returns a {String} id of the language getAssignedLanguageId(buffer) { From f35e51273d121fe0563ba61cee840b7c408ab613 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Mon, 13 Sep 2021 21:23:16 -0400 Subject: [PATCH 3/4] bootstrap: Update required Node to 10.12+ "Node 10.12 or newer" has been a hard requirement since this PR: https://github.com/atom/atom/pull/20879, due to newer versions of electron-chromedriver and electron-mksnapshot relying on extract-zip@2 as an indirect dependency. (extract-zip@2 requires Node 10.12 or newer for its recursive mkdir. Using extract-zip@2 with Node older than 10.12 results in errors. That leads to a lack of electron-vendored chromedriver or mksnapshot binaries where they're supposed to be. Which in turn causes startup blob creation (via mksnapshot) to fail toward the end of the Atom build scripts.) --- script/lib/verify-machine-requirements.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/script/lib/verify-machine-requirements.js b/script/lib/verify-machine-requirements.js index ccc4a68411c..b3bc2dc4c66 100644 --- a/script/lib/verify-machine-requirements.js +++ b/script/lib/verify-machine-requirements.js @@ -14,16 +14,12 @@ module.exports = function(ci) { function verifyNode() { const fullVersion = process.versions.node; const majorVersion = fullVersion.split('.')[0]; - if (majorVersion >= 6) { + const minorVersion = fullVersion.split('.')[1]; + if (majorVersion >= 11 || (majorVersion === '10' && minorVersion >= 12)) { console.log(`Node:\tv${fullVersion}`); - } else if (majorVersion >= 4) { - console.log(`Node:\tv${fullVersion}`); - console.warn( - '\tWarning: Building on Node below version 6 is deprecated. Please use Node 6.x+ to build Atom.' - ); } else { throw new Error( - `node v4+ is required to build Atom. node v${fullVersion} is installed.` + `node v10.12+ is required to build Atom. node v${fullVersion} is installed.` ); } } From 234adb8748aa4adbb510e9e5e8e006388b3b7d0b Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Mon, 20 Sep 2021 11:52:48 -0400 Subject: [PATCH 4/4] Remove deprecated code strings (#22952) Remove deprecated code strings --- packages/one-dark-ui/lib/main.js | 6 ------ packages/one-light-ui/lib/main.js | 6 ------ src/main-process/atom-application.js | 10 ---------- vendor/jasmine.js | 10 ---------- 4 files changed, 32 deletions(-) diff --git a/packages/one-dark-ui/lib/main.js b/packages/one-dark-ui/lib/main.js index 6640106168c..3b3850d9783 100644 --- a/packages/one-dark-ui/lib/main.js +++ b/packages/one-dark-ui/lib/main.js @@ -8,12 +8,6 @@ module.exports = { atom.config.observe(`${themeName}.tabCloseButton`, setTabCloseButton); atom.config.observe(`${themeName}.hideDockButtons`, setHideDockButtons); atom.config.observe(`${themeName}.stickyHeaders`, setStickyHeaders); - - // DEPRECATED: This can be removed at some point (added in Atom 1.17/1.18ish) - // It removes `layoutMode` - if (atom.config.get(`${themeName}.layoutMode`)) { - atom.config.unset(`${themeName}.layoutMode`); - } }, deactivate() { diff --git a/packages/one-light-ui/lib/main.js b/packages/one-light-ui/lib/main.js index f8a6a6d4943..68f545745cb 100644 --- a/packages/one-light-ui/lib/main.js +++ b/packages/one-light-ui/lib/main.js @@ -8,12 +8,6 @@ module.exports = { atom.config.observe(`${themeName}.tabCloseButton`, setTabCloseButton); atom.config.observe(`${themeName}.hideDockButtons`, setHideDockButtons); atom.config.observe(`${themeName}.stickyHeaders`, setStickyHeaders); - - // DEPRECATED: This can be removed at some point (added in Atom 1.17/1.18ish) - // It removes `layoutMode` - if (atom.config.get(`${themeName}.layoutMode`)) { - atom.config.unset(`${themeName}.layoutMode`); - } }, deactivate() { diff --git a/src/main-process/atom-application.js b/src/main-process/atom-application.js index c969e5f55da..cea5f070b5d 100644 --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js @@ -249,16 +249,6 @@ module.exports = class AtomApplication extends EventEmitter { global.atomApplication = this; - // DEPRECATED: This can be removed at some point (added in 1.13) - // It converts `useCustomTitleBar: true` to `titleBar: "custom"` - if ( - process.platform === 'darwin' && - this.config.get('core.useCustomTitleBar') - ) { - this.config.unset('core.useCustomTitleBar'); - this.config.set('core.titleBar', 'custom'); - } - this.applicationMenu = new ApplicationMenu( this.version, this.autoUpdateManager diff --git a/vendor/jasmine.js b/vendor/jasmine.js index 2cec4bf76eb..716fbeb7ed3 100644 --- a/vendor/jasmine.js +++ b/vendor/jasmine.js @@ -1190,16 +1190,6 @@ jasmine.Matchers = function(env, actual, spec, opt_isNot) { this.reportWasCalled_ = false; }; -// todo: @deprecated as of Jasmine 0.11, remove soon [xw] -jasmine.Matchers.pp = function(str) { - throw new Error("jasmine.Matchers.pp() is no longer supported, please use jasmine.pp() instead!"); -}; - -// todo: @deprecated Deprecated as of Jasmine 0.10. Rewrite your custom matchers to return true or false. [xw] -jasmine.Matchers.prototype.report = function(result, failing_message, details) { - throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs"); -}; - jasmine.Matchers.wrapInto_ = function(prototype, matchersClass) { for (var methodName in prototype) { if (methodName == 'report') continue;