From 6ee9e5ad22586b19b2795307db5ebf0582532558 Mon Sep 17 00:00:00 2001 From: Kare Nuorteva Date: Fri, 11 Mar 2022 15:09:09 +0200 Subject: [PATCH 1/4] refactor: remove unused fields from networks.json --- packages/config/src/networks.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/config/src/networks.json b/packages/config/src/networks.json index 86ecf7f5d..b4cee76f1 100644 --- a/packages/config/src/networks.json +++ b/packages/config/src/networks.json @@ -97,8 +97,6 @@ }, "binance": { "id": 56, - "rpcHttpUrl": "", - "rpcWsUrl": "", "rpcEndpoints": [ { "url": "https://bsc-dataseed.binance.org" From 2c292fdd90ec96a88ed7ee077c4c09c9527ccd45 Mon Sep 17 00:00:00 2001 From: Kare Nuorteva Date: Fri, 11 Mar 2022 15:19:35 +0200 Subject: [PATCH 2/4] build: add Makefile in project root --- Makefile | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..e7a9f5894 --- /dev/null +++ b/Makefile @@ -0,0 +1,31 @@ +LANG := en_US.UTF-8 +SHELL := /bin/bash +.SHELLFLAGS := --norc --noprofile -e -u -o pipefail -c +.DEFAULT_GOAL := help + +nvm_brew = /usr/local/opt/nvm/nvm.sh +ifneq ("$(wildcard $(nvm_brew))", "") + nvm_sh = $(nvm_brew) +endif +nvm_default = $(HOME)/.nvm/nvm.sh +ifneq ("$(wildcard $(nvm_default))", "") + nvm_sh = $(nvm_default) +endif +define npm + @$(eval npm_args=$(1)) + bash --norc --noprofile -e -o pipefail -l -c "source $(nvm_sh) && nvm exec npm $(npm_args)" +endef +export NODE_ENV := "development" + +.PHONY: npm-install +npm-install: ## Run 'npm install' + $(call npm, install) + +.PHONY: clean +clean: ## Remove generated files + $(RM) -r \ + node_modules + +.PHONY: help +help: ## Show Help + @grep -E '^[a-zA-Z0-9_\-\/]+%?:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "%-20s %s\n", $$1, $$2}' | sort From 3b407e23d2dc344c721d457017d6764af45f6572 Mon Sep 17 00:00:00 2001 From: Kare Nuorteva Date: Fri, 11 Mar 2022 15:20:29 +0200 Subject: [PATCH 3/4] docs(config): fix typo in README --- packages/config/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/config/README.md b/packages/config/README.md index f368e32b6..8ebe3fdf5 100644 --- a/packages/config/README.md +++ b/packages/config/README.md @@ -25,7 +25,7 @@ const wsRpcEndpoints: RPCEndpoint[] = chains.ethereum.getRPCEndpointsByProtocol( You can also load configuration based on `$NODE_ENV` environment variable: ```typescript -import * as config from "config" +import * as config from "@streamr/config" const chains: Chains = config.Chains.loadFromNodeEnv() ``` From 3633665a129c9c293a082c213546d4272921f3f3 Mon Sep 17 00:00:00 2001 From: Kare Nuorteva Date: Fri, 11 Mar 2022 16:21:25 +0200 Subject: [PATCH 4/4] build: update root package-lock.json on release --- packages/config/package-lock.json | 13 ------------- .../release-npm-update-version-package-json.bash | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 packages/config/package-lock.json diff --git a/packages/config/package-lock.json b/packages/config/package-lock.json deleted file mode 100644 index 4924ec39f..000000000 --- a/packages/config/package-lock.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "@streamr/config", - "version": "0.0.2", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "@streamr/config", - "version": "0.0.2", - "license": "MIT" - } - } -} diff --git a/packages/config/release-npm-update-version-package-json.bash b/packages/config/release-npm-update-version-package-json.bash index 8fda74e55..28aadc269 100755 --- a/packages/config/release-npm-update-version-package-json.bash +++ b/packages/config/release-npm-update-version-package-json.bash @@ -30,5 +30,5 @@ fi sed -i '' -e 's/"version": ".*",$/"version": "'"$version"'",/g' package.json git add package.json -make npm-install -git add package-lock.json +make npm-install -C ../.. +git add ../../package-lock.json