Skip to content

Commit

Permalink
Added support for node 16, formatting and linting (semantic-ui) (#2939)
Browse files Browse the repository at this point in the history
- Regenerated the `package-lock.json` file with node-16
- Added the `cs-check`, `cs-format` and `lint` scripts along with `lint-staged` to the `package.json` file
- Ran `cs-format` over the `src` and `test` directories to fix the build
  • Loading branch information
heath-freenome authored Jul 20, 2022
1 parent e589484 commit ce8fc96
Show file tree
Hide file tree
Showing 58 changed files with 165,583 additions and 18,518 deletions.
183,387 changes: 165,217 additions & 18,170 deletions packages/semantic-ui/package-lock.json

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion packages/semantic-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,18 @@
"scripts": {
"build": "rimraf dist && tsdx build --format cjs,es,umd",
"lint": "eslint src test",
"cs-check": "prettier -l \"{src,test}/**/*.js\"",
"cs-format": "prettier \"{src,test}/**/*.js\" --write",
"lint": "eslint src test",
"test": "tsdx test",
"test:update": "tsdx test --u"
},
"lint-staged": {
"{src,test}/**/*.js": [
"eslint --fix",
"prettier --write"
]
},
"peerDependencies": {
"@rjsf/core": "^4.2.0",
"@rjsf/utils": "^4.2.0",
Expand All @@ -43,7 +52,6 @@
"@rjsf/utils": "^4.2.0",
"@rjsf/validator-ajv6": "^4.2.0",
"atob": "^2.0.3",
"babel-eslint": "^10.1.0",
"eslint": "^8.19.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-flowtype": "^8.0.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/semantic-ui/src/AddButton/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/* eslint-disable import/export */
export { default } from './AddButton';
export * from './AddButton';
export { default } from "./AddButton";
export * from "./AddButton";
32 changes: 17 additions & 15 deletions packages/semantic-ui/src/ArrayFieldTemplate/ArrayFieldTemplate.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable react/prop-types,react/destructuring-assignment */
import React from "react";
import { Button, Grid, Segment } from "semantic-ui-react";
import { isFixedItems, getUiOptions } from '@rjsf/utils';
import { isFixedItems, getUiOptions } from "@rjsf/utils";

import AddButton from "../AddButton";
import { cleanClassNames, getSemanticProps, MaybeWrap } from "../util";
Expand Down Expand Up @@ -46,7 +46,8 @@ function DefaultArrayItem(props) {
!isInitialArrayItem(props)
? { ...gridStyle(!props.horizontalButtons), alignItems: "center" }
: gridStyle(!props.horizontalButtons)
}>
}
>
<Grid.Column width={16} verticalAlign="middle">
{props.children}
</Grid.Column>
Expand Down Expand Up @@ -140,7 +141,8 @@ function DefaultFixedArrayFieldTemplate({
{fieldDescription && (
<div
className="field-description"
key={`field-description-${idSchema.$id}`}>
key={`field-description-${idSchema.$id}`}
>
{fieldDescription}
</div>
)}
Expand All @@ -156,7 +158,8 @@ function DefaultFixedArrayFieldTemplate({
marginTop: "1rem",
position: "relative",
textAlign: "right",
}}>
}}
>
<AddButton onClick={onAddClick} disabled={disabled || readOnly} />
</div>
)}
Expand Down Expand Up @@ -191,7 +194,8 @@ function DefaultNormalArrayFieldTemplate({
className,
classNames,
"sortable-form-fields",
])}>
])}
>
<ArrayFieldTitle
key={`array-field-title-${idSchema.$id}`}
TitleField={TitleField}
Expand Down Expand Up @@ -221,7 +225,8 @@ function DefaultNormalArrayFieldTemplate({
marginTop: "1rem",
position: "relative",
textAlign: "right",
}}>
}}
>
<AddButton onClick={onAddClick} disabled={disabled || readOnly} />
</div>
)}
Expand All @@ -231,17 +236,14 @@ function DefaultNormalArrayFieldTemplate({
}

function ArrayFieldTemplate(props) {
const { options,
schema,
uiSchema,
formContext, } = props;
const { options, schema, uiSchema, formContext } = props;
const semanticProps = getSemanticProps({
options,
uiSchema,
formContext,
defaultSchemaProps: { horizontalButtons : false, wrapItem : false }
options,
uiSchema,
formContext,
defaultSchemaProps: { horizontalButtons: false, wrapItem: false },
});
const { horizontalButtons, wrapItem } = semanticProps;
const { horizontalButtons, wrapItem } = semanticProps;
const itemProps = { horizontalButtons, wrapItem };

if (isFixedItems(schema)) {
Expand Down
4 changes: 2 additions & 2 deletions packages/semantic-ui/src/ArrayFieldTemplate/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/* eslint-disable import/export */
export { default } from './ArrayFieldTemplate';
export * from './ArrayFieldTemplate';
export { default } from "./ArrayFieldTemplate";
export * from "./ArrayFieldTemplate";
2 changes: 1 addition & 1 deletion packages/semantic-ui/src/CheckboxWidget/CheckboxWidget.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function CheckboxWidget(props) {
defaultSchemaProps: {
inverted: false,
},
});
});
const { schemaUtils } = registry;
const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema);
const _onChange = (event, data) => onChange && onChange(data.checked);
Expand Down
4 changes: 2 additions & 2 deletions packages/semantic-ui/src/CheckboxWidget/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/* eslint-disable import/export */
export { default } from './CheckboxWidget';
export * from './CheckboxWidget';
export { default } from "./CheckboxWidget";
export * from "./CheckboxWidget";
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function CheckboxesWidget(props) {
defaultSchemaProps: {
inverted: false,
},
});
});
const _onChange = option => ({ target: { checked } }) => {
// eslint-disable-next-line no-shadow
const all = enumOptions.map(({ value }) => value);
Expand Down
4 changes: 2 additions & 2 deletions packages/semantic-ui/src/CheckboxesWidget/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/* eslint-disable import/export */
export { default } from './CheckboxesWidget';
export * from './CheckboxesWidget';
export { default } from "./CheckboxesWidget";
export * from "./CheckboxesWidget";
61 changes: 31 additions & 30 deletions packages/semantic-ui/src/DateTimeWidget/DateTimeWidget.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,30 @@ import { getSemanticProps } from "../util";

function DateTimeWidget(props) {
const {
id,
required,
readonly,
disabled,
name,
label,
schema,
uiSchema,
value,
onChange,
onBlur,
onFocus,
autofocus,
options,
formContext,
id,
required,
readonly,
disabled,
name,
label,
schema,
uiSchema,
value,
onChange,
onBlur,
onFocus,
autofocus,
options,
formContext,
} = props;
const semanticProps = getSemanticProps({
uiSchema,
schema,
formContext,
options,
});
const _onChange = ({ target: { value } }) => onChange && onChange(localToUTC(value));
const _onChange = ({ target: { value } }) =>
onChange && onChange(localToUTC(value));
const _onBlur = () => onBlur && onBlur(id, value);
const _onFocus = () => onFocus && onFocus(id, value);
const dateValue = utcToLocal(value);
Expand All @@ -39,20 +40,20 @@ function DateTimeWidget(props) {
);
return (
<Form.Input
key={id}
id={id}
type="datetime-local"
label={displayLabel ? label || schema.title : false}
required={required}
autoFocus={autofocus}
disabled={disabled || readonly}
name={name}
{...semanticProps}
value={dateValue}
onChange={_onChange}
onBlur={_onBlur}
onFocus={_onFocus}
/>
key={id}
id={id}
type="datetime-local"
label={displayLabel ? label || schema.title : false}
required={required}
autoFocus={autofocus}
disabled={disabled || readonly}
name={name}
{...semanticProps}
value={dateValue}
onChange={_onChange}
onBlur={_onBlur}
onFocus={_onFocus}
/>
);
}
export default DateTimeWidget;
4 changes: 2 additions & 2 deletions packages/semantic-ui/src/DateTimeWidget/index.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export { default } from './DateTimeWidget';
export * from './DateTimeWidget';
export { default } from "./DateTimeWidget";
export * from "./DateTimeWidget";
28 changes: 14 additions & 14 deletions packages/semantic-ui/src/DateWidget/DateWidget.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,20 @@ function DateWidget(props) {
const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema);
return (
<Form.Input
key={id}
id={id}
type="date"
label={displayLabel ? label || schema.title : false}
required={required}
autoFocus={autofocus}
disabled={disabled || readonly}
name={name}
{...semanticProps}
value={value || value === 0 ? value : ""}
onChange={_onChange}
onBlur={_onBlur}
onFocus={_onFocus}
/>
key={id}
id={id}
type="date"
label={displayLabel ? label || schema.title : false}
required={required}
autoFocus={autofocus}
disabled={disabled || readonly}
name={name}
{...semanticProps}
value={value || value === 0 ? value : ""}
onChange={_onChange}
onBlur={_onBlur}
onFocus={_onFocus}
/>
);
}
export default DateWidget;
4 changes: 2 additions & 2 deletions packages/semantic-ui/src/DateWidget/index.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export { default } from './DateWidget';
export * from './DateWidget';
export { default } from "./DateWidget";
export * from "./DateWidget";
4 changes: 2 additions & 2 deletions packages/semantic-ui/src/DescriptionField/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/* eslint-disable import/export */
export { default } from './DescriptionField';
export * from './DescriptionField';
export { default } from "./DescriptionField";
export * from "./DescriptionField";
2 changes: 1 addition & 1 deletion packages/semantic-ui/src/EmailWidget/EmailWidget.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function EmailWidget(props) {
uiSchema,
formContext,
options,
});
});
const { schemaUtils } = registry;
// eslint-disable-next-line no-shadow
const _onChange = ({ target: { value } }) =>
Expand Down
4 changes: 2 additions & 2 deletions packages/semantic-ui/src/EmailWidget/index.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export { default } from './EmailWidget';
export * from './EmailWidget';
export { default } from "./EmailWidget";
export * from "./EmailWidget";
4 changes: 2 additions & 2 deletions packages/semantic-ui/src/ErrorList/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/* eslint-disable import/export */
export { default } from './ErrorList';
export * from './ErrorList';
export { default } from "./ErrorList";
export * from "./ErrorList";
4 changes: 2 additions & 2 deletions packages/semantic-ui/src/FieldTemplate/FieldTemplate.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { Form } from "semantic-ui-react";
import DescriptionField from "../DescriptionField";
import HelpField from "../HelpField";
import RawErrors from "../RawErrors";
import WrapIfAdditional from './WrapIfAdditional';
import { getSemanticProps,getSemanticErrorProps, MaybeWrap } from "../util";
import WrapIfAdditional from "./WrapIfAdditional";
import { getSemanticProps, getSemanticErrorProps, MaybeWrap } from "../util";

function FieldTemplate({
id,
Expand Down
Loading

0 comments on commit ce8fc96

Please sign in to comment.