From 406a1496db5a4b4d773902a66586caeaebdeb773 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 2 Aug 2023 11:24:54 +0100 Subject: [PATCH] Update buildTools (major) (#8597) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Laurent Cozic --- packages/app-desktop/gui/ErrorBoundary.tsx | 1 + .../NoteBody/CodeMirror/CodeMirror.tsx | 2 +- .../CodeMirror/utils/useScrollHandler.ts | 2 +- .../app-desktop/gui/NoteEditor/NoteEditor.tsx | 4 +- packages/app-desktop/gui/NoteListItem.tsx | 4 +- packages/app-desktop/package.json | 2 +- packages/generate-plugin-doc/package.json | 2 +- packages/lib/package.json | 4 +- packages/pdf-viewer/package.json | 2 +- yarn.lock | 94 ++++++++----------- 10 files changed, 50 insertions(+), 67 deletions(-) diff --git a/packages/app-desktop/gui/ErrorBoundary.tsx b/packages/app-desktop/gui/ErrorBoundary.tsx index 53af7ff1d..a625f4fe9 100644 --- a/packages/app-desktop/gui/ErrorBoundary.tsx +++ b/packages/app-desktop/gui/ErrorBoundary.tsx @@ -26,6 +26,7 @@ interface State { interface Props { message?: string; + children: any; } export default class ErrorBoundary extends React.Component { diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx index 21b58c0cc..a3a0cd24c 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx @@ -99,7 +99,7 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) { } }, []); - const addListItem = useCallback((string1, defaultText = '') => { + const addListItem = useCallback((string1: string, defaultText = '') => { if (editorRef.current) { if (editorRef.current.somethingSelected()) { editorRef.current.wrapSelectionsByLine(string1); diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.ts b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.ts index 93fe2c2d1..1a1443502 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.ts +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.ts @@ -141,7 +141,7 @@ export default function useScrollHandler(editorRef: any, webviewRef: any, onScro // eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied }, []); - const editor_resize = useCallback((cm) => { + const editor_resize = useCallback((cm: any) => { if (isCodeMirrorReady(cm)) { // This handler is called when resized and refreshed. // Only when resized, the scroll position is restored. diff --git a/packages/app-desktop/gui/NoteEditor/NoteEditor.tsx b/packages/app-desktop/gui/NoteEditor/NoteEditor.tsx index ed4385512..b3a41efb3 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteEditor.tsx +++ b/packages/app-desktop/gui/NoteEditor/NoteEditor.tsx @@ -324,7 +324,7 @@ function NoteEditor(props: NoteEditorProps) { const onMessage = useMessageHandler(scrollWhenReady, setScrollWhenReady, editorRef, setLocalSearchResultCount, props.dispatch, formNote); - const externalEditWatcher_noteChange = useCallback((event) => { + const externalEditWatcher_noteChange = useCallback((event: any) => { if (event.id === formNote.id) { const newFormNote = { ...formNote, @@ -337,7 +337,7 @@ function NoteEditor(props: NoteEditorProps) { // eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied }, [formNote]); - const onNotePropertyChange = useCallback((event) => { + const onNotePropertyChange = useCallback((event: any) => { setFormNote(formNote => { if (formNote.id !== event.note.id) return formNote; diff --git a/packages/app-desktop/gui/NoteListItem.tsx b/packages/app-desktop/gui/NoteListItem.tsx index b320e5422..05003d577 100644 --- a/packages/app-desktop/gui/NoteListItem.tsx +++ b/packages/app-desktop/gui/NoteListItem.tsx @@ -84,11 +84,11 @@ function NoteListItem(props: NoteListItemProps, ref: any) { dragItemPosition = 'bottom'; } - const onTitleClick = useCallback((event) => { + const onTitleClick = useCallback((event: any) => { props.onTitleClick(event, props.item); }, [props.onTitleClick, props.item]); - const onCheckboxClick = useCallback((event) => { + const onCheckboxClick = useCallback((event: any) => { props.onCheckboxClick(event, props.item); }, [props.onCheckboxClick, props.item]); diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json index 40ffcea6e..11ce37216 100644 --- a/packages/app-desktop/package.json +++ b/packages/app-desktop/package.json @@ -112,7 +112,7 @@ "@testing-library/react-hooks": "8.0.1", "@types/jest": "29.5.3", "@types/node": "18.16.18", - "@types/react": "16.14.43", + "@types/react": "18.0.24", "@types/react-redux": "7.1.25", "@types/styled-components": "5.1.26", "electron": "25.3.1", diff --git a/packages/generate-plugin-doc/package.json b/packages/generate-plugin-doc/package.json index c61382e2f..29f414155 100644 --- a/packages/generate-plugin-doc/package.json +++ b/packages/generate-plugin-doc/package.json @@ -6,6 +6,6 @@ }, "dependencies": { "typedoc": "0.17.8", - "typescript": "4.9.5" + "typescript": "5.0.4" } } diff --git a/packages/lib/package.json b/packages/lib/package.json index 5c783b3fd..ba327e696 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -21,8 +21,8 @@ "@types/js-yaml": "4.0.5", "@types/node": "18.16.18", "@types/node-rsa": "1.1.1", - "@types/react": "17.0.62", - "@types/uuid": "^9.0.0", + "@types/react": "18.0.24", + "@types/uuid": "9.0.2", "clean-html": "1.5.0", "jest": "29.5.0", "sharp": "0.32.2", diff --git a/packages/pdf-viewer/package.json b/packages/pdf-viewer/package.json index 8e0bf3780..f88db9a09 100644 --- a/packages/pdf-viewer/package.json +++ b/packages/pdf-viewer/package.json @@ -21,7 +21,7 @@ "devDependencies": { "@types/jest": "29.5.3", "@types/pdfjs-dist": "2.10.378", - "@types/react": "16.14.43", + "@types/react": "18.2.6", "@types/react-dom": "18.2.6", "@types/styled-components": "5.1.26", "babel-jest": "29.5.0", diff --git a/yarn.lock b/yarn.lock index 37cc176bf..18b9ab2fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4436,7 +4436,7 @@ __metadata: "@testing-library/react-hooks": 8.0.1 "@types/jest": 29.5.3 "@types/node": 18.16.18 - "@types/react": 16.14.43 + "@types/react": 18.0.24 "@types/react-redux": 7.1.25 "@types/styled-components": 5.1.26 async-mutex: 0.4.0 @@ -4688,8 +4688,8 @@ __metadata: "@types/nanoid": 3.0.0 "@types/node": 18.16.18 "@types/node-rsa": 1.1.1 - "@types/react": 17.0.62 - "@types/uuid": ^9.0.0 + "@types/react": 18.0.24 + "@types/uuid": 9.0.2 async-mutex: 0.4.0 base-64: 1.0.0 base64-stream: 1.0.0 @@ -4760,7 +4760,7 @@ __metadata: "@joplin/lib": ~2.12 "@types/jest": 29.5.3 "@types/pdfjs-dist": 2.10.378 - "@types/react": 16.14.43 + "@types/react": 18.2.6 "@types/react-dom": 18.2.6 "@types/styled-components": 5.1.26 async-mutex: 0.4.0 @@ -8010,28 +8010,6 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:16.14.43": - version: 16.14.43 - resolution: "@types/react@npm:16.14.43" - dependencies: - "@types/prop-types": "*" - "@types/scheduler": "*" - csstype: ^3.0.2 - checksum: 10ce3f8b80eadd66178a53845bddf264fa109fcfe0a615a0dce7e027dc426768573e87aee3eba7c53a2a867e159bba928bd86cac92ba93c5bd0152a63a49ccad - languageName: node - linkType: hard - -"@types/react@npm:17.0.62": - version: 17.0.62 - resolution: "@types/react@npm:17.0.62" - dependencies: - "@types/prop-types": "*" - "@types/scheduler": "*" - csstype: ^3.0.2 - checksum: 428a5aff44824ef504e9a9259b5894fe44a5db1c344b536990f07e132900ff5b34cbef0be77a84f30f37be1f88fc8b56dce328f568de8d65de3bfe414c05b2e1 - languageName: node - linkType: hard - "@types/react@npm:18.0.24": version: 18.0.24 resolution: "@types/react@npm:18.0.24" @@ -8043,6 +8021,17 @@ __metadata: languageName: node linkType: hard +"@types/react@npm:18.2.6": + version: 18.2.6 + resolution: "@types/react@npm:18.2.6" + dependencies: + "@types/prop-types": "*" + "@types/scheduler": "*" + csstype: ^3.0.2 + checksum: dea9d232d8df7ac357367a69dcb557711ab3d5501807ffa77cebeee73d49ee94d095f298e36853c63ed47cce097eee4c7eae2aaa8c02fac3f0171ec1b523a819 + languageName: node + linkType: hard + "@types/react@npm:^17.0.52": version: 17.0.52 resolution: "@types/react@npm:17.0.52" @@ -8142,13 +8131,6 @@ __metadata: languageName: node linkType: hard -"@types/uuid@npm:^9.0.0": - version: 9.0.0 - resolution: "@types/uuid@npm:9.0.0" - checksum: 59ae56d9547c8758588659da2a2b4c97cce79c2aae1798c892bb29452ef08e87859dea2ec3a66bfa88d0d2153147520be2b1893be920f9f0bc9c53a3207ea6aa - languageName: node - linkType: hard - "@types/verror@npm:^1.10.3": version: 1.10.6 resolution: "@types/verror@npm:1.10.6" @@ -17404,7 +17386,7 @@ __metadata: resolution: "generate-plugin-doc@workspace:packages/generate-plugin-doc" dependencies: typedoc: 0.17.8 - typescript: 4.9.5 + typescript: 5.0.4 languageName: unknown linkType: soft @@ -32869,7 +32851,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:4 - 5": +"typescript@npm:4 - 5, typescript@npm:5.0.4": version: 5.0.4 resolution: "typescript@npm:5.0.4" bin: @@ -32879,16 +32861,6 @@ __metadata: languageName: node linkType: hard -"typescript@npm:4.9.5, typescript@npm:^4.0.0, typescript@npm:^4.0.2, typescript@npm:^4.5.5": - version: 4.9.5 - resolution: "typescript@npm:4.9.5" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db - languageName: node - linkType: hard - "typescript@npm:5.1.3": version: 5.1.3 resolution: "typescript@npm:5.1.3" @@ -32909,7 +32881,17 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@4 - 5#~builtin": +"typescript@npm:^4.0.0, typescript@npm:^4.0.2, typescript@npm:^4.5.5": + version: 4.9.5 + resolution: "typescript@npm:4.9.5" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db + languageName: node + linkType: hard + +"typescript@patch:typescript@4 - 5#~builtin, typescript@patch:typescript@5.0.4#~builtin": version: 5.0.4 resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin::version=5.0.4&hash=ad5954" bin: @@ -32919,16 +32901,6 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@4.9.5#~builtin, typescript@patch:typescript@^4.0.0#~builtin, typescript@patch:typescript@^4.0.2#~builtin, typescript@patch:typescript@^4.5.5#~builtin": - version: 4.9.5 - resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin::version=4.9.5&hash=ad5954" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 8f6260acc86b56bfdda6004bc53f32ea548f543e8baef7071c8e34d29d292f3e375c8416556c8de10b24deef6933cd1c16a8233dc84a3dd43a13a13265d0faab - languageName: node - linkType: hard - "typescript@patch:typescript@5.1.3#~builtin": version: 5.1.3 resolution: "typescript@patch:typescript@npm%3A5.1.3#~builtin::version=5.1.3&hash=ad5954" @@ -32949,6 +32921,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@^4.0.0#~builtin, typescript@patch:typescript@^4.0.2#~builtin, typescript@patch:typescript@^4.5.5#~builtin": + version: 4.9.5 + resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin::version=4.9.5&hash=ad5954" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 8f6260acc86b56bfdda6004bc53f32ea548f543e8baef7071c8e34d29d292f3e375c8416556c8de10b24deef6933cd1c16a8233dc84a3dd43a13a13265d0faab + languageName: node + linkType: hard + "typical@npm:^2.6.1": version: 2.6.1 resolution: "typical@npm:2.6.1"