From 4785b6e1bda6f51e71e8ac13375a1adb721a78d4 Mon Sep 17 00:00:00 2001 From: Lingfan Gao Date: Tue, 27 Sep 2022 18:10:33 +0200 Subject: [PATCH 1/2] chore: Migrate react-avatar to use new build Migrates the react-avatar package to use the new build experience introduced in #23369 --- .../react-avatar/config/api-extractor.json | 6 +++++- .../react-avatar/config/api-extractor.local.json | 5 ----- packages/react-components/react-avatar/package.json | 9 ++++----- packages/react-components/react-avatar/tsconfig.json | 3 +++ packages/react-components/react-avatar/tsconfig.lib.json | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 packages/react-components/react-avatar/config/api-extractor.local.json diff --git a/packages/react-components/react-avatar/config/api-extractor.json b/packages/react-components/react-avatar/config/api-extractor.json index eee94ff6de902d..637d9797ae3e6e 100644 --- a/packages/react-components/react-avatar/config/api-extractor.json +++ b/packages/react-components/react-avatar/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": "/dist/types/index.d.ts" + "dtsRollup": { + "enabled": true, + "untrimmedFilePath": "", + "publicTrimmedFilePath": "/dist/index.d.ts" + } } diff --git a/packages/react-components/react-avatar/config/api-extractor.local.json b/packages/react-components/react-avatar/config/api-extractor.local.json deleted file mode 100644 index 69e764bce3a592..00000000000000 --- a/packages/react-components/react-avatar/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": "/dist/types/packages/react-components//src/index.d.ts" -} diff --git a/packages/react-components/react-avatar/package.json b/packages/react-components/react-avatar/package.json index 3d09bd93e425b9..a18d9e5484c263 100644 --- a/packages/react-components/react-avatar/package.json +++ b/packages/react-components/react-avatar/package.json @@ -19,13 +19,12 @@ "just": "just-scripts", "lint": "just-scripts lint", "start": "yarn storybook", - "e2e": "yarn cypress run --component", - "e2e:local": "yarn cypress open --component", + "e2e": "cypress run --component", + "e2e:local": "cypress open --component", "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-avatar/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": "*", diff --git a/packages/react-components/react-avatar/tsconfig.json b/packages/react-components/react-avatar/tsconfig.json index 1941a041d46c19..9087bac77cc8d7 100644 --- a/packages/react-components/react-avatar/tsconfig.json +++ b/packages/react-components/react-avatar/tsconfig.json @@ -20,6 +20,9 @@ }, { "path": "./.storybook/tsconfig.json" + }, + { + "path": "./e2e/tsconfig.json" } ] } diff --git a/packages/react-components/react-avatar/tsconfig.lib.json b/packages/react-components/react-avatar/tsconfig.lib.json index 5d7b14f1e0b70c..7f94e04299ed85 100644 --- a/packages/react-components/react-avatar/tsconfig.lib.json +++ b/packages/react-components/react-avatar/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"] }, From 27c575a8b2eb6bd8c15cefe72216ffd122e0034d Mon Sep 17 00:00:00 2001 From: Lingfan Gao Date: Tue, 27 Sep 2022 18:12:01 +0200 Subject: [PATCH 2/2] changefile --- ...-react-avatar-ad6cefba-a092-49d7-8cf6-bac42f97eb2b.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@fluentui-react-avatar-ad6cefba-a092-49d7-8cf6-bac42f97eb2b.json diff --git a/change/@fluentui-react-avatar-ad6cefba-a092-49d7-8cf6-bac42f97eb2b.json b/change/@fluentui-react-avatar-ad6cefba-a092-49d7-8cf6-bac42f97eb2b.json new file mode 100644 index 00000000000000..e48cc657bd532a --- /dev/null +++ b/change/@fluentui-react-avatar-ad6cefba-a092-49d7-8cf6-bac42f97eb2b.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "chore: Migrate react-avatar to use new build", + "packageName": "@fluentui/react-avatar", + "email": "lingfangao@hotmail.com", + "dependentChangeType": "none" +}