From dd7846f7597dfaf612e3669dc31290b3824f814b Mon Sep 17 00:00:00 2001
From: Martin Hochel <martinhochel@microsoft.com>
Date: Fri, 29 Apr 2022 10:42:10 +0200
Subject: [PATCH 1/6] style: fix formatting issues introduced by manually
 renaming package

---
 tsconfig.base.json |  2 +-
 workspace.json     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tsconfig.base.json b/tsconfig.base.json
index 00824371a98124..e0ddb682c41886 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -38,12 +38,12 @@
       "@fluentui/react-link": ["packages/react-components/react-link/src/index.ts"],
       "@fluentui/react-list": ["packages/react-components/react-list/src/index.ts"],
       "@fluentui/react-menu": ["packages/react-components/react-menu/src/index.ts"],
+      "@fluentui/react-overflow": ["packages/react-overflow/src/index.ts"],
       "@fluentui/react-popover": ["packages/react-components/react-popover/src/index.ts"],
       "@fluentui/react-portal": ["packages/react-components/react-portal/src/index.ts"],
       "@fluentui/react-portal-compat": ["packages/react-portal-compat/src/index.ts"],
       "@fluentui/react-portal-compat-context": ["packages/react-portal-compat-context/src/index.ts"],
       "@fluentui/react-positioning": ["packages/react-positioning/src/index.ts"],
-      "@fluentui/react-overflow": ["packages/react-overflow/src/index.ts"],
       "@fluentui/react-provider": ["packages/react-components/react-provider/src/index.ts"],
       "@fluentui/react-radio": ["packages/react-radio/src/index.ts"],
       "@fluentui/react-select": ["packages/react-components/react-select/src/index.ts"],
diff --git a/workspace.json b/workspace.json
index 203d317de0c5a7..a67ec6aa2251b0 100644
--- a/workspace.json
+++ b/workspace.json
@@ -501,6 +501,13 @@
       "projectType": "library",
       "implicitDependencies": []
     },
+    "@fluentui/react-overflow": {
+      "root": "packages/react-overflow",
+      "projectType": "library",
+      "implicitDependencies": [],
+      "sourceRoot": "packages/react-overflow/src",
+      "tags": ["vNext", "platform:web"]
+    },
     "@fluentui/react-popover": {
       "root": "packages/react-components/react-popover",
       "projectType": "library",
@@ -536,13 +543,6 @@
       "tags": ["vNext", "platform:web"],
       "implicitDependencies": []
     },
