diff --git a/package.json b/package.json
index 4a64379c20cbf..0d266c6949881 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "@types/loader-utils": "2.0.3",
     "@types/markdown-table": "2.0.0",
     "@types/micromatch": "4.0.2",
-    "@types/node": "10.17.55",
+    "@types/node": "14.18.32",
     "@types/node-fetch": "2.5.7",
     "@types/prettier": "2.2.3",
     "@types/progress": "2.0.5",
@@ -339,7 +339,8 @@
     "@typescript-eslint/parser": "4.22.0",
     "@types/jest-axe/axe-core": "4.2.1",
     "eslint": "7.25.0",
-    "requestretry": "7.0.0"
+    "requestretry": "7.0.0",
+    "@types/node": "14.18.32"
   },
   "syncpack": {
     "prod": true,
diff --git a/packages/bundle-size/src/utils/buildFixture.js b/packages/bundle-size/src/utils/buildFixture.js
index 99ef2578e5583..aaaa1ace517f7 100644
--- a/packages/bundle-size/src/utils/buildFixture.js
+++ b/packages/bundle-size/src/utils/buildFixture.js
@@ -129,8 +129,8 @@ module.exports = async function buildFixture(preparedFixture, quiet) {
     /* eslint-enable @typescript-eslint/naming-convention */
   ]);
 
-  await fs.writeFile(webpackOutputPath, terserOutput.code);
-  await fs.writeFile(terserOutputPath, terserOutputMinified.code);
+  await fs.writeFile(webpackOutputPath, terserOutput.code ?? '');
+  await fs.writeFile(terserOutputPath, terserOutputMinified.code ?? '');
 
   if (!quiet) {
     console.log(
diff --git a/packages/bundle-size/src/utils/prepareFixture.js b/packages/bundle-size/src/utils/prepareFixture.js
index 2a4ca190f3da3..97e1f30d80ac2 100644
--- a/packages/bundle-size/src/utils/prepareFixture.js
+++ b/packages/bundle-size/src/utils/prepareFixture.js
@@ -9,6 +9,11 @@ const ajv = new Ajv();
 /** @typedef {{ name: string }} FixtureMetadata */
 /** @typedef {{ absolutePath: string, relativePath: string, name: string }} PreparedFixture */
 
+/**
+ * @template T
+ * @typedef {NonNullable<T> & {[P in keyof T]-?: NonNullable<T[P]>;}} RequiredNonNullableRecord<T>
+ */
+
 /**
  * Prepares a fixture file to be compiled with Webpack, grabs data from a default export and removes it.
  *
@@ -59,7 +64,7 @@ module.exports = async function prepareFixture(fixture) {
 
   /**
    * @param {typeof result} value
-   * @return {value is Required<NonNullable<typeof result>> & {metadata: FixtureMetadata}}
+   * @return {value is RequiredNonNullableRecord<typeof result> & {metadata: FixtureMetadata}}
    */
   function isTransformedFixtureResultHasMetadata(value) {
     return Boolean(value && value.metadata && Object.keys(value.metadata).length);
diff --git a/packages/react-components/babel-preset-global-context/config/api-extractor.json b/packages/react-components/babel-preset-global-context/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/babel-preset-global-context/config/api-extractor.json
+++ b/packages/react-components/babel-preset-global-context/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/babel-preset-global-context/config/api-extractor.local.json b/packages/react-components/babel-preset-global-context/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/babel-preset-global-context/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/babel-preset-global-context/package.json b/packages/react-components/babel-preset-global-context/package.json
index be2285015d849..655af67bfc60c 100644
--- a/packages/react-components/babel-preset-global-context/package.json
+++ b/packages/react-components/babel-preset-global-context/package.json
@@ -3,7 +3,7 @@
   "version": "9.0.0-beta.7",
   "description": "Babel preset that transforms createContext calls to use global context shims",
   "main": "lib-commonjs/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/microsoft/fluentui"
@@ -19,9 +19,8 @@
     "just": "just-scripts",
     "lint": "just-scripts lint",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/babel-preset-global-context/src && yarn docs",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -46,5 +45,12 @@
       "minor",
       "patch"
     ]
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/babel-preset-global-context/tsconfig.lib.json b/packages/react-components/babel-preset-global-context/tsconfig.lib.json
index 6b77ffea2342d..352d917430759 100644
--- a/packages/react-components/babel-preset-global-context/tsconfig.lib.json
+++ b/packages/react-components/babel-preset-global-context/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment", "node"],
     "module": "CommonJS"
diff --git a/packages/react-components/global-context/config/api-extractor.json b/packages/react-components/global-context/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/global-context/config/api-extractor.json
+++ b/packages/react-components/global-context/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/global-context/config/api-extractor.local.json b/packages/react-components/global-context/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/global-context/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/global-context/package.json b/packages/react-components/global-context/package.json
index d024b29140346..cb66e68170e10 100644
--- a/packages/react-components/global-context/package.json
+++ b/packages/react-components/global-context/package.json
@@ -4,7 +4,7 @@
   "description": "Extension of React createContext to be a true singleton on the global scope",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -21,9 +21,8 @@
     "just": "just-scripts",
     "lint": "just-scripts lint",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/global-context/src && yarn docs",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -47,5 +46,13 @@
       "minor",
       "patch"
     ]
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./lib/index.js",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/global-context/tsconfig.lib.json b/packages/react-components/global-context/tsconfig.lib.json
index 356da34103c91..33ff2b70bcf25 100644
--- a/packages/react-components/global-context/tsconfig.lib.json
+++ b/packages/react-components/global-context/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment", "node"]
   },
diff --git a/packages/react-components/keyboard-keys/config/api-extractor.json b/packages/react-components/keyboard-keys/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/keyboard-keys/config/api-extractor.json
+++ b/packages/react-components/keyboard-keys/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/keyboard-keys/config/api-extractor.local.json b/packages/react-components/keyboard-keys/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/keyboard-keys/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/keyboard-keys/package.json b/packages/react-components/keyboard-keys/package.json
index 1084622d24e26..31ff6e357a5d3 100644
--- a/packages/react-components/keyboard-keys/package.json
+++ b/packages/react-components/keyboard-keys/package.json
@@ -4,7 +4,7 @@
   "description": "Contains a set of keyboard constants for key and keyCode",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -17,10 +17,9 @@
     "code-style": "just-scripts code-style",
     "just": "just-scripts",
     "lint": "just-scripts lint",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/keyboard-keys/src && yarn docs",
     "test": "jest --passWithNoTests",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -37,9 +36,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/keyboard-keys/tsconfig.lib.json b/packages/react-components/keyboard-keys/tsconfig.lib.json
