From 8dedcda6150ae48486b8bd28dd44a40489cca609 Mon Sep 17 00:00:00 2001 From: Kevin Siegler Date: Thu, 19 Dec 2019 15:54:48 -0600 Subject: [PATCH] chore: prepare repo for publishing to npm --- .travis.yml | 10 ++--- apps/address-book/package.json | 10 +++-- apps/allocations/package.json | 10 +++-- apps/discussions/package.json | 14 ++++--- apps/dot-voting/package.json | 10 +++-- apps/projects/package.json | 6 ++- apps/rewards/package.json | 6 ++- apps/shared/test-helpers/develop-kit.sh | 4 +- apps/shared/test-helpers/package.json | 2 +- docs/DEVELOPMENT_NOTES.md | 8 ++-- package.json | 37 ++++++++----------- shared/deployments/rinkeby.md | 4 +- shared/deployments/staging.md | 8 ++-- templates/dev/package.json | 13 ++++--- .../open-enterprise/contracts/BaseOEApps.sol | 12 +++--- templates/open-enterprise/package.json | 12 +++--- 16 files changed, 87 insertions(+), 79 deletions(-) diff --git a/.travis.yml b/.travis.yml index eed8a7737..bfe2d51a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/apps/address-book/package.json b/apps/address-book/package.json index a28027293..099a8e27b 100644 --- a/apps/address-book/package.json +++ b/apps/address-book/package.json @@ -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", @@ -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", "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", @@ -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", @@ -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" }, diff --git a/apps/allocations/package.json b/apps/allocations/package.json index 190c884ff..af1531ea6 100644 --- a/apps/allocations/package.json +++ b/apps/allocations/package.json @@ -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", @@ -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", @@ -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", @@ -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" }, diff --git a/apps/discussions/package.json b/apps/discussions/package.json index 821b0d077..3ee89838c 100644 --- a/apps/discussions/package.json +++ b/apps/discussions/package.json @@ -1,5 +1,5 @@ { - "name": "@tps/apps-discussions", + "name": "@autarklabs/apps-discussions", "version": "1.0.0", "description": "", "dependencies": { @@ -7,19 +7,19 @@ "@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.1.0", - "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", @@ -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", "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", diff --git a/apps/dot-voting/package.json b/apps/dot-voting/package.json index 4a0a3b351..25b54c10c 100644 --- a/apps/dot-voting/package.json +++ b/apps/dot-voting/package.json @@ -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", @@ -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", @@ -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", @@ -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" }, diff --git a/apps/projects/package.json b/apps/projects/package.json index 2ec1b3573..2ff814ee2 100644 --- a/apps/projects/package.json +++ b/apps/projects/package.json @@ -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", @@ -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", @@ -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" }, diff --git a/apps/rewards/package.json b/apps/rewards/package.json index acd66a3a9..bf5d997e8 100644 --- a/apps/rewards/package.json +++ b/apps/rewards/package.json @@ -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", @@ -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", @@ -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" }, diff --git a/apps/shared/test-helpers/develop-kit.sh b/apps/shared/test-helpers/develop-kit.sh index dc685ca13..951d33039 100755 --- a/apps/shared/test-helpers/develop-kit.sh +++ b/apps/shared/test-helpers/develop-kit.sh @@ -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 diff --git a/apps/shared/test-helpers/package.json b/apps/shared/test-helpers/package.json index 9ab97560f..1816171a0 100644 --- a/apps/shared/test-helpers/package.json +++ b/apps/shared/test-helpers/package.json @@ -1,6 +1,6 @@ { - "private": true, "name": "@tps/test-helpers", + "private": true, "version": "0.0.1", "description": "Helper scripts for Planning Suite", "devDependencies": { diff --git a/docs/DEVELOPMENT_NOTES.md b/docs/DEVELOPMENT_NOTES.md index b20f47fd7..0cdcf717a 100644 --- a/docs/DEVELOPMENT_NOTES.md +++ b/docs/DEVELOPMENT_NOTES.md @@ -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. diff --git a/package.json b/package.json index 02a1b7acc..a34706ad6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "planning-suite-monorepo", + "name": "open-enterprise-monorepo", "devDependencies": { "coveralls": "3.0.2", "cypress": "^3.1.5", @@ -11,19 +11,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", @@ -32,9 +27,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", @@ -52,16 +47,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", diff --git a/shared/deployments/rinkeby.md b/shared/deployments/rinkeby.md index 5331c2786..6da10f211 100644 --- a/shared/deployments/rinkeby.md +++ b/shared/deployments/rinkeby.md @@ -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 @@ -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) diff --git a/shared/deployments/staging.md b/shared/deployments/staging.md index 25181828a..bb5ce77f2 100644 --- a/shared/deployments/staging.md +++ b/shared/deployments/staging.md @@ -11,7 +11,7 @@ ℹ Transaction hash: 0x4231262285244a475668e8dda953917a64cb9367885c822ca02eea3cae69bac4 ``` -- command: `./node_modules/.bin/lerna exec --scope="@tps/apps-address-book" --stream aragon apm publish patch -- --files dist/ --environment staging` +- command: `./node_modules/.bin/lerna exec --scope="@autarklabs/apps-address-book" --stream aragon apm publish patch -- --files dist/ --environment staging` ### 8.0.0 @@ -22,7 +22,7 @@ ℹ Transaction hash: 0x0b4bef766abb49543810a242902fe9cea3d534184f8001ade47f341559982c2b ``` -- command: `./node_modules/.bin/lerna exec --scope="@tps/apps-address-book" --stream aragon apm publish major -- --files dist/ --environment staging` +- command: `./node_modules/.bin/lerna exec --scope="@autarklabs/apps-address-book" --stream aragon apm publish major -- --files dist/ --environment staging` ### 6.0.2 @@ -144,7 +144,7 @@ ℹ Transaction hash: 0xc361863e7ccdde3d6d04d26494ba276d863b1025cebfea15b345c95a1fab7cbe ``` -- command: `./node_modules/.bin/lerna exec --scope="@tps/apps-address-book" --stream aragon apm publish major -- --files dist/ --environment staging` +- command: `./node_modules/.bin/lerna exec --scope="@autarklabs/apps-address-book" --stream aragon apm publish major -- --files dist/ --environment staging` --- @@ -170,7 +170,7 @@ ℹ Transaction hash: 0x3ef749fd7e2442e6b79704ed1e964a620bf6c5f89e3e6c9285b8bc9735a94e7a ``` -`./node_modules/.bin/lerna exec --scope="@tps/apps-rewards" --stream aragon apm publish patch -- --files dist/ --environment staging` +`./node_modules/.bin/lerna exec --scope="@autarklabs/apps-rewards" --stream aragon apm publish patch -- --files dist/ --environment staging` ### 3.0.1 diff --git a/templates/dev/package.json b/templates/dev/package.json index c7b03f02a..8b2a687d0 100644 --- a/templates/dev/package.json +++ b/templates/dev/package.json @@ -1,6 +1,7 @@ { "name": "@autark/templates-open-enterprise-dev", "version": "1.0.0", + "private": true, "description": "Open Enterprise DEV template for Aragon organizations", "author": "Autark ", "license": "GPL-3.0-or-later", @@ -45,12 +46,12 @@ "@aragon/apps-token-manager": "^2.1.0", "@aragon/apps-shared-minime": "1.0.1", "@aragon/templates-shared": "^1.0.0", - "@tps/apps-address-book": "^0.0.1", - "@tps/apps-allocations": "^0.0.1", - "@tps/apps-discussions": "^1.0.0", - "@tps/apps-dot-voting": "^0.0.1", - "@tps/apps-projects": "^0.0.1", - "@tps/apps-rewards": "^0.0.1", + "@autarklabs/apps-address-book": "^0.0.1", + "@autarklabs/apps-allocations": "^0.0.1", + "@autarklabs/apps-discussions": "^1.0.0", + "@autarklabs/apps-dot-voting": "^0.0.1", + "@autarklabs/apps-projects": "^0.0.1", + "@autarklabs/apps-rewards": "^0.0.1", "@tps/test-helpers": "^0.0.1" }, "devDependencies": { diff --git a/templates/open-enterprise/contracts/BaseOEApps.sol b/templates/open-enterprise/contracts/BaseOEApps.sol index be7c9caaa..39af9d040 100644 --- a/templates/open-enterprise/contracts/BaseOEApps.sol +++ b/templates/open-enterprise/contracts/BaseOEApps.sol @@ -2,12 +2,12 @@ pragma solidity 0.4.24; import "@aragon/templates-shared/contracts/TokenCache.sol"; -import "@tps/apps-address-book/contracts/AddressBook.sol"; -import "@tps/apps-allocations/contracts/Allocations.sol"; -import "@tps/apps-discussions/contracts/DiscussionApp.sol"; -import { DotVoting } from "@tps/apps-dot-voting/contracts/DotVoting.sol"; -import "@tps/apps-projects/contracts/Projects.sol"; -import "@tps/apps-rewards/contracts/Rewards.sol"; +import "@autarklabs/apps-address-book/contracts/AddressBook.sol"; +import "@autarklabs/apps-allocations/contracts/Allocations.sol"; +import "@autarklabs/apps-discussions/contracts/DiscussionApp.sol"; +import { DotVoting } from "@autarklabs/apps-dot-voting/contracts/DotVoting.sol"; +import "@autarklabs/apps-projects/contracts/Projects.sol"; +import "@autarklabs/apps-rewards/contracts/Rewards.sol"; import "./BaseCache.sol"; diff --git a/templates/open-enterprise/package.json b/templates/open-enterprise/package.json index 65fc182de..8e46865fd 100644 --- a/templates/open-enterprise/package.json +++ b/templates/open-enterprise/package.json @@ -54,12 +54,12 @@ "@aragon/apps-token-manager": "^2.1.0", "@aragon/apps-shared-minime": "1.0.1", "@aragon/templates-shared": "^1.0.0", - "@tps/apps-address-book": "^0.0.1", - "@tps/apps-allocations": "^0.0.1", - "@tps/apps-discussions": "^1.0.0", - "@tps/apps-dot-voting": "^0.0.1", - "@tps/apps-projects": "^0.0.1", - "@tps/apps-rewards": "^0.0.1", + "@autarklabs/apps-address-book": "^0.0.1", + "@autarklabs/apps-allocations": "^0.0.1", + "@autarklabs/apps-discussions": "^1.0.0", + "@autarklabs/apps-dot-voting": "^0.0.1", + "@autarklabs/apps-projects": "^0.0.1", + "@autarklabs/apps-rewards": "^0.0.1", "@tps/test-helpers": "^0.0.1" }, "devDependencies": {