From 4d373c62db8e5baf639c14e3cb301a844668b74f Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Tue, 28 Jan 2020 22:52:28 +0100 Subject: [PATCH 1/5] Upgrade lerna --- package.json | 2 +- yarn.lock | 69 ++++++---------------------------------------------- 2 files changed, 8 insertions(+), 63 deletions(-) diff --git a/package.json b/package.json index 20c8ef1e..9bb9a9a5 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "karma-jasmine": "^2", "karma-jasmine-html-reporter": "^1.4", "karma-safari-launcher": "^1.0.0", - "lerna": "^3.14.1", + "lerna": "^3.20.2", "memdown": "^4.0.0", "prettier": "^1.19.1", "shx": "^0.3.2", diff --git a/yarn.lock b/yarn.lock index bbfbd218..fc1ff754 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2534,11 +2534,6 @@ dedent@^0.7.0: resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -2626,11 +2621,6 @@ detect-indent@^5.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - dezalgo@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" @@ -3881,7 +3871,7 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3989,7 +3979,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@^1.3.2, ini@^1.3.4, ini@^1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -4555,7 +4545,7 @@ lcid@^2.0.0: dependencies: invert-kv "^2.0.0" -lerna@^3.14.1: +lerna@^3.20.2: version "3.20.2" resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.20.2.tgz#abf84e73055fe84ee21b46e64baf37b496c24864" integrity sha512-bjdL7hPLpU3Y8CBnw/1ys3ynQMUjiK6l9iDWnEGwFtDy48Xh5JboR9ZJwmKGCz9A/sarVVIGwf1tlRNKUG9etA== @@ -5217,15 +5207,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -needle@^2.2.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" - integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -5301,22 +5282,6 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - nopt@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" @@ -5388,7 +5353,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: semver "^5.6.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.1.6, npm-packlist@^1.4.4: +npm-packlist@^1.4.4: version "1.4.8" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== @@ -5413,7 +5378,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npmlog@^4.0.2, npmlog@^4.1.2: +npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -6124,16 +6089,6 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - read-cmd-shim@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16" @@ -6452,7 +6407,7 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -6510,11 +6465,6 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - schema-utils@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" @@ -7033,11 +6983,6 @@ strip-json-comments@^3.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - strong-log-transformer@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10" @@ -7081,7 +7026,7 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8: +tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== From 0fe2cbba52f4fbffbca78735f836c94e18779f18 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 29 Jan 2020 12:00:24 +0100 Subject: [PATCH 2/5] Convert to monorepository using lerna/workspaces --- lerna.json | 5 ++ package.json | 30 +++++------ packages/bcp/.eslintignore | 1 + .../bcp/jasmine-spec-reporter.config.json | 0 .../bcp/jasmine-testrunner.js | 0 karma.conf.js => packages/bcp/karma.conf.js | 0 {nonces => packages/bcp/nonces}/1570527883 | 0 {nonces => packages/bcp/nonces}/1573026590 | 0 {nonces => packages/bcp/nonces}/1574869843 | 0 {nonces => packages/bcp/nonces}/1576569788 | 0 {nonces => packages/bcp/nonces}/1576595306 | 0 {nonces => packages/bcp/nonces}/1576678551 | 0 {nonces => packages/bcp/nonces}/1576746493 | 0 {nonces => packages/bcp/nonces}/1576760285 | 0 {nonces => packages/bcp/nonces}/1576767119 | 0 {nonces => packages/bcp/nonces}/1579019908 | 0 {nonces => packages/bcp/nonces}/README.txt | 0 packages/bcp/package.json | 54 +++++++++++++++++++ {src => packages/bcp/src}/address.spec.ts | 0 {src => packages/bcp/src}/address.ts | 0 {src => packages/bcp/src}/caip5.spec.ts | 0 {src => packages/bcp/src}/caip5.ts | 0 {src => packages/bcp/src}/cosmoscodec.spec.ts | 0 {src => packages/bcp/src}/cosmoscodec.ts | 0 .../bcp/src}/cosmosconnection.spec.ts | 0 {src => packages/bcp/src}/cosmosconnection.ts | 0 {src => packages/bcp/src}/cosmosconnector.ts | 0 {src => packages/bcp/src}/decode.spec.ts | 0 {src => packages/bcp/src}/decode.ts | 0 {src => packages/bcp/src}/encode.spec.ts | 0 {src => packages/bcp/src}/encode.ts | 0 {src => packages/bcp/src}/index.ts | 0 {src => packages/bcp/src}/restclient.ts | 0 {src => packages/bcp/src}/testdata.spec.ts | 0 .../bcp/src}/testdata/cosmoshub.json | 0 {src => packages/bcp/src}/types.spec.ts | 0 {src => packages/bcp/src}/types.ts | 0 packages/bcp/tsconfig.json | 12 +++++ packages/bcp/tslint.json | 3 ++ typedoc.js => packages/bcp/typedoc.js | 0 {types => packages/bcp/types}/address.d.ts | 0 {types => packages/bcp/types}/caip5.d.ts | 0 .../bcp/types}/cosmoscodec.d.ts | 0 .../bcp/types}/cosmosconnection.d.ts | 0 .../bcp/types}/cosmosconnector.d.ts | 0 {types => packages/bcp/types}/decode.d.ts | 0 {types => packages/bcp/types}/encode.d.ts | 0 {types => packages/bcp/types}/index.d.ts | 0 {types => packages/bcp/types}/restclient.d.ts | 0 {types => packages/bcp/types}/types.d.ts | 0 .../bcp/webpack.web.config.js | 0 tsconfig.json | 6 +-- 52 files changed, 89 insertions(+), 22 deletions(-) create mode 100644 lerna.json create mode 120000 packages/bcp/.eslintignore rename jasmine-spec-reporter.config.json => packages/bcp/jasmine-spec-reporter.config.json (100%) rename jasmine-testrunner.js => packages/bcp/jasmine-testrunner.js (100%) rename karma.conf.js => packages/bcp/karma.conf.js (100%) rename {nonces => packages/bcp/nonces}/1570527883 (100%) rename {nonces => packages/bcp/nonces}/1573026590 (100%) rename {nonces => packages/bcp/nonces}/1574869843 (100%) rename {nonces => packages/bcp/nonces}/1576569788 (100%) rename {nonces => packages/bcp/nonces}/1576595306 (100%) rename {nonces => packages/bcp/nonces}/1576678551 (100%) rename {nonces => packages/bcp/nonces}/1576746493 (100%) rename {nonces => packages/bcp/nonces}/1576760285 (100%) rename {nonces => packages/bcp/nonces}/1576767119 (100%) rename {nonces => packages/bcp/nonces}/1579019908 (100%) rename {nonces => packages/bcp/nonces}/README.txt (100%) create mode 100644 packages/bcp/package.json rename {src => packages/bcp/src}/address.spec.ts (100%) rename {src => packages/bcp/src}/address.ts (100%) rename {src => packages/bcp/src}/caip5.spec.ts (100%) rename {src => packages/bcp/src}/caip5.ts (100%) rename {src => packages/bcp/src}/cosmoscodec.spec.ts (100%) rename {src => packages/bcp/src}/cosmoscodec.ts (100%) rename {src => packages/bcp/src}/cosmosconnection.spec.ts (100%) rename {src => packages/bcp/src}/cosmosconnection.ts (100%) rename {src => packages/bcp/src}/cosmosconnector.ts (100%) rename {src => packages/bcp/src}/decode.spec.ts (100%) rename {src => packages/bcp/src}/decode.ts (100%) rename {src => packages/bcp/src}/encode.spec.ts (100%) rename {src => packages/bcp/src}/encode.ts (100%) rename {src => packages/bcp/src}/index.ts (100%) rename {src => packages/bcp/src}/restclient.ts (100%) rename {src => packages/bcp/src}/testdata.spec.ts (100%) rename {src => packages/bcp/src}/testdata/cosmoshub.json (100%) rename {src => packages/bcp/src}/types.spec.ts (100%) rename {src => packages/bcp/src}/types.ts (100%) create mode 100644 packages/bcp/tsconfig.json create mode 100644 packages/bcp/tslint.json rename typedoc.js => packages/bcp/typedoc.js (100%) rename {types => packages/bcp/types}/address.d.ts (100%) rename {types => packages/bcp/types}/caip5.d.ts (100%) rename {types => packages/bcp/types}/cosmoscodec.d.ts (100%) rename {types => packages/bcp/types}/cosmosconnection.d.ts (100%) rename {types => packages/bcp/types}/cosmosconnector.d.ts (100%) rename {types => packages/bcp/types}/decode.d.ts (100%) rename {types => packages/bcp/types}/encode.d.ts (100%) rename {types => packages/bcp/types}/index.d.ts (100%) rename {types => packages/bcp/types}/restclient.d.ts (100%) rename {types => packages/bcp/types}/types.d.ts (100%) rename webpack.web.config.js => packages/bcp/webpack.web.config.js (100%) diff --git a/lerna.json b/lerna.json new file mode 100644 index 00000000..93ecf82b --- /dev/null +++ b/lerna.json @@ -0,0 +1,5 @@ +{ + "version": "0.0.0", + "useWorkspaces": true, + "npmClient": "yarn" +} diff --git a/package.json b/package.json index 9bb9a9a5..b0c5d5af 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "cosm-js", - "version": "2.0.0-alpha.7", + "name": "cosm-js-monorepo-root", "description": "Transaction codec and client to communicate with any wasmd blockchain", + "private": true, "author": "Ethan Frey ", "license": "Apache-2.0", "main": "build/index.js", @@ -20,22 +20,17 @@ "publishConfig": { "access": "public" }, + "workspaces": [ + "packages/*" + ], "scripts": { - "docs": "shx rm -rf docs && typedoc --options typedoc.js", - "format": "prettier --write --loglevel warn \"./src/**/*.ts\"", - "lint": "eslint --max-warnings 0 \"**/*.{js,ts}\" && tslint -t verbose --project .", - "autolint": "eslint --max-warnings 0 \"**/*.{js,ts}\" --fix", - "move-types": "shx rm -rf ./types/* && shx mv build/types/* ./types && rm -rf ./types/testdata && shx rm -f ./types/*.spec.d.ts", - "format-types": "prettier --write --loglevel warn \"./types/**/*.d.ts\"", - "build": "shx rm -rf ./build && tsc && yarn move-types && yarn format-types", - "build-or-skip": "[ -n \"$SKIP_BUILD\" ] || yarn build", - "test-node": "node jasmine-testrunner.js", - "test-edge": "yarn pack-web && karma start --single-run --browsers Edge", - "test-firefox": "yarn pack-web && karma start --single-run --browsers Firefox", - "test-chrome": "yarn pack-web && karma start --single-run --browsers ChromeHeadlessInsecure", - "test-safari": "yarn pack-web && karma start --single-run --browsers Safari", - "test": "yarn build-or-skip && yarn test-node", - "pack-web": "yarn build-or-skip && webpack --mode development --config webpack.web.config.js" + "format": "lerna run format", + "format-text": "prettier --write --prose-wrap always --print-width 80 \"./*.md\" \"./docs/**/*.md\" \"./scripts/**/*.{json,md}\" && lerna run format-text", + "lint": "lerna run lint", + "lint-fix": "lerna run lint-fix", + "test": "lerna run test", + "build": "lerna run build", + "docs": "lerna run docs" }, "dependencies": { "@iov/bcp": "^2.0.0-alpha.7", @@ -49,7 +44,6 @@ "xstream": "^11.11.0" }, "devDependencies": { - "@iov/keycontrol": "^2.0.0-alpha.7", "@types/jasmine": "^3.3.7", "@types/memdown": "^3.0.0", "@typescript-eslint/eslint-plugin": "^2.10.0", diff --git a/packages/bcp/.eslintignore b/packages/bcp/.eslintignore new file mode 120000 index 00000000..86039baf --- /dev/null +++ b/packages/bcp/.eslintignore @@ -0,0 +1 @@ +../../.eslintignore \ No newline at end of file diff --git a/jasmine-spec-reporter.config.json b/packages/bcp/jasmine-spec-reporter.config.json similarity index 100% rename from jasmine-spec-reporter.config.json rename to packages/bcp/jasmine-spec-reporter.config.json diff --git a/jasmine-testrunner.js b/packages/bcp/jasmine-testrunner.js similarity index 100% rename from jasmine-testrunner.js rename to packages/bcp/jasmine-testrunner.js diff --git a/karma.conf.js b/packages/bcp/karma.conf.js similarity index 100% rename from karma.conf.js rename to packages/bcp/karma.conf.js diff --git a/nonces/1570527883 b/packages/bcp/nonces/1570527883 similarity index 100% rename from nonces/1570527883 rename to packages/bcp/nonces/1570527883 diff --git a/nonces/1573026590 b/packages/bcp/nonces/1573026590 similarity index 100% rename from nonces/1573026590 rename to packages/bcp/nonces/1573026590 diff --git a/nonces/1574869843 b/packages/bcp/nonces/1574869843 similarity index 100% rename from nonces/1574869843 rename to packages/bcp/nonces/1574869843 diff --git a/nonces/1576569788 b/packages/bcp/nonces/1576569788 similarity index 100% rename from nonces/1576569788 rename to packages/bcp/nonces/1576569788 diff --git a/nonces/1576595306 b/packages/bcp/nonces/1576595306 similarity index 100% rename from nonces/1576595306 rename to packages/bcp/nonces/1576595306 diff --git a/nonces/1576678551 b/packages/bcp/nonces/1576678551 similarity index 100% rename from nonces/1576678551 rename to packages/bcp/nonces/1576678551 diff --git a/nonces/1576746493 b/packages/bcp/nonces/1576746493 similarity index 100% rename from nonces/1576746493 rename to packages/bcp/nonces/1576746493 diff --git a/nonces/1576760285 b/packages/bcp/nonces/1576760285 similarity index 100% rename from nonces/1576760285 rename to packages/bcp/nonces/1576760285 diff --git a/nonces/1576767119 b/packages/bcp/nonces/1576767119 similarity index 100% rename from nonces/1576767119 rename to packages/bcp/nonces/1576767119 diff --git a/nonces/1579019908 b/packages/bcp/nonces/1579019908 similarity index 100% rename from nonces/1579019908 rename to packages/bcp/nonces/1579019908 diff --git a/nonces/README.txt b/packages/bcp/nonces/README.txt similarity index 100% rename from nonces/README.txt rename to packages/bcp/nonces/README.txt diff --git a/packages/bcp/package.json b/packages/bcp/package.json new file mode 100644 index 00000000..8a78fd19 --- /dev/null +++ b/packages/bcp/package.json @@ -0,0 +1,54 @@ +{ + "name": "@cosmwasm/bcp", + "version": "2.0.0-alpha.7", + "description": "Transaction codec and client to communicate with any wasmd blockchain", + "author": "Ethan Frey ", + "license": "Apache-2.0", + "main": "build/index.js", + "types": "types/index.d.ts", + "files": [ + "build/", + "types/", + "*.md", + "!*.spec.*", + "!**/testdata/" + ], + "repository": { + "type": "git", + "url": "https://github.com/confio/cosm-js/tree/master/packages/bcp" + }, + "publishConfig": { + "access": "public" + }, + "scripts": { + "docs": "shx rm -rf docs && typedoc --options typedoc.js", + "format": "prettier --write --loglevel warn \"./src/**/*.ts\"", + "lint": "eslint --max-warnings 0 \"**/*.{js,ts}\" && tslint -t verbose --project .", + "lint-fix": "eslint --max-warnings 0 \"**/*.{js,ts}\" --fix", + "move-types": "shx rm -rf ./types/* && shx mv build/types/* ./types && rm -rf ./types/testdata && shx rm -f ./types/*.spec.d.ts", + "format-types": "prettier --write --loglevel warn \"./types/**/*.d.ts\"", + "build": "shx rm -rf ./build && tsc && yarn move-types && yarn format-types", + "build-or-skip": "[ -n \"$SKIP_BUILD\" ] || yarn build", + "test-node": "node jasmine-testrunner.js", + "test-edge": "yarn pack-web && karma start --single-run --browsers Edge", + "test-firefox": "yarn pack-web && karma start --single-run --browsers Firefox", + "test-chrome": "yarn pack-web && karma start --single-run --browsers ChromeHeadlessInsecure", + "test-safari": "yarn pack-web && karma start --single-run --browsers Safari", + "test": "yarn build-or-skip && yarn test-node", + "pack-web": "yarn build-or-skip && webpack --mode development --config webpack.web.config.js" + }, + "dependencies": { + "@iov/bcp": "^2.0.0-alpha.7", + "@iov/crypto": "^2.0.0-alpha.7", + "@iov/encoding": "^2.0.0-alpha.7", + "@iov/stream": "^2.0.0-alpha.7", + "@tendermint/amino-js": "^0.7.0-alpha.1", + "axios": "^0.19.0", + "fast-deep-equal": "^3.1.1", + "readonly-date": "^1.0.0", + "xstream": "^11.11.0" + }, + "devDependencies": { + "@iov/keycontrol": "^2.0.0-alpha.7" + } +} diff --git a/src/address.spec.ts b/packages/bcp/src/address.spec.ts similarity index 100% rename from src/address.spec.ts rename to packages/bcp/src/address.spec.ts diff --git a/src/address.ts b/packages/bcp/src/address.ts similarity index 100% rename from src/address.ts rename to packages/bcp/src/address.ts diff --git a/src/caip5.spec.ts b/packages/bcp/src/caip5.spec.ts similarity index 100% rename from src/caip5.spec.ts rename to packages/bcp/src/caip5.spec.ts diff --git a/src/caip5.ts b/packages/bcp/src/caip5.ts similarity index 100% rename from src/caip5.ts rename to packages/bcp/src/caip5.ts diff --git a/src/cosmoscodec.spec.ts b/packages/bcp/src/cosmoscodec.spec.ts similarity index 100% rename from src/cosmoscodec.spec.ts rename to packages/bcp/src/cosmoscodec.spec.ts diff --git a/src/cosmoscodec.ts b/packages/bcp/src/cosmoscodec.ts similarity index 100% rename from src/cosmoscodec.ts rename to packages/bcp/src/cosmoscodec.ts diff --git a/src/cosmosconnection.spec.ts b/packages/bcp/src/cosmosconnection.spec.ts similarity index 100% rename from src/cosmosconnection.spec.ts rename to packages/bcp/src/cosmosconnection.spec.ts diff --git a/src/cosmosconnection.ts b/packages/bcp/src/cosmosconnection.ts similarity index 100% rename from src/cosmosconnection.ts rename to packages/bcp/src/cosmosconnection.ts diff --git a/src/cosmosconnector.ts b/packages/bcp/src/cosmosconnector.ts similarity index 100% rename from src/cosmosconnector.ts rename to packages/bcp/src/cosmosconnector.ts diff --git a/src/decode.spec.ts b/packages/bcp/src/decode.spec.ts similarity index 100% rename from src/decode.spec.ts rename to packages/bcp/src/decode.spec.ts diff --git a/src/decode.ts b/packages/bcp/src/decode.ts similarity index 100% rename from src/decode.ts rename to packages/bcp/src/decode.ts diff --git a/src/encode.spec.ts b/packages/bcp/src/encode.spec.ts similarity index 100% rename from src/encode.spec.ts rename to packages/bcp/src/encode.spec.ts diff --git a/src/encode.ts b/packages/bcp/src/encode.ts similarity index 100% rename from src/encode.ts rename to packages/bcp/src/encode.ts diff --git a/src/index.ts b/packages/bcp/src/index.ts similarity index 100% rename from src/index.ts rename to packages/bcp/src/index.ts diff --git a/src/restclient.ts b/packages/bcp/src/restclient.ts similarity index 100% rename from src/restclient.ts rename to packages/bcp/src/restclient.ts diff --git a/src/testdata.spec.ts b/packages/bcp/src/testdata.spec.ts similarity index 100% rename from src/testdata.spec.ts rename to packages/bcp/src/testdata.spec.ts diff --git a/src/testdata/cosmoshub.json b/packages/bcp/src/testdata/cosmoshub.json similarity index 100% rename from src/testdata/cosmoshub.json rename to packages/bcp/src/testdata/cosmoshub.json diff --git a/src/types.spec.ts b/packages/bcp/src/types.spec.ts similarity index 100% rename from src/types.spec.ts rename to packages/bcp/src/types.spec.ts diff --git a/src/types.ts b/packages/bcp/src/types.ts similarity index 100% rename from src/types.ts rename to packages/bcp/src/types.ts diff --git a/packages/bcp/tsconfig.json b/packages/bcp/tsconfig.json new file mode 100644 index 00000000..167e8c02 --- /dev/null +++ b/packages/bcp/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "baseUrl": ".", + "outDir": "build", + "declarationDir": "build/types", + "rootDir": "src" + }, + "include": [ + "src/**/*" + ] +} diff --git a/packages/bcp/tslint.json b/packages/bcp/tslint.json new file mode 100644 index 00000000..0946f209 --- /dev/null +++ b/packages/bcp/tslint.json @@ -0,0 +1,3 @@ +{ + "extends": "../../tslint.json" +} diff --git a/typedoc.js b/packages/bcp/typedoc.js similarity index 100% rename from typedoc.js rename to packages/bcp/typedoc.js diff --git a/types/address.d.ts b/packages/bcp/types/address.d.ts similarity index 100% rename from types/address.d.ts rename to packages/bcp/types/address.d.ts diff --git a/types/caip5.d.ts b/packages/bcp/types/caip5.d.ts similarity index 100% rename from types/caip5.d.ts rename to packages/bcp/types/caip5.d.ts diff --git a/types/cosmoscodec.d.ts b/packages/bcp/types/cosmoscodec.d.ts similarity index 100% rename from types/cosmoscodec.d.ts rename to packages/bcp/types/cosmoscodec.d.ts diff --git a/types/cosmosconnection.d.ts b/packages/bcp/types/cosmosconnection.d.ts similarity index 100% rename from types/cosmosconnection.d.ts rename to packages/bcp/types/cosmosconnection.d.ts diff --git a/types/cosmosconnector.d.ts b/packages/bcp/types/cosmosconnector.d.ts similarity index 100% rename from types/cosmosconnector.d.ts rename to packages/bcp/types/cosmosconnector.d.ts diff --git a/types/decode.d.ts b/packages/bcp/types/decode.d.ts similarity index 100% rename from types/decode.d.ts rename to packages/bcp/types/decode.d.ts diff --git a/types/encode.d.ts b/packages/bcp/types/encode.d.ts similarity index 100% rename from types/encode.d.ts rename to packages/bcp/types/encode.d.ts diff --git a/types/index.d.ts b/packages/bcp/types/index.d.ts similarity index 100% rename from types/index.d.ts rename to packages/bcp/types/index.d.ts diff --git a/types/restclient.d.ts b/packages/bcp/types/restclient.d.ts similarity index 100% rename from types/restclient.d.ts rename to packages/bcp/types/restclient.d.ts diff --git a/types/types.d.ts b/packages/bcp/types/types.d.ts similarity index 100% rename from types/types.d.ts rename to packages/bcp/types/types.d.ts diff --git a/webpack.web.config.js b/packages/bcp/webpack.web.config.js similarity index 100% rename from webpack.web.config.js rename to packages/bcp/webpack.web.config.js diff --git a/tsconfig.json b/tsconfig.json index e1e7ec19..238448fc 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,7 +17,6 @@ "pretty": true, "removeComments": false, "resolveJsonModule": true, - "rootDir": "src", "sourceMap": true, "strict": true, "target": "es6", @@ -26,6 +25,5 @@ "./custom_types", "./node_modules/@types" ] - }, - "include": ["src/**/*"] -} \ No newline at end of file + } +} From 974b00ee04c3066dc183835016d9a0bf6894ca10 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 29 Jan 2020 12:01:18 +0100 Subject: [PATCH 3/5] Remove obsolete nonces --- packages/bcp/nonces/1570527883 | 0 packages/bcp/nonces/1573026590 | 0 packages/bcp/nonces/1574869843 | 0 packages/bcp/nonces/1576569788 | 0 packages/bcp/nonces/1576595306 | 0 packages/bcp/nonces/1576678551 | 0 packages/bcp/nonces/1576746493 | 0 packages/bcp/nonces/1576760285 | 0 packages/bcp/nonces/1576767119 | 0 packages/bcp/nonces/1579019908 | 0 10 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 packages/bcp/nonces/1570527883 delete mode 100644 packages/bcp/nonces/1573026590 delete mode 100644 packages/bcp/nonces/1574869843 delete mode 100644 packages/bcp/nonces/1576569788 delete mode 100644 packages/bcp/nonces/1576595306 delete mode 100644 packages/bcp/nonces/1576678551 delete mode 100644 packages/bcp/nonces/1576746493 delete mode 100644 packages/bcp/nonces/1576760285 delete mode 100644 packages/bcp/nonces/1576767119 delete mode 100644 packages/bcp/nonces/1579019908 diff --git a/packages/bcp/nonces/1570527883 b/packages/bcp/nonces/1570527883 deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/bcp/nonces/1573026590 b/packages/bcp/nonces/1573026590 deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/bcp/nonces/1574869843 b/packages/bcp/nonces/1574869843 deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/bcp/nonces/1576569788 b/packages/bcp/nonces/1576569788 deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/bcp/nonces/1576595306 b/packages/bcp/nonces/1576595306 deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/bcp/nonces/1576678551 b/packages/bcp/nonces/1576678551 deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/bcp/nonces/1576746493 b/packages/bcp/nonces/1576746493 deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/bcp/nonces/1576760285 b/packages/bcp/nonces/1576760285 deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/bcp/nonces/1576767119 b/packages/bcp/nonces/1576767119 deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/bcp/nonces/1579019908 b/packages/bcp/nonces/1579019908 deleted file mode 100644 index e69de29b..00000000 From 5cd1f3e5178fe43b6747402f4ef07bdbb9a20ea8 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 29 Jan 2020 12:26:47 +0100 Subject: [PATCH 4/5] Use separate .gitignore for package --- .gitignore | 3 --- packages/bcp/.gitignore | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 packages/bcp/.gitignore diff --git a/.gitignore b/.gitignore index 3e786924..66c5b99a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,3 @@ node_modules/ # IDE-specific .vscode/ - -# Build artifacts -build/ diff --git a/packages/bcp/.gitignore b/packages/bcp/.gitignore new file mode 100644 index 00000000..68bf3735 --- /dev/null +++ b/packages/bcp/.gitignore @@ -0,0 +1,3 @@ +build/ +dist/ +docs/ From 71a280fc944b434b622471fb2729c5a5f6a547f5 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 29 Jan 2020 12:30:37 +0100 Subject: [PATCH 5/5] v0.0.1 --- lerna.json | 2 +- packages/bcp/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index 93ecf82b..29b7e2ba 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.0.0", + "version": "0.0.1", "useWorkspaces": true, "npmClient": "yarn" } diff --git a/packages/bcp/package.json b/packages/bcp/package.json index 8a78fd19..a21e6deb 100644 --- a/packages/bcp/package.json +++ b/packages/bcp/package.json @@ -1,6 +1,6 @@ { "name": "@cosmwasm/bcp", - "version": "2.0.0-alpha.7", + "version": "0.0.1", "description": "Transaction codec and client to communicate with any wasmd blockchain", "author": "Ethan Frey ", "license": "Apache-2.0",