From ae1d6541c6a0618b41a5baaf06580dce44015bd8 Mon Sep 17 00:00:00 2001 From: dskvr Date: Tue, 10 Sep 2024 13:34:51 +0200 Subject: [PATCH] Update internal dependencies with actual versions --- apps/nocapd/package.json | 18 ++++----- apps/trawler/package.json | 14 +++---- .../default/EveryAdapterDefault/package.json | 12 +++--- scripts/prerelease.sh | 39 +++++++++++-------- 4 files changed, 44 insertions(+), 39 deletions(-) diff --git a/apps/nocapd/package.json b/apps/nocapd/package.json index e74811be..f61cb45f 100644 --- a/apps/nocapd/package.json +++ b/apps/nocapd/package.json @@ -6,15 +6,15 @@ "license": "MIT", "dependencies": { "@nostr-fetch/adapter-nostr-tools": "0.14.1", - "@nostrwatch/announce": "*", - "@nostrwatch/controlflow": "*", - "@nostrwatch/logger": "*", - "@nostrwatch/nocap": "*", - "@nostrwatch/nocap-every-adapter-default": "*", - "@nostrwatch/nwcache": "*", - "@nostrwatch/publisher": "*", - "@nostrwatch/seed": "*", - "@nostrwatch/utils": "*", + "@nostrwatch/announce": "0.4.1", + "@nostrwatch/controlflow": "0.5.1", + "@nostrwatch/logger": "0.0.9", + "@nostrwatch/nocap": "0.5.7", + "@nostrwatch/nocap-every-adapter-default": "1.4.6", + "@nostrwatch/nwcache": "0.1.5", + "@nostrwatch/publisher": "0.8.1", + "@nostrwatch/seed": "0.0.5", + "@nostrwatch/utils": "0.1.6", "bluebird": "3.7.2", "chalk": "5.3.0", "ngeohash": "^0.6.3", diff --git a/apps/trawler/package.json b/apps/trawler/package.json index 4925982e..01fd6dee 100644 --- a/apps/trawler/package.json +++ b/apps/trawler/package.json @@ -9,13 +9,13 @@ }, "dependencies": { "@nostr-fetch/adapter-nostr-tools": "0.13.1", - "@nostrwatch/controlflow": "*", - "@nostrwatch/logger": "*", - "@nostrwatch/nocap": "*", - "@nostrwatch/nwcache": "*", - "@nostrwatch/publisher": "*", - "@nostrwatch/seed": "*", - "@nostrwatch/utils": "*", + "@nostrwatch/controlflow": "0.5.1", + "@nostrwatch/logger": "0.0.9", + "@nostrwatch/nocap": "0.5.7", + "@nostrwatch/nwcache": "0.1.5", + "@nostrwatch/publisher": "0.8.1", + "@nostrwatch/seed": "0.0.5", + "@nostrwatch/utils": "0.1.6", "@types/ioredis": "5.0.0", "bullmq": "4.13.3", "chalk": "^5.3.0", diff --git a/libraries/nocap/adapters/default/EveryAdapterDefault/package.json b/libraries/nocap/adapters/default/EveryAdapterDefault/package.json index 815961fa..bc3e61ce 100644 --- a/libraries/nocap/adapters/default/EveryAdapterDefault/package.json +++ b/libraries/nocap/adapters/default/EveryAdapterDefault/package.json @@ -5,11 +5,11 @@ "main": "index.js", "license": "MIT", "dependencies": { - "@nostrwatch/nocap-dns-adapter-default": "*", - "@nostrwatch/nocap-geo-adapter-default": "*", - "@nostrwatch/nocap-info-adapter-default": "*", - "@nostrwatch/nocap-ssl-adapter-default": "*", - "@nostrwatch/nocap-websocket-adapter-default": "*", - "@nostrwatch/nocap-websocket-browser-adapter-default": "*" + "@nostrwatch/nocap-dns-adapter-default": "1.1.4", + "@nostrwatch/nocap-geo-adapter-default": "1.0.7", + "@nostrwatch/nocap-info-adapter-default": "1.1.4", + "@nostrwatch/nocap-ssl-adapter-default": "1.4.5", + "@nostrwatch/nocap-websocket-adapter-default": "1.3.5", + "@nostrwatch/nocap-websocket-browser-adapter-default": "0.0.5" } } diff --git a/scripts/prerelease.sh b/scripts/prerelease.sh index be92dae3..f992f33e 100755 --- a/scripts/prerelease.sh +++ b/scripts/prerelease.sh @@ -9,13 +9,15 @@ if [[ $1 == "--dry-run" ]]; then echo "Running in dry-run mode. No changes will be made." fi +# Create an array to store package names and their versions +package_versions=() + # Get all internal package names and their versions -declare -A package_versions for package_json in $(find . -type f -name "package.json" -not -path "*/node_modules/*"); do package_name=$(jq -r '.name // empty' "$package_json") package_version=$(jq -r '.version // empty' "$package_json") if [[ -n "$package_name" && -n "$package_version" ]]; then - package_versions[$package_name]=$package_version + package_versions+=("$package_name:$package_version") fi done @@ -28,22 +30,25 @@ for file in $(find . -type f -name "package.json" -not -path "*/node_modules/*") dep=$(echo $dep | tr -d '"') # Check if the dependency is an internal package - if [[ -n "${package_versions[$dep]}" ]]; then - dep_version=${package_versions[$dep]} - - # Provide feedback on what will be replaced - echo "Found dependency $dep with version '*'. Will replace it with $dep_version." - - if [[ $DRY_RUN == false ]]; then - # Replace "*" with the actual version in the dependency - sed -i '' "s/\"$dep\": \"\*\"/\"$dep\": \"$dep_version\"/g" "$file" - echo "Replaced $dep version '*' with $dep_version in $file." - else - echo "(Dry run) Would replace $dep version '*' with $dep_version in $file." + for package in "${package_versions[@]}"; do + package_name=${package%%:*} + package_version=${package##*:} + + if [[ "$dep" == "$package_name" ]]; then + echo "Found dependency $dep with version '*'. Will replace it with $package_version." + + if [[ $DRY_RUN == false ]]; then + # Escape special characters in package name + escaped_dep=$(echo "$dep" | sed 's/[]\/$*.^[]/\\&/g') + # Replace "*" with the actual version in the dependency + sed -i '' "s|\"$escaped_dep\": \"\*\"|\"$dep\": \"$package_version\"|g" "$file" + echo "Replaced $dep version '*' with $package_version in $file." + else + echo "(Dry run) Would replace $dep version '*' with $package_version in $file." + fi + break fi - else - echo "No matching internal dependency found for $dep in $file." - fi + done done done