Dedupe build output

.gitignore

@@ -278,6 +278,7 @@ ref/
 
 # Typescript & Rollup
 tsconfig.build.tsbuildinfo
+types/
 
 # MSAL Node Cache Files
 temp-cache.json

api-extractor-base.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/index.d.ts",
+  "mainEntryPointFilePath": "<projectFolder>/types/index.d.ts",
   "newlineKind": "lf",
   "apiReport": {
     "enabled": true,
@@ -16,8 +16,8 @@
   "messages": {
     "compilerMessageReporting": {
       "default": {
-       "logLevel": "warning",
-       "addToApiReportFile": true
+        "logLevel": "warning",
+        "addToApiReportFile": true
       }
     },
     "extractorMessageReporting": {
@@ -40,8 +40,8 @@
     "tsdocMessageReporting": {
       "default": {
         "logLevel": "warning",
-        "addToApiReportFile":true
+        "addToApiReportFile": true
       }
     }
   }
-}
+}

change/@azure-msal-browser-3119ffe4-b5d0-4de3-87fd-4f8b9dbbdb25.json

@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Remove duplicate typings in the build output [#8557](https://github.com/AzureAD/microsoft-authentication-library-for-js/pull/8557)",
+  "packageName": "@azure/msal-browser",
+  "email": "thomas.norling@microsoft.com",
+  "dependentChangeType": "patch"
+}

change/@azure-msal-common-e4e43f22-87e9-466d-8f27-dd830275df22.json

@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Remove duplicate typings in the build output [#8557](https://github.com/AzureAD/microsoft-authentication-library-for-js/pull/8557)",
+  "packageName": "@azure/msal-common",
+  "email": "thomas.norling@microsoft.com",
+  "dependentChangeType": "patch"
+}

change/@azure-msal-node-977b757e-ee8b-45b6-b013-dc213ab43e0c.json

@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Remove duplicate typings in the build output [#8557](https://github.com/AzureAD/microsoft-authentication-library-for-js/pull/8557)",
+  "packageName": "@azure/msal-node",
+  "email": "thomas.norling@microsoft.com",
+  "dependentChangeType": "patch"
+}

change/@azure-msal-node-extensions-dac0fe19-b6cd-4d14-bf45-1855c1dce4f4.json

@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Remove duplicate typings in the build output [#8557](https://github.com/AzureAD/microsoft-authentication-library-for-js/pull/8557)",
+  "packageName": "@azure/msal-node-extensions",
+  "email": "thomas.norling@microsoft.com",
+  "dependentChangeType": "patch"
+}

change/@azure-msal-react-cc1eae69-e881-4eb2-a8be-1788387ac3cd.json

@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Remove duplicate typings in the build output [#8557](https://github.com/AzureAD/microsoft-authentication-library-for-js/pull/8557)",
+  "packageName": "@azure/msal-react",
+  "email": "thomas.norling@microsoft.com",
+  "dependentChangeType": "patch"
+}

extensions/msal-node-extensions/package.json

@@ -8,16 +8,16 @@
   "license": "MIT",
   "type": "module",
   "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
+  "types": "types/index.d.ts",
   "main": "lib/msal-node-extensions.cjs",
   "exports": {
     ".": {
       "import": {
-        "types": "./dist/index.d.ts",
+        "types": "./types/index.d.ts",
         "default": "./dist/index.mjs"
       },
       "require": {
-        "types": "./lib/types/index.d.ts",
+        "types": "./types/index.d.cts",
         "default": "./lib/msal-node-extensions.cjs"
       }
     },
@@ -33,6 +33,7 @@
   ],
   "files": [
     "dist",
+    "types",
     "bin",
     "lib"
   ],
@@ -42,9 +43,10 @@
   "scripts": {
     "compile": "node-gyp rebuild",
     "install": "exit 0",
-    "clean": "shx rm -rf dist bin lib",
-    "build": "npm run clean && npm run build:js && npm run build:binaries",
+    "clean": "shx rm -rf dist types bin lib",
+    "build": "npm run clean && npm run build:js && npm run build:types && npm run build:binaries",
     "build:js": "rollup -c --strictDeprecations --bundleConfigAsCjs",
+    "build:types": "tsc -p tsconfig.build.types.json",
     "build:binaries": "node ./scripts/buildBinaries.cjs",
     "build:all": "cd ../.. && npm run build --workspace=@azure/msal-common --workspace=@azure/msal-node-extensions",
     "test": "jest",
@@ -88,4 +90,4 @@
     "tslib": "^2.0.0",
     "typescript": "^4.9.5"
   }
-}
+}

extensions/msal-node-extensions/rollup.config.js

@@ -6,7 +6,8 @@
 import { nodeResolve } from "@rollup/plugin-node-resolve";
 import typescript from "@rollup/plugin-typescript";
 import pkg from "./package.json";
