From 268b0e6a455c6f998c8a81a0afa77240d1947a9b Mon Sep 17 00:00:00 2001 From: Vytenis Date: Thu, 15 Dec 2016 12:13:02 +0200 Subject: [PATCH 1/2] Update check-version.js Simplify node version check --- lib/check-version.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/check-version.js b/lib/check-version.js index d8780c370e..72220b78bc 100644 --- a/lib/check-version.js +++ b/lib/check-version.js @@ -4,17 +4,11 @@ var chalk = require('chalk') var packageConfig = require('../package.json') module.exports = function (done) { - // Parse version number from strings such as 'v4.2.0' or `>=4.0.0' - function parseVersionNumber (versionString) { - return parseFloat(versionString.replace(/[^\d\.]/g, '')) - } - + // Ensure minimum supported node version is used - var minNodeVersion = parseVersionNumber(packageConfig.engines.node) - var currentNodeVersion = parseVersionNumber(process.version) - if (minNodeVersion > currentNodeVersion) { + if (!semver.satisfies(process.version, packageConfig.engines.node)) { return console.log(chalk.red( - ' You must upgrade node to >=' + minNodeVersion + '.x to use vue-cli' + ' You must upgrade node to >=' + packageConfig.engines.node + '.x to use vue-cli' )) } From 6fc321ff7b422f4c8e8002001f8a13e4ff1c25e7 Mon Sep 17 00:00:00 2001 From: Vytenis Date: Thu, 15 Dec 2016 13:28:03 +0200 Subject: [PATCH 2/2] Update check-version.js code style --- lib/check-version.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/check-version.js b/lib/check-version.js index 72220b78bc..e8f7df60f3 100644 --- a/lib/check-version.js +++ b/lib/check-version.js @@ -4,7 +4,6 @@ var chalk = require('chalk') var packageConfig = require('../package.json') module.exports = function (done) { - // Ensure minimum supported node version is used if (!semver.satisfies(process.version, packageConfig.engines.node)) { return console.log(chalk.red(