Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): upgrade eslint #1089

Merged
merged 8 commits into from
Jul 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
**/lib/
**/coverage/
**/node_modules/
docs/
docs/
jmetev1 marked this conversation as resolved.
Show resolved Hide resolved
.eslintrc.js
4 changes: 2 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ module.exports = {
'plugin:react/recommended',
'plugin:jsx-a11y/recommended',
'prettier',
'prettier/react',
scurker marked this conversation as resolved.
Show resolved Hide resolved
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended'
],
Expand All @@ -26,7 +25,8 @@ module.exports = {
}
],
'@typescript-eslint/camelcase': 'off',
'@typescript-eslint/explicit-function-return-type': 'off'
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/ban-ts-comment': 'warn'
},
settings: {
react: {
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dev:styles": "yarn --cwd=packages/styles dev",
"dev:docs": "webpack-dev-server",
"fmt": "prettier --write \"e2e/*.ts\" \"docs/**/*.{css,js}\" \"packages/react/**/*.{js,ts,tsx}\" \"packages/styles/*.css\" *.{js,json,md,ts}",
"lint": "eslint .",
"lint": "eslint . --quiet",
"prebuild": "yarn clean",
"predev": "yarn clean",
"test": "yarn --cwd=packages/react test",
Expand Down Expand Up @@ -69,8 +69,8 @@
"@types/react-router-dom": "^5.3.2",
"@types/react-syntax-highlighter": "^11.0.4",
"@types/webpack-env": "^1.18.0",
"@typescript-eslint/eslint-plugin": "^2.19.2",
"@typescript-eslint/parser": "^2.19.2",
"@typescript-eslint/eslint-plugin": "^5.59.9",
"@typescript-eslint/parser": "^5.59.9",
"autoprefixer": "^9.7.6",
"axe-core": "^4.3.5-canary.0ddc00b",
"babel-loader": "^8.0.5",
Expand All @@ -85,10 +85,10 @@
"css-minimizer-webpack-plugin": "^4.2.2",
"enzyme": "^3.2.0",
"enzyme-adapter-react-16": "^1.11.2",
"eslint": "^6.8.0",
"eslint-config-prettier": "^3.0.1",
"eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-react": "^7.5.1",
"eslint": "^8.42.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-react": "^7.32.2",
"express": "^4.17.3",
"focusable": "^2.3.0",
"fontsource-lato": "^4.0.0",
Expand Down
1 change: 0 additions & 1 deletion packages/react/__tests__/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
module.exports = {
extends: '../../../.eslintrc.js',
scurker marked this conversation as resolved.
Show resolved Hide resolved
rules: {
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/no-empty-function': 'off'
Expand Down
1 change: 1 addition & 0 deletions packages/react/__tests__/svgMock.js
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
// eslint-disable-next-line react/display-name
module.exports = () => null;
4 changes: 0 additions & 4 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@
"concurrently": "^5.3.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"eslint": "^6.8.0",
scurker marked this conversation as resolved.
Show resolved Hide resolved
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.19.0",
"jest": "^24.7.1",
"jest-axe": "^3.4.0",
"jsdom": "^16.2.2",
Expand Down
10 changes: 6 additions & 4 deletions packages/react/src/components/Breadcrumb/BreadcrumbItem.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { forwardRef } from 'react';
import classnames from 'classnames';
import { Cauldron } from '../../types';
import PropTypes from 'prop-types';

interface BreadcrumbItemProps extends React.HTMLAttributes<HTMLSpanElement> {}
type BreadcrumbItemProps = React.HTMLAttributes<HTMLSpanElement>;

const BreadcrumbItem = forwardRef<HTMLElement, BreadcrumbItemProps>(
const BreadcrumbItem = forwardRef<HTMLElement, BreadcrumbItemProps>( // eslint-disable-line react/display-name
({ className, children, ...props }: BreadcrumbItemProps, ref) => (
<span
className={classnames('Breadcrumb__Item', className)}
Expand All @@ -16,5 +16,7 @@ const BreadcrumbItem = forwardRef<HTMLElement, BreadcrumbItemProps>(
</span>
)
);

BreadcrumbItem.propTypes = {
className: PropTypes.string
};
export default BreadcrumbItem;
3 changes: 1 addition & 2 deletions packages/react/src/components/Card/CardContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import React from 'react';
import classNames from 'classnames';
import PropTypes from 'prop-types';

export interface CardContentProps
extends React.HTMLAttributes<HTMLDivElement> {}
export type CardContentProps = React.HTMLAttributes<HTMLDivElement>;

const CardContent = ({ className, ...other }: CardContentProps) => (
<div className={classNames('Card__content', className)} {...other} />
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/Card/CardFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';

export interface CardFooterProps extends React.HTMLAttributes<HTMLDivElement> {}
export type CardFooterProps = React.HTMLAttributes<HTMLDivElement>;

const CardFooter = ({ className, ...other }: CardFooterProps) => (
<div className={classNames('Card__footer', className)} {...other} />
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/Card/CardHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';

export interface CardHeaderProps extends React.HTMLAttributes<HTMLDivElement> {}
export type CardHeaderProps = React.HTMLAttributes<HTMLDivElement>;

const CardHeader = ({ className, ...other }: CardHeaderProps) => (
<div className={classNames('Card__header', className)} {...other} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export default class ClickOutsideListener extends React.Component<
setRef;
// If child has its own ref, we want to update
// its ref with the newly cloned node
let { ref } = this.props.children as any;
const { ref } = this.props.children as any;
setRef(ref, node);
};

Expand Down
3 changes: 2 additions & 1 deletion packages/react/src/components/Code/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ Code.propTypes = {
children: PropTypes.string.isRequired,
language: PropTypes.oneOf(['javascript', 'css', 'html', 'yaml']),
className: PropTypes.string,
tabIndex: PropTypes.number
tabIndex: PropTypes.number,
scrollable: PropTypes.bool
};

export default Code;
13 changes: 11 additions & 2 deletions packages/react/src/components/Dialog/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ interface DialogState {
isolator?: AriaIsolate;
}

const noop = () => {};
const noop = () => {
//not empty
};

export default class Dialog extends React.Component<DialogProps, DialogState> {
static defaultProps = {
Expand Down Expand Up @@ -206,6 +208,10 @@ const DialogContent = ({
</div>
);
DialogContent.displayName = 'DialogContent';
DialogContent.propTypes = {
className: PropTypes.string,
children: PropTypes.node
};

const DialogFooter = ({
children,
Expand All @@ -217,5 +223,8 @@ const DialogFooter = ({
</div>
);
DialogFooter.displayName = 'DialogFooter';

DialogFooter.propTypes = {
className: PropTypes.string,
children: PropTypes.node
};
export { Dialog, DialogContent, DialogFooter };
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export default class ExpandCollapsePanel extends React.Component<
private styleTag: HTMLStyleElement;

handleToggle = (e: React.MouseEvent<HTMLButtonElement>) => {
// eslint-disable-next-line @typescript-eslint/no-empty-function
const { onToggle = () => {} } = this.props;
const { isOpen, controlled } = this.state;
onToggle(e);
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/Layout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export interface LayoutProps extends React.HTMLAttributes<HTMLDivElement> {

export default class Layout extends React.Component<LayoutProps> {
static defaultProps = {
// eslint-disable-next-line @typescript-eslint/no-empty-function
layoutRef: () => {}
};

Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/Main/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export interface MainProps extends React.HTMLAttributes<HTMLDivElement> {

export default class Main extends Component<MainProps> {
static defaultProps = {
// eslint-disable-next-line @typescript-eslint/no-empty-function
mainRef: () => {}
};

Expand Down
3 changes: 3 additions & 0 deletions packages/react/src/components/MenuItem/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ interface MenuItemProps extends React.HTMLAttributes<HTMLLIElement> {

export default class MenuItem extends Component<MenuItemProps> {
static defaultProps = {
// eslint-disable-next-line @typescript-eslint/no-empty-function
menuItemRef: () => {},
// eslint-disable-next-line @typescript-eslint/no-empty-function
onClick: () => {},
// eslint-disable-next-line @typescript-eslint/no-empty-function
onKeyDown: () => {},
autoClickLink: true
};
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/Offscreen/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

export interface OffscreenProps extends React.HTMLAttributes<HTMLSpanElement> {}
export type OffscreenProps = React.HTMLAttributes<HTMLSpanElement>;

const Offscreen = (props: OffscreenProps) => (
<span className="Offscreen" {...props} />
Expand Down
2 changes: 2 additions & 0 deletions packages/react/src/components/OptionsMenu/OptionsMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ export default class OptionsMenu extends Component<
OptionsMenuState
> {
static defaultProps = {
// eslint-disable-next-line @typescript-eslint/no-empty-function
onClose: () => {},
// eslint-disable-next-line @typescript-eslint/no-empty-function
onSelect: () => {},
align: 'right'
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export interface OptionsMenuItemProps

class OptionsMenuItemComponent extends React.Component<OptionsMenuItemProps> {
static defaultProps = {
// eslint-disable-next-line @typescript-eslint/no-empty-function
onSelect: () => {}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ export default class OptionsMenuList extends React.Component<
> {
static defaultProps = {
closeOnSelect: true,
// eslint-disable-next-line @typescript-eslint/no-empty-function
onSelect: () => {},
// eslint-disable-next-line @typescript-eslint/no-empty-function
onClose: () => {}
};

Expand Down Expand Up @@ -172,6 +174,7 @@ export default class OptionsMenuList extends React.Component<

// Key event is being handled in componentDidMount
/* eslint-disable jsx-a11y/click-events-have-key-events */
/* eslint-disable jsx-a11y/role-supports-aria-props */
return (
<ClickOutsideListener
onClickOutside={this.handleClickOutside}
Expand All @@ -182,7 +185,7 @@ export default class OptionsMenuList extends React.Component<
{...other}
className={classnames('OptionsMenu__list', className)}
/* aria-expanded is not correct usage here, but the pattern library
currently styles the open state of the menu. based on this attribute */
currently styles the open state of the menu. based on this attribute */
aria-expanded={show}
role="menu"
onClick={handleClick}
Expand Down
4 changes: 3 additions & 1 deletion packages/react/src/components/Pointout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,10 @@ export default class Pointout extends React.Component<
PointoutState
> {
static defaultProps = {
// eslint-disable-next-line @typescript-eslint/no-empty-function
ftpoRef: () => {},
noArrow: false,
// eslint-disable-next-line @typescript-eslint/no-empty-function
onClose: () => {},
dismissText: 'dismiss',
previousText: 'previous',
Expand Down Expand Up @@ -273,7 +275,7 @@ export default class Pointout extends React.Component<
const portalNode =
(portal as React.RefObject<HTMLElement>)?.current ||
(portal as HTMLElement);

// eslint-disable-next-line prefer-const
let { top, left, width, height } = targetNode.getBoundingClientRect();
if (portalNode && portalNode !== document.body) {
// If the portal is not placed on document.body
Expand Down
6 changes: 6 additions & 0 deletions packages/react/src/components/Tooltip/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,16 @@ export const TooltipHead = ({
}: React.HTMLAttributes<HTMLDivElement>) => (
<div className={classnames('TooltipHead', className)} {...other} />
);
TooltipHead.propTypes = {
className: PropTypes.string
};

export const TooltipContent = ({
className,
...other
}: React.HTMLAttributes<HTMLDivElement>) => (
<div className={classnames('TooltipContent', className)} {...other} />
);
TooltipContent.propTypes = {
className: PropTypes.string
};
2 changes: 2 additions & 0 deletions packages/react/src/components/TopBar/TopBarMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ export default class TopBarMenu extends React.Component<
TopBarMenuState
> {
static defaultProps = {
// eslint-disable-next-line @typescript-eslint/no-empty-function
onKeyDown: () => {},
// eslint-disable-next-line @typescript-eslint/no-empty-function
menuItemRef: () => {}
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import PropTypes from 'prop-types';
import React, { forwardRef } from 'react';
import classnames from 'classnames';

interface ColumnGroupHeaderProps extends React.HTMLAttributes<HTMLDivElement> {}
type ColumnGroupHeaderProps = React.HTMLAttributes<HTMLDivElement>;

const ColumnGroupHeader = forwardRef<HTMLDivElement, ColumnGroupHeaderProps>(
({ className, children, ...props }, ref) => {
Expand All @@ -18,5 +19,7 @@ const ColumnGroupHeader = forwardRef<HTMLDivElement, ColumnGroupHeaderProps>(
);

ColumnGroupHeader.displayName = 'ColumnGroupHeader';

ColumnGroupHeader.propTypes = {
className: PropTypes.string
};
export default ColumnGroupHeader;
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React, { forwardRef } from 'react';
import classnames from 'classnames';
import PropTypes from 'prop-types';

interface ColumnHeaderProps extends React.HTMLAttributes<HTMLDivElement> {}
type ColumnHeaderProps = React.HTMLAttributes<HTMLDivElement>;

const ColumnHeader = forwardRef<HTMLDivElement, ColumnHeaderProps>(
({ className, children, ...props }, ref) => {
Expand All @@ -18,5 +19,7 @@ const ColumnHeader = forwardRef<HTMLDivElement, ColumnHeaderProps>(
);

ColumnHeader.displayName = 'ColumnHeader';

ColumnHeader.propTypes = {
className: PropTypes.string
};
export default ColumnHeader;
7 changes: 5 additions & 2 deletions packages/react/src/components/TwoColumnPanel/ColumnList.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React, { forwardRef } from 'react';
import classnames from 'classnames';
import PropTypes from 'prop-types';

interface ColumnListProps extends React.HTMLAttributes<HTMLDivElement> {}
type ColumnListProps = React.HTMLAttributes<HTMLDivElement>;

const ColumnList = forwardRef<HTMLDivElement, ColumnListProps>(
({ className, children, ...props }, ref) => {
Expand All @@ -18,5 +19,7 @@ const ColumnList = forwardRef<HTMLDivElement, ColumnListProps>(
);

ColumnList.displayName = 'ColumnList';

ColumnList.propTypes = {
className: PropTypes.string
};
export default ColumnList;
2 changes: 2 additions & 0 deletions packages/react/src/components/Workspace/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ export interface WorkspaceProps extends React.HTMLAttributes<HTMLDivElement> {

export default class Workspace extends React.Component<WorkspaceProps> {
static defaultProps = {
// eslint-disable-next-line @typescript-eslint/no-empty-function
workspaceRef: () => {},
// eslint-disable-next-line @typescript-eslint/no-empty-function
layoutRef: () => {},
noSideBar: false
};
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ReactElement, ReactFragment, ReactPortal } from 'react';

// eslint-disable-next-line @typescript-eslint/no-namespace
export namespace Cauldron {
export type LabelProps =
| { 'aria-label': string }
Expand Down
Loading
Loading