index 7763b7fe82bad..b2da24eff1b32 100644
--- a/packages/react-components/keyboard-keys/tsconfig.lib.json
+++ b/packages/react-components/keyboard-keys/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/priority-overflow/config/api-extractor.json b/packages/react-components/priority-overflow/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/priority-overflow/config/api-extractor.json
+++ b/packages/react-components/priority-overflow/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/priority-overflow/config/api-extractor.local.json b/packages/react-components/priority-overflow/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/priority-overflow/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/priority-overflow/package.json b/packages/react-components/priority-overflow/package.json
index fc5a72f042214..41a3f12f3bfed 100644
--- a/packages/react-components/priority-overflow/package.json
+++ b/packages/react-components/priority-overflow/package.json
@@ -4,7 +4,7 @@
   "description": "Vanilla JS utilities to implement overflow menus",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -19,9 +19,8 @@
     "just": "just-scripts",
     "lint": "just-scripts lint",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/priority-overflow/src && yarn docs",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -36,5 +35,13 @@
       "minor",
       "patch"
     ]
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./lib/index.js",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/priority-overflow/tsconfig.lib.json b/packages/react-components/priority-overflow/tsconfig.lib.json
index 7763b7fe82bad..b2da24eff1b32 100644
--- a/packages/react-components/priority-overflow/tsconfig.lib.json
+++ b/packages/react-components/priority-overflow/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-aria/config/api-extractor.json b/packages/react-components/react-aria/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-aria/config/api-extractor.json
+++ b/packages/react-components/react-aria/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-aria/config/api-extractor.local.json b/packages/react-components/react-aria/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-aria/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-aria/package.json b/packages/react-components/react-aria/package.json
index 555f748ba57f5..6fa70c9f3054a 100644
--- a/packages/react-components/react-aria/package.json
+++ b/packages/react-components/react-aria/package.json
@@ -4,7 +4,7 @@
   "description": "React helper to ensure ARIA",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -19,10 +19,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/types/packages/react-components/react-aria/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -48,9 +47,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-aria/tsconfig.lib.json b/packages/react-components/react-aria/tsconfig.lib.json
index ef66992c5a174..008c602dc19d2 100644
--- a/packages/react-components/react-aria/tsconfig.lib.json
+++ b/packages/react-components/react-aria/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-avatar-context/package.json b/packages/react-components/react-avatar-context/package.json
index 3dc0c329ce5df..fe9f680a7b66e 100644
--- a/packages/react-components/react-avatar-context/package.json
+++ b/packages/react-components/react-avatar-context/package.json
@@ -5,7 +5,7 @@
   "description": "Context to override avatar props",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -46,5 +46,13 @@
       "minor",
       "patch"
     ]
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./lib/index.js",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-avatar/package.json b/packages/react-components/react-avatar/package.json
index de36f9c98b34c..996bbf62a1baa 100644
--- a/packages/react-components/react-avatar/package.json
+++ b/packages/react-components/react-avatar/package.json
@@ -4,7 +4,7 @@
   "description": "React components for building Microsoft web experiences.",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -61,9 +61,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-badge/config/api-extractor.json b/packages/react-components/react-badge/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-badge/config/api-extractor.json
+++ b/packages/react-components/react-badge/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-badge/config/api-extractor.local.json b/packages/react-components/react-badge/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-badge/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-badge/package.json b/packages/react-components/react-badge/package.json
index f35e8fcae687e..5acdbdc47d6d2 100644
--- a/packages/react-components/react-badge/package.json
+++ b/packages/react-components/react-badge/package.json
@@ -4,7 +4,7 @@
   "description": "React components for building web experiences",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-badge/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -52,9 +51,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-badge/tsconfig.lib.json b/packages/react-components/react-badge/tsconfig.lib.json
index 53770c42da6dd..6f90cf95c005b 100644
--- a/packages/react-components/react-badge/tsconfig.lib.json
+++ b/packages/react-components/react-badge/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-button/config/api-extractor.json b/packages/react-components/react-button/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-button/config/api-extractor.json
+++ b/packages/react-components/react-button/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-button/config/api-extractor.local.json b/packages/react-components/react-button/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-button/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-button/package.json b/packages/react-components/react-button/package.json
index f38e6cc21f58d..63650f853cddc 100644
--- a/packages/react-components/react-button/package.json
+++ b/packages/react-components/react-button/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI React Button component.",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-button/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/a11y-testing": "^0.1.0",
@@ -56,9 +55,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-button/tsconfig.lib.json b/packages/react-components/react-button/tsconfig.lib.json
index 53770c42da6dd..6f90cf95c005b 100644
--- a/packages/react-components/react-button/tsconfig.lib.json
+++ b/packages/react-components/react-button/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-checkbox/config/api-extractor.json b/packages/react-components/react-checkbox/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-checkbox/config/api-extractor.json
+++ b/packages/react-components/react-checkbox/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-checkbox/config/api-extractor.local.json b/packages/react-components/react-checkbox/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-checkbox/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-checkbox/package.json b/packages/react-components/react-checkbox/package.json
index b1aec2ca284c1..b58b70350f4ea 100644
--- a/packages/react-components/react-checkbox/package.json
+++ b/packages/react-components/react-checkbox/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI checkbox component",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -19,10 +19,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-checkbox/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -53,9 +52,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-checkbox/tsconfig.lib.json b/packages/react-components/react-checkbox/tsconfig.lib.json
index 53770c42da6dd..6f90cf95c005b 100644
--- a/packages/react-components/react-checkbox/tsconfig.lib.json
+++ b/packages/react-components/react-checkbox/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-combobox/config/api-extractor.json b/packages/react-components/react-combobox/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-combobox/config/api-extractor.json
+++ b/packages/react-components/react-combobox/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-combobox/config/api-extractor.local.json b/packages/react-components/react-combobox/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-combobox/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-combobox/package.json b/packages/react-components/react-combobox/package.json
index cbda7396cd037..f73e9bbe3a4b4 100644
--- a/packages/react-components/react-combobox/package.json
+++ b/packages/react-components/react-combobox/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI React Combobox component",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-combobox/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -59,9 +58,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-combobox/tsconfig.lib.json b/packages/react-components/react-combobox/tsconfig.lib.json
index 5d7b14f1e0b70..7f94e04299ed8 100644
--- a/packages/react-components/react-combobox/tsconfig.lib.json
+++ b/packages/react-components/react-combobox/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-components/config/api-extractor.json b/packages/react-components/react-components/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-components/config/api-extractor.json
+++ b/packages/react-components/react-components/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-components/config/api-extractor.local.json b/packages/react-components/react-components/config/api-extractor.local.json
deleted file mode 100644
index fc68f7c9367c8..0000000000000
--- a/packages/react-components/react-components/config/api-extractor.local.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts",
-  "compiler": {
-    /**
-     * This is a quickfix to make build:local work
-     * - @see https://github.com/microsoft/fluentui/issues/19360
-     * - config uses standard tsconfig.lib.json and overrides path aliases
-     */
-    "overrideTsconfig": {
-      "extends": "./tsconfig.lib.json",
-      "compilerOptions": {
-        "paths": {
-          "@fluentui/*": ["dist/*/src/index.d.ts"]
-        }
-      }
-    }
-  }
-}
diff --git a/packages/react-components/react-components/config/api-extractor.unstable.json b/packages/react-components/react-components/config/api-extractor.unstable.json
index 86279bdf5c1bb..f853077f0abc3 100644
--- a/packages/react-components/react-components/config/api-extractor.unstable.json
+++ b/packages/react-components/react-components/config/api-extractor.unstable.json
@@ -1,17 +1,14 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/unstable/index.d.ts",
+  "mainEntryPointFilePath": "<projectFolder>/../../../dist/out-tsc/types/packages/react-components/<unscopedPackageName>/src/unstable/index.d.ts",
   "apiReport": {
     "enabled": true,
     "reportFileName": "<unscopedPackageName>.unstable.api.md"
   },
