From d62574f77751f7693c491c3c03e028e479d82e7e Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Wed, 25 Aug 2021 12:22:30 +0200 Subject: [PATCH 1/6] chore(react-slider): properly apply nx migrate-converged-pkg to adhere to new dx setup --- packages/react-slider/.babelrc.json | 3 +++ packages/react-slider/.storybook/main.js | 5 ++++- packages/react-slider/.storybook/preview.js | 4 ++++ packages/react-slider/package.json | 12 +++++++----- packages/react-slider/tsconfig.json | 7 +++---- 5 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 packages/react-slider/.babelrc.json diff --git a/packages/react-slider/.babelrc.json b/packages/react-slider/.babelrc.json new file mode 100644 index 0000000000000..b51a5457ced10 --- /dev/null +++ b/packages/react-slider/.babelrc.json @@ -0,0 +1,3 @@ +{ + "plugins": ["module:@fluentui/babel-make-styles", "annotate-pure-calls", "@babel/transform-react-pure-annotations"] +} diff --git a/packages/react-slider/.storybook/main.js b/packages/react-slider/.storybook/main.js index f47245f2d07f0..18a60b265c2cf 100644 --- a/packages/react-slider/.storybook/main.js +++ b/packages/react-slider/.storybook/main.js @@ -1,11 +1,14 @@ const rootMain = require('../../../.storybook/main'); -module.exports = /** @type {Pick} */ ({ +module.exports = /** @type {Omit} */ ({ + ...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; }, }); diff --git a/packages/react-slider/.storybook/preview.js b/packages/react-slider/.storybook/preview.js index b52409294c330..10fd98d02c945 100644 --- a/packages/react-slider/.storybook/preview.js +++ b/packages/react-slider/.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-slider/package.json b/packages/react-slider/package.json index 6282c00caeef0..b152ec1b4dd09 100644 --- a/packages/react-slider/package.json +++ b/packages/react-slider/package.json @@ -18,10 +18,11 @@ "code-style": "just-scripts code-style", "just": "just-scripts", "lint": "just-scripts lint", - "start": "just-scripts dev:storybook", - "start-test": "just-scripts jest-watch", - "test": "just-scripts test", - "update-snapshots": "just-scripts jest -u" + "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-slider/src && yarn docs", + "storybook": "start-storybook" }, "devDependencies": { "@fluentui/eslint-plugin": "^1.4.1", @@ -37,7 +38,8 @@ "enzyme-adapter-react-16": "^1.15.0", "react": "16.8.6", "react-dom": "16.8.6", - "react-test-renderer": "^16.3.0" + "react-test-renderer": "^16.3.0", + "@fluentui/babel-make-styles": "^9.0.0-alpha.40" }, "dependencies": { "@fluentui/react-make-styles": "^9.0.0-alpha.59", diff --git a/packages/react-slider/tsconfig.json b/packages/react-slider/tsconfig.json index 851c909e1eadf..d07617f617b00 100644 --- a/packages/react-slider/tsconfig.json +++ b/packages/react-slider/tsconfig.json @@ -2,9 +2,9 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "compilerOptions": { - "target": "ES5", + "target": "ES2019", "module": "CommonJS", - "lib": ["es5", "dom"], + "lib": ["ES2019", "dom"], "outDir": "dist", "jsx": "react", "declaration": true, @@ -12,7 +12,6 @@ "importHelpers": true, "noUnusedLocals": true, "preserveConstEnums": true, - "types": ["jest", "custom-global", "inline-style-expand-shorthand"], - "isolatedModules": true + "types": ["jest", "custom-global", "inline-style-expand-shorthand", "storybook__addons"] } } From 08082844560785f1e29397cb9282c67bf92ad1b3 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Fri, 27 Aug 2021 16:56:29 +0200 Subject: [PATCH 2/6] revert(react-button): remove vNext components used in SB from devDeps that are stale --- packages/react-button/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/react-button/package.json b/packages/react-button/package.json index ff9af8f56de3c..febb46f9991ee 100644 --- a/packages/react-button/package.json +++ b/packages/react-button/package.json @@ -25,7 +25,6 @@ "storybook": "start-storybook" }, "devDependencies": { - "@fluentui/react-menu": "^9.0.0-alpha.68", "@fluentui/a11y-testing": "^0.1.0", "@fluentui/babel-make-styles": "^9.0.0-alpha.40", "@fluentui/eslint-plugin": "^1.4.1", From 45b7778af37850656b6fb4808d6b5629c931003d Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Fri, 27 Aug 2021 17:10:41 +0200 Subject: [PATCH 3/6] Change files --- ...-react-button-d97e005b-38ee-4edf-a440-01eafa33783f.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@fluentui-react-button-d97e005b-38ee-4edf-a440-01eafa33783f.json diff --git a/change/@fluentui-react-button-d97e005b-38ee-4edf-a440-01eafa33783f.json b/change/@fluentui-react-button-d97e005b-38ee-4edf-a440-01eafa33783f.json new file mode 100644 index 0000000000000..8f54b9d3a44c7 --- /dev/null +++ b/change/@fluentui-react-button-d97e005b-38ee-4edf-a440-01eafa33783f.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "revert(react-button): remove vNext components used in SB from devDeps that are stale", + "packageName": "@fluentui/react-button", + "email": "martinhochel@microsoft.com", + "dependentChangeType": "none" +} From 1ea1558eadb2c1e00ff732bd7c3e468359b69ade Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Fri, 27 Aug 2021 17:17:59 +0200 Subject: [PATCH 4/6] fixup! revert(react-button): remove vNext components used in SB from devDeps that are stale --- packages/react-button/src/MenuButton.stories.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/react-button/src/MenuButton.stories.tsx b/packages/react-button/src/MenuButton.stories.tsx index f0c18eab304e0..3d557bd2642dd 100644 --- a/packages/react-button/src/MenuButton.stories.tsx +++ b/packages/react-button/src/MenuButton.stories.tsx @@ -1,12 +1,15 @@ import * as React from 'react'; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment +/* eslint-disable @typescript-eslint/ban-ts-comment */ // @ts-ignore import { Menu, MenuItem, MenuList, MenuTrigger } from '@fluentui/react-menu'; +// @ts-ignore +import type { MenuButtonProps } from './MenuButton'; +/* eslint-enable @typescript-eslint/ban-ts-comment */ + import { MenuButton } from './MenuButton'; import { Playground } from './Playground.stories'; import { buttonBaseProps } from './buttonBaseProps.stories'; import type { MenuProps } from '@fluentui/react-menu'; -import type { MenuButtonProps } from './MenuButton'; import type { PlaygroundProps } from './Playground.types.stories'; const ExampleMenu = (props: MenuButtonProps): JSX.Element => ( From 3a82b18a2b30a3275f1a4f90b57dfed0a6cfb549 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Fri, 27 Aug 2021 17:19:47 +0200 Subject: [PATCH 5/6] fixup! fixup! revert(react-button): remove vNext components used in SB from devDeps that are stale --- packages/react-button/src/MenuButton.stories.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-button/src/MenuButton.stories.tsx b/packages/react-button/src/MenuButton.stories.tsx index 3d557bd2642dd..202dc2112ad65 100644 --- a/packages/react-button/src/MenuButton.stories.tsx +++ b/packages/react-button/src/MenuButton.stories.tsx @@ -2,14 +2,14 @@ import * as React from 'react'; /* eslint-disable @typescript-eslint/ban-ts-comment */ // @ts-ignore import { Menu, MenuItem, MenuList, MenuTrigger } from '@fluentui/react-menu'; +import type { MenuProps } from '@fluentui/react-menu'; // @ts-ignore -import type { MenuButtonProps } from './MenuButton'; /* eslint-enable @typescript-eslint/ban-ts-comment */ import { MenuButton } from './MenuButton'; import { Playground } from './Playground.stories'; import { buttonBaseProps } from './buttonBaseProps.stories'; -import type { MenuProps } from '@fluentui/react-menu'; +import type { MenuButtonProps } from './MenuButton'; import type { PlaygroundProps } from './Playground.types.stories'; const ExampleMenu = (props: MenuButtonProps): JSX.Element => ( From bbb6379abb51911d159d56e8fb8a0484488e5322 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Fri, 27 Aug 2021 18:48:09 +0200 Subject: [PATCH 6/6] fixup! fixup! fixup! revert(react-button): remove vNext components used in SB from devDeps that are stale --- packages/react-button/src/MenuButton.stories.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-button/src/MenuButton.stories.tsx b/packages/react-button/src/MenuButton.stories.tsx index 202dc2112ad65..e8d9299cff1cb 100644 --- a/packages/react-button/src/MenuButton.stories.tsx +++ b/packages/react-button/src/MenuButton.stories.tsx @@ -2,8 +2,8 @@ import * as React from 'react'; /* eslint-disable @typescript-eslint/ban-ts-comment */ // @ts-ignore import { Menu, MenuItem, MenuList, MenuTrigger } from '@fluentui/react-menu'; -import type { MenuProps } from '@fluentui/react-menu'; // @ts-ignore +import type { MenuProps } from '@fluentui/react-menu'; /* eslint-enable @typescript-eslint/ban-ts-comment */ import { MenuButton } from './MenuButton';