diff --git a/install.sh b/install.sh index 57d8369..a75f7f2 100755 --- a/install.sh +++ b/install.sh @@ -1,19 +1,24 @@ #!/bin/bash -for upstream in $(./get_packages.py); do - version=$(sed -nr 's/ +"version": "(.+)",/\1/p' packages/$upstream/package.json) +upstream=$1 - for downstream in $(./get_packages.py); do - n=@welshman/$upstream - f=packages/$downstream/package.json - v=$(jq '.dependencies["'$n'"] // empty' $f) +if [[ -z $upstream ]]; then + echo "Please provide an upstream package name" + die 1 +fi - if [[ ! -z $v ]]; then - jq '.dependencies["'$n'"]="'~$version'"' $f > $f.tmp - mv $f.tmp $f - mkdir -p packages/$downstream/node_modules/@welshman - fi - done +version=$(sed -nr 's/ +"version": "(.+)",/\1/p' packages/$upstream/package.json) + +for downstream in $(./get_packages.py); do + n=@welshman/$upstream + f=packages/$downstream/package.json + v=$(jq '.dependencies["'$n'"] // empty' $f) + + if [[ ! -z $v ]]; then + jq '.dependencies["'$n'"]="'~$version'"' $f > $f.tmp + mv $f.tmp $f + mkdir -p packages/$downstream/node_modules/@welshman + fi done npm i diff --git a/package-lock.json b/package-lock.json index 4e30e31..8ada632 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3636,16 +3636,16 @@ }, "packages/app": { "name": "@welshman/app", - "version": "0.0.12", + "version": "0.0.15", "license": "MIT", "dependencies": { "@welshman/dvm": "~0.0.10", "@welshman/feeds": "~0.0.20", - "@welshman/lib": "~0.0.21", - "@welshman/net": "~0.0.25", + "@welshman/lib": "~0.0.22", + "@welshman/net": "~0.0.27", "@welshman/signer": "~0.0.8", "@welshman/store": "~0.0.10", - "@welshman/util": "~0.0.37", + "@welshman/util": "~0.0.38", "fuse.js": "^7.0.0", "idb": "^8.0.0", "svelte": "^4.2.18", @@ -3676,8 +3676,8 @@ "version": "0.0.10", "license": "MIT", "dependencies": { - "@welshman/lib": "~0.0.21", - "@welshman/net": "~0.0.25", + "@welshman/lib": "~0.0.22", + "@welshman/net": "~0.0.27", "@welshman/util": "~0.0.37", "nostr-tools": "^2.7.2" }, @@ -3692,7 +3692,7 @@ "version": "0.0.20", "license": "MIT", "dependencies": { - "@welshman/lib": "~0.0.21", + "@welshman/lib": "~0.0.22", "@welshman/util": "~0.0.37" }, "devDependencies": { @@ -3703,7 +3703,7 @@ }, "packages/lib": { "name": "@welshman/lib", - "version": "0.0.21", + "version": "0.0.22", "license": "MIT", "dependencies": { "@scure/base": "^1.1.6", @@ -3727,10 +3727,10 @@ }, "packages/net": { "name": "@welshman/net", - "version": "0.0.25", + "version": "0.0.27", "license": "MIT", "dependencies": { - "@welshman/lib": "~0.0.21", + "@welshman/lib": "~0.0.22", "@welshman/util": "~0.0.37", "isomorphic-ws": "^5.0.0", "ws": "^8.16.0" @@ -3747,8 +3747,8 @@ "version": "0.0.8", "license": "MIT", "dependencies": { - "@welshman/lib": "~0.0.21", - "@welshman/net": "~0.0.25", + "@welshman/lib": "~0.0.22", + "@welshman/net": "~0.0.27", "@welshman/util": "~0.0.37", "nostr-tools": "^2.7.2" }, @@ -3766,7 +3766,7 @@ "version": "0.0.10", "license": "MIT", "dependencies": { - "@welshman/lib": "~0.0.21", + "@welshman/lib": "~0.0.22", "@welshman/util": "~0.0.37", "svelte": "^4.2.18" }, @@ -3778,10 +3778,10 @@ }, "packages/util": { "name": "@welshman/util", - "version": "0.0.37", + "version": "0.0.38", "license": "MIT", "dependencies": { - "@welshman/lib": "~0.0.21", + "@welshman/lib": "~0.0.22", "nostr-tools": "^2.7.2" }, "devDependencies": { diff --git a/packages/app/package.json b/packages/app/package.json index 9c54dfe..bfc0dd4 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/app", - "version": "0.0.14", + "version": "0.0.15", "author": "hodlbod", "license": "MIT", "description": "A collection of svelte stores for use in building nostr client applications.", @@ -31,10 +31,10 @@ "typescript": "~5.1.6" }, "dependencies": { - "@welshman/lib": "~0.0.21", + "@welshman/lib": "~0.0.22", "@welshman/feeds": "~0.0.20", "@welshman/dvm": "~0.0.10", - "@welshman/net": "~0.0.26", + "@welshman/net": "~0.0.27", "@welshman/signer": "~0.0.8", "@welshman/store": "~0.0.10", "@welshman/util": "~0.0.38", diff --git a/packages/dvm/package.json b/packages/dvm/package.json index 240f4dc..21d2519 100644 --- a/packages/dvm/package.json +++ b/packages/dvm/package.json @@ -31,8 +31,8 @@ "typescript": "~5.1.6" }, "dependencies": { - "@welshman/lib": "~0.0.21", - "@welshman/net": "~0.0.25", + "@welshman/lib": "~0.0.22", + "@welshman/net": "~0.0.27", "@welshman/util": "~0.0.37", "nostr-tools": "^2.7.2" } diff --git a/packages/feeds/package.json b/packages/feeds/package.json index e8bed02..86e8397 100644 --- a/packages/feeds/package.json +++ b/packages/feeds/package.json @@ -31,7 +31,7 @@ "typescript": "~5.1.6" }, "dependencies": { - "@welshman/lib": "~0.0.21", + "@welshman/lib": "~0.0.22", "@welshman/util": "~0.0.37" } } diff --git a/packages/lib/package.json b/packages/lib/package.json index 1360ffc..76d16d3 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/lib", - "version": "0.0.21", + "version": "0.0.22", "author": "hodlbod", "license": "MIT", "description": "A collection of utilities.", diff --git a/packages/net/package.json b/packages/net/package.json index 3ae3fae..7d8371b 100644 --- a/packages/net/package.json +++ b/packages/net/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/net", - "version": "0.0.26", + "version": "0.0.27", "author": "hodlbod", "license": "MIT", "description": "Utilities for connecting with nostr relays.", @@ -33,7 +33,7 @@ "typescript": "~5.1.6" }, "dependencies": { - "@welshman/lib": "~0.0.21", + "@welshman/lib": "~0.0.22", "@welshman/util": "~0.0.37", "isomorphic-ws": "^5.0.0", "ws": "^8.16.0" diff --git a/packages/signer/package.json b/packages/signer/package.json index 95067df..95a7db2 100644 --- a/packages/signer/package.json +++ b/packages/signer/package.json @@ -31,8 +31,8 @@ "typescript": "~5.1.6" }, "dependencies": { - "@welshman/lib": "~0.0.21", - "@welshman/net": "~0.0.25", + "@welshman/lib": "~0.0.22", + "@welshman/net": "~0.0.27", "@welshman/util": "~0.0.37", "nostr-tools": "^2.7.2" }, diff --git a/packages/store/package.json b/packages/store/package.json index ab4bc07..47239e2 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -31,7 +31,7 @@ "typescript": "~5.1.6" }, "dependencies": { - "@welshman/lib": "~0.0.21", + "@welshman/lib": "~0.0.22", "@welshman/util": "~0.0.37", "svelte": "^4.2.18" } diff --git a/packages/util/package.json b/packages/util/package.json index 4a43715..213971e 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -31,7 +31,7 @@ "typescript": "~5.1.6" }, "dependencies": { - "@welshman/lib": "~0.0.21", + "@welshman/lib": "~0.0.22", "nostr-tools": "^2.7.2" } }