-  "docModel": {
-    "enabled": true,
-    "apiJsonFilePath": "<projectFolder>/dist/<unscopedPackageName>.unstable.api.json"
-  },
   "dtsRollup": {
     "enabled": true,
-    "untrimmedFilePath": "<projectFolder>/dist/unstable.d.ts"
+    "untrimmedFilePath": "<projectFolder>/dist/unstable-untrimmed.d.ts",
+    "publicTrimmedFilePath": "<projectFolder>/dist/unstable.d.ts"
   }
 }
diff --git a/packages/react-components/react-components/package.json b/packages/react-components/react-components/package.json
index f6d79f87c3c57..fef5b928749f3 100644
--- a/packages/react-components/react-components/package.json
+++ b/packages/react-components/react-components/package.json
@@ -4,7 +4,7 @@
   "description": "Suite package for converged React components",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -19,11 +19,10 @@
     "just": "just-scripts",
     "lint": "just-scripts lint",
     "start": "yarn storybook",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-components/src && yarn docs",
     "storybook": "start-storybook --port 3000 --no-manager-cache",
     "test": "jest --passWithNoTests",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -88,12 +87,12 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
     },
     "./unstable": {
-      "types": "./lib/unstable/index.d.ts",
+      "types": "./dist/unstable.d.ts",
       "import": "./lib/unstable/index.js",
       "require": "./lib-commonjs/unstable/index.js"
     },
