diff --git a/package.json b/package.json index 41bf941ad..9d564c4b5 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "eslint-plugin-functional": "^5.0.4", "eslint-plugin-import": "^2.27.5", "eslint-plugin-jsx-a11y": "^6.7.0", - "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-prettier": "^5.0.0-alpha.2", "eslint-plugin-react": "^7.32.2", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-testing-library": "^5.11.0", @@ -104,7 +104,7 @@ "postcss-import": "^15.1.0", "postcss-nested": "^6.0.0", "postcss-preset-env": "^9.0.0", - "prettier": "^2.8.8", + "prettier": "^3.0.0", "react": "18.2.0", "react-dom": "18.2.0", "storybook-addon-pseudo-states": "^2.1.0", diff --git a/packages/tab-list/src/TabList.tsx b/packages/tab-list/src/TabList.tsx index 0267bfcbb..cd4bcea95 100644 --- a/packages/tab-list/src/TabList.tsx +++ b/packages/tab-list/src/TabList.tsx @@ -10,20 +10,19 @@ import { useRef } from 'react'; import styles from './styles/TabList.module.css'; -type TabListProps = - | AriaTabListProps & { - /** The active Tab to show on render. The value passed in here should match the value of the active Tab's Item key. */ - activeTab?: T; - /** CSS classes to pass into the TabList wrapper div. */ - className?: string; - /** The children passed into the TabList. This is a react-stately Item with JSX children. */ - children: ItemElement | Array>; - /** Array of any disabled Tabs in the grouping. */ - disabledTabs?: string[]; - /** Called when the user clicks on a different tab */ - onChange?: (tab: T) => void; - 'data-test-id'?: string; - }; +type TabListProps = AriaTabListProps & { + /** The active Tab to show on render. The value passed in here should match the value of the active Tab's Item key. */ + activeTab?: T; + /** CSS classes to pass into the TabList wrapper div. */ + className?: string; + /** The children passed into the TabList. This is a react-stately Item with JSX children. */ + children: ItemElement | Array>; + /** Array of any disabled Tabs in the grouping. */ + disabledTabs?: string[]; + /** Called when the user clicks on a different tab */ + onChange?: (tab: T) => void; + 'data-test-id'?: string; +}; /** React-aria' useTabListState hook supports a * selectedKey under the hood for showing diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 27327fecf..b2513ea70 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -159,8 +159,8 @@ importers: specifier: ^6.7.0 version: 6.7.0(eslint@8.44.0) eslint-plugin-prettier: - specifier: ^4.2.1 - version: 4.2.1(eslint-config-prettier@8.8.0)(eslint@8.44.0)(prettier@2.8.8) + specifier: ^5.0.0-alpha.2 + version: 5.0.0-alpha.2(eslint-config-prettier@8.8.0)(eslint@8.44.0)(prettier@3.0.0) eslint-plugin-react: specifier: ^7.32.2 version: 7.32.2(eslint@8.44.0) @@ -204,8 +204,8 @@ importers: specifier: ^9.0.0 version: 9.0.0(postcss@8.4.16) prettier: - specifier: ^2.8.8 - version: 2.8.8 + specifier: ^3.0.0 + version: 3.0.0 react: specifier: 18.2.0 version: 18.2.0 @@ -11993,21 +11993,25 @@ packages: semver: 6.3.0 dev: true - /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.8.0)(eslint@8.44.0)(prettier@2.8.8): - resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} - engines: {node: '>=12.0.0'} + /eslint-plugin-prettier@5.0.0-alpha.2(eslint-config-prettier@8.8.0)(eslint@8.44.0)(prettier@3.0.0): + resolution: {integrity: sha512-F6YBCbrRzvZwcINw3crm1+/uX/i+rJYaFErPtwCfUoPLywRfY7pwBtI3yMe5OpIotuaiws8cd29oM80ca6NQSQ==} + engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: - eslint: '>=7.28.0' + '@types/eslint': '>=8.0.0' + eslint: '>=8.0.0' eslint-config-prettier: '*' - prettier: '>=2.0.0' + prettier: '>=3.0.0' peerDependenciesMeta: + '@types/eslint': + optional: true eslint-config-prettier: optional: true dependencies: eslint: 8.44.0 eslint-config-prettier: 8.8.0(eslint@8.44.0) - prettier: 2.8.8 + prettier: 3.0.0 prettier-linter-helpers: 1.0.0 + synckit: 0.8.5 dev: true /eslint-plugin-react-hooks@4.6.0(eslint@8.44.0): @@ -17114,6 +17118,12 @@ packages: hasBin: true dev: true + /prettier@3.0.0: + resolution: {integrity: sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==} + engines: {node: '>=14'} + hasBin: true + dev: true + /pretty-bytes@5.6.0: resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==} engines: {node: '>=6'}