From 25a2a30a2c6c1e278b3ecae08fd3074fdbc60dfc Mon Sep 17 00:00:00 2001 From: Robert Snow Date: Fri, 23 Aug 2024 07:16:05 +1000 Subject: [PATCH] Fix lint job on CI (#6921) * Fix lint job on CI --- .circleci/config.yml | 2 +- package.json | 2 +- packages/@react-spectrum/s2/src/AvatarGroup.tsx | 4 ++-- packages/@react-spectrum/s2/src/Badge.tsx | 6 +++--- packages/@react-spectrum/s2/src/Tabs.tsx | 11 ++++++----- packages/@react-spectrum/s2/src/bar-utils.ts | 2 +- packages/react-aria-components/src/FieldError.tsx | 4 ++-- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index af30dc664a0..4f394d90bc2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -291,7 +291,7 @@ jobs: node --loader ./scripts/esm-support/loader.mjs ./scripts/esm-support/testESM.mjs lint: - executor: rsp + executor: rsp-xlarge steps: - restore_cache: key: react-spectrum-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }} diff --git a/package.json b/package.json index 7547b4f3d90..602d0e46dc3 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "build": "make build", "test:ssr": "cross-env STRICT_MODE=1 yarn jest --config jest.ssr.config.js", "ci-test": "cross-env STRICT_MODE=1 yarn jest --maxWorkers=2 && cross-env STRICT_MODE=1 yarn test:ssr --runInBand", - "lint": "yarn check-types & eslint packages --ext .js,.ts,.tsx & yarn constraints & node scripts/lint-packages.js", + "lint": "concurrently \"yarn check-types\" \"eslint packages --ext .js,.ts,.tsx\" \"node scripts/lint-packages.js\" \"yarn constraints\"", "jest": "node scripts/jest.js", "copyrights": "babel-node --presets @babel/env ./scripts/addHeaders.js", "build:icons": "babel-node --presets @babel/env ./scripts/buildIcons.js", diff --git a/packages/@react-spectrum/s2/src/AvatarGroup.tsx b/packages/@react-spectrum/s2/src/AvatarGroup.tsx index ec54cbb949c..f2e9d37d5aa 100644 --- a/packages/@react-spectrum/s2/src/AvatarGroup.tsx +++ b/packages/@react-spectrum/s2/src/AvatarGroup.tsx @@ -12,7 +12,7 @@ import {AriaLabelingProps, DOMProps, DOMRef, DOMRefValue} from '@react-types/shared'; import {AvatarContext} from './Avatar'; -import {ContextValue} from 'react-aria-components'; +import {ContextValue, SlotProps} from 'react-aria-components'; import {createContext, CSSProperties, forwardRef, ReactNode} from 'react'; import {filterDOMProps} from '@react-aria/utils'; import {getAllowedOverrides, StylesPropWithoutWidth, UnsafeStyles} from './style-utils' with {type: 'macro'}; @@ -21,7 +21,7 @@ import {useDOMRef} from '@react-spectrum/utils'; import {useLabel} from 'react-aria'; import {useSpectrumContextProps} from './useSpectrumContextProps'; -export interface AvatarGroupProps extends UnsafeStyles, DOMProps, AriaLabelingProps { +export interface AvatarGroupProps extends UnsafeStyles, DOMProps, AriaLabelingProps, SlotProps { /** Avatar children of the avatar group. */ children: ReactNode, /** The label for the avatar group. */ diff --git a/packages/@react-spectrum/s2/src/Badge.tsx b/packages/@react-spectrum/s2/src/Badge.tsx index 54dfb01a5cd..44c79b0d2cf 100644 --- a/packages/@react-spectrum/s2/src/Badge.tsx +++ b/packages/@react-spectrum/s2/src/Badge.tsx @@ -25,13 +25,13 @@ import {useSpectrumContextProps} from './useSpectrumContextProps'; export interface BadgeStyleProps { /** * The size of the badge. - * + * * @default 'S' */ size?: 'S' | 'M' | 'L' | 'XL', /** * The variant changes the background color of the badge. When badge has a semantic meaning, they should use the variant for semantic colors. - * + * * @default 'neutral' */ variant?: 'accent' | 'informative' | 'neutral' | 'positive' | 'notice' | 'negative' | 'gray' | 'red' | 'orange' | 'yellow' | 'charteuse' | 'celery' | 'green' | 'seafoam' | 'cyan' | 'blue' | 'indigo' | 'purple' | 'fuchsia' | 'magenta' | 'pink' | 'turquoise' | 'brown' | 'cinnamon' | 'silver', @@ -169,7 +169,7 @@ const badge = style({ neutral: 'gray-700', positive: 'positive-700', notice: 'notice-700', - negative: 'negative-800', + negative: 'negative-800' } } } diff --git a/packages/@react-spectrum/s2/src/Tabs.tsx b/packages/@react-spectrum/s2/src/Tabs.tsx index a31c2794362..eb150dd809e 100644 --- a/packages/@react-spectrum/s2/src/Tabs.tsx +++ b/packages/@react-spectrum/s2/src/Tabs.tsx @@ -15,14 +15,15 @@ import { TabPanel as AriaTabPanel, TabPanelProps as AriaTabPanelProps, TabProps as AriaTabProps, - TabsProps as AriaTabsProps, + TabsProps as AriaTabsProps, ContextValue, Provider, Tab as RACTab, TabList as RACTabList, Tabs as RACTabs, TabListStateContext, - useSlottedContext} from 'react-aria-components'; + useSlottedContext + } from 'react-aria-components'; import {centerBaseline} from './CenterBaseline'; import {Collection, DOMRef, DOMRefValue, Key, Node, Orientation} from '@react-types/shared'; import {createContext, forwardRef, ReactNode, useCallback, useContext, useEffect, useRef, useState} from 'react'; @@ -57,7 +58,7 @@ export interface TabListProps extends Omit, 'children' | children?: ReactNode } -export interface TabPanelProps extends Omit, UnsafeStyles { +export interface TabPanelProps extends Omit, UnsafeStyles { /** Spectrum-defined styles, returned by the `style()` macro. */ styles?: StylesPropWithHeight, /** The content to display in the tab panels. */ @@ -121,7 +122,7 @@ const icon = style({ }); export function Tab(props: TabProps) { - let {density} = useSlottedContext(TabsContext); + let {density} = useSlottedContext(TabsContext) ?? {}; return ( (props: TabListProps) { - let {density, isDisabled, disabledKeys, orientation} = useSlottedContext(TabsContext); + let {density, isDisabled, disabledKeys, orientation} = useSlottedContext(TabsContext) ?? {}; let state = useContext(TabListStateContext); let [selectedTab, setSelectedTab] = useState(undefined); let tablistRef = useRef(null); diff --git a/packages/@react-spectrum/s2/src/bar-utils.ts b/packages/@react-spectrum/s2/src/bar-utils.ts index cb5093549b1..65e2e79a35f 100644 --- a/packages/@react-spectrum/s2/src/bar-utils.ts +++ b/packages/@react-spectrum/s2/src/bar-utils.ts @@ -25,7 +25,7 @@ export const bar = () => ({ labelPosition: { top: [ 'label value', - 'bar bar', + 'bar bar' ], side: [ 'label bar value' diff --git a/packages/react-aria-components/src/FieldError.tsx b/packages/react-aria-components/src/FieldError.tsx index 9be357ef033..18c79322845 100644 --- a/packages/react-aria-components/src/FieldError.tsx +++ b/packages/react-aria-components/src/FieldError.tsx @@ -10,8 +10,8 @@ * governing permissions and limitations under the License. */ -import {DOMProps, ValidationResult} from "@react-types/shared"; -import {filterDOMProps} from "@react-aria/utils"; +import {DOMProps, ValidationResult} from '@react-types/shared'; +import {filterDOMProps} from '@react-aria/utils'; import React, {createContext, ForwardedRef, forwardRef, useContext} from 'react'; import {RenderProps, useRenderProps} from './utils'; import {Text} from './Text';