From a0ee042c5073dc9ee26a27e70dbc13c70e00fb45 Mon Sep 17 00:00:00 2001 From: Brett Sun Date: Fri, 5 Jul 2019 15:46:42 +0200 Subject: [PATCH 1/2] Add prepublish script before publishing to aragonPM --- apps/agent/package.json | 9 +++++---- apps/finance/package.json | 9 +++++---- apps/survey/package.json | 9 +++++---- apps/token-manager/package.json | 9 +++++---- apps/vault/package.json | 9 +++++---- apps/voting/package.json | 9 +++++---- future-apps/payroll/package.json | 9 +++++---- 7 files changed, 35 insertions(+), 28 deletions(-) diff --git a/apps/agent/package.json b/apps/agent/package.json index 64d658acd8..2edb3e99cf 100644 --- a/apps/agent/package.json +++ b/apps/agent/package.json @@ -4,9 +4,10 @@ "main": "index.js", "scripts": { "compile": "truffle compile", - "apm:publish:major": "aragon apm publish major", - "apm:publish:minor": "aragon apm publish minor", - "apm:publish:patch": "aragon apm publish patch", + "apm:prepublish": "npm run compile", + "apm:publish:major": "aragon apm publish major --files public/ --prepublish-script apm:prepublish", + "apm:publish:minor": "aragon apm publish minor --files public/ --prepublish-script apm:prepublish", + "apm:publish:patch": "aragon apm publish patch --files public/ --prepublish-script apm:prepublish", "lint": "solium --dir ./contracts", "test": "TRUFFLE_TEST=true npm run ganache-cli:test", "test:gas": "GAS_REPORTER=true npm test", @@ -32,7 +33,7 @@ "description": "", "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", - "@aragon/cli": "~5.6.0", + "@aragon/cli": "~5.10.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", "ethereumjs-testrpc-sc": "^6.1.6", diff --git a/apps/finance/package.json b/apps/finance/package.json index a47aa0d2fd..acde213942 100644 --- a/apps/finance/package.json +++ b/apps/finance/package.json @@ -5,9 +5,10 @@ "scripts": { "compile": "truffle compile", "build": "cd app && npm run build", - "apm:publish:major": "aragon apm publish major --files app/build/", - "apm:publish:minor": "aragon apm publish minor --files app/build/", - "apm:publish:patch": "aragon apm publish patch --files app/build/", + "apm:prepublish": "npm run compile", + "apm:publish:major": "aragon apm publish major --files app/build/ --prepublish-script apm:prepublish", + "apm:publish:minor": "aragon apm publish minor --files app/build/ --prepublish-script apm:prepublish", + "apm:publish:patch": "aragon apm publish patch --files app/build/ --prepublish-script apm:prepublish", "lint": "solium --dir ./contracts", "test": "TRUFFLE_TEST=true npm run ganache-cli:test", "test:gas": "GAS_REPORTER=true npm test", @@ -39,7 +40,7 @@ "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", "@aragon/apps-shared-scripts": "^1.0.0", - "@aragon/cli": "~5.6.0", + "@aragon/cli": "~5.10.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", "ethereumjs-testrpc-sc": "^6.1.6", diff --git a/apps/survey/package.json b/apps/survey/package.json index 4e05756556..20a51bff24 100644 --- a/apps/survey/package.json +++ b/apps/survey/package.json @@ -5,9 +5,10 @@ "scripts": { "compile": "truffle compile", "build": "cd app && npm run build", - "apm:publish:major": "aragon apm publish major --files app/build/", - "apm:publish:minor": "aragon apm publish minor --files app/build/", - "apm:publish:patch": "aragon apm publish patch --files app/build/", + "apm:prepublish": "npm run compile", + "apm:publish:major": "aragon apm publish major --files app/build/ --prepublish-script apm:prepublish", + "apm:publish:minor": "aragon apm publish minor --files app/build/ --prepublish-script apm:prepublish", + "apm:publish:patch": "aragon apm publish patch --files app/build/ --prepublish-script apm:prepublish", "lint": "solium --dir ./contracts", "test": "TRUFFLE_TEST=true npm run ganache-cli:test", "test:gas": "GAS_REPORTER=true npm test", @@ -33,7 +34,7 @@ "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", "@aragon/apps-shared-scripts": "^1.0.0", - "@aragon/cli": "~5.6.0", + "@aragon/cli": "~5.10.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", "ethereumjs-testrpc-sc": "^6.1.6", diff --git a/apps/token-manager/package.json b/apps/token-manager/package.json index 1c52f6e4b0..35f2ac90d6 100644 --- a/apps/token-manager/package.json +++ b/apps/token-manager/package.json @@ -5,9 +5,10 @@ "scripts": { "compile": "truffle compile", "build": "cd app && npm run build", - "apm:publish:major": "aragon apm publish major --files app/build/", - "apm:publish:minor": "aragon apm publish minor --files app/build/", - "apm:publish:patch": "aragon apm publish patch --files app/build/", + "apm:prepublish": "npm run compile", + "apm:publish:major": "aragon apm publish major --files app/build/ --prepublish-script apm:prepublish", + "apm:publish:minor": "aragon apm publish minor --files app/build/ --prepublish-script apm:prepublish/", + "apm:publish:patch": "aragon apm publish patch --files app/build/ --prepublish-script apm:prepublish/", "lint": "solium --dir ./contracts", "test": "TRUFFLE_TEST=true npm run ganache-cli:test", "test:gas": "GAS_REPORTER=true npm test", @@ -39,7 +40,7 @@ "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", "@aragon/apps-shared-scripts": "^1.0.0", - "@aragon/cli": "~5.6.0", + "@aragon/cli": "~5.10.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", "ethereumjs-testrpc-sc": "^6.1.6", diff --git a/apps/vault/package.json b/apps/vault/package.json index 3cc2fc4596..c74d0e2a94 100644 --- a/apps/vault/package.json +++ b/apps/vault/package.json @@ -4,9 +4,10 @@ "main": "index.js", "scripts": { "compile": "truffle compile", - "apm:publish:major": "aragon apm publish major --files public/", - "apm:publish:minor": "aragon apm publish minor --files public/", - "apm:publish:patch": "aragon apm publish patch --files public/", + "apm:prepublish": "npm run compile", + "apm:publish:major": "aragon apm publish major --files public/ --prepublish-script apm:prepublish", + "apm:publish:minor": "aragon apm publish minor --files public/ --prepublish-script apm:prepublish", + "apm:publish:patch": "aragon apm publish patch --files public/ --prepublish-script apm:prepublish", "lint": "solium --dir ./contracts", "test": "TRUFFLE_TEST=true npm run ganache-cli:test", "test:gas": "GAS_REPORTER=true npm test", @@ -35,7 +36,7 @@ "description": "", "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", - "@aragon/cli": "~5.6.0", + "@aragon/cli": "~5.10.0", "@aragon/test-helpers": "^2.0.0", "eth-ens-namehash": "^2.0.8", "eth-gas-reporter": "^0.2.0", diff --git a/apps/voting/package.json b/apps/voting/package.json index 9d9345e5a6..db7d4317fe 100644 --- a/apps/voting/package.json +++ b/apps/voting/package.json @@ -5,9 +5,10 @@ "scripts": { "compile": "truffle compile", "build": "cd app && npm run build", - "apm:publish:major": "aragon apm publish major --files app/build/", - "apm:publish:minor": "aragon apm publish minor --files app/build/", - "apm:publish:patch": "aragon apm publish patch --files app/build/", + "apm:prepublish": "npm run compile", + "apm:publish:major": "aragon apm publish major --files app/build/ --prepublish-script apm:prepublish", + "apm:publish:minor": "aragon apm publish minor --files app/build/ --prepublish-script apm:prepublish", + "apm:publish:patch": "aragon apm publish patch --files app/build/ --prepublish-script apm:prepublish", "lint": "solium --dir ./contracts", "test": "TRUFFLE_TEST=true npm run ganache-cli:test", "test:gas": "GAS_REPORTER=true npm test", @@ -40,7 +41,7 @@ "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", "@aragon/apps-shared-scripts": "^1.0.0", - "@aragon/cli": "~5.6.0", + "@aragon/cli": "~5.10.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", "ethereumjs-testrpc-sc": "^6.1.6", diff --git a/future-apps/payroll/package.json b/future-apps/payroll/package.json index 1136764741..c7b633610a 100644 --- a/future-apps/payroll/package.json +++ b/future-apps/payroll/package.json @@ -18,9 +18,10 @@ "scripts": { "compile": "truffle compile", "build": "cd app && npm run build", - "apm:publish:major": "aragon apm publish major --files app/build/", - "apm:publish:minor": "aragon apm publish minor --files app/build/", - "apm:publish:patch": "aragon apm publish patch --files app/build/", + "apm:prepublish": "npm run compile", + "apm:publish:major": "aragon apm publish major --files app/build/ --prepublish-script apm:prepublish", + "apm:publish:minor": "aragon apm publish minor --files app/build/ --prepublish-script apm:prepublish", + "apm:publish:patch": "aragon apm publish patch --files app/build/ --prepublish-script apm:prepublish", "lint": "solium --dir ./contracts", "dev": "npm start -- --http localhost:8001 --http-served-from ./app/build", "dev:reset": "npm run dev -- --reset", @@ -53,7 +54,7 @@ "@aragon/apps-shared-scripts": "^1.0.0", "@aragon/apps-token-manager": "2.0.0", "@aragon/apps-vault": "4.0.0", - "@aragon/cli": "~5.6.0", + "@aragon/cli": "~5.10.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", "ethereumjs-testrpc-sc": "^6.1.6", From 24da79f1b267562af0c598aca5745b603975ab2f Mon Sep 17 00:00:00 2001 From: Brett Sun Date: Tue, 16 Jul 2019 11:31:54 +0200 Subject: [PATCH 2/2] Upgrade @aragon/cli to v6 --- apps/agent/package.json | 2 +- apps/finance/package.json | 2 +- apps/survey/package.json | 2 +- apps/token-manager/package.json | 2 +- apps/vault/package.json | 2 +- apps/voting/package.json | 2 +- future-apps/payroll/package.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/agent/package.json b/apps/agent/package.json index 2edb3e99cf..b6b8ff5459 100644 --- a/apps/agent/package.json +++ b/apps/agent/package.json @@ -33,7 +33,7 @@ "description": "", "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", - "@aragon/cli": "~5.10.0", + "@aragon/cli": "^6.0.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", "ethereumjs-testrpc-sc": "^6.1.6", diff --git a/apps/finance/package.json b/apps/finance/package.json index acde213942..4ea4b7a81c 100644 --- a/apps/finance/package.json +++ b/apps/finance/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", "@aragon/apps-shared-scripts": "^1.0.0", - "@aragon/cli": "~5.10.0", + "@aragon/cli": "^6.0.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", "ethereumjs-testrpc-sc": "^6.1.6", diff --git a/apps/survey/package.json b/apps/survey/package.json index 20a51bff24..74dc06d2e4 100644 --- a/apps/survey/package.json +++ b/apps/survey/package.json @@ -34,7 +34,7 @@ "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", "@aragon/apps-shared-scripts": "^1.0.0", - "@aragon/cli": "~5.10.0", + "@aragon/cli": "^6.0.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", "ethereumjs-testrpc-sc": "^6.1.6", diff --git a/apps/token-manager/package.json b/apps/token-manager/package.json index 35f2ac90d6..e57e2066e8 100644 --- a/apps/token-manager/package.json +++ b/apps/token-manager/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", "@aragon/apps-shared-scripts": "^1.0.0", - "@aragon/cli": "~5.10.0", + "@aragon/cli": "^6.0.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", "ethereumjs-testrpc-sc": "^6.1.6", diff --git a/apps/vault/package.json b/apps/vault/package.json index c74d0e2a94..3c7241ec40 100644 --- a/apps/vault/package.json +++ b/apps/vault/package.json @@ -36,7 +36,7 @@ "description": "", "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", - "@aragon/cli": "~5.10.0", + "@aragon/cli": "^6.0.0", "@aragon/test-helpers": "^2.0.0", "eth-ens-namehash": "^2.0.8", "eth-gas-reporter": "^0.2.0", diff --git a/apps/voting/package.json b/apps/voting/package.json index db7d4317fe..e7ae9eea4e 100644 --- a/apps/voting/package.json +++ b/apps/voting/package.json @@ -41,7 +41,7 @@ "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", "@aragon/apps-shared-scripts": "^1.0.0", - "@aragon/cli": "~5.10.0", + "@aragon/cli": "^6.0.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", "ethereumjs-testrpc-sc": "^6.1.6", diff --git a/future-apps/payroll/package.json b/future-apps/payroll/package.json index c7b633610a..2de4a1d1df 100644 --- a/future-apps/payroll/package.json +++ b/future-apps/payroll/package.json @@ -54,7 +54,7 @@ "@aragon/apps-shared-scripts": "^1.0.0", "@aragon/apps-token-manager": "2.0.0", "@aragon/apps-vault": "4.0.0", - "@aragon/cli": "~5.10.0", + "@aragon/cli": "^6.0.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", "ethereumjs-testrpc-sc": "^6.1.6",