Skip to content

prepare repo for publishing to npm #1812

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

Open
topocount wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

prepare repo for publishing to npm #1812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dedcda
chore: prepare repo for publishing to npm
topocount Dec 19, 2019
58614d6
Merge remote-tracking branch 'origin/dev' into npm-publish-prep
topocount Jan 13, 2020
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
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,31 @@ jobs:
script: npm run lint

- stage: test
script: travis_wait 60 npm run coverage -- --scope=@tps/apps-address-book
script: travis_wait 60 npm run coverage -- --scope=@autarklabs/apps-address-book
name: Address Book app tests and coverage report
install: npm run bootstrap
after_success: npm run coveralls

- stage: test
script: travis_wait 60 npm run coverage -- --scope=@tps/apps-allocations
script: travis_wait 60 npm run coverage -- --scope=@autarklabs/apps-allocations
name: Allocations app tests and coverage report
install: npm run bootstrap
after_success: npm run coveralls

- stage: test
script: travis_wait 60 npm run coverage -- --scope=@tps/apps-projects
script: travis_wait 60 npm run coverage -- --scope=@autarklabs/apps-projects
name: Projects app tests and coverage report
install: npm run bootstrap
after_success: npm run coveralls

- stage: test
script: travis_wait 60 npm run coverage -- --scope=@tps/apps-dot-voting
script: travis_wait 60 npm run coverage -- --scope=@autarklabs/apps-dot-voting
name: Dot Voting app tests and coverage report
install: npm run bootstrap
after_success: npm run coveralls

