Update dist settings for packages (#6322)

Updates file extensions in rollup and package.json files to resolve bundling issues --------- Co-authored-by: Bogdan Gavril <[email protected]>
AzureAD · Aug 10, 2023 · ae5fbc4 · ae5fbc4
1 parent a8e5fca
commit ae5fbc4
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 32 deletions.
diff --git a/change/@azure-msal-browser-3b5eea60-1038-4a71-9f7d-226bc86404fc.json b/change/@azure-msal-browser-3b5eea60-1038-4a71-9f7d-226bc86404fc.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Update dist settings for packages #6322",
+  "packageName": "@azure/msal-browser",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-msal-common-1e0491c5-5565-401f-ac59-813ab14b1910.json b/change/@azure-msal-common-1e0491c5-5565-401f-ac59-813ab14b1910.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Update dist settings for packages #6322",
+  "packageName": "@azure/msal-common",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-msal-node-3954c509-d32b-4836-9c26-699a68fbb420.json b/change/@azure-msal-node-3954c509-d32b-4836-9c26-699a68fbb420.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Update dist settings for packages #6322",
+  "packageName": "@azure/msal-node",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-msal-node-extensions-b049b8af-aeef-4093-bdb3-95531a516609.json b/change/@azure-msal-node-extensions-b049b8af-aeef-4093-bdb3-95531a516609.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Update dist settings for packages #6322",
+  "packageName": "@azure/msal-node-extensions",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/extensions/msal-node-extensions/package.json b/extensions/msal-node-extensions/package.json
@@ -6,15 +6,15 @@
     "url": "https://github.com/AzureAD/microsoft-authentication-library-for-js.git"
   },
   "license": "MIT",
-  "module": "dist/index.esm.js",
+  "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "module": "./dist/index.esm.js",
-      "import": "./dist/index.esm.js",
-      "require": "./dist/index.js",
-      "default": "./dist/index.esm.js"
+      "module": "./dist/index.mjs",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs",
+      "default": "./dist/index.mjs"
     },
     "./package.json": "./package.json"
   },