-    "@fluentui/react-overflow": {
-      "root": "packages/react-overflow",
-      "projectType": "library",
-      "implicitDependencies": [],
-      "sourceRoot": "packages/react-overflow/src",
-      "tags": ["vNext", "platform:web"]
-    },
     "@fluentui/react-proptypes": {
       "root": "packages/fluentui/react-proptypes",
       "projectType": "library",

From 8ae7d17794bddcf58f374496937a29af97b955ba Mon Sep 17 00:00:00 2001
From: Martin Hochel <martinhochel@microsoft.com>
Date: Fri, 29 Apr 2022 10:44:00 +0200
Subject: [PATCH 2/6] feat(v9): migrate card,dialog,image to ship rolluped only
 dts

---
 packages/react-components/react-card/.npmignore                | 1 +
 packages/react-components/react-card/config/api-extractor.json | 3 ++-
 packages/react-components/react-card/package.json              | 2 +-
 packages/react-components/react-card/tsconfig.lib.json         | 2 ++
 packages/react-components/react-dialog/.npmignore              | 1 +
 .../react-components/react-dialog/config/api-extractor.json    | 3 ++-
 packages/react-components/react-dialog/package.json            | 2 +-
 packages/react-components/react-dialog/tsconfig.lib.json       | 2 ++
 packages/react-components/react-image/.npmignore               | 1 +
 .../react-components/react-image/config/api-extractor.json     | 3 ++-
 packages/react-components/react-image/package.json             | 2 +-
 packages/react-components/react-image/tsconfig.lib.json        | 2 ++
 12 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/react-components/react-card/.npmignore b/packages/react-components/react-card/.npmignore
index e719afb921bc93..52d2a7273a151d 100644
--- a/packages/react-components/react-card/.npmignore
+++ b/packages/react-components/react-card/.npmignore
@@ -7,6 +7,7 @@ e2e/
 etc/
 node_modules/
 src/
+dist/types/
 temp/
 __fixtures__
 __mocks__
diff --git a/packages/react-components/react-card/config/api-extractor.json b/packages/react-components/react-card/config/api-extractor.json
index 30897284c6b835..eee94ff6de902d 100644
--- a/packages/react-components/react-card/config/api-extractor.json
+++ b/packages/react-components/react-card/config/api-extractor.json
@@ -1,4 +1,5 @@
 {
   "$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"
+  "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
+  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
 }
diff --git a/packages/react-components/react-card/package.json b/packages/react-components/react-card/package.json
index f68531c558f353..9bbf19db79b7aa 100644
--- a/packages/react-components/react-card/package.json
+++ b/packages/react-components/react-card/package.json
@@ -5,7 +5,7 @@
   "description": "Card container components for Fluent UI React.",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "lib/index.d.ts",
+  "typings": "dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
diff --git a/packages/react-components/react-card/tsconfig.lib.json b/packages/react-components/react-card/tsconfig.lib.json
index 79c440a4857481..5d7b14f1e0b70c 100644
--- a/packages/react-components/react-card/tsconfig.lib.json
+++ b/packages/react-components/react-card/tsconfig.lib.json
@@ -5,6 +5,8 @@
     "lib": ["ES2019", "dom"],
     "outDir": "dist",
     "declaration": true,
+    "declarationDir": "dist/types",
+    "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
   "exclude": [
diff --git a/packages/react-components/react-dialog/.npmignore b/packages/react-components/react-dialog/.npmignore
index e719afb921bc93..52d2a7273a151d 100644
--- a/packages/react-components/react-dialog/.npmignore
+++ b/packages/react-components/react-dialog/.npmignore
@@ -7,6 +7,7 @@ e2e/
 etc/
 node_modules/
 src/
+dist/types/
 temp/
 __fixtures__
 __mocks__
diff --git a/packages/react-components/react-dialog/config/api-extractor.json b/packages/react-components/react-dialog/config/api-extractor.json
index 30897284c6b835..eee94ff6de902d 100644
--- a/packages/react-components/react-dialog/config/api-extractor.json
+++ b/packages/react-components/react-dialog/config/api-extractor.json
@@ -1,4 +1,5 @@
 {
   "$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"
+  "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
+  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
 }
diff --git a/packages/react-components/react-dialog/package.json b/packages/react-components/react-dialog/package.json
index 409ab0b6fef1e7..0417b75f1182d0 100644
--- a/packages/react-components/react-dialog/package.json
+++ b/packages/react-components/react-dialog/package.json
@@ -5,7 +5,7 @@
   "description": "Dialog component for Fluent UI React",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "lib/index.d.ts",
+  "typings": "dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
diff --git a/packages/react-components/react-dialog/tsconfig.lib.json b/packages/react-components/react-dialog/tsconfig.lib.json
index 79c440a4857481..5d7b14f1e0b70c 100644
--- a/packages/react-components/react-dialog/tsconfig.lib.json
+++ b/packages/react-components/react-dialog/tsconfig.lib.json
@@ -5,6 +5,8 @@
     "lib": ["ES2019", "dom"],
     "outDir": "dist",
     "declaration": true,
+    "declarationDir": "dist/types",
+    "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
   "exclude": [
diff --git a/packages/react-components/react-image/.npmignore b/packages/react-components/react-image/.npmignore
index e719afb921bc93..52d2a7273a151d 100644
--- a/packages/react-components/react-image/.npmignore
+++ b/packages/react-components/react-image/.npmignore
@@ -7,6 +7,7 @@ e2e/
 etc/
 node_modules/
 src/
+dist/types/
 temp/
 __fixtures__
 __mocks__
diff --git a/packages/react-components/react-image/config/api-extractor.json b/packages/react-components/react-image/config/api-extractor.json
index 30897284c6b835..eee94ff6de902d 100644
--- a/packages/react-components/react-image/config/api-extractor.json
+++ b/packages/react-components/react-image/config/api-extractor.json
@@ -1,4 +1,5 @@
 {
   "$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"
+  "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
+  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
 }
diff --git a/packages/react-components/react-image/package.json b/packages/react-components/react-image/package.json
index 4ddbbe3455be4d..2d942beccec47c 100644
--- a/packages/react-components/react-image/package.json
+++ b/packages/react-components/react-image/package.json
@@ -4,7 +4,7 @@
   "description": "Fluent UI React Image component.",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "lib/index.d.ts",
+  "typings": "dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
diff --git a/packages/react-components/react-image/tsconfig.lib.json b/packages/react-components/react-image/tsconfig.lib.json
index 79c440a4857481..5d7b14f1e0b70c 100644
--- a/packages/react-components/react-image/tsconfig.lib.json
+++ b/packages/react-components/react-image/tsconfig.lib.json
@@ -5,6 +5,8 @@
     "lib": ["ES2019", "dom"],
     "outDir": "dist",
     "declaration": true,
+    "declarationDir": "dist/types",
+    "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
   "exclude": [

From 2493490d9bb6f854a2ac4d5dcfdfcef2fd87e6af Mon Sep 17 00:00:00 2001
From: Martin Hochel <martinhochel@microsoft.com>
Date: Fri, 29 Apr 2022 10:47:51 +0200
Subject: [PATCH 3/6] generate change files

---
 ...ui-react-card-7f3d21c8-ee65-4256-b92b-a5744e456a0d.json | 7 +++++++
 ...i-react-image-d64ad1ba-6317-467c-a6e0-4dcf772fdd03.json | 7 +++++++
 2 files changed, 14 insertions(+)
 create mode 100644 change/@fluentui-react-card-7f3d21c8-ee65-4256-b92b-a5744e456a0d.json
 create mode 100644 change/@fluentui-react-image-d64ad1ba-6317-467c-a6e0-4dcf772fdd03.json

diff --git a/change/@fluentui-react-card-7f3d21c8-ee65-4256-b92b-a5744e456a0d.json b/change/@fluentui-react-card-7f3d21c8-ee65-4256-b92b-a5744e456a0d.json
new file mode 100644
index 00000000000000..40b2bd64f54264
--- /dev/null
+++ b/change/@fluentui-react-card-7f3d21c8-ee65-4256-b92b-a5744e456a0d.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "feat: ship rolluped only dts",
+  "packageName": "@fluentui/react-card",
+  "email": "martinhochel@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@fluentui-react-image-d64ad1ba-6317-467c-a6e0-4dcf772fdd03.json b/change/@fluentui-react-image-d64ad1ba-6317-467c-a6e0-4dcf772fdd03.json
new file mode 100644
index 00000000000000..ad3801515b617b
--- /dev/null
+++ b/change/@fluentui-react-image-d64ad1ba-6317-467c-a6e0-4dcf772fdd03.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "feat: ship rolluped only dts",
+  "packageName": "@fluentui/react-image",
+  "email": "martinhochel@microsoft.com",
+  "dependentChangeType": "patch"
+}

From 3b9d29de296e70cd93a11d2082c38d7cafc4c7ac Mon Sep 17 00:00:00 2001
From: Martin Hochel <martinhochel@microsoft.com>
Date: Mon, 2 May 2022 13:34:11 +0200
Subject: [PATCH 4/6] fixup! feat(v9): migrate card,dialog,image to ship
 rolluped only dts

---
 packages/react-components/react-text/.npmignore                | 1 +
 packages/react-components/react-text/config/api-extractor.json | 3 ++-
 packages/react-components/react-text/package.json              | 2 +-
 packages/react-components/react-text/tsconfig.lib.json         | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/react-components/react-text/.npmignore b/packages/react-components/react-text/.npmignore
index e719afb921bc93..52d2a7273a151d 100644
--- a/packages/react-components/react-text/.npmignore
+++ b/packages/react-components/react-text/.npmignore
@@ -7,6 +7,7 @@ e2e/
 etc/
 node_modules/
 src/
+dist/types/
 temp/
 __fixtures__
 __mocks__
diff --git a/packages/react-components/react-text/config/api-extractor.json b/packages/react-components/react-text/config/api-extractor.json
index 30897284c6b835..eee94ff6de902d 100644
--- a/packages/react-components/react-text/config/api-extractor.json
+++ b/packages/react-components/react-text/config/api-extractor.json
@@ -1,4 +1,5 @@
 {
   "$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"
+  "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json",
+  "mainEntryPointFilePath": "<projectFolder>/dist/types/index.d.ts"
 }
diff --git a/packages/react-components/react-text/package.json b/packages/react-components/react-text/package.json
index 6c5bc77acad720..b090fc7eb14434 100644
--- a/packages/react-components/react-text/package.json
+++ b/packages/react-components/react-text/package.json
@@ -4,7 +4,7 @@
   "description": "Text is a typography and styling abstraction component that can be used to ensure the consistency of all text across your application.",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
-  "typings": "lib/index.d.ts",
+  "typings": "dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
diff --git a/packages/react-components/react-text/tsconfig.lib.json b/packages/react-components/react-text/tsconfig.lib.json
index 79c440a4857481..5d7b14f1e0b70c 100644
--- a/packages/react-components/react-text/tsconfig.lib.json
+++ b/packages/react-components/react-text/tsconfig.lib.json
@@ -5,6 +5,8 @@
     "lib": ["ES2019", "dom"],
     "outDir": "dist",
     "declaration": true,
+    "declarationDir": "dist/types",
+    "inlineSources": true,
     "types": ["static-assets", "environment"]
   },
   "exclude": [

From c4da42f64f595e32c0c3e0347323344487965baa Mon Sep 17 00:00:00 2001
From: Martin Hochel <martinhochel@microsoft.com>
Date: Mon, 2 May 2022 13:35:40 +0200
Subject: [PATCH 5/6] fixup! generate change files

---
 ...ui-react-text-161a4d77-6681-453b-bee6-99e039532301.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 change/@fluentui-react-text-161a4d77-6681-453b-bee6-99e039532301.json

diff --git a/change/@fluentui-react-text-161a4d77-6681-453b-bee6-99e039532301.json b/change/@fluentui-react-text-161a4d77-6681-453b-bee6-99e039532301.json
new file mode 100644
index 00000000000000..1786237be975b5
--- /dev/null
+++ b/change/@fluentui-react-text-161a4d77-6681-453b-bee6-99e039532301.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "feat: ship rolluped only dts",
+  "packageName": "@fluentui/react-text",
+  "email": "martinhochel@microsoft.com",
+  "dependentChangeType": "patch"
+}

From 8b9b7848683168f6a79e7cd9cde1080cedc2bb31 Mon Sep 17 00:00:00 2001
From: Martin Hochel <martinhochel@microsoft.com>
Date: Mon, 2 May 2022 14:00:13 +0200
Subject: [PATCH 6/6] fix(scripts): make sure api-extractor always runs for v9
 no matter if --min flag was used

---
 scripts/just.config.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/just.config.ts b/scripts/just.config.ts
index 545b8b46951765..a6c2d23ff07b7f 100644
--- a/scripts/just.config.ts
+++ b/scripts/just.config.ts
@@ -115,7 +115,8 @@ export function preset() {
       'copy',
       'sass',
       'ts',
-      condition('api-extractor', () => !args.min),
+      // v9 needs to run api-extractor which generates rolluped .d.ts files that are shipped to npm
+      condition('api-extractor', () => isConvergedPackage() || !args.min),
     ),
   ).cached();