-import { createPackageJson } from "rollup-msal";
+import { createCjsTypeShims, createPackageJson } from "rollup-msal";
+import path from "path";
 
 const libraryHeader = `/*! ${pkg.name} v${pkg.version} ${new Date().toISOString().split("T")[0]} */`;
 const useStrictHeader = "'use strict';";
@@ -36,7 +37,11 @@ export default [
             typescript({
                 typescript: require("typescript"),
                 tsconfig: "tsconfig.build.json",
-                compilerOptions: { outDir: "lib/types" }
+                compilerOptions: {
+                    outDir: "./lib",
+                    declaration: false,
+                    declarationMap: false
+                }
             }),
             nodeResolve({
                 preferBuiltins: true
@@ -67,7 +72,20 @@ export default [
         plugins: [
             typescript({
                 typescript: require("typescript"),
-                tsconfig: "tsconfig.build.json"
+                tsconfig: "tsconfig.build.json",
+                compilerOptions: {
+                    declaration: false,
+                    declarationMap: false
+                }
+            }),
+            createCjsTypeShims({
+                packageRoot: __dirname,
+                shims: [
+                    {
+                        filePath: path.join("types", "index.d.cts"),
+                        target: "../dist/index.mjs"
+                    }
+                ]
             }),
             nodeResolve({
                 preferBuiltins: true

extensions/msal-node-extensions/tsconfig.build.types.json

@@ -0,0 +1,13 @@
+{
+    "extends": "./tsconfig.build.json",
+    "compilerOptions": {
+        "outDir": "./types",
+        "declaration": true,
+        "declarationMap": true,
+        "emitDeclarationOnly": true,
+        "noEmit": false
+    },
+    "include": [
+        "src"
+    ]
+}

lib/msal-browser/package.json

@@ -25,35 +25,35 @@
   "sideEffects": false,
   "main": "./lib/msal-browser.cjs",
   "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "types": "./types/index.d.ts",
   "exports": {
     "./custom-auth": {
       "import": {
-        "types": "./dist/custom-auth-path/custom_auth/index.d.ts",
-        "default": "./dist/custom-auth-path/custom_auth/index.mjs"
+        "types": "./types/custom_auth/index.d.ts",
+        "default": "./dist/custom_auth/index.mjs"
       },
       "require": {
-        "types": "./lib/custom-auth-path/types/custom_auth/index.d.ts",
+        "types": "./types/custom_auth/index.d.cts",
         "default": "./lib/custom-auth-path/msal-custom-auth.cjs"
       }
     },
     "./redirect-bridge": {
       "import": {
-        "types": "./dist/redirect-bridge/redirect_bridge/index.d.ts",
-        "default": "./dist/redirect-bridge/redirect_bridge/index.mjs"
+        "types": "./types/redirect_bridge/index.d.ts",
+        "default": "./dist/redirect_bridge/index.mjs"
       },
       "require": {
-        "types": "./lib/redirect-bridge/types/redirect_bridge/index.d.ts",
+        "types": "./types/redirect_bridge/index.d.cts",
         "default": "./lib/redirect-bridge/msal-redirect-bridge.cjs"
       }
     },
     ".": {
       "import": {
-        "types": "./dist/index.d.ts",
+        "types": "./types/index.d.ts",
         "default": "./dist/index.mjs"
       },
       "require": {
-        "types": "./lib/types/index.d.ts",
+        "types": "./types/index.d.cts",
         "default": "./lib/msal-browser.cjs"
       }
     },
@@ -72,11 +72,12 @@
   },
   "files": [
     "dist",
+    "types",
     "lib",
     "src"
   ],
   "scripts": {
-    "clean": "shx rm -rf dist lib",
+    "clean": "shx rm -rf dist types lib",
     "clean:coverage": "rimraf ../../.nyc_output/*",
     "lint": "eslint src --ext .ts",
     "lint:fix": "npm run lint -- --fix",
@@ -85,7 +86,8 @@
     "test:coverage:only": "npm run clean:coverage && npm run test:coverage",
     "build:all": "cd ../.. && npm run build --workspace=@azure/msal-common --workspace=@azure/msal-browser",
     "build:all:debug": "cd ../.. && cross-env MSAL_MINIFY_LOGS=false npm run build --workspace=@azure/msal-common --workspace=@azure/msal-browser",
-    "build:modules": "rollup -c --strictDeprecations --bundleConfigAsCjs",
+    "build:modules": "rollup -c --strictDeprecations --bundleConfigAsCjs && npm run build:types",
+    "build:types": "tsc -p tsconfig.build.types.json",
     "build:modules:watch": "rollup -cw --bundleConfigAsCjs",
     "build": "npm run clean && npm run build:modules",
     "build:debug": "npm run clean && cross-env MSAL_MINIFY_LOGS=false npm run build:modules",
@@ -130,4 +132,4 @@
   "dependencies": {
     "@azure/msal-common": "16.5.1"
   }
-}
+}