From abb5454c7230ae8c700c0f8f0ebcb37227ec4d1b Mon Sep 17 00:00:00 2001 From: Gabriel Date: Thu, 28 Feb 2019 12:56:17 -0300 Subject: [PATCH 1/4] version bump to publsih create-aragon-app from monorepo --- packages/create-aragon-app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-aragon-app/package.json b/packages/create-aragon-app/package.json index c0434225c..77a0621ee 100644 --- a/packages/create-aragon-app/package.json +++ b/packages/create-aragon-app/package.json @@ -1,6 +1,6 @@ { "name": "create-aragon-app", - "version": "1.0.6", + "version": "1.0.7", "description": "Aragon command-line tool to create aragon apps", "main": "dist/cli.js", "bin": { From 5569642877c646bac2d7cf3ce2fe4fc291b453d4 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Thu, 28 Feb 2019 13:09:39 -0300 Subject: [PATCH 2/4] include link to github repo --- packages/create-aragon-app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-aragon-app/package.json b/packages/create-aragon-app/package.json index 77a0621ee..292d6073f 100644 --- a/packages/create-aragon-app/package.json +++ b/packages/create-aragon-app/package.json @@ -13,7 +13,7 @@ }, "repository": { "type": "git", - "url": "" + "url": "git+https://github.com/aragon/aragon-cli/tree/master/packages/create-aragon-app" }, "keywords": [ "create-aragon-app", From de206c4e65e8c60bbd41f5641a11e0a121619740 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Thu, 28 Feb 2019 13:11:16 -0300 Subject: [PATCH 3/4] Fix: link typo --- packages/create-aragon-app/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create-aragon-app/package.json b/packages/create-aragon-app/package.json index 292d6073f..ec29c83ec 100644 --- a/packages/create-aragon-app/package.json +++ b/packages/create-aragon-app/package.json @@ -1,6 +1,6 @@ { "name": "create-aragon-app", - "version": "1.0.7", + "version": "1.0.8", "description": "Aragon command-line tool to create aragon apps", "main": "dist/cli.js", "bin": { @@ -13,7 +13,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/aragon/aragon-cli/tree/master/packages/create-aragon-app" + "url": "https://github.com/aragon/aragon-cli/tree/master/packages/create-aragon-app" }, "keywords": [ "create-aragon-app", From 8452c123d3cbc8a3904c7a20dff844af01a1eaef Mon Sep 17 00:00:00 2001 From: Gabriel Date: Thu, 28 Feb 2019 14:20:14 -0300 Subject: [PATCH 4/4] Update to yargs v12 --- packages/aragon-cli/package.json | 2 +- packages/aragon-cli/src/cli.js | 11 +++----- packages/aragon-cli/src/commands/apm.js | 25 +++---------------- packages/aragon-cli/src/commands/dao.js | 25 +++---------------- .../aragon-cli/src/commands/dao_cmds/acl.js | 19 +------------- .../aragon-cli/src/commands/dao_cmds/token.js | 19 +------------- 6 files changed, 13 insertions(+), 88 deletions(-) diff --git a/packages/aragon-cli/package.json b/packages/aragon-cli/package.json index 6137110db..924ac6a30 100644 --- a/packages/aragon-cli/package.json +++ b/packages/aragon-cli/package.json @@ -77,7 +77,7 @@ "truffle-hdwallet-provider": "^1.0.2", "truffle-hdwallet-provider-privkey": "^0.3.0", "web3": "1.0.0-beta.34", - "yargs": "^10.1.0" + "yargs": "12.0.5" }, "devDependencies": { "@aragon/apps-finance": "^2.0.0", diff --git a/packages/aragon-cli/src/cli.js b/packages/aragon-cli/src/cli.js index 8b5ecc65f..17f73717f 100755 --- a/packages/aragon-cli/src/cli.js +++ b/packages/aragon-cli/src/cli.js @@ -16,13 +16,10 @@ const MIDDLEWARES = [ ] // Set up commands -const cmd = require('yargs').commandDir('./commands', { - visit: cmd => { - // Add middlewares - cmd.middlewares = MIDDLEWARES - return cmd - }, -}) // .strict() +const cmd = require('yargs').commandDir('./commands') +// .strict() + +cmd.middleware(MIDDLEWARES) cmd.alias('h', 'help') cmd.alias('v', 'version') diff --git a/packages/aragon-cli/src/commands/apm.js b/packages/aragon-cli/src/commands/apm.js index 7099f39ef..d86656aa1 100644 --- a/packages/aragon-cli/src/commands/apm.js +++ b/packages/aragon-cli/src/commands/apm.js @@ -1,15 +1,3 @@ -const { - manifestMiddleware, - moduleMiddleware, - environmentMiddleware, -} = require('../middleware') - -const MIDDLEWARES = [ - manifestMiddleware, - moduleMiddleware, - environmentMiddleware, -] - exports.command = 'apm ' exports.describe = 'Publish and manage your APM package' @@ -17,14 +5,7 @@ exports.describe = 'Publish and manage your APM package' exports.aliases = ['package'] exports.builder = function(yargs) { - const cmd = yargs.commandDir('apm_cmds', { - visit: cmd => { - // Add middlewares - cmd.middlewares = MIDDLEWARES - return cmd - }, - }) - cmd.demandCommand(1, 'You need to specify a command') - - return cmd + return yargs + .commandDir('apm_cmds') + .demandCommand(1, 'You need to specify a command') } diff --git a/packages/aragon-cli/src/commands/dao.js b/packages/aragon-cli/src/commands/dao.js index fdf43214e..90e87505c 100644 --- a/packages/aragon-cli/src/commands/dao.js +++ b/packages/aragon-cli/src/commands/dao.js @@ -1,15 +1,4 @@ const daoArg = require('./dao_cmds/utils/daoArg') -const { - manifestMiddleware, - moduleMiddleware, - environmentMiddleware, -} = require('../middleware') - -const MIDDLEWARES = [ - manifestMiddleware, - moduleMiddleware, - environmentMiddleware, -] exports.command = 'dao ' @@ -19,15 +8,7 @@ exports.builder = function(yargs) { if (process.argv[3] !== 'new' && process.argv[3] !== 'act') { yargs = daoArg(yargs) } - - const cmd = yargs.commandDir('dao_cmds', { - visit: cmd => { - // Add middlewares - cmd.middlewares = MIDDLEWARES - return cmd - }, - }) - cmd.demandCommand(1, 'You need to specify a command') - - return cmd + return yargs + .commandDir('dao_cmds') + .demandCommand(1, 'You need to specify a command') } diff --git a/packages/aragon-cli/src/commands/dao_cmds/acl.js b/packages/aragon-cli/src/commands/dao_cmds/acl.js index 8bff43df4..c2e18cd0d 100644 --- a/packages/aragon-cli/src/commands/dao_cmds/acl.js +++ b/packages/aragon-cli/src/commands/dao_cmds/acl.js @@ -1,28 +1,11 @@ const viewCommand = require('./acl_cmds/view') -const { - manifestMiddleware, - moduleMiddleware, - environmentMiddleware, -} = require('../../middleware') - -const MIDDLEWARES = [ - manifestMiddleware, - moduleMiddleware, - environmentMiddleware, -] - exports.command = 'acl ' exports.describe = 'Shortcut for aragon dao acl view ' exports.builder = function(yargs) { - return yargs.commandDir('acl_cmds', { - visit: cmd => { - cmd.middlewares = MIDDLEWARES - return cmd - }, - }) + return yargs.commandDir('acl_cmds') } exports.handler = viewCommand.handler diff --git a/packages/aragon-cli/src/commands/dao_cmds/token.js b/packages/aragon-cli/src/commands/dao_cmds/token.js index 28830e58d..0d05965c2 100644 --- a/packages/aragon-cli/src/commands/dao_cmds/token.js +++ b/packages/aragon-cli/src/commands/dao_cmds/token.js @@ -1,26 +1,9 @@ -const { - manifestMiddleware, - moduleMiddleware, - environmentMiddleware, -} = require('../../middleware') - -const MIDDLEWARES = [ - manifestMiddleware, - moduleMiddleware, - environmentMiddleware, -] - exports.command = 'token ' exports.describe = 'Create and interact with MiniMe tokens' exports.builder = function(yargs) { return yargs - .commandDir('token_cmds', { - visit: cmd => { - cmd.middlewares = MIDDLEWARES - return cmd - }, - }) + .commandDir('token_cmds') .demandCommand(1, 'You need to specify a command') }