Skip to content

Commit 813814e

Browse files
izaeraizaera
committed
WIP
1 parent c974b82 commit 813814e

File tree

9 files changed

+30
-25
lines changed

9 files changed

+30
-25
lines changed

‎modules/apps/frontend-editor/frontend-editor-ckeditor-sample-web/src/main/resources/META-INF/resources/js/CKEditor5ReactClassicEditor.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
44
*/
55

6-
import {Bookmark, Underline} from 'ckeditor5';
6+
import {Bookmark} from '@ckeditor/ckeditor5-bookmark/dist/index.js';
7+
import {Underline} from '@ckeditor/ckeditor5-basic-styles/dist/index.js';
78
import {SourceEditingEnhanced} from '@ckeditor/ckeditor5-source-editing-enhanced/dist/index.js';
89
import {
910
CKEditor5ClassicEditor as ClassicEditor,

‎modules/apps/frontend-editor/frontend-editor-ckeditor-web/node-scripts.config.js‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,25 @@ module.exports = {
99
'./src/main/resources/META-INF/resources/js/ckeditor5/icons.ts',
1010
},
1111
exports: [
12-
'@ckeditor/ckeditor5-react',
1312

14-
'@ckeditor/ckeditor5-source-editing-enhanced/dist/index.js',
13+
TODO: let rename @ckeditor/ckeditor5-adapter-ckfinder/dist/index.js to @ckeditor/ckeditor5-adapter-ckfinder in node-scripts
1514

1615
'@ckeditor/ckeditor5-adapter-ckfinder/dist/index.js',
1716
'@ckeditor/ckeditor5-alignment/dist/index.js',
1817
'@ckeditor/ckeditor5-autoformat/dist/index.js',
1918
'@ckeditor/ckeditor5-autosave/dist/index.js',
20-
'@ckeditor/ckeditor5-basic-styles/dist/index.js',
19+
'@ckeditor/ckeditor5-basic-styles/dist/index.js',
2120
'@ckeditor/ckeditor5-block-quote/dist/index.js',
22-
'@ckeditor/ckeditor5-bookmark/dist/index.js',
21+
'@ckeditor/ckeditor5-bookmark/dist/index.js',
2322
'@ckeditor/ckeditor5-ckbox/dist/index.js',
2423
'@ckeditor/ckeditor5-ckfinder/dist/index.js',
2524
'@ckeditor/ckeditor5-clipboard/dist/index.js',
2625
'@ckeditor/ckeditor5-cloud-services/dist/index.js',
2726
'@ckeditor/ckeditor5-code-block/dist/index.js',
28-
'@ckeditor/ckeditor5-core/dist/index.js',
27+
'@ckeditor/ckeditor5-core/dist/index.js',
2928
'@ckeditor/ckeditor5-easy-image/dist/index.js',
30-
'@ckeditor/ckeditor5-editor-balloon/dist/index.js',
31-
'@ckeditor/ckeditor5-editor-classic/dist/index.js',
29+
'@ckeditor/ckeditor5-editor-balloon/dist/index.js',
30+
'@ckeditor/ckeditor5-editor-classic/dist/index.js',
3231
'@ckeditor/ckeditor5-editor-decoupled/dist/index.js',
3332
'@ckeditor/ckeditor5-editor-inline/dist/index.js',
3433
'@ckeditor/ckeditor5-editor-multi-root/dist/index.js',
@@ -44,7 +43,7 @@ module.exports = {
4443
'@ckeditor/ckeditor5-horizontal-line/dist/index.js',
4544
'@ckeditor/ckeditor5-html-embed/dist/index.js',
4645
'@ckeditor/ckeditor5-html-support/dist/index.js',
47-
'@ckeditor/ckeditor5-icons/dist/index.js',
46+
'@ckeditor/ckeditor5-icons/dist/index.js',
4847
'@ckeditor/ckeditor5-image/dist/index.js',
4948
'@ckeditor/ckeditor5-indent/dist/index.js',
5049
'@ckeditor/ckeditor5-language/dist/index.js',
@@ -57,24 +56,24 @@ module.exports = {
5756
'@ckeditor/ckeditor5-page-break/dist/index.js',
5857
'@ckeditor/ckeditor5-paragraph/dist/index.js',
5958
'@ckeditor/ckeditor5-paste-from-office/dist/index.js',
59+
'@ckeditor/ckeditor5-react',
6060
'@ckeditor/ckeditor5-remove-format/dist/index.js',
6161
'@ckeditor/ckeditor5-restricted-editing/dist/index.js',
6262
'@ckeditor/ckeditor5-select-all/dist/index.js',
6363
'@ckeditor/ckeditor5-show-blocks/dist/index.js',
6464
'@ckeditor/ckeditor5-source-editing/dist/index.js',
65+
'@ckeditor/ckeditor5-source-editing-enhanced/dist/index.js',
6566
'@ckeditor/ckeditor5-special-characters/dist/index.js',
6667
'@ckeditor/ckeditor5-style/dist/index.js',
6768
'@ckeditor/ckeditor5-table/dist/index.js',
68-
'@ckeditor/ckeditor5-typing/dist/index.js',
69-
'@ckeditor/ckeditor5-ui/dist/index.js',
69+
'@ckeditor/ckeditor5-typing/dist/index.js',
70+
'@ckeditor/ckeditor5-ui/dist/index.js',
7071
'@ckeditor/ckeditor5-undo/dist/index.js',
7172
'@ckeditor/ckeditor5-upload/dist/index.js',
72-
'@ckeditor/ckeditor5-utils/dist/index.js',
73+
'@ckeditor/ckeditor5-utils/dist/index.js',
7374
'@ckeditor/ckeditor5-watchdog/dist/index.js',
74-
'@ckeditor/ckeditor5-widget/dist/index.js',
75+
'@ckeditor/ckeditor5-widget/dist/index.js',
7576
'@ckeditor/ckeditor5-word-count/dist/index.js',
76-
77-
'ckeditor5',
7877
'ckeditor5/ckeditor5.css',
7978
],
8079
main: './src/main/resources/META-INF/resources/js/index.ts',

‎modules/apps/frontend-editor/frontend-editor-ckeditor-web/package.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"dependencies": {
3-
"@ckeditor/ckeditor5-react": "9.3.1",
4-
"@ckeditor/ckeditor5-source-editing-enhanced": "46.0.2",
5-
63
"@ckeditor/ckeditor5-adapter-ckfinder": "46.0.2",
74
"@ckeditor/ckeditor5-alignment": "46.0.2",
85
"@ckeditor/ckeditor5-autoformat": "46.0.2",
@@ -47,11 +44,13 @@
4744
"@ckeditor/ckeditor5-page-break": "46.0.2",
4845
"@ckeditor/ckeditor5-paragraph": "46.0.2",
4946
"@ckeditor/ckeditor5-paste-from-office": "46.0.2",
47+
"@ckeditor/ckeditor5-react": "9.3.1",
5048
"@ckeditor/ckeditor5-remove-format": "46.0.2",
5149
"@ckeditor/ckeditor5-restricted-editing": "46.0.2",
5250
"@ckeditor/ckeditor5-select-all": "46.0.2",
5351
"@ckeditor/ckeditor5-show-blocks": "46.0.2",
5452
"@ckeditor/ckeditor5-source-editing": "46.0.2",
53+
"@ckeditor/ckeditor5-source-editing-enhanced": "46.0.2",
5554
"@ckeditor/ckeditor5-special-characters": "46.0.2",
5655
"@ckeditor/ckeditor5-style": "46.0.2",
5756
"@ckeditor/ckeditor5-table": "46.0.2",
@@ -63,7 +62,6 @@
6362
"@ckeditor/ckeditor5-watchdog": "46.0.2",
6463
"@ckeditor/ckeditor5-widget": "46.0.2",
6564
"@ckeditor/ckeditor5-word-count": "46.0.2",
66-
6765
"@clayui/loading-indicator": "3.144.1",
6866
"@liferay/cookies-banner-web": "*",
6967
"@liferay/frontend-data-set-web": "*",

‎modules/apps/frontend-editor/frontend-editor-ckeditor-web/src/main/resources/META-INF/resources/js/ckeditor5/BalloonEditor.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
44
*/
55

6-
import {BalloonEditor as BaseBalloonEditor, EventInfo} from 'ckeditor5';
6+
import {BalloonEditor as BaseBalloonEditor} from '@ckeditor/ckeditor5-editor-balloon/dist/index.js';
7+
import {EventInfo} from '@ckeditor/ckeditor5-utils/dist/index.js';
78
import React from 'react';
89

910
import BaseEditor from './BaseEditor';

‎modules/apps/frontend-editor/frontend-editor-ckeditor-web/src/main/resources/META-INF/resources/js/ckeditor5/BaseEditor.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
44
*/
55

6-
import {EventInfo} from 'ckeditor5';
6+
import {EventInfo} from '@ckeditor/ckeditor5-utils/dist/index.js';
77
import {loadEditorClientExtensions} from 'frontend-js-web';
88
import React, {useEffect, useRef, useState} from 'react';
99

‎modules/apps/frontend-editor/frontend-editor-ckeditor-web/src/main/resources/META-INF/resources/js/ckeditor5/ClassicEditor.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
44
*/
55

6-
import {ClassicEditor as BaseClassicEditor, EventInfo} from 'ckeditor5';
6+
import {ClassicEditor as BaseClassicEditor} from '@ckeditor/ckeditor5-editor-classic/dist/index.js';
7+
import {EventInfo} from '@ckeditor/ckeditor5-utils/dist/index.js';
78
import React from 'react';
89

910
import BaseEditor from './BaseEditor';

‎modules/apps/frontend-editor/frontend-editor-ckeditor-web/src/main/resources/META-INF/resources/js/ckeditor5/plugins/AICreator.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
44
*/
55

6-
import {ButtonView, Command, Config, Plugin} from 'ckeditor5';
6+
import {Command, Plugin} from '@ckeditor/ckeditor5-core/dist/index.js';
7+
import {ButtonView} from '@ckeditor/ckeditor5-ui/dist/index.js';
8+
import {Config} from '@ckeditor/ckeditor5-utils/dist/index.js';
79
import {openModal} from 'frontend-js-components-web';
810

911
import getIcon from '../utils/getIcon';

‎modules/apps/frontend-editor/frontend-editor-ckeditor-web/src/main/resources/META-INF/resources/js/ckeditor5/plugins/HeadlessItemSelector.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
44
*/
55

6+
import {Command, Plugin} from '@ckeditor/ckeditor5-core/dist/index.js';
7+
import {ButtonView} from '@ckeditor/ckeditor5-ui/dist/index.js';
68
import {IFrontendDataSetProps} from '@liferay/frontend-data-set-web';
79
import {openItemSelectorModal} from '@liferay/frontend-js-item-selector-web';
8-
import {ButtonView, Command, Plugin} from 'ckeditor5';
910

1011
import getIcon from '../utils/getIcon';
1112

‎modules/apps/frontend-editor/frontend-editor-ckeditor-web/src/main/resources/META-INF/resources/js/ckeditor5/plugins/ItemSelector.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
44
*/
55

6-
import {ButtonView, Command, Config, Plugin} from 'ckeditor5';
6+
import {Command, Plugin} from '@ckeditor/ckeditor5-core/dist/index.js';
7+
import {ButtonView} from '@ckeditor/ckeditor5-ui/dist/index.js';
8+
import {Config} from '@ckeditor/ckeditor5-utils/dist/index.js';
79
import {openSelectionModal} from 'frontend-js-components-web';
810

911
import getIcon from '../utils/getIcon';

0 commit comments

Comments
 (0)