@@ -52,7 +52,7 @@
     "url": "https://www.microsoft.com"
   },
   "beachball": {
-    "disallowedChangeTypes": []
+    "disallowedChangeTypes": ["major"]
   },
   "dependencies": {
     "@azure/msal-common": "14.0.0",

diff --git a/extensions/msal-node-extensions/rollup.config.js b/extensions/msal-node-extensions/rollup.config.js
@@ -20,6 +20,7 @@ export default [
             format: "cjs",
             preserveModules: true,
             preserveModulesRoot: "src",
+            entryFileNames: "[name].cjs",
             banner: fileHeader,
             sourcemap: true
         },
@@ -47,8 +48,8 @@ export default [
         input: "src/index.ts",
         output: {
             dir: "dist",
-            format: "esm",
-            entryFileNames: "[name].esm.js",
+            format: "es",
+            entryFileNames: "[name].mjs",
             preserveModules: true,
             preserveModulesRoot: "src",
             banner: fileHeader,

diff --git a/extensions/msal-node-extensions/test/performance-test/LockAndWriteToStorageScript.js b/extensions/msal-node-extensions/test/performance-test/LockAndWriteToStorageScript.js
@@ -4,7 +4,7 @@
  */
 
 const process = require("process");
-const extensions = require("../../dist/index");
+const extensions = require("../../dist/index.cjs");
 const fs = require("fs");
 const path = require("path");
 const msalCommon = require("@azure/msal-common");
@@ -57,7 +57,7 @@ async function writeToCache(fileName, retryNumber, retryDelay) {
         await plugin.beforeCacheAccess(context);
 
         const processId = process.pid.toString();
-        let data = fileData + "< " + processId + "\n";
+        const data = fileData + "< " + processId + "\n";
         await sleep(100);
         fileData = data + "> " + processId + "\n";
     } finally {

diff --git a/lib/msal-browser/package.json b/lib/msal-browser/package.json
@@ -23,23 +23,23 @@
   ],
   "type": "module",
   "sideEffects": false,
-  "module": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "module": "./dist/index.js",
-      "import": "./dist/index.js",
-      "require": "./lib/msal-browser.cjs.js",
-      "default": "./dist/index.js"
+      "module": "./dist/index.mjs",
+      "import": "./dist/index.mjs",
+      "require": "./lib/msal-browser.cjs",
+      "default": "./dist/index.mjs"
     },
     "./package.json": "./package.json"
   },
   "engines": {
     "node": ">=0.8.0"
   },
   "beachball": {
-    "disallowedChangeTypes": []
+    "disallowedChangeTypes": ["major"]
   },
   "directories": {
     "test": "test"
@@ -48,14 +48,11 @@
     "dist",
     "lib/msal-browser.js",
     "lib/msal-browser.js.map",
-    "lib/msal-browser.cjs.js",
-    "lib/msal-browser.cjs.js.map",
+    "lib/msal-browser.cjs",
+    "lib/msal-browser.cjs.map",
     "lib/msal-browser.min.js"
   ],
   "scripts": {
-    "cdn": "npm run build:all && npm run cdn:upload && npm run cdn:sri",
-    "cdn:upload": "node ./cdn-upload.js",
-    "cdn:sri": "node ./cdn-sri.js",
     "clean": "shx rm -rf dist lib",
     "clean:coverage": "rimraf ../../.nyc_output/*",
     "lint": "cd ../../ && npm run lint:browser",

diff --git a/lib/msal-browser/rollup.config.js b/lib/msal-browser/rollup.config.js
@@ -21,6 +21,7 @@ export default [
             preserveModules: true,
             preserveModulesRoot: "src",
             format: "es",
+            entryFileNames: "[name].mjs",
             banner: fileHeader,
             sourcemap: true,
         },
@@ -48,7 +49,7 @@ export default [
                 format: "cjs",
                 banner: fileHeader,
                 sourcemap: true,
-                entryFileNames: "msal-browser.cjs.js"
+                entryFileNames: "msal-browser.cjs"
             },
             {
                 dir: "lib",

diff --git a/lib/msal-browser/tsconfig.build.tsbuildinfo b/lib/msal-browser/tsconfig.build.tsbuildinfo
diff --git a/lib/msal-common/package.json b/lib/msal-common/package.json
@@ -22,15 +22,15 @@
     "oauth"
   ],
   "sideEffects": false,
-  "module": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "module": "./dist/index.js",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs.js",
-      "default": "./dist/index.js"
+      "module": "./dist/index.mjs",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs",
+      "default": "./dist/index.mjs"
     },
     "./package.json": "./package.json"
   },
@@ -61,7 +61,7 @@
     "format:fix": "npx prettier --ignore-path .gitignore --write src test"
   },
   "beachball": {
-    "disallowedChangeTypes": []
+    "disallowedChangeTypes": ["major"]
   },
   "devDependencies": {
     "@babel/core": "^7.7.2",

diff --git a/lib/msal-common/rollup.config.js b/lib/msal-common/rollup.config.js
@@ -17,6 +17,7 @@ export default [
         output: {
             dir: "dist",
             format: "es",
+            entryFileNames: "[name].mjs",
             preserveModules: true,
             preserveModulesRoot: "src",
             banner: fileHeader,
@@ -45,7 +46,7 @@ export default [
                 format: "cjs",
                 banner: fileHeader,
                 sourcemap: true,
-                entryFileNames: "index.cjs.js"
+                entryFileNames: "[name].cjs"
             }
         ],
         external: [

diff --git a/lib/msal-node/package.json b/lib/msal-node/package.json
@@ -51,7 +51,7 @@
     "format:fix": "npx prettier --ignore-path .gitignore --write src test"
   },
   "beachball": {
-    "disallowedChangeTypes": []
+    "disallowedChangeTypes": ["major"]
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.19.4",

diff --git a/lib/msal-node/rollup.config.js b/lib/msal-node/rollup.config.js
@@ -45,7 +45,7 @@ export default [
         input: "src/index.ts",
         output: {
             dir: "dist",
-            format: "esm",
+            format: "es",
             entryFileNames: "[name].mjs",
             preserveModules: true,
             preserveModulesRoot: "src",