chore: update pkg json validator

packages/credential-provider-web-identity/package.json

@@ -15,8 +15,7 @@
     "test": "jest"
   },
   "browser": {
-    "./dist-es/fromTokenFile": false,
-    "./dist-cjs/fromTokenFile": false
+    "./dist-es/fromTokenFile": false
   },
   "react-native": {
     "./dist-es/fromTokenFile": false,

packages/middleware-flexible-checksums/package.json

@@ -15,6 +15,9 @@
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
   "browser": {
+    "./dist-es/streams/create-read-stream-on-buffer": "./dist-es/streams/create-read-stream-on-buffer.browser"
+  },
+  "react-native": {
     "./dist-es/streams/create-read-stream-on-buffer": "./dist-es/streams/create-read-stream-on-buffer.browser",
     "./dist-cjs/streams/create-read-stream-on-buffer": "./dist-cjs/streams/create-read-stream-on-buffer.browser"
   },
@@ -63,9 +66,5 @@
   },
   "typedoc": {
     "entryPoint": "src/index.ts"
-  },
-  "react-native": {
-    "./dist-es/streams/create-read-stream-on-buffer": "./dist-es/streams/create-read-stream-on-buffer.browser",
-    "./dist-cjs/streams/create-read-stream-on-buffer": "./dist-cjs/streams/create-read-stream-on-buffer.browser"
   }
 }

packages/middleware-token/package.json

@@ -58,8 +58,7 @@
     "dist-*/**"
   ],
   "browser": {
-    "./dist-es/tokenDefaultProvider": "./dist-es/tokenDefaultProvider.browser",
-    "./dist-cjs/tokenDefaultProvider": "./dist-cjs/tokenDefaultProvider.browser"
+    "./dist-es/tokenDefaultProvider": "./dist-es/tokenDefaultProvider.browser"
   },
   "react-native": {
     "./dist-es/tokenDefaultProvider": "./dist-es/tokenDefaultProvider.browser",

packages/rds-signer/package.json

@@ -58,13 +58,9 @@
     "dist-*/**"
   ],
   "browser": {
-    "./dist-es/runtimeConfig": "./dist-es/runtimeConfig.browser",
-    "./dist-cjs/runtimeConfig": "./dist-cjs/runtimeConfig.browser"
-  },
-  "react-native": {
-    "./dist-es/runtimeConfig": "./dist-es/runtimeConfig.native",
-    "./dist-cjs/runtimeConfig": "./dist-cjs/runtimeConfig.native"
+    "./dist-es/runtimeConfig": "./dist-es/runtimeConfig.browser"
   },
+  "react-native": {},
   "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages/rds-signer",
   "repository": {
     "type": "git",

packages/token-providers/package.json

@@ -89,8 +89,7 @@
     "dist-*/**"
   ],
   "browser": {
-    "./dist-es/bundle/client-sso-oidc-node": "./dist-es/bundle/client-sso-oidc-browser",
-    "./dist-cjs/bundle/client-sso-oidc-node": "./dist-cjs/bundle/client-sso-oidc-browser"
+    "./dist-es/bundle/client-sso-oidc-node": "./dist-es/bundle/client-sso-oidc-browser"
   },
   "react-native": {
     "./dist-es/bundle/client-sso-oidc-node": "./dist-es/bundle/client-sso-oidc-browser",

packages/types/package.json

@@ -56,8 +56,7 @@
     "entryPoint": "src/index.ts"
   },
   "browser": {
-    "./dist-es/blob/runtime-blob-types.node": "./dist-es/blob/runtime-blob-types.browser",
-    "./dist-cjs/blob/runtime-blob-types.node": "./dist-cjs/blob/runtime-blob-types.browser"
+    "./dist-es/blob/runtime-blob-types.node": "./dist-es/blob/runtime-blob-types.browser"
   },
   "react-native": {
     "./dist-es/blob/runtime-blob-types.node": "./dist-es/blob/runtime-blob-types.browser",

packages/util-dns/package.json

@@ -59,11 +59,7 @@
     "./dist-es/index": "./dist-es/index.browser",
     "./dist-es/HostResolver": "./dist-es/HostResolver.browser",
     "./dist-es/NodeDnsLookupHostResolver": false,
-    "./dist-es/NodeDnsResolveHostResolver": false,
-    "./dist-cjs/index": "./dist-cjs/index.browser",
-    "./dist-cjs/HostResolver": "./dist-cjs/HostResolver.browser",
-    "./dist-cjs/NodeDnsLookupHostResolver": false,
-    "./dist-cjs/NodeDnsResolveHostResolver": false
+    "./dist-es/NodeDnsResolveHostResolver": false
   },
   "react-native": {
     "./dist-es/index": "./dist-es/index.browser",

packages/util-user-agent-browser/package.json

@@ -13,13 +13,13 @@
   },
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
+  "browser": "./dist-es/index.js",
   "types": "./dist-types/index.d.ts",
   "author": {
     "name": "AWS SDK for JavaScript Team",
     "url": "https://aws.amazon.com/javascript/"
   },
   "license": "Apache-2.0",
