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.

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

Moved @aragon/apps-* to devDependencies #209

Merged
merged 3 commits into from
Sep 25, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
dist
dist
src/knownRoles.json
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
"dao": "./aliases/dao"
},
"scripts": {
"build": "babel -d dist src",
"build": "npm run extract-roles && babel -d dist src --copy-files",
"prepare": "npm run build",
"test": "ava",
"lint": "standard src"
"lint": "standard src",
"extract-roles": "scripts/extract-roles"
},
"repository": {
"type": "git",
Expand All @@ -35,10 +36,6 @@
"homepage": "https://github.com/aragon/aragon-dev-cli#readme",
"dependencies": {
"@aragon/apm": "^2.0.1",
"@aragon/apps-finance": "^1.0.1",
"@aragon/apps-token-manager": "^1.0.0",
"@aragon/apps-vault": "^2.0.1",
"@aragon/apps-voting": "^1.0.0",
"@aragon/aragen": "2.0.0-beta.1",
"@aragon/os": "4.0.0-beta.1",
"@aragon/templates-beta": "^1.1.3",
Expand Down Expand Up @@ -73,6 +70,10 @@
"yargs": "^10.1.0"
},
"devDependencies": {
"@aragon/apps-finance": "^1.0.1",
"@aragon/apps-token-manager": "^1.0.0",
"@aragon/apps-vault": "^2.0.1",
"@aragon/apps-voting": "^1.0.0",
"@babel/cli": "^7.0.0-beta.46",
"@babel/core": "^7.0.0-beta.46",
"@babel/node": "^7.0.0-beta.46",
Expand Down
34 changes: 34 additions & 0 deletions scripts/extract-roles
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/usr/bin/env node
const { writeJson } = require('fs-extra')
const path = require('path')

const getAppNPMPackage = appName => `@aragon/apps-${appName}`

const knownApps = ['voting', 'token-manager', 'vault', 'finance']

const getAppRoles = app => {
const arapp = require(`${getAppNPMPackage(app)}/arapp`)
return arapp.roles.map(({ name, id }) => ({ name, id }))
}

const flatten = list => list.reduce(
(a, b) => a.concat(Array.isArray(b) ? flatten(b) : b), []
)

const aOSRoles = [
{ id: 'CREATE_PERMISSIONS_ROLE', name: 'Create new permissions'},
{ id: 'APP_MANAGER_ROLE', name: 'Manage DAO apps'}
]

// TODO: Add support for user apps
const rolesForDefaultApps = () => {
const allRoles = flatten(knownApps.map(app => getAppRoles(app))).concat(aOSRoles)

return allRoles
}

writeJson(
path.resolve('.', 'src/knownRoles.json'),
rolesForDefaultApps(),
{ spaces: '\t' }
)
22 changes: 2 additions & 20 deletions src/commands/dao_cmds/acl_cmds/utils/knownRoles.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,7 @@ const sha3 = require('js-sha3')
const keccak256 = x => '0x'+sha3.keccak_256(x)
const path = require('path')
const { findProjectRoot } = require('../../../../util')


const getAppNPMPackage = appName => `@aragon/apps-${appName}`

const knownApps = ['voting', 'token-manager', 'vault', 'finance']

const getAppRoles = app => {
const arapp = require(`${getAppNPMPackage(app)}/arapp`)
return arapp.roles.map(({ name, id }) => ({ name, id }))
}

const flatten = list => list.reduce(
(a, b) => a.concat(Array.isArray(b) ? flatten(b) : b), []
)

const aOSRoles = [
{ id: 'CREATE_PERMISSIONS_ROLE', name: 'Create new permissions'},
{ id: 'APP_MANAGER_ROLE', name: 'Manage DAO apps'}
]
const defaultAppsRoles = require('../../../../knownRoles.json')

const currentAppRoles = () => {
const arappPath = path.resolve(findProjectRoot(), 'arapp.json')
Expand All @@ -29,7 +11,7 @@ const currentAppRoles = () => {

// TODO: add support for user apps
const rolesForApps = () => {
const allRoles = flatten(knownApps.map(app => getAppRoles(app))).concat(aOSRoles).concat(currentAppRoles())
const allRoles = defaultAppsRoles.concat(currentAppRoles())
const knownRoles = allRoles.reduce(
(acc, role) => Object.assign(acc, { [keccak256(role.id)]: role })
, {})
Expand Down