Skip to content

Commit 5fa674b

Browse files
committed
dev: Move to typescript ~4.9.5 and typedoc ~0.25.3
- Align typescript and typedoc dependencies to be the same for all packages - Remove custom typedoc theme - Adapt @mui/icons-material import in material-renderers to work with later typescript version. The used imports broke starting with 4.2.4
1 parent ca3ea15 commit 5fa674b

File tree

17 files changed

+163
-353
lines changed

17 files changed

+163
-353
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"ts-loader": "^6.2.1",
4646
"ts-node": "^10.4.0",
4747
"tslib": "^2.5.0",
48-
"typescript": "4.2.3",
48+
"typescript": "~4.9.5",
4949
"webpack": "^4.41.2",
5050
"webpack-merge": "^4.2.2"
5151
},

packages/core/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"report": "nyc report --reporter=html",
4545
"test": "ava",
4646
"test-cov": "rimraf -rf .nyc_output && nyc ava",
47-
"doc": "typedoc --name 'JSON Forms Core' --excludeExternals --theme ../../typedoc-jsonforms --out docs src"
47+
"doc": "typedoc --name 'JSON Forms Core' --excludeExternals --out docs src"
4848
},
4949
"ava": {
5050
"files": [
@@ -96,7 +96,7 @@
9696
"source-map-support": "0.5.16",
9797
"ts-node": "^10.4.0",
9898
"tslib": "^2.5.0",
99-
"typedoc": "~0.21.9",
100-
"typescript": "4.2.3"
99+
"typedoc": "~0.25.3",
100+
"typescript": "~4.9.5"
101101
}
102102
}

packages/examples/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"lint": "eslint .",
4141
"lint:fix": "eslint --fix .",
4242
"test": "echo 'Nothing to do for `examples` package'",
43-
"doc": "typedoc --name 'JSON Forms Examples' --excludeExternals --theme ../../typedoc-jsonforms --out docs src"
43+
"doc": "typedoc --name 'JSON Forms Examples' --excludeExternals --out docs src"
4444
},
4545
"dependencies": {
4646
"ajv-i18n": "^3.5.0",
@@ -65,7 +65,7 @@
6565
"rollup-plugin-typescript2": "^0.34.1",
6666
"rollup-plugin-visualizer": "^5.4.1",
6767
"tslib": "^2.5.0",
68-
"typedoc": "~0.21.9",
69-
"typescript": "4.2.3"
68+
"typedoc": "~0.25.3",
69+
"typescript": "~4.9.5"
7070
}
7171
}

packages/material-renderers/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"test": "jest --no-cache",
4646
"test-cov": "jest --no-cache --coverage",
4747
"report": "nyc report --reporter=html",
48-
"doc": "typedoc --name 'JSON Forms React Material Renderers' --excludeExternals --theme ../../typedoc-jsonforms --out docs src",
48+
"doc": "typedoc --name 'JSON Forms React Material Renderers' --excludeExternals --out docs src",
4949
"tsc": "tsc --build tsconfig.json"
5050
},
5151
"jest": {
@@ -135,8 +135,8 @@
135135
"ts-jest": "^27.1.4",
136136
"ts-loader": "^6.2.1",
137137
"tslib": "^2.5.0",
138-
"typedoc": "~0.21.9",
139-
"typescript": "4.2.3",
138+
"typedoc": "~0.25.3",
139+
"typescript": "~4.9.5",
140140
"webpack": "^4.41.2",
141141
"webpack-cli": "^3.2.1",
142142
"webpack-dev-server": "^3.9.0"

packages/material-renderers/src/additional/ListWithDetailMasterItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
ListItemSecondaryAction,
3333
ListItemText,
3434
} from '@mui/material';
35-
import DeleteIcon from '@mui/icons-material/Delete';
35+
import { Delete as DeleteIcon } from '@mui/icons-material';
3636
import React from 'react';
3737

3838
export const ListWithDetailMasterItem = ({

packages/material-renderers/src/complex/MaterialTableControl.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,11 @@ import {
5757
encode,
5858
ArrayTranslations,
5959
} from '@jsonforms/core';
60-
import DeleteIcon from '@mui/icons-material/Delete';
61-
import ArrowDownward from '@mui/icons-material/ArrowDownward';
62-
import ArrowUpward from '@mui/icons-material/ArrowUpward';
60+
import {
61+
Delete as DeleteIcon,
62+
ArrowDownward,
63+
ArrowUpward,
64+
} from '@mui/icons-material';
6365

6466
import { WithDeleteDialogSupport } from './DeleteDialog';
6567
import NoBorderTableCell from './NoBorderTableCell';

packages/material-renderers/src/complex/TableToolbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import {
3030
ArrayTranslations,
3131
} from '@jsonforms/core';
3232
import { IconButton, TableRow, Tooltip, Grid, Typography } from '@mui/material';
33-
import AddIcon from '@mui/icons-material/Add';
33+
import { Add as AddIcon } from '@mui/icons-material';
3434
import ValidationIcon from './ValidationIcon';
3535
import NoBorderTableCell from './NoBorderTableCell';
3636

packages/material-renderers/src/complex/ValidationIcon.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
import React from 'react';
2626

27-
import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline';
27+
import { ErrorOutline as ErrorOutlineIcon } from '@mui/icons-material';
2828
import { Badge, Tooltip, styled } from '@mui/material';
2929

3030
const StyledBadge = styled(Badge)(({ theme }: any) => ({

packages/material-renderers/src/layouts/ArrayToolbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Grid, IconButton, Toolbar, Tooltip, Typography } from '@mui/material';
2-
import AddIcon from '@mui/icons-material/Add';
2+
import { Add as AddIcon } from '@mui/icons-material';
33
import React from 'react';
44
import ValidationIcon from '../complex/ValidationIcon';
55
import { ArrayTranslations } from '@jsonforms/core';

packages/material-renderers/src/layouts/ExpandPanelRenderer.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@ import {
4040
Grid,
4141
IconButton,
4242
} from '@mui/material';
43-
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
44-
import DeleteIcon from '@mui/icons-material/Delete';
45-
import ArrowUpward from '@mui/icons-material/ArrowUpward';
46-
import ArrowDownward from '@mui/icons-material/ArrowDownward';
43+
import {
44+
ExpandMore as ExpandMoreIcon,
45+
Delete as DeleteIcon,
46+
ArrowUpward,
47+
ArrowDownward,
48+
} from '@mui/icons-material';
4749

4850
const iconStyle: any = { float: 'right' };
4951

0 commit comments

Comments
 (0)