Update docs and checks for Node 6

feicc · May 31, 2017 · 1f56e06 · 1f56e06
1 parent 93b7427
commit 1f56e06
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/docs/build-instructions/linux.md b/docs/build-instructions/linux.md
@@ -7,7 +7,7 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.
 * OS with 64-bit or 32-bit architecture
 * C++11 toolchain
 * Git
-* Node.js 6.x (we recommend installing it via [nvm](https://github.com/creationix/nvm))
+* Node.js 6.x or later (we recommend installing it via [nvm](https://github.com/creationix/nvm))
 * npm 3.10.x or later (run `npm install -g npm`)
 * Ensure node-gyp uses python2 (run `npm config set python /usr/bin/python2 -g`, use `sudo` if you didn't install node via nvm)
 * Development headers for [libsecret](https://wiki.gnome.org/Projects/Libsecret).

diff --git a/docs/build-instructions/macOS.md b/docs/build-instructions/macOS.md
@@ -3,7 +3,7 @@
 ## Requirements
 
   * macOS 10.8 or later
-  * Node.js 6.x (we recommend installing it via [nvm](https://github.com/creationix/nvm))
+  * Node.js 6.x or later (we recommend installing it via [nvm](https://github.com/creationix/nvm))
   * npm 3.10.x or later (run `npm install -g npm`)
   * Command Line Tools for [Xcode](https://developer.apple.com/xcode/downloads/) (run `xcode-select --install` to install)
 

diff --git a/docs/build-instructions/windows.md b/docs/build-instructions/windows.md
@@ -2,7 +2,7 @@
 
 ## Requirements
 
-* Node.js 6.x (the architecture of node available to the build system will determine whether you build 32-bit or 64-bit Atom)
+* Node.js 6.x or later (the architecture of node available to the build system will determine whether you build 32-bit or 64-bit Atom)
 * Python v2.7.x
   * The python.exe must be available at `%SystemDrive%\Python27\python.exe`. If it is installed elsewhere create a symbolic link to the directory containing the python.exe using: `mklink /d %SystemDrive%\Python27 D:\elsewhere\Python27`
 * 7zip (7z.exe available from the command line) - for creating distribution zip files

diff --git a/script/lib/verify-machine-requirements.js b/script/lib/verify-machine-requirements.js
@@ -17,8 +17,11 @@ module.exports = function () {
 function verifyNode () {
   const fullVersion = process.versions.node
   const majorVersion = fullVersion.split('.')[0]
-  if (majorVersion >= 4) {
+  if (majorVersion >= 6) {
     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.`)
   }