From 295eaa763370b7dc210fbdaf76ffad7e5e690b9b Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 7 Aug 2017 16:13:54 +0200 Subject: [PATCH 1/8] Update: Bump copy-props to 2.0.1 --- lib/shared/config/env-flags.js | 8 ++++---- lib/shared/config/load-files.js | 8 ++++---- package.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/shared/config/env-flags.js b/lib/shared/config/env-flags.js index c404e5f2..43ebb071 100644 --- a/lib/shared/config/env-flags.js +++ b/lib/shared/config/env-flags.js @@ -12,11 +12,11 @@ function mergeConfigToEnvFlags(env, config) { return copyProps(env, config, toFrom, convert, true); } -function convert(value, configKey, envKey) { - if (envKey === 'configBase') { - return path.dirname(value); +function convert(srcInfo, dstInfo) { + if (dstInfo.keyChain === 'configBase') { + return path.dirname(srcInfo.value); } - return value; + return srcInfo.value; } module.exports = mergeConfigToEnvFlags; diff --git a/lib/shared/config/load-files.js b/lib/shared/config/load-files.js index 3810c93e..54e73cd4 100644 --- a/lib/shared/config/load-files.js +++ b/lib/shared/config/load-files.js @@ -16,11 +16,11 @@ function loadConfigFiles(configFiles, configFileOrder) { copyProps(require(filePath), config, convert); - function convert(value, name) { - if (name === 'flags.gulpfile') { - return path.resolve(path.dirname(filePath), value); + function convert(srcInfo) { + if (srcInfo.keyChain === 'flags.gulpfile') { + return path.resolve(path.dirname(filePath), srcInfo.value); } - return value; + return srcInfo.value; } } diff --git a/package.json b/package.json index 5f566639..ebfa3c0c 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "dependencies": { "archy": "^1.0.0", "chalk": "^1.1.0", - "copy-props": "^1.4.1", + "copy-props": "^2.0.1", "fancy-log": "^1.1.0", "gulplog": "^1.0.0", "interpret": "^1.0.0", From a79438fd0575d8e1858ecfeabf4fdb4129e9bc0a Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 7 Aug 2017 16:13:58 +0200 Subject: [PATCH 2/8] Update: Bump chalk to 1.1.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ebfa3c0c..eb710b06 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "dependencies": { "archy": "^1.0.0", - "chalk": "^1.1.0", + "chalk": "^1.1.3", "copy-props": "^2.0.1", "fancy-log": "^1.1.0", "gulplog": "^1.0.0", From e4dc25b194bfe5be46803a9504defc06e59545c8 Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 7 Aug 2017 16:13:59 +0200 Subject: [PATCH 3/8] Update: Bump v8flags to 3.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb710b06..7dd39bc2 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "pretty-hrtime": "^1.0.0", "semver-greatest-satisfied-range": "^1.0.0", "tildify": "^1.0.0", - "v8flags": "^2.0.9", + "v8flags": "^3.0.0", "wreck": "^6.3.0", "yargs": "^3.28.0" }, From 65e0a346abe858cf6c460ef37b5cd1a27d68d5be Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 7 Aug 2017 16:14:00 +0200 Subject: [PATCH 4/8] Update: Bump yargs to 7.1.0 --- index.js | 8 ++---- package.json | 2 +- test/expected/flags-help.txt | 48 +++++++++++++++++++++++------------- 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/index.js b/index.js index 87ef29e9..2896a105 100644 --- a/index.js +++ b/index.js @@ -56,7 +56,8 @@ var usage = '\n' + chalk.bold('Usage:') + ' gulp ' + chalk.blue('[options]') + ' tasks'; -var parser = yargs.usage(usage, cliOptions); +var parser = yargs.usage(usage, cliOptions) + .help('help', cliOptions.help.desc); var opts = parser.argv; // Set up event listeners for logging temporarily. @@ -106,11 +107,6 @@ function handleArguments(env) { // Set up event listeners for logging again after configuring. toConsole(log, opts); - if (opts.help) { - console.log(parser.help()); - exit(0); - } - if (opts.version) { log.info('CLI version', cliVersion); if (env.modulePackage && typeof env.modulePackage.version !== 'undefined') { diff --git a/package.json b/package.json index 7dd39bc2..321ed08f 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "tildify": "^1.0.0", "v8flags": "^3.0.0", "wreck": "^6.3.0", - "yargs": "^3.28.0" + "yargs": "^7.1.0" }, "devDependencies": { "babel-preset-es2015": "^6.5.0", diff --git a/test/expected/flags-help.txt b/test/expected/flags-help.txt index fa313519..803eb06e 100644 --- a/test/expected/flags-help.txt +++ b/test/expected/flags-help.txt @@ -2,21 +2,35 @@ Usage: gulp [options] tasks Options: - --help, -h Show this help. [boolean] - --version, -v Print the global and local gulp versions. [boolean] - --require Will require a module before running the gulpfile. This is useful for transpilers but also has other applications. [string] - --gulpfile Manually set path of gulpfile. Useful if you have multiple gulpfiles. This will set the CWD to the gulpfile directory as well. [string] - --cwd Manually set the CWD. The search for the gulpfile, as well as the relativity of all requires will be from here. [string] - --verify Will verify plugins referenced in project's package.json against the plugins blacklist. - --tasks, -T Print the task dependency tree for the loaded gulpfile. [boolean] - --tasks-simple Print a plaintext list of tasks for the loaded gulpfile. [boolean] - --tasks-json Print the task dependency tree, in JSON format, for the loaded gulpfile. - --tasks-depth, --depth Specify the depth of the task dependency tree. - --compact-tasks Reduce the output of task dependency tree by printing only top tasks and their child tasks. [boolean] - --sort-tasks Will sort top tasks of task dependency tree. [boolean] - --color Will force gulp and gulp plugins to display colors, even when no color support is detected. [boolean] - --no-color Will force gulp and gulp plugins to not display colors, even when color support is detected. [boolean] - --silent, -S Suppress all gulp logging. [boolean] - --continue Continue execution of tasks upon failure. [boolean] - --log-level, -L Set the loglevel. -L for least verbose and -LLLL for most verbose. -LLL is default. [count] + --help, -h Show this help. [boolean] + --version, -v Print the global and local gulp versions. [boolean] + --require Will require a module before running the gulpfile. + This is useful for transpilers but also has other + applications. [string] + --gulpfile Manually set path of gulpfile. Useful if you have + multiple gulpfiles. This will set the CWD to the + gulpfile directory as well. [string] + --cwd Manually set the CWD. The search for the gulpfile, as + well as the relativity of all requires will be from + here. [string] + --verify Will verify plugins referenced in project's + package.json against the plugins blacklist. + --tasks, -T Print the task dependency tree for the loaded + gulpfile. [boolean] + --tasks-simple Print a plaintext list of tasks for the loaded + gulpfile. [boolean] + --tasks-json Print the task dependency tree, in JSON format, for + the loaded gulpfile. + --tasks-depth, --depth Specify the depth of the task dependency tree.[number] + --compact-tasks Reduce the output of task dependency tree by printing + only top tasks and their child tasks. [boolean] + --sort-tasks Will sort top tasks of task dependency tree. [boolean] + --color Will force gulp and gulp plugins to display colors, + even when no color support is detected. [boolean] + --no-color Will force gulp and gulp plugins to not display + colors, even when color support is detected. [boolean] + --silent, -S Suppress all gulp logging. [boolean] + --continue Continue execution of tasks upon failure. [boolean] + --log-level, -L Set the loglevel. -L for least verbose and -LLLL for + most verbose. -LLL is default. [count] From 44879bd923bc18edc4074991d0b546ac16ad0092 Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 7 Aug 2017 16:14:00 +0200 Subject: [PATCH 5/8] Update: Bump coveralls to 2.11.15 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 321ed08f..caad9c93 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "devDependencies": { "babel-preset-es2015": "^6.5.0", "babel-register": "^6.5.1", - "coveralls": "^2.7.0", + "coveralls": "2.11.15", "eslint": "^1.7.3", "eslint-config-gulp": "^2.0.0", "expect": "^1.20.2", From 786102f2ee7b77845f8bc8ace7c6f24c7089a8b8 Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 7 Aug 2017 16:14:01 +0200 Subject: [PATCH 6/8] Update: Bump nyc to 11.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index caad9c93..4ef0bc63 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "jscs-preset-gulp": "^1.0.0", "marked-man": "^0.1.3", "mocha": "^3.2.0", - "nyc": "^10.0.0" + "nyc": "^11.1.0" }, "keywords": [ "build", From b7056f7a5b14264c92c307cd017ac2c59dca1f01 Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 7 Aug 2017 16:14:02 +0200 Subject: [PATCH 7/8] Update: Bump jscs to 3.0.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4ef0bc63..4981eada 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "github-changes": "^1.0.1", "gulp": "gulpjs/gulp#4.0", "gulp-test-tools": "^0.6.1", - "jscs": "^2.3.5", + "jscs": "^3.0.7", "jscs-preset-gulp": "^1.0.0", "marked-man": "^0.1.3", "mocha": "^3.2.0", From 564af5fafeebc3d450877d6f1d7f40308101a265 Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 7 Aug 2017 16:35:11 +0200 Subject: [PATCH 8/8] Update: Bump fs-extra to 2.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4981eada..d87c64d5 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "eslint": "^1.7.3", "eslint-config-gulp": "^2.0.0", "expect": "^1.20.2", - "fs-extra": "^0.26.1", + "fs-extra": "~2.0.0", "github-changes": "^1.0.1", "gulp": "gulpjs/gulp#4.0", "gulp-test-tools": "^0.6.1",