Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert liftoff #144

Merged
merged 2 commits into from
Apr 4, 2021
Merged

Revert liftoff #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6230186
1.4.1
vladikoff Mar 25, 2021
ce4ed2d
Revert "Revert liftoff changes due to https://github.com/gruntjs/grun…
vladikoff Apr 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions bin/grunt
View file
Open in desktop
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
View file
Open in desktop
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