diff --git a/packages/react-components/react-components/src/unstable/package.json__tmpl__ b/packages/react-components/react-components/src/unstable/package.json__tmpl__
index 6a148f872a8cb..91359ab10175e 100644
--- a/packages/react-components/react-components/src/unstable/package.json__tmpl__
+++ b/packages/react-components/react-components/src/unstable/package.json__tmpl__
@@ -7,7 +7,7 @@
   "license": "MIT",
   "exports": {
     ".": {
-      "types": "./../lib/unstable/index.d.ts",
+      "types": "./../dist/unstable.d.ts",
       "import": "./../lib/unstable/index.js",
       "require": "./../lib-commonjs/unstable/index.js"
     }
diff --git a/packages/react-components/react-components/tsconfig.lib.json b/packages/react-components/react-components/tsconfig.lib.json
index ef66992c5a174..008c602dc19d2 100644
--- a/packages/react-components/react-components/tsconfig.lib.json
+++ b/packages/react-components/react-components/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-conformance-griffel/config/api-extractor.json b/packages/react-components/react-conformance-griffel/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-conformance-griffel/config/api-extractor.json
+++ b/packages/react-components/react-conformance-griffel/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-conformance-griffel/config/api-extractor.local.json b/packages/react-components/react-conformance-griffel/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-conformance-griffel/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-conformance-griffel/etc/react-conformance-griffel.api.md b/packages/react-components/react-conformance-griffel/etc/react-conformance-griffel.api.md
new file mode 100644
index 0000000000000..bbfbdc7ddd461
--- /dev/null
+++ b/packages/react-components/react-conformance-griffel/etc/react-conformance-griffel.api.md
@@ -0,0 +1,20 @@
+## API Report File for "@fluentui/react-conformance-griffel"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { TestObject } from '@fluentui/react-conformance';
+
+// @public (undocumented)
+const makeStylesTests: TestObject;
+export default makeStylesTests;
+
+// @public (undocumented)
+export type OverridesWinTestOptions = {
+    callCount?: number;
+};
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/react-components/react-conformance-griffel/package.json b/packages/react-components/react-conformance-griffel/package.json
index df0ffe8094073..fca1a10126523 100644
--- a/packages/react-components/react-conformance-griffel/package.json
+++ b/packages/react-components/react-conformance-griffel/package.json
@@ -3,7 +3,7 @@
   "version": "9.0.0-beta.17",
   "description": "A set of conformance tests for Griffel CSS-in-JS",
   "main": "lib-commonjs/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/microsoft/fluentui"
@@ -16,9 +16,8 @@
     "just": "just-scripts",
     "lint": "just-scripts lint",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-conformance-griffel/src && yarn docs",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -41,5 +40,12 @@
       "minor",
       "patch"
     ]
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-conformance-griffel/tsconfig.lib.json b/packages/react-components/react-conformance-griffel/tsconfig.lib.json
index 3d83e93246449..ff6d546d087e9 100644
--- a/packages/react-components/react-conformance-griffel/tsconfig.lib.json
+++ b/packages/react-components/react-conformance-griffel/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["DOM", "ES2019"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment", "jest", "node"],
     "module": "CommonJS"
diff --git a/packages/react-components/react-context-selector/config/api-extractor.json b/packages/react-components/react-context-selector/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-context-selector/config/api-extractor.json
+++ b/packages/react-components/react-context-selector/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-context-selector/config/api-extractor.local.json b/packages/react-components/react-context-selector/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-context-selector/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-context-selector/package.json b/packages/react-components/react-context-selector/package.json
index dded17cfe7e1e..fb7fd66a09771 100644
--- a/packages/react-components/react-context-selector/package.json
+++ b/packages/react-components/react-context-selector/package.json
@@ -4,7 +4,7 @@
   "description": "React useContextSelector hook in userland",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -18,9 +18,8 @@
     "just": "just-scripts",
     "lint": "just-scripts lint",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-context-selector/src && yarn docs",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -45,9 +44,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-context-selector/tsconfig.lib.json b/packages/react-components/react-context-selector/tsconfig.lib.json
index 7763b7fe82bad..b2da24eff1b32 100644
--- a/packages/react-components/react-context-selector/tsconfig.lib.json
+++ b/packages/react-components/react-context-selector/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-dialog/package.json b/packages/react-components/react-dialog/package.json
index 0a1b8d6e7e014..a6920c4d5380e 100644
--- a/packages/react-components/react-dialog/package.json
+++ b/packages/react-components/react-dialog/package.json
@@ -4,7 +4,7 @@
   "description": "Dialog component for Fluent UI React",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -59,9 +59,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-divider/config/api-extractor.json b/packages/react-components/react-divider/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-divider/config/api-extractor.json
+++ b/packages/react-components/react-divider/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-divider/config/api-extractor.local.json b/packages/react-components/react-divider/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-divider/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-divider/package.json b/packages/react-components/react-divider/package.json
index a68e2ed22b6ee..ef087ce50421a 100644
--- a/packages/react-components/react-divider/package.json
+++ b/packages/react-components/react-divider/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI component to visually separate content.",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-divider/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -51,9 +50,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-divider/tsconfig.lib.json b/packages/react-components/react-divider/tsconfig.lib.json
index 53770c42da6dd..6f90cf95c005b 100644
--- a/packages/react-components/react-divider/tsconfig.lib.json
+++ b/packages/react-components/react-divider/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-field/config/api-extractor.json b/packages/react-components/react-field/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-field/config/api-extractor.json
+++ b/packages/react-components/react-field/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-field/config/api-extractor.local.json b/packages/react-components/react-field/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-field/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-field/package.json b/packages/react-components/react-field/package.json
index 9fdf7f31c0122..3f5c26280f5b4 100644
--- a/packages/react-components/react-field/package.json
+++ b/packages/react-components/react-field/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI Field components",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,9 +20,8 @@
     "start": "yarn storybook",
     "storybook": "start-storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-field/src && yarn docs",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -61,5 +60,13 @@
       "minor",
       "patch"
     ]
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./lib/index.js",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-field/tsconfig.lib.json b/packages/react-components/react-field/tsconfig.lib.json
index 5d7b14f1e0b70..7f94e04299ed8 100644
--- a/packages/react-components/react-field/tsconfig.lib.json
+++ b/packages/react-components/react-field/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-input/config/api-extractor.json b/packages/react-components/react-input/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-input/config/api-extractor.json
+++ b/packages/react-components/react-input/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-input/config/api-extractor.local.json b/packages/react-components/react-input/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-input/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-input/package.json b/packages/react-components/react-input/package.json
index 71b0d20097123..b7e3a367c1347 100644
--- a/packages/react-components/react-input/package.json
+++ b/packages/react-components/react-input/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI React Input component",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-input/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -52,9 +51,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-input/tsconfig.lib.json b/packages/react-components/react-input/tsconfig.lib.json
index 53770c42da6dd..6f90cf95c005b 100644
--- a/packages/react-components/react-input/tsconfig.lib.json
+++ b/packages/react-components/react-input/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-label/config/api-extractor.json b/packages/react-components/react-label/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-label/config/api-extractor.json
+++ b/packages/react-components/react-label/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-label/config/api-extractor.local.json b/packages/react-components/react-label/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-label/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-label/package.json b/packages/react-components/react-label/package.json
index a4540ae70971b..e5e7b6c1dfc79 100644
--- a/packages/react-components/react-label/package.json
+++ b/packages/react-components/react-label/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI React Label component",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-label/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -51,9 +50,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-label/tsconfig.lib.json b/packages/react-components/react-label/tsconfig.lib.json
index 53770c42da6dd..6f90cf95c005b 100644
--- a/packages/react-components/react-label/tsconfig.lib.json
+++ b/packages/react-components/react-label/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-link/config/api-extractor.json b/packages/react-components/react-link/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-link/config/api-extractor.json
+++ b/packages/react-components/react-link/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-link/config/api-extractor.local.json b/packages/react-components/react-link/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-link/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-link/package.json b/packages/react-components/react-link/package.json
index 030cc40009bd6..c709016f7377e 100644
--- a/packages/react-components/react-link/package.json
+++ b/packages/react-components/react-link/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI React Link component",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-link/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/a11y-testing": "^0.1.0",
@@ -54,9 +53,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-link/tsconfig.lib.json b/packages/react-components/react-link/tsconfig.lib.json
index 53770c42da6dd..6f90cf95c005b 100644
--- a/packages/react-components/react-link/tsconfig.lib.json
+++ b/packages/react-components/react-link/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-overflow/package.json b/packages/react-components/react-overflow/package.json
index e99bb85372716..fe462c95e1e6c 100644
--- a/packages/react-components/react-overflow/package.json
+++ b/packages/react-components/react-overflow/package.json
@@ -4,7 +4,7 @@
   "description": "React bindings for @fluentui/priority-overflow",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -51,5 +51,13 @@
       "minor",
       "patch"
     ]
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./lib/index.js",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-persona/config/api-extractor.json b/packages/react-components/react-persona/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-persona/config/api-extractor.json
+++ b/packages/react-components/react-persona/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-persona/config/api-extractor.local.json b/packages/react-components/react-persona/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-persona/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-persona/package.json b/packages/react-components/react-persona/package.json
index 441c38ef1e389..00c899ba708a2 100644
--- a/packages/react-components/react-persona/package.json
+++ b/packages/react-components/react-persona/package.json
@@ -4,7 +4,7 @@
   "description": "React components for building web experiences",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -19,11 +19,10 @@
     "just": "just-scripts",
     "lint": "just-scripts lint",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-persona/src && yarn docs",
     "type-check": "tsc -b tsconfig.json",
     "storybook": "start-storybook",
-    "start": "yarn storybook"
+    "start": "yarn storybook",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -52,5 +51,13 @@
       "minor",
       "patch"
     ]
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./lib/index.js",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-persona/tsconfig.lib.json b/packages/react-components/react-persona/tsconfig.lib.json
index 5d7b14f1e0b70..7f94e04299ed8 100644
--- a/packages/react-components/react-persona/tsconfig.lib.json
+++ b/packages/react-components/react-persona/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-popover/package.json b/packages/react-components/react-popover/package.json
index f11a0bb5e0b17..347b16d77ac94 100644
--- a/packages/react-components/react-popover/package.json
+++ b/packages/react-components/react-popover/package.json
@@ -4,7 +4,7 @@
   "description": "Popover component for Fluent UI",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -60,9 +60,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-portal-compat-context/config/api-extractor.json b/packages/react-components/react-portal-compat-context/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-portal-compat-context/config/api-extractor.json
