Bundle msal-common into msal-browser

lib/msal-browser/jest.config.js

@@ -13,5 +13,8 @@ module.exports = {
         url: "https://localhost:8081/index.html"
     },
     collectCoverageFrom: ["src/**/*.ts"],
-    coverageReporters: [["lcov", {"projectRoot": "../../"}]]
+    coverageReporters: [["lcov", { "projectRoot": "../../" }]],
+    moduleNameMapper: {
+        '^@azure/msal-common$': '<rootDir>/../msal-common/src'
+    }
 };

lib/msal-browser/package.json

@@ -56,7 +56,6 @@
     "build:modules": "rollup -c --strictDeprecations --bundleConfigAsCjs",
     "build:modules:watch": "rollup -cw --bundleConfigAsCjs",
     "build": "npm run clean && npm run build:modules",
-    "link:localDeps": "npx lerna bootstrap --scope @azure/msal-common --scope @azure/msal-browser",
     "prepack": "npm run build:all",
     "format:check": "npx prettier --ignore-path .gitignore --check src test",
     "format:fix": "npx prettier --ignore-path .gitignore --write src test"
@@ -90,7 +89,7 @@
     "tslint": "^5.20.0",
     "typescript": "^4.9.5"
   },
-  "dependencies": {
-    "@azure/msal-common": "^12.0.0"
-  }
+  "bundledDependencies": [
+    "@azure/msal-common"
+  ]
 }

lib/msal-browser/rollup.config.js

@@ -15,7 +15,7 @@ const fileHeader = `${libraryHeader}\n${useStrictHeader}`;
 export default [
     {
         // for es build
-        input: "src/index.ts",
+        input: ["src/index.ts", "../msal-common/src/index.ts"],
         output: {
             dir: "dist",
             preserveModules: true,
@@ -40,21 +40,14 @@ export default [
         ]
     },
     {
-        input: "src/index.ts",
+        input: ["src/index.ts", "../msal-common/src/index.ts"],
         preserveModules: false,
         output: [
             {
                 dir: "lib",
                 format: "cjs",
                 banner: fileHeader,
                 sourcemap: true,
-            },
-            {
-                dir: "lib",
-                format: "umd",
-                name: "msal",
-                banner: fileHeader,
-                sourcemap: true,
             }
         ],
         plugins: [
@@ -66,7 +59,7 @@ export default [
                 typescript: require("typescript"),
                 tsconfig: "tsconfig.build.json",
                 sourceMap: true,
-                compilerOptions: {outDir: "./lib"}
+                compilerOptions: { outDir: "./lib" }
             })
         ]
     },
@@ -91,7 +84,7 @@ export default [
                 typescript: require("typescript"),
                 tsconfig: "tsconfig.build.json",
                 sourceMap: false,
-                compilerOptions: {outDir: "./lib"}
+                compilerOptions: { outDir: "./lib" }
             }),
             terser({
                 output: {

lib/msal-browser/tsconfig.base.json

@@ -1,4 +1,5 @@
 {
+    "extends": "../../tsconfig.json",
     "compilerOptions": {
         "suppressImplicitAnyIndexErrors": true,
         "sourceMap": true,
@@ -13,4 +14,4 @@
     },
     "compileOnSave": false,
     "buildOnSave": false
-}
+}

lib/msal-browser/tsconfig.build.json

@@ -1,7 +1,18 @@
 {
     "extends": "./tsconfig.json",
     "compilerOptions": {
-        "rootDir": "./src"
+        "rootDirs": [
+            "./src",
+            "../msal-common/src"
+        ],
+        "paths": {
+            "@azure/msal-common": [
+                "../msal-common/src"
+            ]
+        }
     },
-    "include": ["src"]
+    "include": [
+        "src",
+        "../msal-common/src"
+    ]
 }

lib/msal-browser/tsconfig.json

@@ -13,19 +13,37 @@
         "allowUnusedLabels": false,
         "noImplicitReturns": true,
         "esModuleInterop": true,
-        "resolveJsonModule": true
+        "resolveJsonModule": true,
+        "strictPropertyInitialization": false,
+        "rootDirs": [
+            "./",
+            "../msal-common"
+        ],
+        "baseUrl": "./",
+        "paths": {
+            "*": [
+                "src/*",
+                "node_modules/"
+            ],
+            "@azure/msal-common": [
+                "../msal-common/src"
+            ]
+        }
     },
     "references": [
         {
             "path": "../msal-common"
         }
     ],
-    "include": ["src", "test"],
+    "include": [
+        "src",
+        "test"
+    ],
     "exclude": [
         "node_modules"
     ],
     "types": [
         "node",
         "jest"
     ]
-}
+}