From bbc440076e682b41b57469e4c8a4c42dde371b18 Mon Sep 17 00:00:00 2001 From: Vlad Filippov Date: Thu, 25 Mar 2021 12:28:42 -0400 Subject: [PATCH 1/6] Update changelog --- CHANGELOG.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 411ee5b..a3cd9eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +- v1.4.0: + - date: 2021-03-25 + - changes: + - updated dependencies + - Requires node >= 10 - v1.3.2: - date: 2018-11-04 - changes: diff --git a/package.json b/package.json index 35ecd1e..059aafe 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "repository": "gruntjs/grunt-cli", "license": "MIT", "engines": { - "node": ">=8" + "node": ">=10" }, "scripts": { "test": "node bin/grunt test" From 2293dc5071794beb4c049dbdc5a755c18e26b0b4 Mon Sep 17 00:00:00 2001 From: Vlad Filippov Date: Thu, 25 Mar 2021 12:29:17 -0400 Subject: [PATCH 2/6] 1.4.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 059aafe..8e0e623 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "grunt-cli", "description": "The grunt command line interface", - "version": "1.3.2", + "version": "1.4.0", "author": "Grunt Development Team (http://gruntjs.com/development-team)", "repository": "gruntjs/grunt-cli", "license": "MIT", From e820858a2052768b43e7cfdd6f9adfd42b5b2aed Mon Sep 17 00:00:00 2001 From: Vlad Filippov Date: Thu, 25 Mar 2021 12:56:20 -0400 Subject: [PATCH 3/6] Revert liftoff changes due to https://github.com/gruntjs/grunt/issues/1725 (#143) --- bin/grunt | 38 ++++++++++++++++++-------------------- package.json | 2 +- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/bin/grunt b/bin/grunt index cfc99d8..3186e44 100755 --- a/bin/grunt +++ b/bin/grunt @@ -4,7 +4,7 @@ process.title = 'grunt'; -var Liftup = require('liftup'); +var Liftoff = require('liftoff'); var v8flags = require('v8flags'); var extensions = require('interpret').jsVariants; var nopt = require('nopt'); @@ -35,7 +35,7 @@ if ('completion' in options) { } v8flags(function (err, v8flags) { - var Grunt = new Liftup({ + var Grunt = new Liftoff({ name: 'grunt', configName: 'Gruntfile', // Support a number of languages based on file extension @@ -43,29 +43,27 @@ v8flags(function (err, v8flags) { // Flags that are v8 flags will be loaded into node instead of Gruntfile v8flags: v8flags }); - Grunt.prepare({ + Grunt.launch({ cwd: options.base, configPath: options.gruntfile, require: options.require, verbose: options.verbose }, function (env) { - Grunt.execute(env, function(env) { - var tasks = options.argv.remain; - delete options.argv; - // No grunt install found! - if (!env.modulePath) { - if (options.version) { - process.exit(); - } - if (options.help) { - info.help(); - } - info.fatal('Unable to find local grunt.', 99); - } else { - options.gruntfile = env.configPath; - var grunt = require(env.modulePath); - grunt.tasks(tasks, options); + var tasks = options.argv.remain; + delete options.argv; + // No grunt install found! + if (!env.modulePath) { + if (options.version) { + process.exit(); } - }); + if (options.help) { + info.help(); + } + info.fatal('Unable to find local grunt.', 99); + } else { + options.gruntfile = env.configPath; + var grunt = require(env.modulePath); + grunt.tasks(tasks, options); + } }); }); diff --git a/package.json b/package.json index 8e0e623..e77ebe3 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "dependencies": { "grunt-known-options": "~1.1.1", "interpret": "~1.1.0", - "liftup": "~3.0.1", + "liftoff": "~2.5.0", "nopt": "~4.0.1", "v8flags": "~3.2.0" }, From 4d691e25378ac3bcac9f81f7bc0190f00f31c7d0 Mon Sep 17 00:00:00 2001 From: Vlad Filippov Date: Sun, 4 Apr 2021 10:18:12 -0400 Subject: [PATCH 4/6] Revert liftoff (#144) * 1.4.1 * Revert "Revert liftoff changes due to https://github.com/gruntjs/grunt/issues/1725 (#143)" This reverts commit e820858a2052768b43e7cfdd6f9adfd42b5b2aed. --- bin/grunt | 38 ++++++++++++++++++++------------------ package.json | 4 ++-- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/bin/grunt b/bin/grunt index 3186e44..cfc99d8 100755 --- a/bin/grunt +++ b/bin/grunt @@ -4,7 +4,7 @@ process.title = 'grunt'; -var Liftoff = require('liftoff'); +var Liftup = require('liftup'); var v8flags = require('v8flags'); var extensions = require('interpret').jsVariants; var nopt = require('nopt'); @@ -35,7 +35,7 @@ if ('completion' in options) { } v8flags(function (err, v8flags) { - var Grunt = new Liftoff({ + var Grunt = new Liftup({ name: 'grunt', configName: 'Gruntfile', // Support a number of languages based on file extension @@ -43,27 +43,29 @@ v8flags(function (err, v8flags) { // Flags that are v8 flags will be loaded into node instead of Gruntfile v8flags: v8flags }); - Grunt.launch({ + Grunt.prepare({ cwd: options.base, configPath: options.gruntfile, require: options.require, verbose: options.verbose }, function (env) { - var tasks = options.argv.remain; - delete options.argv; - // No grunt install found! - if (!env.modulePath) { - if (options.version) { - process.exit(); + Grunt.execute(env, function(env) { + var tasks = options.argv.remain; + delete options.argv; + // No grunt install found! + if (!env.modulePath) { + if (options.version) { + process.exit(); + } + if (options.help) { + info.help(); + } + info.fatal('Unable to find local grunt.', 99); + } else { + options.gruntfile = env.configPath; + var grunt = require(env.modulePath); + grunt.tasks(tasks, options); } - if (options.help) { - info.help(); - } - info.fatal('Unable to find local grunt.', 99); - } else { - options.gruntfile = env.configPath; - var grunt = require(env.modulePath); - grunt.tasks(tasks, options); - } + }); }); }); diff --git a/package.json b/package.json index e77ebe3..13348bc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "grunt-cli", "description": "The grunt command line interface", - "version": "1.4.0", + "version": "1.4.1", "author": "Grunt Development Team (http://gruntjs.com/development-team)", "repository": "gruntjs/grunt-cli", "license": "MIT", @@ -17,7 +17,7 @@ "dependencies": { "grunt-known-options": "~1.1.1", "interpret": "~1.1.0", - "liftoff": "~2.5.0", + "liftup": "~3.0.1", "nopt": "~4.0.1", "v8flags": "~3.2.0" }, From 07f3b0d6ced0d1216e672f65c8ff82eaa3d7ffbe Mon Sep 17 00:00:00 2001 From: Vlad Filippov Date: Mon, 24 May 2021 21:41:57 -0400 Subject: [PATCH 5/6] Fix preload option (#147) * 1.4.2 * Fix prepare option for latest grunt * Add changelog --- CHANGELOG.md | 4 ++++ bin/grunt | 1 + package.json | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3cd9eb..35d057b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +- v1.4.1: + - date: 2021-05-24 + - changes: + - fix preload option for latest grunt - v1.4.0: - date: 2021-03-25 - changes: diff --git a/bin/grunt b/bin/grunt index cfc99d8..de893bd 100755 --- a/bin/grunt +++ b/bin/grunt @@ -47,6 +47,7 @@ v8flags(function (err, v8flags) { cwd: options.base, configPath: options.gruntfile, require: options.require, + preload: options.preload, verbose: options.verbose }, function (env) { Grunt.execute(env, function(env) { diff --git a/package.json b/package.json index 13348bc..51f0ebb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "grunt-cli", "description": "The grunt command line interface", - "version": "1.4.1", + "version": "1.4.2", "author": "Grunt Development Team (http://gruntjs.com/development-team)", "repository": "gruntjs/grunt-cli", "license": "MIT", @@ -15,7 +15,7 @@ "grunt": "bin/grunt" }, "dependencies": { - "grunt-known-options": "~1.1.1", + "grunt-known-options": "~2.0.0", "interpret": "~1.1.0", "liftup": "~3.0.1", "nopt": "~4.0.1", From cf8c452550fb292927c02de266e38bd122290aa3 Mon Sep 17 00:00:00 2001 From: Vlad Filippov Date: Mon, 24 May 2021 21:42:51 -0400 Subject: [PATCH 6/6] 1.4.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 51f0ebb..a20c7f4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "grunt-cli", "description": "The grunt command line interface", - "version": "1.4.2", + "version": "1.4.3", "author": "Grunt Development Team (http://gruntjs.com/development-team)", "repository": "gruntjs/grunt-cli", "license": "MIT",