Skip to content

Commit

Permalink
Revert liftoff (#144)
Browse files Browse the repository at this point in the history
* 1.4.1

* Revert "Revert liftoff changes due to gruntjs/grunt#1725 (#143)"

This reverts commit e820858.
  • Loading branch information
vladikoff authored Apr 4, 2021
1 parent e820858 commit 4d691e2
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 20 deletions.
38 changes: 20 additions & 18 deletions bin/grunt
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -35,35 +35,37 @@ 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
extensions: extensions,
// 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);
}
});
});
});
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
},
Expand Down

0 comments on commit 4d691e2

Please sign in to comment.