chore(Badge): Migrate to solution style tsconfigs (microsoft#20739)

* chore(Badge): Migrate to solution style tsconfigs * Change files * use relative imports
mlp73 · Jan 17, 2022 · 1037582 · 1037582
1 parent 2b321d6
commit 1037582
Show file tree

Hide file tree

Showing 27 changed files with 103 additions and 85 deletions.
diff --git a/change/@fluentui-react-badge-2e30a51b-3c1d-45ab-b09c-4d64fc8a4831.json b/change/@fluentui-react-badge-2e30a51b-3c1d-45ab-b09c-4d64fc8a4831.json
@@ -0,0 +1,7 @@
+{
+  "type": "none",
+  "comment": "Migrate package to use solution style ts-config",
+  "packageName": "@fluentui/react-badge",
+  "email": "[email protected]",
+  "dependentChangeType": "none"
+}
diff --git a/packages/react-badge/.npmignore b/packages/react-badge/.npmignore
@@ -1,4 +1,3 @@
-.cache/
 .storybook/
 .vscode/
 bundle-size/

diff --git a/packages/react-badge/.storybook/main.js b/packages/react-badge/.storybook/main.js
@@ -1,12 +1,14 @@
 const rootMain = require('../../../.storybook/main');
 
-module.exports = /** @type {Pick<import('../../../.storybook/main').StorybookConfig,'addons'|'stories'|'webpackFinal'>} */ ({
+module.exports = /** @type {Omit<import('../../../.storybook/main'), 'typescript'|'babel'>} */ ({
+  ...rootMain,
   stories: [...rootMain.stories, '../src/**/*.stories.mdx', '../src/**/*.stories.@(ts|tsx)'],
   addons: [...rootMain.addons],
   webpackFinal: (config, options) => {
     const localConfig = { ...rootMain.webpackFinal(config, options) };
 
+    // add your own webpack tweaks if needed
+
     return localConfig;
   },
-  previewHead: rootMain.previewHead,
 });
diff --git a/packages/react-badge/.storybook/preview.js b/packages/react-badge/.storybook/preview.js
@@ -1,3 +1,7 @@
 import * as rootPreview from '../../../.storybook/preview';
 
+/** @type {typeof rootPreview.decorators} */
 export const decorators = [...rootPreview.decorators];
+
+/** @type {typeof rootPreview.parameters} */
+export const parameters = { ...rootPreview.parameters };
diff --git a/packages/react-badge/.storybook/tsconfig.json b/packages/react-badge/.storybook/tsconfig.json
@@ -1,9 +1,10 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
+    "outDir": "",
     "allowJs": true,
-    "checkJs": true
+    "checkJs": true,
+    "types": ["static-assets", "environment", "inline-style-expand-shorthand", "storybook__addons"]
   },
-  "exclude": ["../**/*.test.ts", "../**/*.test.js", "../**/*.test.tsx", "../**/*.test.jsx"],
-  "include": ["../src/**/*", "*.js"]
+  "include": ["../src/**/*.stories.ts", "../src/**/*.stories.tsx", "*.js"]
 }
diff --git a/packages/react-badge/config/api-extractor.local.json b/packages/react-badge/config/api-extractor.local.json
@@ -1,5 +1,5 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "./api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>/dist/<unscopedPackageName>/src/index.d.ts"
+  "mainEntryPointFilePath": "<projectFolder>/dist/packages/<unscopedPackageName>/src/index.d.ts"
 }
