Skip to content

Commit 807c993

Browse files
authored
INT-3337: Updated Dependencies (#579)
* INT-3337: Bump `babel` minors * INT-3337: Bump `gh-pages` minor * INT-3337: Bump `vite` major * INT-3337: Bump `node` types majors * INT-3337: Bump `tinymce` minor * INT-3337: Bump `typescript` minor * INT-3337: Clean up lockfile structure * INT-3337: Bump `agar` and `eslint-plugin` to latest * INT-3337: Bump `bedrock` major
1 parent 650e3a5 commit 807c993

File tree

5 files changed

+1621
-1608
lines changed

5 files changed

+1621
-1608
lines changed

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
}
4040
},
4141
"devDependencies": {
42-
"@babel/core": "^7.24.9",
43-
"@babel/preset-env": "^7.24.8",
44-
"@babel/preset-react": "^7.24.7",
45-
"@babel/preset-typescript": "^7.24.7",
46-
"@ephox/agar": "^8.0.0-alpha.0",
47-
"@ephox/bedrock-client": "^14.1.1",
48-
"@ephox/bedrock-server": "^14.1.4",
42+
"@babel/core": "^7.26.9",
43+
"@babel/preset-env": "^7.26.9",
44+
"@babel/preset-react": "^7.26.3",
45+
"@babel/preset-typescript": "^7.26.0",
46+
"@ephox/agar": "^8.0.1",
47+
"@ephox/bedrock-client": "^15.0.0",
48+
"@ephox/bedrock-server": "^15.0.3-alpha.0",
4949
"@ephox/katamari": "^9.1.5",
5050
"@ephox/mcagar": "^9.0.0-alpha.0",
5151
"@ephox/sand": "^6.0.9",
@@ -57,24 +57,24 @@
5757
"@storybook/react": "^8.2.4",
5858
"@storybook/react-vite": "^8.2.4",
5959
"@tinymce/beehive-flow": "^0.19.0",
60-
"@tinymce/eslint-plugin": "^2.3.1",
60+
"@tinymce/eslint-plugin": "^2.4.0",
6161
"@tinymce/miniature": "^6.0.0",
62-
"@types/node": "^20.14.10",
62+
"@types/node": "^22.13.10",
6363
"@types/prop-types": "^15.7.12",
6464
"@types/react": "^18.3.3",
6565
"@types/react-dom": "^18.3.0",
66-
"gh-pages": "^6.1.0",
66+
"gh-pages": "^6.3.0",
6767
"react": "^18.3.1",
6868
"react-dom": "^18.3.1",
6969
"rimraf": "^6.0.1",
7070
"storybook": "^8.2.4",
71-
"tinymce": "^7.2.1",
71+
"tinymce": "^7.7.1",
7272
"tinymce-4": "npm:tinymce@^4",
7373
"tinymce-5": "npm:tinymce@^5",
7474
"tinymce-6": "npm:tinymce@^6",
7575
"tinymce-7": "npm:tinymce@^7",
76-
"typescript": "~5.5.3",
77-
"vite": "^5.3.3"
76+
"typescript": "~5.8.2",
77+
"vite": "^6.2.1"
7878
},
7979
"version": "6.0.1-rc",
8080
"name": "@tinymce/tinymce-react"

src/main/ts/components/Editor.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ export class Editor extends React.Component<IAllProps> {
190190
// getBookmark throws exceptions when the editor has not been focused
191191
// possibly only in inline mode but I'm not taking chances
192192
cursor = localEditor.selection.getBookmark(3);
193-
} catch (e) { /* ignore */ }
193+
} catch (_e) { /* ignore */ }
194194
}
195195
const valueCursor = this.valueCursor;
196196
localEditor.setContent(this.props.value as string);
@@ -201,7 +201,7 @@ export class Editor extends React.Component<IAllProps> {
201201
localEditor.selection.moveToBookmark(bookmark);
202202
this.valueCursor = bookmark;
203203
break;
204-
} catch (e) { /* ignore */ }
204+
} catch (_e) { /* ignore */ }
205205
}
206206
}
207207
}
@@ -361,7 +361,7 @@ export class Editor extends React.Component<IAllProps> {
361361
if (this.valueCursor && (!this.inline || editor.hasFocus())) {
362362
try {
363363
editor.selection.moveToBookmark(this.valueCursor);
364-
} catch (e) { /* ignore */ }
364+
} catch (_e) { /* ignore */ }
365365
}
366366
});
367367
}
@@ -375,7 +375,7 @@ export class Editor extends React.Component<IAllProps> {
375375
// getBookmark throws exceptions when the editor has not been focused
376376
// possibly only in inline mode but I'm not taking chances
377377
this.valueCursor = this.editor.selection.getBookmark(3);
378-
} catch (e) { /* ignore */ }
378+
} catch (_e) { /* ignore */ }
379379
}
380380
}
381381
};
@@ -498,6 +498,7 @@ export class Editor extends React.Component<IAllProps> {
498498
target.value = this.getInitialValue();
499499
}
500500

501+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
501502
tinymce.init(finalInit);
502503
};
503504
}

src/test/ts/alien/Loader.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Fun, Optional } from '@ephox/katamari';
2-
import { SugarElement, SugarNode } from '@ephox/sugar';
2+
import { Remove, SugarElement, SugarNode } from '@ephox/sugar';
33
import * as React from 'react';
44
import * as ReactDOM from 'react-dom';
55
import { Editor, IAllProps, IProps, Version } from '../../../main/ts/components/Editor';
@@ -72,6 +72,7 @@ export const render = async (props: Partial<IAllProps> = {}, container: HTMLElem
7272

7373
const remove = () => {
7474
ReactDOM.unmountComponentAtNode(container);
75+
Remove.remove(SugarElement.fromDom(container));
7576
};
7677

7778
return {

src/test/ts/browser/EditorInitTest.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ describe('EditorInitTest', () => {
6565
it('Value prop should propagate changes to editor', async () => {
6666
using ctx = await render({ value: '<p>Initial Value</p>' });
6767
TinyAssertions.assertContent(ctx.editor, '<p>Initial Value</p>');
68-
ctx.reRender({ ...defaultProps, value: '<p>New Value</p>' });
68+
await ctx.reRender({ ...defaultProps, value: '<p>New Value</p>' });
6969
TinyAssertions.assertContent(ctx.editor, '<p>New Value</p>');
7070
});
7171

7272
it('Disabled prop should disable editor', async () => {
7373
using ctx = await render();
7474
Assertions.assertEq('Should be design mode', true, '4' === version ? !ctx.editor.readonly : ctx.editor.mode.get() === 'design');
75-
ctx.reRender({ ...defaultProps, disabled: true });
75+
await ctx.reRender({ ...defaultProps, disabled: true });
7676
Assertions.assertEq('Should be readonly mode', true, '4' === version ? ctx.editor.readonly : ctx.editor.mode.get() === 'readonly');
7777
});
7878

0 commit comments

Comments
 (0)