+++ b/packages/react-components/react-portal-compat-context/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-portal-compat-context/config/api-extractor.local.json b/packages/react-components/react-portal-compat-context/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-portal-compat-context/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-portal-compat-context/package.json b/packages/react-components/react-portal-compat-context/package.json
index 974c0571017e9..53ffbdb060df9 100644
--- a/packages/react-components/react-portal-compat-context/package.json
+++ b/packages/react-components/react-portal-compat-context/package.json
@@ -4,7 +4,7 @@
   "description": "A package that holds React context for compatibility of React Contexts",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -18,9 +18,8 @@
     "just": "just-scripts",
     "lint": "just-scripts lint && just-scripts lint-imports",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-portal-compat-context/src && yarn docs",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -38,5 +37,13 @@
       "major",
       "prerelease"
     ]
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./lib/index.js",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-portal-compat-context/tsconfig.lib.json b/packages/react-components/react-portal-compat-context/tsconfig.lib.json
index 7763b7fe82bad..b2da24eff1b32 100644
--- a/packages/react-components/react-portal-compat-context/tsconfig.lib.json
+++ b/packages/react-components/react-portal-compat-context/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-portal-compat/config/api-extractor.json b/packages/react-components/react-portal-compat/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-portal-compat/config/api-extractor.json
+++ b/packages/react-components/react-portal-compat/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-portal-compat/config/api-extractor.local.json b/packages/react-components/react-portal-compat/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-portal-compat/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-portal-compat/package.json b/packages/react-components/react-portal-compat/package.json
index bb6779f8e9d3d..fd1a552d74117 100644
--- a/packages/react-components/react-portal-compat/package.json
+++ b/packages/react-components/react-portal-compat/package.json
@@ -4,7 +4,7 @@
   "description": "A package that contains compatibility layer for React Portals",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -21,9 +21,8 @@
     "just": "just-scripts",
     "lint": "just-scripts lint && just-scripts lint-imports",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-portal-compat/src && yarn docs",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -46,5 +45,13 @@
       "major",
       "prerelease"
     ]
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./lib/index.js",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-portal-compat/tsconfig.lib.json b/packages/react-components/react-portal-compat/tsconfig.lib.json
index c2f9c89ec5c8d..47002ae1f756b 100644
--- a/packages/react-components/react-portal-compat/tsconfig.lib.json
+++ b/packages/react-components/react-portal-compat/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-portal/config/api-extractor.json b/packages/react-components/react-portal/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-portal/config/api-extractor.json
+++ b/packages/react-components/react-portal/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-portal/config/api-extractor.local.json b/packages/react-components/react-portal/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-portal/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-portal/package.json b/packages/react-components/react-portal/package.json
index 9117deac6bab2..0b021e9aff52e 100644
--- a/packages/react-components/react-portal/package.json
+++ b/packages/react-components/react-portal/package.json
@@ -4,7 +4,7 @@
   "description": "A utility component that creates portals compatible with Fluent UI",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-portal/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -51,9 +50,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-portal/tsconfig.lib.json b/packages/react-components/react-portal/tsconfig.lib.json
index ef66992c5a174..008c602dc19d2 100644
--- a/packages/react-components/react-portal/tsconfig.lib.json
+++ b/packages/react-components/react-portal/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-positioning/config/api-extractor.json b/packages/react-components/react-positioning/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-positioning/config/api-extractor.json
+++ b/packages/react-components/react-positioning/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-positioning/config/api-extractor.local.json b/packages/react-components/react-positioning/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-positioning/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-positioning/package.json b/packages/react-components/react-positioning/package.json
index 09558791c5474..d63e2aeffed92 100644
--- a/packages/react-components/react-positioning/package.json
+++ b/packages/react-components/react-positioning/package.json
@@ -4,7 +4,7 @@
   "description": "A react wrapper around Popper.js for Fluent UI",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -19,9 +19,8 @@
     "just": "just-scripts",
     "lint": "just-scripts lint",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-positioning/src && yarn docs",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -48,9 +47,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-positioning/tsconfig.lib.json b/packages/react-components/react-positioning/tsconfig.lib.json
index 7763b7fe82bad..b2da24eff1b32 100644
--- a/packages/react-components/react-positioning/tsconfig.lib.json
+++ b/packages/react-components/react-positioning/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-progress/config/api-extractor.json b/packages/react-components/react-progress/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-progress/config/api-extractor.json
+++ b/packages/react-components/react-progress/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-progress/config/api-extractor.local.json b/packages/react-components/react-progress/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-progress/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-progress/package.json b/packages/react-components/react-progress/package.json
index 7a4c8cde73a3f..dfe22e736e1ac 100644
--- a/packages/react-components/react-progress/package.json
+++ b/packages/react-components/react-progress/package.json
@@ -4,7 +4,7 @@
   "description": "Progress component for FluentUI v9",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -19,11 +19,10 @@
     "just": "just-scripts",
     "lint": "just-scripts lint",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-progress/src && yarn docs",
     "type-check": "tsc -b tsconfig.json",
     "storybook": "start-storybook",
-    "start": "yarn storybook"
+    "start": "yarn storybook",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -50,5 +49,13 @@
       "minor",
       "patch"
     ]
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./lib/index.js",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-progress/tsconfig.lib.json b/packages/react-components/react-progress/tsconfig.lib.json
index 5d7b14f1e0b70..7f94e04299ed8 100644
--- a/packages/react-components/react-progress/tsconfig.lib.json
+++ b/packages/react-components/react-progress/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-provider/config/api-extractor.json b/packages/react-components/react-provider/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-provider/config/api-extractor.json
+++ b/packages/react-components/react-provider/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-provider/config/api-extractor.local.json b/packages/react-components/react-provider/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-provider/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-provider/package.json b/packages/react-components/react-provider/package.json
index 6e3aa0e466a79..8fff79ac6fecf 100644
--- a/packages/react-components/react-provider/package.json
+++ b/packages/react-components/react-provider/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI React provider component",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -19,11 +19,10 @@
     "code-style": "just-scripts code-style",
     "just": "just-scripts",
     "lint": "just-scripts lint",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-provider/src && yarn docs",
     "storybook": "start-storybook",
     "start": "yarn storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -54,9 +53,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-provider/tsconfig.lib.json b/packages/react-components/react-provider/tsconfig.lib.json