diff --git a/packages/react-badge/jest.config.js b/packages/react-badge/jest.config.js
@@ -8,7 +8,7 @@ module.exports = {
   preset: '../../jest.preset.js',
   globals: {
     'ts-jest': {
-      tsConfig: '<rootDir>/tsconfig.json',
+      tsConfig: '<rootDir>/tsconfig.spec.json',
       diagnostics: false,
     },
   },

diff --git a/packages/react-badge/package.json b/packages/react-badge/package.json
@@ -21,8 +21,9 @@
     "start": "yarn storybook",
     "test": "jest",
     "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p . --module esnext --emitDeclarationOnly && node ../../scripts/typescript/normalize-import --output dist/react-badge/src && yarn docs",
-    "storybook": "start-storybook"
+    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../scripts/typescript/normalize-import --output ./dist/packages/react-badge/src && yarn docs",
+    "storybook": "start-storybook",
+    "type-check": "tsc -b tsconfig.json"
   },
   "devDependencies": {
     "@fluentui/babel-make-styles": "9.0.0-beta.3",

diff --git a/packages/react-badge/src/stories/BadgeAppearance.stories.tsx b/packages/react-badge/src/stories/BadgeAppearance.stories.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { Badge } from '@fluentui/react-badge';
+
+import { Badge } from '../index';
 
 export const Appearance = () => {
   return (

diff --git a/packages/react-badge/src/stories/BadgeColor.stories.tsx b/packages/react-badge/src/stories/BadgeColor.stories.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { Badge } from '@fluentui/react-badge';
+
+import { Badge } from '../index';
 
 export const Color = () => {
   return (

diff --git a/packages/react-badge/src/stories/BadgeDefault.stories.tsx b/packages/react-badge/src/stories/BadgeDefault.stories.tsx
@@ -1,7 +1,5 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { Badge, BadgeProps } from '@fluentui/react-badge';
+
+import { Badge, BadgeProps } from '../index';
 
 export const Default = (props: BadgeProps) => <Badge {...props} />;
diff --git a/packages/react-badge/src/stories/BadgeIcon.stories.tsx b/packages/react-badge/src/stories/BadgeIcon.stories.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { Badge } from '@fluentui/react-badge';
+
+import { Badge } from '../index';
 import { ClipboardPaste20Regular as PasteIcon } from '@fluentui/react-icons';
 
 export const Icon = () => {

diff --git a/packages/react-badge/src/stories/BadgeShapes.stories.tsx b/packages/react-badge/src/stories/BadgeShapes.stories.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { Badge } from '@fluentui/react-badge';
+
+import { Badge } from '../index';
 
 export const Shapes = () => {
   return (

diff --git a/packages/react-badge/src/stories/BadgeSizes.stories.tsx b/packages/react-badge/src/stories/BadgeSizes.stories.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { Badge } from '@fluentui/react-badge';
+
+import { Badge } from '../index';
 
 export const Sizes = () => {
   return (

diff --git a/packages/react-badge/src/stories/CounterBadgeAppearance.stories.tsx b/packages/react-badge/src/stories/CounterBadgeAppearance.stories.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { CounterBadge, CounterBadgeProps } from '@fluentui/react-badge';
+
+import { CounterBadge, CounterBadgeProps } from '../index';
 
 export const Appearance = (args: CounterBadgeProps) => {
   return (

diff --git a/packages/react-badge/src/stories/CounterBadgeColor.stories.tsx b/packages/react-badge/src/stories/CounterBadgeColor.stories.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { CounterBadge, CounterBadgeProps } from '@fluentui/react-badge';
+
+import { CounterBadge, CounterBadgeProps } from '../index';
 
 export const Color = (args: CounterBadgeProps) => {
   return (

diff --git a/packages/react-badge/src/stories/CounterBadgeDefault.stories.tsx b/packages/react-badge/src/stories/CounterBadgeDefault.stories.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { CounterBadge, CounterBadgeProps } from '@fluentui/react-badge';
+
+import { CounterBadge, CounterBadgeProps } from '../index';
 
 export const Default = (args: CounterBadgeProps) => <CounterBadge {...args} />;
 Default.args = {

diff --git a/packages/react-badge/src/stories/CounterBadgeDot.stories.tsx b/packages/react-badge/src/stories/CounterBadgeDot.stories.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { CounterBadge, CounterBadgeProps } from '@fluentui/react-badge';
+
+import { CounterBadge, CounterBadgeProps } from '../index';
 
 export const Dot = (args: CounterBadgeProps) => <CounterBadge {...args} />;
 

diff --git a/packages/react-badge/src/stories/CounterBadgeShapes.stories.tsx b/packages/react-badge/src/stories/CounterBadgeShapes.stories.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { CounterBadge, CounterBadgeProps } from '@fluentui/react-badge';
+
+import { CounterBadge, CounterBadgeProps } from '../index';
 
 export const Shapes = (args: CounterBadgeProps) => {
   return (

diff --git a/packages/react-badge/src/stories/CounterBadgeSizes.stories.tsx b/packages/react-badge/src/stories/CounterBadgeSizes.stories.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { CounterBadge, CounterBadgeProps } from '@fluentui/react-badge';
+
+import { CounterBadge, CounterBadgeProps } from '../index';
 
 export const Sizes = (args: CounterBadgeProps) => {
   return (

diff --git a/packages/react-badge/src/stories/PresenceBadgeDefault.stories.tsx b/packages/react-badge/src/stories/PresenceBadgeDefault.stories.tsx
@@ -1,7 +1,5 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { PresenceBadge } from '@fluentui/react-badge';
+
+import { PresenceBadge } from '../index';
 
 export const Default = () => <PresenceBadge />;
diff --git a/packages/react-badge/src/stories/PresenceBadgeOutOfOffice.stories.tsx b/packages/react-badge/src/stories/PresenceBadgeOutOfOffice.stories.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { PresenceBadge } from '@fluentui/react-badge';
+
+import { PresenceBadge } from '../index';
 
 export const OutOfOffice = () => {
   return (

diff --git a/packages/react-badge/src/stories/PresenceBadgeSizes.stories.tsx b/packages/react-badge/src/stories/PresenceBadgeSizes.stories.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { PresenceBadge } from '@fluentui/react-badge';
+
+import { PresenceBadge } from '../index';
 
 export const Sizes = () => {
   return (

diff --git a/packages/react-badge/src/stories/PresenceBadgeStatus.stories.tsx b/packages/react-badge/src/stories/PresenceBadgeStatus.stories.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-// https://github.com/microsoft/fluentui/pull/18695#issuecomment-868432982
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { PresenceBadge } from '@fluentui/react-badge';
+
+import { PresenceBadge } from '../index';
 
 export const Status = () => {
   return (

diff --git a/packages/react-badge/tsconfig.json b/packages/react-badge/tsconfig.json
@@ -1,18 +1,25 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["src"],
   "compilerOptions": {
     "target": "ES2019",
-    "module": "CommonJS",
-    "lib": ["ES2019", "DOM"],
-    "outDir": "dist",
-    "jsx": "react",
-    "declaration": true,
-    "experimentalDecorators": true,
+    "noEmit": true,
+    "isolatedModules": true,
     "importHelpers": true,
+    "jsx": "react",
     "noUnusedLocals": true,
-    "preserveConstEnums": true,
-    "types": ["jest", "custom-global", "inline-style-expand-shorthand"],
-    "isolatedModules": true
-  }
+    "preserveConstEnums": true
+  },
+  "include": [],
+  "files": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    },
+    {
+      "path": "./.storybook/tsconfig.json"
+    }
+  ]
 }
diff --git a/packages/react-badge/tsconfig.lib.json b/packages/react-badge/tsconfig.lib.json
@@ -0,0 +1,20 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "noEmit": false,
+    "lib": ["ES2019", "dom"],
+    "outDir": "dist",
+    "declaration": true,
+    "types": ["static-assets", "environment", "inline-style-expand-shorthand"]
+  },
+  "exclude": [
+    "./src/common/**",
+    "**/*.spec.ts",
+    "**/*.spec.tsx",
+    "**/*.test.ts",
+    "**/*.test.tsx",
+    "**/*.stories.ts",
+    "**/*.stories.tsx"
+  ],
+  "include": ["./src/**/*.ts", "./src/**/*.tsx"]
+}
diff --git a/packages/react-badge/tsconfig.spec.json b/packages/react-badge/tsconfig.spec.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "CommonJS",
+    "outDir": "dist",
+    "types": ["jest", "node", "inline-style-expand-shorthand"]
+  },
+  "include": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx", "**/*.d.ts"]
+}