From e5102fafa1de960d309a8c79aa3dc7e1f4b699b0 Mon Sep 17 00:00:00 2001 From: Vlad Filippov Date: Thu, 25 Mar 2021 12:53:05 -0400 Subject: [PATCH] Revert liftoff changes due to https://github.com/gruntjs/grunt/issues/1725 --- 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" },