index 5d7b14f1e0b70..7f94e04299ed8 100644
--- a/packages/react-components/react-provider/tsconfig.lib.json
+++ b/packages/react-components/react-provider/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-radio/config/api-extractor.json b/packages/react-components/react-radio/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-radio/config/api-extractor.json
+++ b/packages/react-components/react-radio/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-radio/config/api-extractor.local.json b/packages/react-components/react-radio/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-radio/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-radio/package.json b/packages/react-components/react-radio/package.json
index 05429ef37aee9..1896d36248d0f 100644
--- a/packages/react-components/react-radio/package.json
+++ b/packages/react-components/react-radio/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI Radio component",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-radio/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -55,9 +54,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-radio/tsconfig.lib.json b/packages/react-components/react-radio/tsconfig.lib.json
index 5d7b14f1e0b70..7f94e04299ed8 100644
--- a/packages/react-components/react-radio/tsconfig.lib.json
+++ b/packages/react-components/react-radio/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-select/config/api-extractor.json b/packages/react-components/react-select/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-select/config/api-extractor.json
+++ b/packages/react-components/react-select/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-select/config/api-extractor.local.json b/packages/react-components/react-select/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-select/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-select/package.json b/packages/react-components/react-select/package.json
index a740d32c80a42..7520170a7a7e1 100644
--- a/packages/react-components/react-select/package.json
+++ b/packages/react-components/react-select/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI React Select component",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-select/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -53,9 +52,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-select/tsconfig.lib.json b/packages/react-components/react-select/tsconfig.lib.json
index 53770c42da6dd..6f90cf95c005b 100644
--- a/packages/react-components/react-select/tsconfig.lib.json
+++ b/packages/react-components/react-select/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-shared-contexts/config/api-extractor.json b/packages/react-components/react-shared-contexts/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-shared-contexts/config/api-extractor.json
+++ b/packages/react-components/react-shared-contexts/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-shared-contexts/config/api-extractor.local.json b/packages/react-components/react-shared-contexts/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-shared-contexts/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-shared-contexts/package.json b/packages/react-components/react-shared-contexts/package.json
index 31fdb35357f6b..884d499d94623 100644
--- a/packages/react-components/react-shared-contexts/package.json
+++ b/packages/react-components/react-shared-contexts/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI React Contexts shared by multiple components.",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -17,10 +17,9 @@
     "code-style": "just-scripts code-style",
     "just": "just-scripts",
     "lint": "just-scripts lint",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-shared-contexts/src && yarn docs",
     "test": "jest --passWithNoTests",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -42,9 +41,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-shared-contexts/tsconfig.lib.json b/packages/react-components/react-shared-contexts/tsconfig.lib.json
index 7763b7fe82bad..b2da24eff1b32 100644
--- a/packages/react-components/react-shared-contexts/tsconfig.lib.json
+++ b/packages/react-components/react-shared-contexts/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-spinbutton/config/api-extractor.json b/packages/react-components/react-spinbutton/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-spinbutton/config/api-extractor.json
+++ b/packages/react-components/react-spinbutton/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-spinbutton/config/api-extractor.local.json b/packages/react-components/react-spinbutton/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-spinbutton/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-spinbutton/package.json b/packages/react-components/react-spinbutton/package.json
index e2bcd6e5bca60..67bed6226b4f7 100644
--- a/packages/react-components/react-spinbutton/package.json
+++ b/packages/react-components/react-spinbutton/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI React SpinButton component.",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-spinbutton/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -55,9 +54,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-spinbutton/tsconfig.lib.json b/packages/react-components/react-spinbutton/tsconfig.lib.json
index 5d7b14f1e0b70..7f94e04299ed8 100644
--- a/packages/react-components/react-spinbutton/tsconfig.lib.json
+++ b/packages/react-components/react-spinbutton/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-spinner/config/api-extractor.json b/packages/react-components/react-spinner/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-spinner/config/api-extractor.json
+++ b/packages/react-components/react-spinner/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-spinner/config/api-extractor.local.json b/packages/react-components/react-spinner/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-spinner/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-spinner/package.json b/packages/react-components/react-spinner/package.json
index ba7835eb2ac05..c699ce1f8b497 100644
--- a/packages/react-components/react-spinner/package.json
+++ b/packages/react-components/react-spinner/package.json
@@ -4,7 +4,7 @@
   "description": "Spinner component for Fluent UI React",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-spinner/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -52,9 +51,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-spinner/tsconfig.lib.json b/packages/react-components/react-spinner/tsconfig.lib.json
index 5d7b14f1e0b70..7f94e04299ed8 100644
--- a/packages/react-components/react-spinner/tsconfig.lib.json
+++ b/packages/react-components/react-spinner/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-storybook-addon/config/api-extractor.json b/packages/react-components/react-storybook-addon/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-storybook-addon/config/api-extractor.json
+++ b/packages/react-components/react-storybook-addon/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-storybook-addon/config/api-extractor.local.json b/packages/react-components/react-storybook-addon/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-storybook-addon/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-storybook-addon/package.json b/packages/react-components/react-storybook-addon/package.json
index c6d0ec9460613..65a8fdc8448a8 100644
--- a/packages/react-components/react-storybook-addon/package.json
+++ b/packages/react-components/react-storybook-addon/package.json
@@ -5,7 +5,7 @@
   "description": "fluentui react storybook addon",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-storybook-addon/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -52,12 +51,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
     },
-    "./preset": {
-      "require": "./preset.js"
-    }
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-storybook-addon/tsconfig.lib.json b/packages/react-components/react-storybook-addon/tsconfig.lib.json
index ef66992c5a174..008c602dc19d2 100644
--- a/packages/react-components/react-storybook-addon/tsconfig.lib.json
+++ b/packages/react-components/react-storybook-addon/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-storybook/config/api-extractor.json b/packages/react-components/react-storybook/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-storybook/config/api-extractor.json
+++ b/packages/react-components/react-storybook/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-storybook/config/api-extractor.local.json b/packages/react-components/react-storybook/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-storybook/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-storybook/package.json b/packages/react-components/react-storybook/package.json
index bc359b1a35ec5..62b965cb77f0a 100644
--- a/packages/react-components/react-storybook/package.json
+++ b/packages/react-components/react-storybook/package.json
@@ -5,7 +5,7 @@
   "description": "Storybook addons and utils for @fluentui/react-components",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -19,9 +19,8 @@
     "just": "just-scripts",
     "lint": "just-scripts lint",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-storybook/src && yarn docs",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -45,9 +44,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-storybook/tsconfig.lib.json b/packages/react-components/react-storybook/tsconfig.lib.json
index 7763b7fe82bad..b2da24eff1b32 100644
--- a/packages/react-components/react-storybook/tsconfig.lib.json
+++ b/packages/react-components/react-storybook/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-switch/config/api-extractor.json b/packages/react-components/react-switch/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-switch/config/api-extractor.json
+++ b/packages/react-components/react-switch/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-switch/config/api-extractor.local.json b/packages/react-components/react-switch/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-switch/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-switch/package.json b/packages/react-components/react-switch/package.json
index 5a9fa48d0f42e..70b54d262755b 100644
--- a/packages/react-components/react-switch/package.json
+++ b/packages/react-components/react-switch/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI React Switch component.",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-switch/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -54,9 +53,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-switch/tsconfig.lib.json b/packages/react-components/react-switch/tsconfig.lib.json
index 5d7b14f1e0b70..7f94e04299ed8 100644
--- a/packages/react-components/react-switch/tsconfig.lib.json
+++ b/packages/react-components/react-switch/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-tabster/config/api-extractor.json b/packages/react-components/react-tabster/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-tabster/config/api-extractor.json
+++ b/packages/react-components/react-tabster/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-tabster/config/api-extractor.local.json b/packages/react-components/react-tabster/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-tabster/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-tabster/package.json b/packages/react-components/react-tabster/package.json
index ae642a039f692..1a24e21296e05 100644
--- a/packages/react-components/react-tabster/package.json
+++ b/packages/react-components/react-tabster/package.json
@@ -4,7 +4,7 @@
   "description": "Utilities for focus management and facade for tabster",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -21,10 +21,9 @@
     "lint": "just-scripts lint",
     "storybook": "start-storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-tabster/src && yarn docs",
     "start": "yarn storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -53,9 +52,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-tabster/tsconfig.lib.json b/packages/react-components/react-tabster/tsconfig.lib.json
