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

Hoist common dependencies #863

Merged
merged 5 commits into from
May 27, 2019
Merged

Hoist common dependencies #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68e5f03
Hoist common dependencies
sohkai May 22, 2019
db2bcd0
Remove npm prune from Travis
sohkai May 22, 2019
c7d5dc9
Avoid instrumenting app dependencies for coverage
sohkai May 23, 2019
774e891
Add ethereumjs-testrpc-sc as devDependencies to keep testrpc-sc binar…
sohkai May 23, 2019
580e309
Force apps-shared-minime to not be hoisted
sohkai May 23, 2019
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
2 changes: 0 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ matrix:
- env: TASK=coverage:payroll
install:
- travis_wait 60 npm install
before_script:
- npm prune
script:
- travis_wait 60 npm run $TASK
after_success:
Expand Down
4 changes: 3 additions & 1 deletion apps/agent/.solcover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ module.exports = {
norpc: true,
copyPackages: ['@aragon/os', '@aragon/apps-vault'],
skipFiles: [
'test'
'test',
'@aragon/os',
'@aragon/apps-vault/contracts/Vault.sol',
]
}
5 changes: 3 additions & 2 deletions apps/agent/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@
"description": "",
"devDependencies": {
"@aragon/apps-shared-migrations": "1.0.0",
"@aragon/cli": "^5.6.0",
"@aragon/cli": "~5.6.0",
"@aragon/test-helpers": "^1.1.0",
"eth-gas-reporter": "^0.1.1",
"eth-gas-reporter": "^0.2.0",
"ethereumjs-testrpc-sc": "^6.1.6",
"ethereumjs-util": "^6.1.0",
"ganache-cli": "^6.4.3",
"solidity-coverage": "^0.5.11",
Expand Down
2 changes: 2 additions & 0 deletions apps/finance/.solcover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ module.exports = {
copyPackages: ['@aragon/os', '@aragon/apps-vault', '@aragon/test-helpers'],
skipFiles: [
'test',
'@aragon/os',
'@aragon/apps-vault/contracts/Vault.sol',
'@aragon/test-helpers/contracts/TimeHelpersMock.sol',
]
}
5 changes: 3 additions & 2 deletions apps/finance/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@
"devDependencies": {
"@aragon/apps-shared-migrations": "1.0.0",
"@aragon/apps-shared-scripts": "^1.0.0",
"@aragon/cli": "^5.6.0",
"@aragon/cli": "~5.6.0",
"@aragon/test-helpers": "^1.1.0",
"eth-gas-reporter": "^0.1.1",
"eth-gas-reporter": "^0.2.0",
"ethereumjs-testrpc-sc": "^6.1.6",
"ganache-cli": "^6.4.3",
"solidity-coverage": "^0.5.11",
"solium": "^1.2.3",
Expand Down
2 changes: 2 additions & 0 deletions apps/survey/.solcover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ module.exports = {
copyPackages: ['@aragon/os', '@aragon/apps-shared-minime', '@aragon/test-helpers'],
skipFiles: [
'test',
'@aragon/os',
'@aragon/apps-shared-minime/contracts/MiniMeToken.sol',
'@aragon/test-helpers/contracts/TimeHelpersMock.sol',
]
}
5 changes: 3 additions & 2 deletions apps/survey/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@
"devDependencies": {
"@aragon/apps-shared-migrations": "1.0.0",
"@aragon/apps-shared-scripts": "^1.0.0",
"@aragon/cli": "^5.6.0",
"@aragon/cli": "~5.6.0",
"@aragon/test-helpers": "^1.1.0",
"eth-gas-reporter": "^0.1.1",
"eth-gas-reporter": "^0.2.0",
"ethereumjs-testrpc-sc": "^6.1.6",
"ganache-cli": "^6.4.3",
"solidity-coverage": "^0.5.11",
"solium": "^1.2.3",
Expand Down
2 changes: 2 additions & 0 deletions apps/token-manager/.solcover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ module.exports = {
copyPackages: ['@aragon/os', '@aragon/apps-shared-minime', '@aragon/test-helpers'],
skipFiles: [
'test',
'@aragon/os',
'@aragon/apps-shared-minime/contracts/MiniMeToken.sol',
'@aragon/test-helpers/contracts/TimeHelpersMock.sol',
]
}
5 changes: 3 additions & 2 deletions apps/token-manager/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@
"devDependencies": {
"@aragon/apps-shared-migrations": "1.0.0",
"@aragon/apps-shared-scripts": "^1.0.0",
"@aragon/cli": "^5.6.0",
"@aragon/cli": "~5.6.0",
"@aragon/test-helpers": "^1.1.0",
"eth-gas-reporter": "^0.1.1",
"eth-gas-reporter": "^0.2.0",
"ethereumjs-testrpc-sc": "^6.1.6",
"ganache-cli": "^6.4.3",
"solidity-coverage": "^0.5.11",
"solium": "^1.2.3",
Expand Down
1 change: 1 addition & 0 deletions apps/vault/.solcover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ module.exports = {
copyPackages: ['@aragon/os'],
skipFiles: [
'test',
'@aragon/os',
]
}
5 changes: 3 additions & 2 deletions apps/vault/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@
"description": "",
"devDependencies": {
"@aragon/apps-shared-migrations": "1.0.0",
"@aragon/cli": "^5.6.0",
"@aragon/cli": "~5.6.0",
"@aragon/test-helpers": "^1.1.0",
"eth-ens-namehash": "^2.0.8",
"eth-gas-reporter": "^0.1.1",
"eth-gas-reporter": "^0.2.0",
"ethereumjs-testrpc-sc": "^6.1.6",
"ganache-cli": "^6.4.3",
"solidity-coverage": "^0.5.11",
"solium": "^1.2.3",
Expand Down
2 changes: 2 additions & 0 deletions apps/voting/.solcover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ module.exports = {
copyPackages: ['@aragon/os', '@aragon/apps-shared-minime', '@aragon/test-helpers'],
skipFiles: [
'test',
'@aragon/os',
'@aragon/apps-shared-minime/contracts/MiniMeToken.sol',
'@aragon/test-helpers/contracts/TimeHelpersMock.sol',
]
}
5 changes: 3 additions & 2 deletions apps/voting/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@
"devDependencies": {
"@aragon/apps-shared-migrations": "1.0.0",
"@aragon/apps-shared-scripts": "^1.0.0",
"@aragon/cli": "^5.6.0",
"@aragon/cli": "~5.6.0",
"@aragon/test-helpers": "^1.1.0",
"eth-gas-reporter": "^0.1.5",
"eth-gas-reporter": "^0.2.0",
"ethereumjs-testrpc-sc": "^6.1.6",
"ganache-cli": "^6.4.3",
"solidity-coverage": "^0.5.11",
"solidity-sha3": "^0.4.1",
Expand Down
5 changes: 5 additions & 0 deletions future-apps/payroll/.solcover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ module.exports = {
norpc: true,
copyPackages: ['@aragon/os', '@aragon/apps-finance', '@aragon/apps-vault', '@aragon/test-helpers'],
skipFiles: [
'PayrollKit.sol',
'test',
'@aragon/os',
'@aragon/apps-vault/contracts/Finance.sol',
'@aragon/apps-vault/contracts/Vault.sol',
'@aragon/ppf-contracts',
'@aragon/test-helpers/contracts/TimeHelpersMock.sol',
]
}
5 changes: 3 additions & 2 deletions future-apps/payroll/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,10 @@
"@aragon/apps-shared-scripts": "^1.0.0",
"@aragon/apps-token-manager": "2.0.0",
"@aragon/apps-vault": "4.0.0",
"@aragon/cli": "~5.6.2",
"@aragon/cli": "~5.6.0",
"@aragon/test-helpers": "^1.2.0",
"eth-gas-reporter": "^0.1.12",
"eth-gas-reporter": "^0.2.0",
"ethereumjs-testrpc-sc": "^6.1.6",
"ganache-cli": "^6.4.3",
"solidity-coverage": "^0.5.11",
"solium": "^1.2.3",
Expand Down
5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@
"license": "(GPL-3.0-or-later OR AGPL-3.0-or-later)",
"devDependencies": {
"coveralls": "^3.0.1",
"ganache-cli": "^6.1.0",
"lcov-result-merger": "^3.1.0",
"lerna": "^3.11.1"
"lerna": "^3.14.1"
},
"scripts": {
"install": "node scripts/install",
"bootstrap": "lerna bootstrap --nohoist=@aragon/os",
"bootstrap": "lerna bootstrap --hoist --nohoist=@aragon/os --nohoist=@aragon/apps-shared-minime",
"bootstrap:ci": "npm run bootstrap -- --no-ci",
"clean": "git clean -fdxi apps future-apps shared",
"test": "npm run test:all",
Expand Down
2 changes: 1 addition & 1 deletion scripts/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ if (inCI) {
execute('npm run bootstrap:ci', { stdio: 'inherit' })
} else {
process.env.INSTALL_FRONTEND = true
execute('npm run bootstrap', { stdio: 'inherit' })
execute('npm run bootstrap -- --nohoist=@aragon/cli', { stdio: 'inherit' })
}
5 changes: 3 additions & 2 deletions shared/minime/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
"devDependencies": {
"@aragon/apps-shared-migrations": "1.0.0",
"@aragon/test-helpers": "^1.0.1",
"ganache-cli": "6.1.8",
"solidity-coverage": "0.5.8",
"ethereumjs-testrpc-sc": "^6.1.6",
"ganache-cli": "^6.4.3",
"solidity-coverage": "^0.5.11",
"truffle": "4.1.14",
"truffle-extract": "^1.2.1"
}
Expand Down