- stage: test
script: travis_wait 60 npm run coverage -- --scope=@tps/apps-rewards
script: travis_wait 60 npm run coverage -- --scope=@autarklabs/apps-rewards
name: Rewards app tests and coverage report
install: npm run bootstrap
after_success: npm run coveralls
Expand Down
10 changes: 6 additions & 4 deletions apps/address-book/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"name": "@tps/apps-address-book",
"name": "@autarklabs/apps-address-book",
"version": "0.0.1",
"description": "Address book app from Planning Suite",
"scripts": {
"abi:extract": "truffle-extract --output abi/ --keys abi",
"build:app": "parcel build app/index.html -d dist/ --public-url '.' --no-cache",
"build:script": "parcel build app/script.js -d dist/ --no-cache",
"build": "npm run sync-assets && npm run build:app && npm run build:script",
Expand All @@ -14,7 +15,7 @@
"ganache-cli:test": "sh ../../node_modules/@aragon/test-helpers/ganache-cli.sh",
"lint": "solium --dir ./contracts",
"precommit": "lint-staged",
"prepublishOnly": "truffle compile",
"prepublishOnly": "truffle compile --all && npm run abi:extract -- --no-compile",
Copy link
Copy Markdown
Member

@ottodevs ottodevs Feb 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--all seems redundant here, we have been testing without the option in the about app and it just works fine.

Copy link
Copy Markdown
Member

@ottodevs ottodevs Feb 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for consistency we may want to call the compile script, as in the rest of apps, anyway not a big deal

Suggested change
"prepublishOnly": "truffle compile --all && npm run abi:extract -- --no-compile",
"prepublishOnly": "npm run compile && npm run abi:extract -- --no-compile",

"publish": "aragon apm publish patch && sleep 3",
"publish:cd": "../../shared/deployments/check-publish.sh",
"publish:http": "npm run build:script && yes | aragon apm publish major --files dist --http localhost:1111 --http-served-from ./dist --propagate-content false --skip-confirmation true",
Expand All @@ -34,13 +35,13 @@
"@aragon/api-react": "2.0.0-beta.8",
"@aragon/ui": "^1.0.0-alpha.26",
"axios": "^0.18.0",
"date-fns": "2.0.0-alpha.22",
"ipfs-http-client": "29.1.0",
"prop-types": "^15.7.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"styled-components": "4.1.3",
"web3-utils": "^1.0.0",
"date-fns": "2.0.0-alpha.22"
"web3-utils": "^1.0.0"
},
"devDependencies": {
"@aragon/test-helpers": "^2.0.0",
Expand Down Expand Up @@ -78,6 +79,7 @@
"stylelint-config-styled-components": "^0.1.1",
"stylelint-processor-styled-components": "^1.7.0",
"truffle": "4.1.14",
"truffle-extract": "^1.2.1",
"truffle-hdwallet-provider-privkey": "0.3.0",
"truffle-privatekey-provider": "1.1.0"
},
Expand Down
10 changes: 6 additions & 4 deletions apps/allocations/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"name": "@tps/apps-allocations",
"name": "@autarklabs/apps-allocations",
"version": "0.0.1",
"description": "Allocations app from Planning Suite",
"scripts": {
"abi:extract": "truffle-extract --output abi/ --keys abi",
"build:app": "parcel build app/index.html -d dist/ --public-url '.' --no-cache",
"build:script": "parcel build app/script.js -d dist/ --no-cache",
"build": "npm run sync-assets && npm run build:app && npm run build:script",
Expand All @@ -14,7 +15,7 @@
"ganache-cli:test": "../shared/test-helpers/ganache-cli.sh",
"lint": "solium --dir ./contracts",
"precommit": "lint-staged",
"prepublishOnly": "truffle compile",
"prepublishOnly": "npm run compile && npm run abi:extract -- --no-compile",
"publish:cd": "../../shared/deployments/check-publish.sh",
"publish:http": "npm run build:script && yes | aragon apm publish major --files dist --http localhost:2222 --http-served-from ./dist --propagate-content false --skip-confirmation true",
"publish": "aragon apm publish patch && sleep 3",
Expand All @@ -37,12 +38,12 @@
"@aragon/ui": "1.0.0",
"@babel/polyfill": "^7.2.5",
"bignumber.js": "^7.2.1",
"date-fns": "2.0.0-alpha.22",
"prop-types": "^15.7.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"styled-components": "4.1.3",
"web3-utils": "^1.0.0",
"date-fns": "2.0.0-alpha.22"
"web3-utils": "^1.0.0"
},
"devDependencies": {
"@aragon/apps-shared-minime": "1.0.1",
Expand Down Expand Up @@ -80,6 +81,7 @@
"stylelint-config-styled-components": "^0.1.1",
"stylelint-processor-styled-components": "^1.7.0",
"truffle": "4.1.14",
"truffle-extract": "^1.2.1",
"truffle-hdwallet-provider-privkey": "0.3.0",
"truffle-privatekey-provider": "1.1.0"
},
Expand Down
14 changes: 8 additions & 6 deletions apps/discussions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"name": "@tps/apps-discussions",
"name": "@autarklabs/apps-discussions",
"version": "1.0.0",
"description": "",
"dependencies": {
"@aragon/api": "2.0.0-beta.8",
"@aragon/api-react": "2.0.0-beta.8",
"@aragon/ui": "1.0.0-alpha.11",
"@babel/polyfill": "^7.2.5",
"ipfs-http-client": "^32.0.1",
"lodash.clonedeep": "^4.5.0",
"prop-types": "^15.7.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-markdown": "^4.2.2",
"styled-components": "4.1.3",
"ipfs-http-client": "^32.0.1",
"lodash.clonedeep": "^4.5.0"
"styled-components": "4.1.3"
},
"devDependencies": {
"@aragon/test-helpers": "^2.0.0",
"@babel/core": "^7.4.5",
"@babel/plugin-proposal-class-properties": "^7.4.4",
"@babel/preset-env": "^7.4.5",
"@aragon/test-helpers": "^2.0.0",
"@tps/test-helpers": "^0.0.1",
"babel-eslint": "^10.0.1",
"eslint": "^5.16.0",
Expand All @@ -34,9 +34,11 @@
"eslint-plugin-standard": "^4.0.0",
"prettier": "^1.17.1",
"react-hot-loader": "^4.12.7",
"solidity-coverage": "0.5.11"
"solidity-coverage": "0.5.11",
"truffle-extract": "^1.2.1"
},
"scripts": {
"abi:extract": "truffle-extract --output abi/ --keys abi",
Copy link
Copy Markdown
Member

@ottodevs ottodevs Feb 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prePublishOnly script is missing here

"dev": "npm run sync-assets && parcel app/index.html --port 9999",
"copy-public-assets": "rsync -rtu ./public/ ./dist",
"sync-assets": "copy-aragon-ui-assets -n aragon-ui ./dist && npm run copy-public-assets",
Expand Down
10 changes: 6 additions & 4 deletions apps/dot-voting/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"name": "@tps/apps-dot-voting",
"name": "@autarklabs/apps-dot-voting",
"version": "0.0.1",
"description": "Dot Voting app from Planning Suite",
"scripts": {
"abi:extract": "truffle-extract --output abi/ --keys abi",
"build:app": "parcel build app/index.html -d dist/ --public-url '.' --no-cache",
"build:script": "parcel build app/script.js -d dist/ --no-cache",
"build": "npm run sync-assets && npm run build:app && npm run build:script",
Expand All @@ -14,7 +15,7 @@
"ganache-cli:test": "sh ../../node_modules/@aragon/test-helpers/ganache-cli.sh",
"lint": "solium --dir ./contracts",
"precommit": "lint-staged",
"prepublishOnly": "truffle compile",
"prepublishOnly": "npm run compile && npm run abi:extract -- --no-compile",
"publish:cd": "../../shared/deployments/check-publish.sh",
"publish:http": "npm run build:script && yes | aragon apm publish major --files dist --http localhost:4444 --http-served-from ./dist --propagate-content false --skip-confirmation true",
"publish": "aragon apm publish patch && sleep 3",
Expand All @@ -37,13 +38,13 @@
"@aragon/ui": "1.0.0",
"@babel/polyfill": "^7.2.5",
"bignumber.js": "^7.2.1",
"date-fns": "2.0.0-alpha.22",
"prop-types": "^15.7.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-motion": "0.5.2",
"styled-components": "4.1.3",
"web3-utils": "^1.0.0",
"date-fns": "2.0.0-alpha.22"
"web3-utils": "^1.0.0"
},
"devDependencies": {
"@aragon/test-helpers": "^2.0.0",
Expand Down Expand Up @@ -81,6 +82,7 @@
"stylelint-config-styled-components": "^0.1.1",
"stylelint-processor-styled-components": "^1.7.0",
"truffle": "4.1.14",
"truffle-extract": "^1.2.1",
"truffle-hdwallet-provider-privkey": "0.3.0",
"truffle-privatekey-provider": "1.1.0"
},
Expand Down
6 changes: 4 additions & 2 deletions apps/projects/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"name": "@tps/apps-projects",
"name": "@autarklabs/apps-projects",
"version": "0.0.1",
"description": "Project management app from Planning Suite",
"scripts": {
"abi:extract": "truffle-extract --output abi/ --keys abi",
"build:app": "parcel build app/index.html -d dist/ --public-url '.' --no-cache",
"build:script": "parcel build app/script.js -d dist/ --no-cache",
"build": "npm run sync-assets && npm run build:app && npm run build:script",
Expand All @@ -15,7 +16,7 @@
"ganache-cli:test:orig": "../shared/test-helpers/ganache-cli.sh",
"lint": "solium --dir ./contracts",
"precommit": "lint-staged",
"prepublishOnly": "truffle compile",
"prepublishOnly": "npm run compile && npm run abi:extract -- --no-compile",
"publish": "aragon apm publish patch && sleep 3",
"publish:cd": "../../shared/deployments/check-publish.sh",
"publish:http": "npm run build:script && yes | aragon apm publish major --files dist --http localhost:3333 --http-served-from ./dist --propagate-content false --skip-confirmation true",
Expand Down Expand Up @@ -95,6 +96,7 @@
"stylelint-processor-styled-components": "^1.7.0",
"truffle": "4.1.14",
"truffle-assertions": "^0.9.1",
"truffle-extract": "^1.2.1",
"truffle-hdwallet-provider-privkey": "0.3.0",
"truffle-privatekey-provider": "1.1.0"
},
Expand Down
6 changes: 4 additions & 2 deletions apps/rewards/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"name": "@tps/apps-rewards",
"name": "@autarklabs/apps-rewards",
"version": "0.0.1",
"description": "Rewards app from Planning Suite",
"scripts": {
"abi:extract": "truffle-extract --output abi/ --keys abi",
"build:app": "parcel build app/index.html -d dist/ --public-url \".\" --no-cache",
"build:script": "parcel build app/script.js -d dist/ --no-cache",
"build": "npm run sync-assets && npm run build:app && npm run build:script",
Expand All @@ -14,7 +15,7 @@
"ganache-cli:test": "sh ../../node_modules/@aragon/test-helpers/ganache-cli.sh",
"lint": "solium --dir ./contracts",
"precommit": "lint-staged",
"prepublishOnly": "truffle compile",
"prepublishOnly": "npm run compile && npm run abi:extract -- --no-compile",
"publish": "aragon apm publish patch && sleep 3",
"publish:cd": "../../shared/deployments/check-publish.sh",
"publish:http": "npm run build:script && yes | aragon apm publish major --files dist --http localhost:5555 --http-served-from ./dist --propagate-content false --skip-confirmation true",
Expand Down Expand Up @@ -83,6 +84,7 @@
"stylelint-config-styled-components": "^0.1.1",
"stylelint-processor-styled-components": "^1.7.0",
"truffle": "4.1.14",
"truffle-extract": "^1.2.1",
"truffle-hdwallet-provider-privkey": "0.3.0",
"truffle-privatekey-provider": "1.1.0"
},
Expand Down
4 changes: 2 additions & 2 deletions apps/shared/test-helpers/develop-kit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ start_kit() {
}

echo "Compiling and getting deployed contract address"
lerna exec --scope=@tps/apps-* --concurrency=1 -- deploy_contract
lerna exec --scope=@tps/apps-* -- aragon apm versions
lerna exec --scope=@autarklabs/apps-* --concurrency=1 -- deploy_contract
lerna exec --scope=@autarklabs/apps-* -- aragon apm versions
echo "Starting multi parcel instances in parallel execution"
start_multi_parcel "$@"
sleep 10
Expand Down
2 changes: 1 addition & 1 deletion apps/shared/test-helpers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"name": "@tps/test-helpers",
"private": true,
"version": "0.0.1",
"description": "Helper scripts for Planning Suite",
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions docs/DEVELOPMENT_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ $ lerna ls
lerna info version 2.11.0
lerna info versioning independent
@tps/planning-suite v0.0.1
@tps/apps-address-book v0.0.1
@tps/apps-allocations v0.0.1
@tps/apps-projects v0.0.1
@tps/apps-dot-voting v0.0.1
@autarklabs/apps-address-book v0.0.1
@autarklabs/apps-allocations v0.0.1
@autarklabs/apps-projects v0.0.1
@autarklabs/apps-dot-voting v0.0.1
```

- Planning-suite is the base monorepo.
Expand Down
37 changes: 16 additions & 21 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"name": "planning-suite-monorepo",
"name": "open-enterprise-monorepo",
"devDependencies": {
"@commitlint/cli": "^8.2.0",
"@commitlint/config-conventional": "^8.2.0",
Expand All @@ -13,19 +13,14 @@
},
"scripts": {
"bootstrap": "lerna bootstrap --hoist",
"build:apps": "npm run build:app:address && npm run build:app:allocations && npm run build:app:discussions && npm run build:app:dot && npm run build:app:projects && npm run build:app:rewards",
"build:app:address": "lerna run build:app --scope=@tps/apps-address-book",
"build:app:allocations": "lerna run build:app --scope=@tps/apps-allocations",
"build:app:discussions": "lerna run build:app --scope=@tps/apps-discussions",
"build:app:dot": "lerna run build:app --scope=@tps/apps-dot-voting",
"build:app:projects": "lerna run build:app --scope=@tps/apps-projects",
"build:app:rewards": "lerna run build:app --scope=@tps/apps-rewards",
"build:script:address": "lerna run build:script --scope=@tps/apps-address-book",
"build:script:allocations": "lerna run build:script --scope=@tps/apps-allocations",
"build:script:discussions": "lerna run build:script --scope=@tps/apps-discussions",
"build:script:dot": "lerna run build:script --scope=@tps/apps-dot-voting",
"build:script:projects": "lerna run build:script --scope=@tps/apps-projects",
"build:script:rewards": "lerna run build:script --scope=@tps/apps-rewards",
"build:apps": "lerna run build:app --scope=@autarklabs/apps-*",
"build:scripts": "lerna run build:script --scope=@autarklabs/apps-*",
"build:script:address": "lerna run build:script --scope=@autarklabs/apps-address-book",
"build:script:allocations": "lerna run build:script --scope=@autarklabs/apps-allocations",
"build:script:discussions": "lerna run build:script --scope=@autarklabs/apps-discussions",
"build:script:dot": "lerna run build:script --scope=@autarklabs/apps-dot-voting",
"build:script:projects": "lerna run build:script --scope=@autarklabs/apps-projects",
"build:script:rewards": "lerna run build:script --scope=@autarklabs/apps-rewards",
"clean:aragon": "rm -rf ~/.aragon && rm -rf ~/.ipfs",
"clean:build": "npm run clean -- $npm_package_build_exclude_pattern",
"clean": "git clean -fXd",
Expand All @@ -34,9 +29,9 @@
"cypress:open": "cypress open",
"cypress:run": "wait-on http://localhost:3000/#/0x5b6a3301a67A4bfda9D3a528CaD34cac6e7F8070 && cypress run",
"cypress": "CYPRESS=true apps/shared/test-helpers/ganache-cli.sh",
"deploy:apps:rinkeby": "lerna run --scope='@tps/apps-*' deploy:rinkeby --stream",
"deploy:apps:rpc": "lerna run --scope='@tps/apps-*' deploy:rpc --stream",
"deploy:apps:staging": "lerna run --scope='@tps/apps-*' deploy:staging --stream",
"deploy:apps:rinkeby": "lerna run --scope='@autarklabs/apps-*' deploy:rinkeby --stream",
"deploy:apps:rpc": "lerna run --scope='@autarklabs/apps-*' deploy:rpc --stream",
"deploy:apps:staging": "lerna run --scope='@autarklabs/apps-*' deploy:staging --stream",
"deploy:kit:rinkeby": "lerna run --scope='@tps/kits-*' deploy:kit:rinkeby --stream",
"deploy:kit:rpc": "lerna run --scope='@tps/kits-*' deploy:kit:rpc --stream",
"deploy:kit:staging": "lerna run --scope='@tps/kits-*' deploy:kit:staging --stream",
Expand All @@ -54,16 +49,16 @@
"frontend:rewards": "cd apps/rewards && npm run frontend",
"lint:address": "cd apps/address-book && npm run lint",
"lint:allocations": "cd apps/allocations && npm run lint",
"lint:contracts": "lerna run --scope='@tps/apps-*' lint --stream",
"lint:contracts": "lerna run --scope='@autarklabs/apps-*' lint --stream",
"lint:dot": "cd apps/dot-voting && npm run lint",
"lint:fix": "lerna exec --scope=@tps/apps-* --stream -- eslint app --fix",
"lint:fix": "lerna exec --scope=@autarklabs/apps-* --stream -- eslint app --fix",
"lint:projects": "cd apps/projects && npm run lint",
"lint": "npm run lint:contracts && lerna exec --scope=@tps/apps-* --stream -- eslint app",
"lint": "npm run lint:contracts && lerna exec --scope=@autarklabs/apps-* --stream -- eslint app",
"mine": "lerna exec --scope=@tps/test-helpers truffle exec ./mine.js",
"postinstall": "npm run bootstrap",
"publish:cd": "lerna run publish:cd --no-ci --stream --no-bail --scope=@tps/apps*",
"publish:apps": "lerna run publish",
"publish:http": "lerna run --scope='@tps/apps-*' publish:http --stream",
"publish:http": "lerna run --scope='@autarklabs/apps-*' publish:http --stream",
"recoverTemplate": "cd templates/open-enterprise && npm run recover:tx",
"restart": "RESTART_KIT=true apps/shared/test-helpers/ganache-cli.sh",
"start:kit": "cd apps/planning-suite-kit && npm run start:kit",
Expand Down
4 changes: 2 additions & 2 deletions shared/deployments/rinkeby.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
commit hash: 9890895240b237c1db1271264b2290d002eaf9d6

Command:
`./node_modules/.bin/lerna exec --scope="@tps/apps-projects" --stream aragon apm publish patch -- --files dist/ --environment rinkeby`
`./node_modules/.bin/lerna exec --scope="@autarklabs/apps-projects" --stream aragon apm publish patch -- --files dist/ --environment rinkeby`


### v1.0.2
Expand All @@ -45,7 +45,7 @@ Command:
```

Command:
`./node_modules/.bin/lerna exec --scope="@tps/apps-projects" --stream aragon apm publish patch -- --files dist/ --environment rinkeby`
`./node_modules/.bin/lerna exec --scope="@autarklabs/apps-projects" --stream aragon apm publish patch -- --files dist/ --environment rinkeby`


## DotVoting (formerly RangeVoting)
Expand Down
Loading