index ef66992c5a174..008c602dc19d2 100644
--- a/packages/react-components/react-tabster/tsconfig.lib.json
+++ b/packages/react-components/react-tabster/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-textarea/config/api-extractor.json b/packages/react-components/react-textarea/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-textarea/config/api-extractor.json
+++ b/packages/react-components/react-textarea/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-textarea/config/api-extractor.local.json b/packages/react-components/react-textarea/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-textarea/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-textarea/package.json b/packages/react-components/react-textarea/package.json
index 78aabad1c9b5d..ef1127dcf3885 100644
--- a/packages/react-components/react-textarea/package.json
+++ b/packages/react-components/react-textarea/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI TextArea component",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -20,10 +20,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-textarea/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -48,5 +47,13 @@
       "major",
       "prerelease"
     ]
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./lib/index.js",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-textarea/tsconfig.lib.json b/packages/react-components/react-textarea/tsconfig.lib.json
index 5d7b14f1e0b70..7f94e04299ed8 100644
--- a/packages/react-components/react-textarea/tsconfig.lib.json
+++ b/packages/react-components/react-textarea/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-theme-sass/config/api-extractor.json b/packages/react-components/react-theme-sass/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-theme-sass/config/api-extractor.json
+++ b/packages/react-components/react-theme-sass/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-theme-sass/config/api-extractor.local.json b/packages/react-components/react-theme-sass/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-theme-sass/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-theme-sass/package.json b/packages/react-components/react-theme-sass/package.json
index d0a9aa5abba19..fef3e58e8f8d5 100644
--- a/packages/react-components/react-theme-sass/package.json
+++ b/packages/react-components/react-theme-sass/package.json
@@ -4,7 +4,7 @@
   "description": "SASS variables referencing react-theme design tokens injected to DOM by react-provider.",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "style": "sass/tokens.scss",
   "sideEffects": false,
   "repository": {
@@ -19,9 +19,8 @@
     "just": "just-scripts",
     "lint": "just-scripts lint",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-theme-sass/src && yarn docs",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -35,5 +34,13 @@
       "patch"
     ]
   },
-  "dependencies": {}
+  "dependencies": {},
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./lib/index.js",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
+  }
 }
diff --git a/packages/react-components/react-theme-sass/tsconfig.lib.json b/packages/react-components/react-theme-sass/tsconfig.lib.json
index 7763b7fe82bad..b2da24eff1b32 100644
--- a/packages/react-components/react-theme-sass/tsconfig.lib.json
+++ b/packages/react-components/react-theme-sass/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-theme/config/api-extractor.json b/packages/react-components/react-theme/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-theme/config/api-extractor.json
+++ b/packages/react-components/react-theme/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-theme/config/api-extractor.local.json b/packages/react-components/react-theme/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-theme/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-theme/package.json b/packages/react-components/react-theme/package.json
index ef48ba6133294..e9ce4f63f93e5 100644
--- a/packages/react-components/react-theme/package.json
+++ b/packages/react-components/react-theme/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI themes",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -21,10 +21,9 @@
     "start": "yarn storybook",
     "storybook": "start-storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-theme/src && yarn docs",
     "token-pipeline": "node -r ../../../scripts/ts-node-register ../../../scripts/token-pipeline.ts",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -47,9 +46,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-theme/tsconfig.lib.json b/packages/react-components/react-theme/tsconfig.lib.json
index ef66992c5a174..008c602dc19d2 100644
--- a/packages/react-components/react-theme/tsconfig.lib.json
+++ b/packages/react-components/react-theme/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-toolbar/config/api-extractor.json b/packages/react-components/react-toolbar/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-toolbar/config/api-extractor.json
+++ b/packages/react-components/react-toolbar/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-toolbar/config/api-extractor.local.json b/packages/react-components/react-toolbar/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-toolbar/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-toolbar/package.json b/packages/react-components/react-toolbar/package.json
index b4719037db801..36b3ba74e3e08 100644
--- a/packages/react-components/react-toolbar/package.json
+++ b/packages/react-components/react-toolbar/package.json
@@ -4,7 +4,7 @@
   "description": "React components for building web experiences",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -21,10 +21,9 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-toolbar/src && yarn docs",
     "storybook": "start-storybook",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -55,5 +54,13 @@
       "minor",
       "patch"
     ]
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./lib/index.js",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-toolbar/tsconfig.lib.json b/packages/react-components/react-toolbar/tsconfig.lib.json
index 5d7b14f1e0b70..7f94e04299ed8 100644
--- a/packages/react-components/react-toolbar/tsconfig.lib.json
+++ b/packages/react-components/react-toolbar/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/react-tooltip/package.json b/packages/react-components/react-tooltip/package.json
index eb2b6b3fdb82a..c2e9cc655b113 100644
--- a/packages/react-components/react-tooltip/package.json
+++ b/packages/react-components/react-tooltip/package.json
@@ -4,7 +4,7 @@
   "description": "React components for building web experiences",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -54,9 +54,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-utilities/config/api-extractor.json b/packages/react-components/react-utilities/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/react-utilities/config/api-extractor.json
+++ b/packages/react-components/react-utilities/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/react-utilities/config/api-extractor.local.json b/packages/react-components/react-utilities/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/react-utilities/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/react-utilities/package.json b/packages/react-components/react-utilities/package.json
index c3960d2d610be..b72d573d2185e 100644
--- a/packages/react-components/react-utilities/package.json
+++ b/packages/react-components/react-utilities/package.json
@@ -4,7 +4,7 @@
   "description": "A set of general React-specific utilities.",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -19,9 +19,8 @@
     "just": "just-scripts",
     "lint": "just-scripts lint",
     "test": "jest --passWithNoTests",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-utilities/src && yarn docs",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -43,9 +42,10 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib-commonjs/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/react-utilities/tsconfig.lib.json b/packages/react-components/react-utilities/tsconfig.lib.json
index 7763b7fe82bad..b2da24eff1b32 100644
--- a/packages/react-components/react-utilities/tsconfig.lib.json
+++ b/packages/react-components/react-utilities/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/packages/react-components/theme-designer/config/api-extractor.json b/packages/react-components/theme-designer/config/api-extractor.json
index eee94ff6de902..637d9797ae3e6 100644
--- a/packages/react-components/theme-designer/config/api-extractor.json
+++ b/packages/react-components/theme-designer/config/api-extractor.json
@@ -1,5 +1,9 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+  }
 }
