Skip to content

Commit

Permalink
Make packages depend on git vesrion (not npm) (#1192)
Browse files Browse the repository at this point in the history
Several packages were depending on a fixed npm version; and not the
package in the git repo; which defeat the monorepo purpose.
  • Loading branch information
Mariano Cortesi authored Oct 3, 2019
1 parent a70d7aa commit 21cbb94
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 93 deletions.
4 changes: 2 additions & 2 deletions packages/attestation-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"lint": "tslint -c tslint.json --project ."
},
"dependencies": {
"@celo/contractkit": "0.1.1",
"@celo/utils": "^0.1.0",
"@celo/contractkit": "0.2.0-dev",
"@celo/utils": "0.1.2-dev",
"bignumber.js": "^7.2.0",
"body-parser": "1.19.0",
"debug": "^4.1.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/celotool/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"license": "Apache-2.0",
"dependencies": {
"@celo/verification-pool-api": "^1.0.0",
"@celo/utils": "^0.1.0",
"@celo/utils": "0.1.2-dev",
"@celo/walletkit": "^0.0.14",
"@celo/contractkit": "0.1.6",
"@celo/contractkit": "0.2.0-dev",
"@google-cloud/monitoring": "0.7.1",
"@google-cloud/pubsub": "^0.28.1",
"@google-cloud/storage": "^2.4.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"test": "TZ=UTC jest"
},
"dependencies": {
"@celo/utils": "^0.1.0",
"@celo/contractkit": "^0.1.1",
"@celo/utils": "0.1.2-dev",
"@celo/contractkit": "0.2.0-dev",
"@oclif/command": "^1",
"@oclif/config": "^1",
"@oclif/plugin-help": "^2",
Expand Down
4 changes: 2 additions & 2 deletions packages/contractkit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@celo/contractkit",
"version": "0.1.6",
"version": "0.2.0-dev",
"description": "Celo's ContractKit to interact with Celo network",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
Expand All @@ -26,7 +26,7 @@
},
"dependencies": {
"@0x/subproviders": "^5.0.0",
"@celo/utils": "^0.1.0",
"@celo/utils": "0.1.2-dev",
"@types/debug": "^4.1.5",
"bignumber.js": "^7.2.0",
"cross-fetch": "3.0.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/dappkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"build": "tsc"
},
"dependencies": {
"@celo/contractkit": "0.1.5",
"@celo/utils": "^0.1.0",
"@celo/contractkit": "0.2.0-dev",
"@celo/utils": "0.1.2-dev",
"expo": "^34.0.1",
"expo-contacts": "6.0.0",
"libphonenumber-js": "^1.7.22"
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"dependencies": {
"@celo/client": "640a41f",
"@celo/react-native-sms-retriever": "git+https://github.com/celo-org/react-native-sms-retriever#d3a2fdb",
"@celo/utils": "^0.1.0",
"@celo/utils": "0.1.2-dev",
"@celo/walletkit": "^0.0.14",
"@react-native-community/netinfo": "^2.0.4",
"@segment/analytics-react-native": "^1.1.0-beta.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/notification-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"deploy": "./deploy.sh"
},
"dependencies": {
"@celo/contractkit": "0.1.5",
"@celo/utils": "^0.1.0",
"@celo/contractkit": "0.2.0-dev",
"@celo/utils": "0.1.2-dev",
"async-polling": "^0.2.1",
"bignumber.js": "^7.2.0",
"dotenv": "^6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@0x/sol-profiler": "^3.0.0",
"@0x/sol-trace": "^2.0.16",
"@0x/subproviders": "^5.0.0",
"@celo/utils": "^0.1.0",
"@celo/utils": "0.1.2-dev",
"apollo-client": "^2.4.13",
"bls12377js": "https://github.com/celo-org/bls12377js#4f596cabb659c4f8969ae4b617f185f2bc74cbbb",
"chai-subset": "^1.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"test:watch": "export TZ=UTC && jest --watch"
},
"dependencies": {
"@celo/utils": "^0.1.0",
"@celo/utils": "0.1.2-dev",
"hoist-non-react-statics": "^3.3.0",
"lodash": "^4.17.14",
"react-native-autocomplete-input": "^3.6.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/transaction-metrics-exporter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"license": "Apache-2.0",
"private": true,
"dependencies": {
"@celo/contractkit": "^0.1.1",
"@celo/utils": "^0.1.0",
"@celo/contractkit": "0.2.0-dev",
"@celo/utils": "0.1.2-dev",
"express": "4.16.4",
"prom-client": "11.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@celo/utils",
"version": "0.1.1",
"version": "0.1.2-dev",
"description": "Celo common utils",
"author": "Celo",
"license": "Apache-2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/verification-pool-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"test:verbose": "jest --ci --verbose --runInBand --detectOpenHandles"
},
"dependencies": {
"@celo/contractkit": "^0.1.5",
"@celo/utils": "^0.1.0",
"@celo/contractkit": "0.2.0-dev",
"@celo/utils": "0.1.2-dev",
"bignumber.js": "^7.2.0",
"eth-lib": "^0.2.8",
"ethereumjs-util": "^5.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/verifier/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"dependencies": {
"@celo/react-components": "1.0.0",
"@celo/utils": "^0.1.0",
"@celo/utils": "0.1.2-dev",
"@react-native-community/netinfo": "^2.0.4",
"@segment/analytics-react-native": "^1.1.0-beta.1",
"@segment/analytics-react-native-firebase": "^1.1.0-beta.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/walletkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"dependencies": {
"@0x/subproviders": "^4.1.0",
"@celo/utils": "^0.1.0",
"@celo/utils": "0.1.2-dev",
"@google-cloud/storage": "^2.3.3",
"babel-jest": "^24.8.0",
"bignumber.js": "^7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"test-licenses": "yarn licenses list --prod | grep '\\(─ GPL\\|─ (GPL-[1-9]\\.[0-9]\\+ OR GPL-[1-9]\\.[0-9]\\+)\\)' && echo 'Found GPL license(s). Use 'yarn licenses list --prod' to look up the offending package' || echo 'No GPL licenses found'"
},
"dependencies": {
"@celo/utils": "^0.1.0",
"@celo/utils": "0.1.2-dev",
"@segment/in-eu": "^0.2.1",
"@sentry/browser": "^5.6.2",
"@sentry/node": "^5.6.2",
Expand Down
70 changes: 0 additions & 70 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2248,34 +2248,6 @@
resolved "https://registry.yarnpkg.com/@celo/client/-/client-0.0.142.tgz#ea15cf543f512c6d7ad1bc6611d3836c5bf06f40"
integrity sha512-F5CEEsKNegFJzb9btk9OpUWTSL9gDNAqoi4fEZ+fEeYJR6763PPW8CHub+KrwslALcCeuSQiRSFzvtuCq85SgA==

"@celo/contractkit@0.1.1":
version "0.1.1"
resolved "https://registry.yarnpkg.com/@celo/contractkit/-/contractkit-0.1.1.tgz#bd85812d883b58fbc8d9897a59e2f7311cc0e2eb"
integrity sha512-GQbLuLUEgKtwy2I8ZVi4P0HBVhh9MlT5S90vIrGznb9eZ2vwGahfOxHapVKcxw2I4tbVBNTTWWpcjzOtJZCY7Q==
dependencies:
"@celo/utils" "^0.0.6-beta5"
"@types/debug" "^4.1.5"
bignumber.js "^7.2.0"
debug "^4.1.1"
web3 "1.0.0-beta.37"
web3-utils "1.0.0-beta.37"

"@celo/contractkit@0.1.5":
version "0.1.5"
resolved "https://registry.yarnpkg.com/@celo/contractkit/-/contractkit-0.1.5.tgz#097052ac8f672f03480a1226f11f0c398c35c75e"
integrity sha512-vW8/ZluqJXx4SOB64XyFZjR3Z6qzcCUjXk6ec5613NH8DC/7jzxPCnbPsnxL4R+zuEajDWKfjjeH94Y1uLgVGA==
dependencies:
"@0x/subproviders" "^5.0.0"
"@celo/utils" "0.1.0"
"@types/debug" "^4.1.5"
bignumber.js "^7.2.0"
debug "^4.1.1"
eth-lib "^0.2.8"
web3 "1.0.0-beta.37"
web3-core-helpers "1.0.0-beta.37"
web3-eth-abi "1.0.0-beta.37"
web3-utils "1.0.0-beta.37"

"@celo/dev-cli@^2.0.3":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@celo/dev-cli/-/dev-cli-2.0.3.tgz#67f61dfee373ad8b412925e386cf122aabada5f5"
Expand Down Expand Up @@ -2314,43 +2286,6 @@
version "1.0.3"
resolved "git+https://github.com/celo-org/react-native-sms-retriever#d3a2fdb148e3427c9a8c1c87acb61e79e2afcfee"

"@celo/utils@0.1.0":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@celo/utils/-/utils-0.1.0.tgz#081e0c9a7ea3e7b50cbc88e89b0f7ff8d5578499"
integrity sha512-sSE17+lu0dqG+Zo+H/aZYFXq436+Kd9xhXk5a36RtONXuJY8q6jfaXMFoBJ0Wft19rJM24e9F2aM84HM/IiUTQ==
dependencies:
"@umpirsky/country-list" "git://github.com/umpirsky/country-list#05fda51"
bigi "^1.1.0"
bignumber.js "^7.2.0"
bn.js "4.11.8"
buffer-reverse "^1.0.1"
country-data "^0.0.31"
crypto-js "^3.1.9-1"
elliptic "^6.4.1"
ethereumjs-util "^5.2.0"
futoin-hkdf "^1.0.3"
google-libphonenumber "^3.2.4"
keccak256 "^1.0.0"
lodash "^4.17.14"
web3-utils "1.0.0-beta.37"

"@celo/utils@^0.0.6-beta5":
version "0.0.6-beta5"
resolved "https://registry.yarnpkg.com/@celo/utils/-/utils-0.0.6-beta5.tgz#a558cfc9dc68d9ec15888798c95cd6e5f1d3fe67"
integrity sha512-TGIDjr1aCcNRVv2Z3DZkjd71K/vNd6C18BPZw8VfKzSFyt0UcxkbN/X+loqvJSrwymtYgu/s6JdIQD3t14xiJA==
dependencies:
"@umpirsky/country-list" "git://github.com/umpirsky/country-list#05fda51"
bignumber.js "^7.2.0"
bn.js "4.11.8"
country-data "^0.0.31"
crypto-js "^3.1.9-1"
elliptic "^6.4.1"
ethereumjs-util "^5.2.0"
futoin-hkdf "^1.0.3"
google-libphonenumber "^3.2.1"
lodash "^4.17.14"
web3-utils "1.0.0-beta.37"

"@cnakazawa/watch@^1.0.3":
version "1.0.3"
resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
Expand Down Expand Up @@ -16367,11 +16302,6 @@ google-gax@^1.0.0, google-gax@^1.1.2:
semver "^6.0.0"
walkdir "^0.4.0"

google-libphonenumber@^3.2.1:
version "3.2.5"
resolved "https://registry.yarnpkg.com/google-libphonenumber/-/google-libphonenumber-3.2.5.tgz#2ebe6437fd3dbbffd65f4339ad1ba93b3dc56836"
integrity sha512-Y0r7MFCI11UDLn0KaMPBEInhROyIOkWkQIyvWMFVF2I+h+sHE3vbl5a7FVe39td6u/w+nlKDdUMP9dMOZyv+2Q==

google-libphonenumber@^3.2.4:
version "3.2.4"
resolved "https://registry.yarnpkg.com/google-libphonenumber/-/google-libphonenumber-3.2.4.tgz#91d3fe62ca531f154165e6580b1c55ff6bd53abf"
Expand Down

0 comments on commit 21cbb94

Please sign in to comment.