Skip to content

Commit 456c726

Browse files
committed
installation: upgrade and fix compat issues
1 parent 529803a commit 456c726

File tree

7 files changed

+23
-26
lines changed

7 files changed

+23
-26
lines changed

craco.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
const { ESLINT_MODES } = require('@craco/craco');
21
var path = require('path');
32

43
module.exports = {
54
plugins: [{ plugin: require('@semantic-ui-react/craco-less') }],
65
eslint: {
76
enable: true /* (default value) */,
87
useEslintrc: true,
9-
mode: ESLINT_MODES.file,
8+
mode: 'file',
109
},
1110
webpack: {
1211
alias: {

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,31 +54,31 @@
5454
"devDependencies": {
5555
"@artsy/fresnel": "^1.3.1",
5656
"@babel/runtime": "^7.15.4",
57-
"@craco/craco": "^6.0.0",
57+
"@craco/craco": "^7.1.0",
5858
"@rjsf/core": "^5.18.4",
5959
"@rjsf/semantic-ui": "^5.18.0",
6060
"@rollup/plugin-alias": "^3.1.8",
6161
"@rollup/plugin-babel": "^5.2.2",
6262
"@rollup/plugin-commonjs": "^12.0.0",
6363
"@rollup/plugin-node-resolve": "^8.0.1",
64-
"@semantic-ui-react/craco-less": "^2.0.0",
64+
"@semantic-ui-react/craco-less": "^3.0.0",
6565
"@types/jest": "^24.9.1",
66-
"@typescript-eslint/eslint-plugin": "^5.5.0",
67-
"axios": "^1.7.0",
66+
"@typescript-eslint/eslint-plugin": "^4.0.0",
67+
"axios": "^0.21.2",
6868
"axios-mock-adapter": "^1.22.0",
6969
"classnames": "^2.2.6",
7070
"cypress": "^13.11.0",
7171
"enzyme": "^3.11.0",
7272
"enzyme-adapter-react-16": "^1.15.2",
7373
"enzyme-to-json": "^3.4.4",
74-
"eslint": "^8.0.0",
74+
"eslint": "^7.0.0",
7575
"eslint-config-prettier": "^9.0.0",
76-
"eslint-config-react-app": "^7.0.0",
76+
"eslint-config-react-app": "^6.0.0",
7777
"eslint-loader": "^4.0.0",
78-
"eslint-plugin-flowtype": "^8.0.0",
78+
"eslint-plugin-flowtype": "^5.2.0",
7979
"eslint-plugin-import": "^2.25.2",
8080
"eslint-plugin-jsx-a11y": "^6.8.0",
81-
"eslint-plugin-prettier": "^5.0.0",
81+
"eslint-plugin-prettier": "^4.0.0",
8282
"eslint-plugin-react": "^7.0.0",
8383
"eslint-plugin-react-hooks": "^4.0.0",
8484
"formik": "^2.2.6",
@@ -102,7 +102,7 @@
102102
"react-router-dom": "^5.3.0",
103103
"react-scripts": "^5.0.0",
104104
"react-scroll": "^1.8.4",
105-
"react-searchkit": "^2.0.0",
105+
"react-searchkit": "^2.2.6",
106106
"react-show-more": "^2.0.0",
107107
"react-tagcloud": "^2.0.0",
108108
"redux": "^4.0.5",

src/lib/forms/rjsf/RJSFCustomTemplates.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import { RJSFormWrapper } from '@forms/rjsf/RJSFormWrapper';
2-
import {
3-
ArrayFieldTemplate,
4-
FieldTemplate,
5-
ObjectFieldTemplate,
6-
} from '@rjsf/semantic-ui';
2+
import ArrayFieldTemplate from '@rjsf/semantic-ui/lib/ArrayFieldTemplate';
3+
import FieldTemplate from '@rjsf/semantic-ui/lib/FieldTemplate';
4+
import ObjectFieldTemplate from '@rjsf/semantic-ui/lib/ObjectFieldTemplate';
75
import _find from 'lodash/find';
86
import PropTypes from 'prop-types';
97
import React from 'react';

src/lib/forms/rjsf/fields/RJSFLabelField.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import HiddenWidget from '@rjsf/core/dist/cjs/components/widgets/HiddenWidget';
1+
import HiddenWidget from '@rjsf/core/lib/components/widgets/HiddenWidget';
22
import _capitalize from 'lodash/capitalize';
33
import PropTypes from 'prop-types';
44
import React, { Component } from 'react';

src/lib/modules/Document/DocumentContent.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ export class DocumentContent extends Component {
1313
render() {
1414
const {
1515
metadata,
16-
metadata: { abstract, table_of_content },
16+
metadata: { abstract, table_of_content: toc },
1717
} = this.props;
1818

1919
return (
2020
<>
2121
<Divider horizontal>Table of contents</Divider>
22-
{!_isEmpty(table_of_content) ? (
22+
{!_isEmpty(toc) ? (
2323
<List ordered>
24-
{table_of_content.map((entry) => (
24+
{toc.map((entry) => (
2525
<List.Item key={entry}>
2626
<List.Content>{entry}</List.Content>
2727
</List.Item>

src/lib/pages/backoffice/Document/DocumentDetails/DocumentMetadata/DocumentPublishing.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ export class DocumentPublishing extends Component {
3333
renderConferenceInfo = () => {
3434
const {
3535
document: {
36-
metadata: { conference_info },
36+
metadata: { conference_info: conferenceInfo },
3737
},
3838
} = this.props;
3939
let rows = [];
40-
conference_info.map((conf) => {
40+
conferenceInfo.map((conf) => {
4141
for (const [key, val] of Object.entries(conf)) {
4242
if (Array.isArray(val)) {
4343
const arrayVals = (
@@ -57,7 +57,7 @@ export class DocumentPublishing extends Component {
5757
rows.push({ name: capitalize(key), value: val });
5858
}
5959
}
60-
if (conference_info.length > 1) {
60+
if (conferenceInfo.length > 1) {
6161
rows.push(<br />);
6262
rows.push(<br />);
6363
}

src/lib/pages/frontsite/Documents/DocumentDetails/DocumentPanel/DocumentTitle.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import { Link } from 'react-router-dom';
1111
export class DocumentTitle extends Component {
1212
subtitle() {
1313
const {
14-
metadata: { alternative_titles },
14+
metadata: { alternative_titles: altTitles },
1515
} = this.props;
16-
if (!_isEmpty(alternative_titles)) {
17-
const subtitle = alternative_titles.find((e) => e.type === 'SUBTITLE');
16+
if (!_isEmpty(altTitles)) {
17+
const subtitle = altTitles.find((e) => e.type === 'SUBTITLE');
1818
if (!_isEmpty(subtitle)) {
1919
return <Header.Subheader>{subtitle.value}</Header.Subheader>;
2020
}

0 commit comments

Comments
 (0)