diff --git a/packages/react-components/theme-designer/config/api-extractor.local.json b/packages/react-components/theme-designer/config/api-extractor.local.json
deleted file mode 100644
index 69e764bce3a59..0000000000000
--- a/packages/react-components/theme-designer/config/api-extractor.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/types/packages/react-components/<unscopedPackageName>/src/index.d.ts"
-}
diff --git a/packages/react-components/theme-designer/package.json b/packages/react-components/theme-designer/package.json
index 5f81627cb4805..5f3cb1801a5e8 100644
--- a/packages/react-components/theme-designer/package.json
+++ b/packages/react-components/theme-designer/package.json
@@ -5,7 +5,7 @@
   "description": "A theme designer",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -22,9 +22,8 @@
     "start": "yarn storybook",
     "test": "jest --passWithNoTests",
     "storybook": "start-storybook",
-    "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/theme-designer/src && yarn docs",
-    "type-check": "tsc -b tsconfig.json"
+    "type-check": "tsc -b tsconfig.json",
+    "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor"
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
@@ -55,5 +54,13 @@
       "minor",
       "patch"
     ]
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./lib/index.js",
+      "require": "./lib-commonjs/index.js"
+    },
+    "./package.json": "./package.json"
   }
 }
diff --git a/packages/react-components/theme-designer/tsconfig.lib.json b/packages/react-components/theme-designer/tsconfig.lib.json
index ef66992c5a174..008c602dc19d2 100644
--- a/packages/react-components/theme-designer/tsconfig.lib.json
+++ b/packages/react-components/theme-designer/tsconfig.lib.json
@@ -3,9 +3,9 @@
   "compilerOptions": {
     "noEmit": false,
     "lib": ["ES2019", "dom"],
-    "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist/types",
+    "declarationDir": "../../../dist/out-tsc/types",
+    "outDir": "../../../dist/out-tsc",
     "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
diff --git a/scripts/exec.js b/scripts/exec.js
index 40cd4fd16bbce..1a4a1e108b909 100644
--- a/scripts/exec.js
+++ b/scripts/exec.js
@@ -42,10 +42,10 @@ function exec(cmd, displayName, cwd = process.cwd(), opts = {}) {
     );
 
     if (opts.stdout) {
-      child.stdout.pipe(opts.stdout);
+      child.stdout?.pipe(opts.stdout);
     }
     if (opts.stderr) {
-      child.stderr.pipe(opts.stderr);
+      child.stderr?.pipe(opts.stderr);
     }
   });
 }
diff --git a/tools/generators/epic-generator/index.spec.ts b/tools/generators/epic-generator/index.spec.ts
index bc0dc6c78accc..f07c47ab82526 100644
--- a/tools/generators/epic-generator/index.spec.ts
+++ b/tools/generators/epic-generator/index.spec.ts
@@ -45,7 +45,7 @@ function setupTest(packages: Package[]) {
 
   // response to 'gh auth'
   spawnSyncMock.mockReturnValueOnce({
-    output: ['Logged in to github.com'],
+    output: [['Logged in to github.com']],
   });
 
   // response to epic creation
@@ -114,7 +114,7 @@ describe('epic-generator', () => {
 
     it('requires you to have logged in with gh', () => {
       spawnSyncMock.mockReturnValueOnce({
-        output: ['You are not logged into any GitHub hosts. Run gh auth login to authenticate.'],
+        output: [['You are not logged into any GitHub hosts. Run gh auth login to authenticate.']],
       });
 
       const tree = createTreeWithEmptyWorkspace();
diff --git a/typings/json-stable-stringify-without-jsonify/index.d.ts b/typings/json-stable-stringify-without-jsonify/index.d.ts
index 2541e43c77a22..7e2ad7bffad75 100644
--- a/typings/json-stable-stringify-without-jsonify/index.d.ts
+++ b/typings/json-stable-stringify-without-jsonify/index.d.ts
@@ -1,7 +1,7 @@
 // Type definitions for json-stable-stringify-without-jsonify 1.0.1
 
 declare module 'json-stable-stringify-without-jsonify' {
-  function stringify(value: Record<string, any>, options?: Partial<Options>): Record<string, any>;
+  function stringify(value: Record<string, any>, options?: Partial<Options>): string;
 
   interface Options {
     cmp: (a: any, b: any) => any;
diff --git a/yarn.lock b/yarn.lock
index bd47b3c4f2206..34ef9c8564ffb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5702,35 +5702,10 @@
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node@*", "@types/node@>=10.0.0", "@types/node@^14.0.10 || ^16.0.0", "@types/node@^14.14.20 || ^16.0.0", "@types/node@^14.14.31":
-  version "14.18.12"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz#0d4557fd3b94497d793efd4e7d92df2f83b4ef24"
-  integrity sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==
-
-"@types/node@10.17.13":
-  version "10.17.13"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz#ccebcdb990bd6139cd16e84c39dc2fb1023ca90c"
-  integrity sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==
-
-"@types/node@10.17.55", "@types/node@^10.12.18":
-  version "10.17.55"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.55.tgz#a147f282edec679b894d4694edb5abeb595fecbd"
-  integrity sha512-koZJ89uLZufDvToeWO5BrC4CR4OUfHnUz2qoPs/daQH6qq3IN62QFxCTZ+bKaCE0xaoCAJYE4AXre8AbghCrhg==
-
-"@types/node@12.20.24":
-  version "12.20.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.24.tgz#c37ac69cb2948afb4cef95f424fa0037971a9a5c"
-  integrity sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==
-
-"@types/node@^11.9.4":
-  version "11.15.54"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.15.54.tgz#59ed60e7b0d56905a654292e8d73275034eb6283"
-  integrity sha512-1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g==
-
-"@types/node@^8.0.19":
-  version "8.10.54"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.54.tgz#1c88eb253ac1210f1a5876953fb70f7cc4928402"
-  integrity sha512-kaYyLYf6ICn6/isAyD4K1MyWWd5Q3JgH6bnMN089LUx88+s4W8GvK9Q6JMBVu5vsFFp7pMdSxdKmlBXwH/VFRg==
+"@types/node@*", "@types/node@10.17.13", "@types/node@12.20.24", "@types/node@14.18.32", "@types/node@>=10.0.0", "@types/node@^10.12.18", "@types/node@^11.9.4", "@types/node@^14.0.10 || ^16.0.0", "@types/node@^14.14.20 || ^16.0.0", "@types/node@^14.14.31", "@types/node@^8.0.19":
+  version "14.18.32"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.32.tgz#8074f7106731f1a12ba993fe8bad86ee73905014"
+  integrity sha512-Y6S38pFr04yb13qqHf8uk1nHE3lXgQ30WZbv1mLliV9pt0NjvqdWttLcrOYLnXbOafknVYRHZGoMSpR9UwfYow==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"