diff --git a/package-lock.json b/package-lock.json index 1bcc5e7a7..4eb87187a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@aragon/cli", - "version": "5.1.1", + "version": "5.2.0-beta.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 10708fb16..3fc260d95 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@aragon/cli", - "version": "5.1.1", + "version": "5.2.0-beta.1", "description": "Aragon command-line tools", "main": "dist/cli.js", "bin": { diff --git a/src/middleware/environment.js b/src/middleware/environment.js index 77e09ef40..254dc9109 100644 --- a/src/middleware/environment.js +++ b/src/middleware/environment.js @@ -52,13 +52,15 @@ module.exports = function environmentMiddleware (argv) { const { reporter, module, apm } = argv let { environment, network } = argv - if (environment && network) { + const isTruffleFwd = argv._[0] === 'contracts' + + if (environment && network && !isTruffleFwd) { reporter.error('Arguments \'--network\' and \'--environment\' are mutually exclusive. Using \'--network\' has been deprecated and \'--environment\' should be used instead.') process.exit(1) } if (!runsInCwd && module) { - if (network && module.environments) { + if (network && module.environments && !isTruffleFwd) { reporter.error( 'Your arapp.json contains an `environments` property. The use of \'--network\' is deprecated and \'--environment\' should be used instead.' )