chore(scripts): use caret when updating aws-sdk peerDependencies (#6031)

aws · Apr 26, 2024 · 0d54a05 · 0d54a05
1 parent 2d46254
commit 0d54a05
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 45 deletions.
diff --git a/clients/client-sso-oidc/package.json b/clients/client-sso-oidc/package.json
@@ -85,7 +85,7 @@
   },
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@aws-sdk/credential-provider-node": "^3.564.0"
+    "@aws-sdk/credential-provider-node": "*"
   },
   "browser": {
     "./dist-es/runtimeConfig": "./dist-es/runtimeConfig.browser"

diff --git a/clients/client-sts/package.json b/clients/client-sts/package.json
@@ -87,7 +87,7 @@
   },
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@aws-sdk/credential-provider-node": "^3.564.0"
+    "@aws-sdk/credential-provider-node": "*"
   },
   "browser": {
     "./dist-es/runtimeConfig": "./dist-es/runtimeConfig.browser"

diff --git a/lib/lib-dynamodb/package.json b/lib/lib-dynamodb/package.json
@@ -32,7 +32,7 @@
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@aws-sdk/client-dynamodb": "^3.0.0"
+    "@aws-sdk/client-dynamodb": "*"
   },
   "devDependencies": {
     "@aws-sdk/client-dynamodb": "*",

diff --git a/lib/lib-storage/package.json b/lib/lib-storage/package.json
@@ -35,7 +35,7 @@
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@aws-sdk/client-s3": "^3.0.0"
+    "@aws-sdk/client-s3": "*"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "*",

diff --git a/packages/util-dynamodb/package.json b/packages/util-dynamodb/package.json
@@ -32,7 +32,7 @@
     "typescript": "~4.9.5"
   },
   "peerDependencies": {
-    "@aws-sdk/client-dynamodb": "^3.0.0"
+    "@aws-sdk/client-dynamodb": "*"
   },
   "engines": {
     "node": ">=14.0.0"

diff --git a/scripts/update-versions/current.mjs b/scripts/update-versions/current.mjs
@@ -4,8 +4,6 @@
 // in dependencies/devDependencies/peerDependencies
 
 import { getDepToCurrentVersionHash } from "./getDepToCurrentVersionHash.mjs";
-import { runUpdatePeers } from "./peers.mjs";
 import { updateVersions } from "./updateVersions.mjs";
 
 updateVersions(getDepToCurrentVersionHash());
-runUpdatePeers();
diff --git a/scripts/update-versions/default.mjs b/scripts/update-versions/default.mjs
@@ -4,8 +4,6 @@
 // in dependencies/devDependencies/peerDependencies
 
 import { getDepToDefaultVersionHash } from "./getDepToDefaultVersionHash.mjs";
-import { runUpdatePeers } from "./peers.mjs";
 import { updateVersions } from "./updateVersions.mjs";
 
 updateVersions(getDepToDefaultVersionHash());
-runUpdatePeers();
diff --git a/scripts/update-versions/getUpdatedPackageJson.mjs b/scripts/update-versions/getUpdatedPackageJson.mjs
@@ -2,12 +2,16 @@
 import { getUpdatedPackageJsonSection } from "./getUpdatedPackageJsonSection.mjs";
 
 export const getUpdatedPackageJson = (packageJson, depToVersionHash) =>
-  ["dependencies", "devDependencies"]
+  ["dependencies", "devDependencies", "peerDependencies"]
     .filter((sectionName) => sectionName in packageJson)
     .reduce(
       (acc, sectionName) => ({
         ...acc,
-        [sectionName]: getUpdatedPackageJsonSection(packageJson[sectionName], depToVersionHash),
+        [sectionName]: getUpdatedPackageJsonSection(
+          packageJson[sectionName],
+          depToVersionHash,
+          sectionName === "peerDependencies"
+        ),
       }),
       packageJson
     );
diff --git a/scripts/update-versions/getUpdatedPackageJsonSection.mjs b/scripts/update-versions/getUpdatedPackageJsonSection.mjs
@@ -1,5 +1,11 @@
 // @ts-check
-export const getUpdatedPackageJsonSection = (section, depToVersionHash) =>
+export const getUpdatedPackageJsonSection = (section, depToVersionHash, isPeer = false) =>
   Object.entries(section)
     .filter(([key, value]) => key.startsWith("@aws-sdk/") && !value.startsWith("file:"))
-    .reduce((acc, [key, value]) => ({ ...acc, [key]: depToVersionHash[key] || value }), section);
+    .reduce((acc, [key]) => {
+      const newVersion = depToVersionHash[key];
+      if (newVersion) {
+        acc[key] = isPeer && newVersion !== "*" ? `^${newVersion}` : newVersion;
+      }
+      return acc;
+    }, section);
diff --git a/scripts/update-versions/peers.mjs b/scripts/update-versions/peers.mjs
diff --git a/scripts/update-versions/updateVersions.mjs b/scripts/update-versions/updateVersions.mjs
@@ -14,18 +14,3 @@ export const updateVersions = (depToVersionHash) => {
     writeFileSync(packageJsonPath, format(JSON.stringify(updatedPackageJson), { parser: "json-stringify" }));
   });
 };
-
-export const updatePeerVersions = (depToVersionHash) => {
-  getWorkspacePaths().forEach((workspacePath) => {
-    const packageJsonPath = join(workspacePath, "package.json");
-    const packageJson = JSON.parse(readFileSync(packageJsonPath).toString());
-    if (packageJson.peerDependencies) {
-      for (const peer of Object.keys(packageJson.peerDependencies)) {
-        if (peer in depToVersionHash) {
-          packageJson.peerDependencies[peer] = depToVersionHash[peer];
-        }
-      }
-    }
-    writeFileSync(packageJsonPath, format(JSON.stringify(packageJson), { parser: "json-stringify" }));
-  });
-};