Skip to content

Commit c8d3ecf

Browse files
lucas-koehlerlucas-koehler
committed
dev: typescript 4.9.5, TS target ES2021, TS module ES2020, typedoc ~0.25.3
- Upgrade all packages to use typescript `~4.9.5` - Update typedoc version to `~0.25.3` and remove custom typedoc theme - Adapt @mui/icons-material imports in material-renderers to work with later typescript versions. The used imports broke starting with 4.2.4 - Fix typescript target from ESNext to ES2021 because - Fix typescript module from ESNext to ES2020 Remove ESNext from typescript configurations because it leads to changes in output when updating the typescript version. For `target` ESNext is explicitly discouraged in the typescript docs.
1 parent b00754c commit c8d3ecf

20 files changed

+171
-397
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"ts-loader": "^6.2.1",
4747
"ts-node": "^10.4.0",
4848
"tslib": "^2.5.0",
49-
"typescript": "4.2.3",
49+
"typescript": "~4.9.5",
5050
"webpack": "^4.41.2",
5151
"webpack-merge": "^4.2.2"
5252
},

‎packages/core/package.json

+3-3
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

+3-3
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

+3-3
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

+1-1
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

+5-3
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

+1-1
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

+1-1
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

+1-1
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

+6-4
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

‎packages/material-renderers/src/mui-controls/MuiInputText.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
useTheme,
3333
} from '@mui/material';
3434
import merge from 'lodash/merge';
35-
import Close from '@mui/icons-material/Close';
35+
import { Close } from '@mui/icons-material';
3636
import {
3737
JsonFormsTheme,
3838
WithInputProps,

‎packages/react/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
"rollup-plugin-visualizer": "^5.4.1",
127127
"ts-jest": "^27.1.4",
128128
"tslib": "^2.5.0",
129-
"typedoc": "~0.21.9",
130-
"typescript": "4.2.3"
129+
"typedoc": "~0.25.3",
130+
"typescript": "~4.9.5"
131131
}
132132
}

‎packages/vanilla-renderers/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"report": "nyc report --reporter=html",
2020
"test": "jest --no-cache",
2121
"test-cov": "jest --no-cache --coverage",
22-
"doc": "typedoc --name 'JSON Forms Vanilla Renderers' --excludeExternals --theme ../../typedoc-jsonforms --out docs src"
22+
"doc": "typedoc --name 'JSON Forms Vanilla Renderers' --excludeExternals --out docs src"
2323
},
2424
"files": [
2525
"lib",
@@ -91,7 +91,7 @@
9191
"ts-loader": "^6.2.1",
9292
"ts-node": "^10.4.0",
9393
"tslib": "^2.5.0",
94-
"typedoc": "~0.21.9",
94+
"typedoc": "~0.25.3",
9595
"webpack": "^4.41.2",
9696
"webpack-cli": "^3.2.1",
9797
"webpack-dev-server": "^3.9.0"

‎packages/vue-vanilla/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
"rollup-plugin-vue": "^6.0.0",
8989
"symlink-dir": "^5.0.0",
9090
"tslib": "^2.5.0",
91-
"typedoc": "~0.21.9",
92-
"typescript": "4.2.3",
91+
"typedoc": "~0.25.3",
92+
"typescript": "~4.9.5",
9393
"vue": "^3.2.26",
9494
"vue-jest": "^5.0.0-0"
9595
},

‎packages/vue-vanilla/tsconfig.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
3-
"target": "esnext",
4-
"module": "esnext",
3+
"target": "ES2021",
4+
"module": "ES2020",
55
"skipLibCheck": true,
66
"strict": true,
77
"declaration": true,
@@ -14,7 +14,7 @@
1414
"sourceMap": true,
1515
"outDir": "./lib",
1616
"types": ["node", "vue", "mocha", "chai"],
17-
"lib": ["esnext", "dom", "dom.iterable", "scripthost"]
17+
"lib": ["ES2021", "dom", "dom.iterable", "scripthost"]
1818
},
1919
"exclude": ["node_modules", "lib"]
2020
}

‎packages/vue/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
"rollup-plugin-vue": "^6.0.0",
8282
"ts-jest": "^27.1.5",
8383
"tslib": "^2.5.0",
84-
"typedoc": "~0.21.9",
85-
"typescript": "4.2.3",
84+
"typedoc": "~0.25.3",
85+
"typescript": "~4.9.5",
8686
"vue": "^3.2.26"
8787
},
8888
"peerDependencies": {

‎packages/vue/tsconfig.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
3-
"target": "esnext",
4-
"module": "esnext",
3+
"target": "ES2021",
4+
"module": "ES2020",
55
"skipLibCheck": true,
66
"strict": true,
77
"declaration": true,
@@ -14,7 +14,7 @@
1414
"sourceMap": true,
1515
"outDir": "./lib",
1616
"types": ["node", "vue", "jest"],
17-
"lib": ["esnext", "dom", "dom.iterable", "scripthost"]
17+
"lib": ["ES2021", "dom", "dom.iterable", "scripthost"]
1818
},
1919
"exclude": ["node_modules", "lib"]
2020
}

0 commit comments

Comments
 (0)