chore: update package.json browser/react-native fields

aws · Nov 8, 2023 · f337abf · f337abf
1 parent 5c3ac72
commit f337abf
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 30 deletions.
diff --git a/packages/credential-provider-web-identity/package.json b/packages/credential-provider-web-identity/package.json
@@ -15,8 +15,8 @@
     "test": "jest"
   },
   "browser": {
-    "./dist-cjs/fromTokenFile": false,
-    "./dist-es/fromTokenFile": false
+    "./dist-es/fromTokenFile": false,
+    "./dist-cjs/fromTokenFile": false
   },
   "react-native": {
     "./dist-es/fromTokenFile": false,

diff --git a/packages/middleware-flexible-checksums/package.json b/packages/middleware-flexible-checksums/package.json
@@ -15,7 +15,8 @@
   "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"
+    "./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"
   },
   "types": "./dist-types/index.d.ts",
   "author": {
@@ -62,5 +63,9 @@
   },
   "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"
   }
 }
diff --git a/packages/middleware-token/package.json b/packages/middleware-token/package.json
@@ -58,10 +58,12 @@
     "dist-*/**"
   ],
   "browser": {
-    "./dist-es/tokenDefaultProvider": "./dist-es/tokenDefaultProvider.browser"
+    "./dist-es/tokenDefaultProvider": "./dist-es/tokenDefaultProvider.browser",
+    "./dist-cjs/tokenDefaultProvider": "./dist-cjs/tokenDefaultProvider.browser"
   },
   "react-native": {
-    "./dist-es/tokenDefaultProvider": "./dist-es/tokenDefaultProvider.browser"
+    "./dist-es/tokenDefaultProvider": "./dist-es/tokenDefaultProvider.browser",
+    "./dist-cjs/tokenDefaultProvider": "./dist-cjs/tokenDefaultProvider.browser"
   },
   "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages/middleware-token",
   "repository": {

diff --git a/packages/rds-signer/package.json b/packages/rds-signer/package.json
@@ -58,10 +58,12 @@
     "dist-*/**"
   ],
   "browser": {
-    "./dist-es/runtimeConfig": "./dist-es/runtimeConfig.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-es/runtimeConfig": "./dist-es/runtimeConfig.native",
+    "./dist-cjs/runtimeConfig": "./dist-cjs/runtimeConfig.native"
   },
   "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages/rds-signer",
   "repository": {

diff --git a/packages/token-providers/package.json b/packages/token-providers/package.json
@@ -89,10 +89,12 @@
     "dist-*/**"
   ],
   "browser": {
-    "./dist-es/bundle/client-sso-oidc-node": "./dist-es/bundle/client-sso-oidc-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"
   },
   "react-native": {
-    "./dist-es/bundle/client-sso-oidc-node": "./dist-es/bundle/client-sso-oidc-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"
   },
   "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages/token-providers",
   "repository": {

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -56,9 +56,11 @@
     "entryPoint": "src/index.ts"
   },
   "browser": {
-    "./dist-es/blob/runtime-blob-types.node": "./dist-es/blob/runtime-blob-types.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"
   },
   "react-native": {
-    "./dist-es/blob/runtime-blob-types.node": "./dist-es/blob/runtime-blob-types.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"
   }
 }
diff --git a/packages/util-dns/package.json b/packages/util-dns/package.json
@@ -59,13 +59,21 @@
     "./dist-es/index": "./dist-es/index.browser",
     "./dist-es/HostResolver": "./dist-es/HostResolver.browser",
     "./dist-es/NodeDnsLookupHostResolver": false,
-    "./dist-es/NodeDnsResolveHostResolver": 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
   },
   "react-native": {
     "./dist-es/index": "./dist-es/index.browser",
     "./dist-es/HostResolver": "./dist-es/HostResolver.browser",
     "./dist-es/NodeDnsLookupHostResolver": false,
-    "./dist-es/NodeDnsResolveHostResolver": 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
   },
   "typedoc": {
     "entryPoint": "src/index.ts"

diff --git a/packages/util-user-agent-browser/package.json b/packages/util-user-agent-browser/package.json
@@ -19,6 +19,7 @@
     "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": "*",

diff --git a/scripts/runtime-dependency-version-check/check-dependencies.js b/scripts/runtime-dependency-version-check/check-dependencies.js
@@ -21,7 +21,7 @@ const walk = require("../utils/walk");
     }
 
     const pkgJsonPath = path.join(packages, folder, "package.json");
-    errors.push(...pkgJsonEnforcement(pkgJsonPath, false));
+    errors.push(...pkgJsonEnforcement(pkgJsonPath, true));
 
     const srcPath = path.join(packages, folder, "src");
     const pkgJson = require(pkgJsonPath);
@@ -65,7 +65,7 @@ const walk = require("../utils/walk");
           }
           pkgJson.dependencies[dep] = version;
 
-          fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
+          fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2) + "\n");
         }
       }
     }

diff --git a/scripts/runtime-dependency-version-check/package-json-enforcement.js b/scripts/runtime-dependency-version-check/package-json-enforcement.js
@@ -45,10 +45,17 @@ 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 browserEntrySet = [
+    const browserCanonical = [
       ...new Set([
         ...Object.entries(pkgJson.browser).map(([k, v]) => [
           k.replace("dist-cjs", "dist-es"),
@@ -59,13 +66,16 @@ module.exports = function (pkgJsonFilePath, overwrite = false) {
           typeof v === "string" ? v.replace("dist-es", "dist-cjs") : v,
         ]),
       ]),
-    ];
+    ].reduce((acc, [k, v]) => {
+      acc[k] = v;
+      return acc;
+    }, {});
 
-    if (Object.keys(browserEntrySet).length !== Object.keys(pkgJson.browser).length) {
+    if (Object.keys(browserCanonical).length !== Object.keys(pkgJson.browser).length) {
       errors.push(`${pkgJson.name} browser field is incomplete.`);
     }
 
-    const reactNativeEntrySet = [
+    const reactNativeCanonical = [
       ...new Set([
         ...Object.entries(pkgJson["react-native"]).map(([k, v]) => [
           k.replace("dist-cjs", "dist-es"),
@@ -76,26 +86,23 @@ module.exports = function (pkgJsonFilePath, overwrite = false) {
           typeof v === "string" ? v.replace("dist-es", "dist-cjs") : v,
         ]),
       ]),
-    ];
+    ].reduce((acc, [k, v]) => {
+      acc[k] = v;
+      return acc;
+    }, {});
 
-    if (Object.keys(reactNativeEntrySet).length !== Object.keys(pkgJson["react-native"]).length) {
+    if (Object.keys(reactNativeCanonical).length !== Object.keys(pkgJson["react-native"]).length) {
       errors.push(`${pkgJson.name} react-native field is incomplete.`);
     }
 
     if (overwrite) {
-      pkgJson.browser = browserEntrySet.reduce((acc, [k, v]) => {
-        acc[k] = v;
-        return acc;
-      }, {});
-      pkgJson["react-native"] = reactNativeEntrySet.reduce((acc, [k, v]) => {
-        acc[k] = v;
-        return acc;
-      }, {});
+      pkgJson.browser = browserCanonical;
+      pkgJson["react-native"] = reactNativeCanonical;
     }
   }
 
   if (overwrite) {
-    fs.writeFileSync(pkgJsonFilePath, JSON.stringify(pkgJson, null, 2));
+    fs.writeFileSync(pkgJsonFilePath, JSON.stringify(pkgJson, null, 2) + "\n");
   }
 
   return errors;