-  "browser": "./dist-es/index.js",
   "react-native": "dist-es/index.native.js",
   "dependencies": {
     "@aws-sdk/types": "*",

scripts/runtime-dependency-version-check/package-json-enforcement.js

@@ -1,3 +1,4 @@
+const { error } = require("console");
 const fs = require("fs");
 
 /**
@@ -49,34 +50,21 @@ module.exports = function (pkgJsonFilePath, overwrite = false) {
 
   if (typeof pkgJson.browser !== typeof pkgJson["react-native"]) {
     errors.push(`browser and react-native fields are different in ${pkgJson.name}`);
-    if (overwrite) {
-      if (typeof pkgJson.browser === "object") {
-        pkgJson["react-native"] = pkgJson.browser;
-      } else if (typeof pkgJson["react-native"] === "object") {
-        pkgJson.browser = pkgJson["react-native"];
-      }
-    }
   }
 
   if (typeof pkgJson.browser === "object" && typeof pkgJson["react-native"] === "object") {
-    const browserCanonical = [
-      ...new Set([
-        ...Object.entries(pkgJson.browser).map(([k, v]) => [
-          k.replace("dist-cjs", "dist-es"),
-          typeof v === "string" ? v.replace("dist-cjs", "dist-es") : v,
-        ]),
-        ...Object.entries(pkgJson.browser).map(([k, v]) => [
-          k.replace("dist-es", "dist-cjs"),
-          typeof v === "string" ? v.replace("dist-es", "dist-cjs") : v,
-        ]),
-      ]),
-    ].reduce((acc, [k, v]) => {
-      acc[k] = v;
+    const browserCanonical = Object.entries(pkgJson.browser).reduce((acc, [k, v]) => {
+      if (!k.includes("dist-cjs/")) {
+        acc[k] = v;
+      }
       return acc;
     }, {});
 
     if (Object.keys(browserCanonical).length !== Object.keys(pkgJson.browser).length) {
       errors.push(`${pkgJson.name} browser field is incomplete.`);
+      if (overwrite) {
+        pkgJson.browser = browserCanonical;
+      }
     }
 
     const reactNativeCanonical = [
@@ -91,21 +79,24 @@ module.exports = function (pkgJsonFilePath, overwrite = false) {
         ]),
       ]),
     ].reduce((acc, [k, v]) => {
-      acc[k] = v;
+      const automatic = typeof v === "string" ? v.match(/\.native(\.js)?$/) && k === v.replace(".native", "") : false;
+      if (!automatic) {
+        acc[k] = v;
+      } else {
+        errors.push(`${k} -> ${v} is unnecessary in ${pkgJson.name} (automatic in React-Native bundler)`);
+      }
       return acc;
     }, {});
 
     if (Object.keys(reactNativeCanonical).length !== Object.keys(pkgJson["react-native"]).length) {
       errors.push(`${pkgJson.name} react-native field is incomplete.`);
-    }
-
-    if (overwrite) {
-      pkgJson.browser = browserCanonical;
-      pkgJson["react-native"] = reactNativeCanonical;
+      if (overwrite) {
+        pkgJson["react-native"] = reactNativeCanonical;
+      }
     }
   }
 
-  if (overwrite) {
+  if (overwrite && errors.length) {
     fs.writeFileSync(pkgJsonFilePath, JSON.stringify(pkgJson, null, 2) + "\n");
   }