diff --git a/packages/ckeditor5-build-balloon-block/src/ckeditor.ts b/packages/ckeditor5-build-balloon-block/src/ckeditor.ts index 2696a33c56e..c3a7c18cade 100644 --- a/packages/ckeditor5-build-balloon-block/src/ckeditor.ts +++ b/packages/ckeditor5-build-balloon-block/src/ckeditor.ts @@ -16,18 +16,13 @@ import { CKBox } from '@ckeditor/ckeditor5-ckbox'; import { CKFinder } from '@ckeditor/ckeditor5-ckfinder'; import { EasyImage } from '@ckeditor/ckeditor5-easy-image'; import { Heading } from '@ckeditor/ckeditor5-heading'; -import Image from '@ckeditor/ckeditor5-image/src/image'; -import ImageCaption from '@ckeditor/ckeditor5-image/src/imagecaption'; -import ImageStyle from '@ckeditor/ckeditor5-image/src/imagestyle'; -import ImageToolbar from '@ckeditor/ckeditor5-image/src/imagetoolbar'; -import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload'; +import { Image, ImageCaption, ImageStyle, ImageToolbar, ImageUpload, PictureEditing } from '@ckeditor/ckeditor5-image'; import Indent from '@ckeditor/ckeditor5-indent/src/indent'; import Link from '@ckeditor/ckeditor5-link/src/link'; import List from '@ckeditor/ckeditor5-list/src/list'; import MediaEmbed from '@ckeditor/ckeditor5-media-embed/src/mediaembed'; import { Paragraph } from '@ckeditor/ckeditor5-paragraph'; import PasteFromOffice from '@ckeditor/ckeditor5-paste-from-office/src/pastefromoffice'; -import PictureEditing from '@ckeditor/ckeditor5-image/src/pictureediting'; import { Table, TableToolbar } from '@ckeditor/ckeditor5-table'; import { TextTransformation } from '@ckeditor/ckeditor5-typing'; import { CloudServices } from '@ckeditor/ckeditor5-cloud-services'; diff --git a/packages/ckeditor5-build-balloon/src/ckeditor.ts b/packages/ckeditor5-build-balloon/src/ckeditor.ts index e6c6957c030..ef214d4119a 100644 --- a/packages/ckeditor5-build-balloon/src/ckeditor.ts +++ b/packages/ckeditor5-build-balloon/src/ckeditor.ts @@ -15,18 +15,13 @@ import { CKBox } from '@ckeditor/ckeditor5-ckbox'; import { CKFinder } from '@ckeditor/ckeditor5-ckfinder'; import { EasyImage } from '@ckeditor/ckeditor5-easy-image'; import { Heading } from '@ckeditor/ckeditor5-heading'; -import Image from '@ckeditor/ckeditor5-image/src/image'; -import ImageCaption from '@ckeditor/ckeditor5-image/src/imagecaption'; -import ImageStyle from '@ckeditor/ckeditor5-image/src/imagestyle'; -import ImageToolbar from '@ckeditor/ckeditor5-image/src/imagetoolbar'; -import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload'; +import { Image, ImageCaption, ImageStyle, ImageToolbar, ImageUpload, PictureEditing } from '@ckeditor/ckeditor5-image'; import Indent from '@ckeditor/ckeditor5-indent/src/indent'; import Link from '@ckeditor/ckeditor5-link/src/link'; import List from '@ckeditor/ckeditor5-list/src/list'; import MediaEmbed from '@ckeditor/ckeditor5-media-embed/src/mediaembed'; import { Paragraph } from '@ckeditor/ckeditor5-paragraph'; import PasteFromOffice from '@ckeditor/ckeditor5-paste-from-office/src/pastefromoffice'; -import PictureEditing from '@ckeditor/ckeditor5-image/src/pictureediting'; import { Table, TableToolbar } from '@ckeditor/ckeditor5-table'; import { TextTransformation } from '@ckeditor/ckeditor5-typing'; import { CloudServices } from '@ckeditor/ckeditor5-cloud-services'; diff --git a/packages/ckeditor5-build-classic/src/ckeditor.ts b/packages/ckeditor5-build-classic/src/ckeditor.ts index d8b6d5a76ae..71402162a83 100644 --- a/packages/ckeditor5-build-classic/src/ckeditor.ts +++ b/packages/ckeditor5-build-classic/src/ckeditor.ts @@ -15,18 +15,13 @@ import { CKBox } from '@ckeditor/ckeditor5-ckbox'; import { CKFinder } from '@ckeditor/ckeditor5-ckfinder'; import { EasyImage } from '@ckeditor/ckeditor5-easy-image'; import { Heading } from '@ckeditor/ckeditor5-heading'; -import Image from '@ckeditor/ckeditor5-image/src/image'; -import ImageCaption from '@ckeditor/ckeditor5-image/src/imagecaption'; -import ImageStyle from '@ckeditor/ckeditor5-image/src/imagestyle'; -import ImageToolbar from '@ckeditor/ckeditor5-image/src/imagetoolbar'; -import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload'; +import { Image, ImageCaption, ImageStyle, ImageToolbar, ImageUpload, PictureEditing } from '@ckeditor/ckeditor5-image'; import Indent from '@ckeditor/ckeditor5-indent/src/indent'; import Link from '@ckeditor/ckeditor5-link/src/link'; import List from '@ckeditor/ckeditor5-list/src/list'; import MediaEmbed from '@ckeditor/ckeditor5-media-embed/src/mediaembed'; import { Paragraph } from '@ckeditor/ckeditor5-paragraph'; import PasteFromOffice from '@ckeditor/ckeditor5-paste-from-office/src/pastefromoffice'; -import PictureEditing from '@ckeditor/ckeditor5-image/src/pictureediting'; import { Table, TableToolbar } from '@ckeditor/ckeditor5-table'; import { TextTransformation } from '@ckeditor/ckeditor5-typing'; import { CloudServices } from '@ckeditor/ckeditor5-cloud-services'; diff --git a/packages/ckeditor5-build-decoupled-document/src/ckeditor.ts b/packages/ckeditor5-build-decoupled-document/src/ckeditor.ts index c61da51d91a..4fcbc43b101 100644 --- a/packages/ckeditor5-build-decoupled-document/src/ckeditor.ts +++ b/packages/ckeditor5-build-decoupled-document/src/ckeditor.ts @@ -17,12 +17,7 @@ import { CKBox } from '@ckeditor/ckeditor5-ckbox'; import { CKFinder } from '@ckeditor/ckeditor5-ckfinder'; import { EasyImage } from '@ckeditor/ckeditor5-easy-image'; import { Heading } from '@ckeditor/ckeditor5-heading'; -import Image from '@ckeditor/ckeditor5-image/src/image'; -import ImageCaption from '@ckeditor/ckeditor5-image/src/imagecaption'; -import ImageResize from '@ckeditor/ckeditor5-image/src/imageresize'; -import ImageStyle from '@ckeditor/ckeditor5-image/src/imagestyle'; -import ImageToolbar from '@ckeditor/ckeditor5-image/src/imagetoolbar'; -import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload'; +import { Image, ImageCaption, ImageResize, ImageStyle, ImageToolbar, ImageUpload, PictureEditing } from '@ckeditor/ckeditor5-image'; import Indent from '@ckeditor/ckeditor5-indent/src/indent'; import IndentBlock from '@ckeditor/ckeditor5-indent/src/indentblock'; import Link from '@ckeditor/ckeditor5-link/src/link'; @@ -31,7 +26,6 @@ import ListProperties from '@ckeditor/ckeditor5-list/src/listproperties'; import MediaEmbed from '@ckeditor/ckeditor5-media-embed/src/mediaembed'; import { Paragraph } from '@ckeditor/ckeditor5-paragraph'; import PasteFromOffice from '@ckeditor/ckeditor5-paste-from-office/src/pastefromoffice'; -import PictureEditing from '@ckeditor/ckeditor5-image/src/pictureediting'; import { Table, TableToolbar } from '@ckeditor/ckeditor5-table'; import { TextTransformation } from '@ckeditor/ckeditor5-typing'; import { CloudServices } from '@ckeditor/ckeditor5-cloud-services'; diff --git a/packages/ckeditor5-build-inline/src/ckeditor.ts b/packages/ckeditor5-build-inline/src/ckeditor.ts index 2331ec8df02..6024e12ec73 100644 --- a/packages/ckeditor5-build-inline/src/ckeditor.ts +++ b/packages/ckeditor5-build-inline/src/ckeditor.ts @@ -15,18 +15,13 @@ import { CKBox } from '@ckeditor/ckeditor5-ckbox'; import { CKFinder } from '@ckeditor/ckeditor5-ckfinder'; import { EasyImage } from '@ckeditor/ckeditor5-easy-image'; import { Heading } from '@ckeditor/ckeditor5-heading'; -import Image from '@ckeditor/ckeditor5-image/src/image'; -import ImageCaption from '@ckeditor/ckeditor5-image/src/imagecaption'; -import ImageStyle from '@ckeditor/ckeditor5-image/src/imagestyle'; -import ImageToolbar from '@ckeditor/ckeditor5-image/src/imagetoolbar'; -import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload'; +import { Image, ImageCaption, ImageStyle, ImageToolbar, ImageUpload, PictureEditing } from '@ckeditor/ckeditor5-image'; import Indent from '@ckeditor/ckeditor5-indent/src/indent'; import Link from '@ckeditor/ckeditor5-link/src/link'; import List from '@ckeditor/ckeditor5-list/src/list'; import MediaEmbed from '@ckeditor/ckeditor5-media-embed/src/mediaembed'; import { Paragraph } from '@ckeditor/ckeditor5-paragraph'; import PasteFromOffice from '@ckeditor/ckeditor5-paste-from-office/src/pastefromoffice'; -import PictureEditing from '@ckeditor/ckeditor5-image/src/pictureediting'; import { Table, TableToolbar } from '@ckeditor/ckeditor5-table'; import { TextTransformation } from '@ckeditor/ckeditor5-typing'; import { CloudServices } from '@ckeditor/ckeditor5-cloud-services'; diff --git a/packages/ckeditor5-editor-multi-root/tsconfig.json b/packages/ckeditor5-editor-multi-root/tsconfig.json index 6d2d43909f9..890e077e061 100644 --- a/packages/ckeditor5-editor-multi-root/tsconfig.json +++ b/packages/ckeditor5-editor-multi-root/tsconfig.json @@ -1,10 +1,10 @@ { "extends": "../../tsconfig.release.json", "include": [ - "./src/", - "../../typings/" + "src", + "../../typings" ], "exclude": [ - "./tests/" + "tests" ] } diff --git a/packages/ckeditor5-image/src/augmentation.ts b/packages/ckeditor5-image/src/augmentation.ts new file mode 100644 index 00000000000..2962b03ac01 --- /dev/null +++ b/packages/ckeditor5-image/src/augmentation.ts @@ -0,0 +1,99 @@ +/** + * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license + */ + +import type { + ImageConfig, + + AutoImage, + Image, + ImageBlock, + ImageCaption, + ImageInline, + ImageInsert, + ImageInsertViaUrl, + ImageResize, + ImageStyle, + ImageTextAlternative, + ImageToolbar, + ImageUpload, + ImageUtils, + ImageBlockEditing, + ImageEditing, + ImageCaptionEditing, + ImageCaptionUI, + ImageCaptionUtils, + ImageInsertUI, + ImageResizeEditing, + ImageStyleEditing, + ImageStyleUI, + ImageTextAlternativeEditing, + ImageTextAlternativeUI, + ImageUploadEditing, + ImageUploadProgress, + ImageUploadUI, + + ImageTypeCommand, + InsertImageCommand, + ReplaceImageSourceCommand, + ToggleImageCaptionCommand, + ResizeImageCommand, + ImageStyleCommand, + ImageTextAlternativeCommand, + UploadImageCommand +} from '.'; + +declare module '@ckeditor/ckeditor5-core' { + interface EditorConfig { + + /** + * The configuration of the image features. Used by the image features in the `@ckeditor/ckeditor5-image` package. + * + * Read more in {@link module:image/imageconfig~ImageConfig}. + */ + image?: ImageConfig; + } + + interface PluginsMap { + [ AutoImage.pluginName ]: AutoImage; + [ Image.pluginName ]: Image; + [ ImageBlock.pluginName ]: ImageBlock; + [ ImageCaption.pluginName ]: ImageCaption; + [ ImageInline.pluginName ]: ImageInline; + [ ImageInsert.pluginName ]: ImageInsert; + [ ImageInsertViaUrl.pluginName ]: ImageInsertViaUrl; + [ ImageResize.pluginName ]: ImageResize; + [ ImageStyle.pluginName ]: ImageStyle; + [ ImageTextAlternative.pluginName ]: ImageTextAlternative; + [ ImageToolbar.pluginName ]: ImageToolbar; + [ ImageUpload.pluginName ]: ImageUpload; + [ ImageUtils.pluginName ]: ImageUtils; + [ ImageBlockEditing.pluginName ]: ImageBlockEditing; + [ ImageEditing.pluginName ]: ImageEditing; + [ ImageCaptionEditing.pluginName ]: ImageCaptionEditing; + [ ImageCaptionUI.pluginName ]: ImageCaptionUI; + [ ImageCaptionUtils.pluginName ]: ImageCaptionUtils; + [ ImageInsertUI.pluginName ]: ImageInsertUI; + [ ImageResizeEditing.pluginName ]: ImageResizeEditing; + [ ImageStyleEditing.pluginName ]: ImageStyleEditing; + [ ImageStyleUI.pluginName ]: ImageStyleUI; + [ ImageTextAlternativeEditing.pluginName ]: ImageTextAlternativeEditing; + [ ImageTextAlternativeUI.pluginName ]: ImageTextAlternativeUI; + [ ImageUploadEditing.pluginName ]: ImageUploadEditing; + [ ImageUploadProgress.pluginName ]: ImageUploadProgress; + [ ImageUploadUI.pluginName ]: ImageUploadUI; + } + + interface CommandsMap { + imageTypeBlock: ImageTypeCommand; + imageTypeInline: ImageTypeCommand; + insertImage: InsertImageCommand; + replaceImageSource: ReplaceImageSourceCommand; + toggleImageCaption: ToggleImageCaptionCommand; + resizeImage: ResizeImageCommand; + imageStyle: ImageStyleCommand; + imageTextAlternative: ImageTextAlternativeCommand; + uploadImage: UploadImageCommand; + } +} diff --git a/packages/ckeditor5-image/src/autoimage.ts b/packages/ckeditor5-image/src/autoimage.ts index 9dd5ddf879c..a2a9f8ad120 100644 --- a/packages/ckeditor5-image/src/autoimage.ts +++ b/packages/ckeditor5-image/src/autoimage.ts @@ -177,9 +177,3 @@ export default class AutoImage extends Plugin { }, 100 ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ AutoImage.pluginName ]: AutoImage; - } -} diff --git a/packages/ckeditor5-image/src/image.ts b/packages/ckeditor5-image/src/image.ts index abfefc0fd0e..71c6048ebfc 100644 --- a/packages/ckeditor5-image/src/image.ts +++ b/packages/ckeditor5-image/src/image.ts @@ -12,7 +12,6 @@ import ImageBlock from './imageblock'; import ImageInline from './imageinline'; import '../theme/image.css'; -import './imageconfig'; /** * The image plugin. @@ -42,10 +41,3 @@ export default class Image extends Plugin { return 'Image'; } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ Image.pluginName ]: Image; - } -} - diff --git a/packages/ckeditor5-image/src/image/imageblockediting.ts b/packages/ckeditor5-image/src/image/imageblockediting.ts index 683c56e5e50..7482ff8987e 100644 --- a/packages/ckeditor5-image/src/image/imageblockediting.ts +++ b/packages/ckeditor5-image/src/image/imageblockediting.ts @@ -176,9 +176,3 @@ export default class ImageBlockEditing extends Plugin { } ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageBlockEditing.pluginName ]: ImageBlockEditing; - } -} diff --git a/packages/ckeditor5-image/src/image/imageediting.ts b/packages/ckeditor5-image/src/image/imageediting.ts index 53897b4e896..09645227386 100644 --- a/packages/ckeditor5-image/src/image/imageediting.ts +++ b/packages/ckeditor5-image/src/image/imageediting.ts @@ -85,9 +85,3 @@ export default class ImageEditing extends Plugin { editor.commands.add( 'imageInsert', insertImageCommand ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageEditing.pluginName ]: ImageEditing; - } -} diff --git a/packages/ckeditor5-image/src/image/imagetypecommand.ts b/packages/ckeditor5-image/src/image/imagetypecommand.ts index 67b61c0d887..f5bdb2ef139 100644 --- a/packages/ckeditor5-image/src/image/imagetypecommand.ts +++ b/packages/ckeditor5-image/src/image/imagetypecommand.ts @@ -100,10 +100,3 @@ export default class ImageTypeCommand extends Command { } ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface CommandsMap { - imageTypeBlock: ImageTypeCommand; - imageTypeInline: ImageTypeCommand; - } -} diff --git a/packages/ckeditor5-image/src/image/insertimagecommand.ts b/packages/ckeditor5-image/src/image/insertimagecommand.ts index c9ffe2975ae..98c6c8cbb2f 100644 --- a/packages/ckeditor5-image/src/image/insertimagecommand.ts +++ b/packages/ckeditor5-image/src/image/insertimagecommand.ts @@ -11,8 +11,6 @@ import { Command, type Editor } from 'ckeditor5/src/core'; import { logWarning, toArray, type ArrayOrItem } from 'ckeditor5/src/utils'; import type ImageUtils from '../imageutils'; -import '../imageconfig'; - /** * Insert image command. * @@ -134,9 +132,3 @@ export default class InsertImageCommand extends Command { } ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface CommandsMap { - insertImage: InsertImageCommand; - } -} diff --git a/packages/ckeditor5-image/src/image/replaceimagesourcecommand.ts b/packages/ckeditor5-image/src/image/replaceimagesourcecommand.ts index 66e71a73802..5081575d37a 100644 --- a/packages/ckeditor5-image/src/image/replaceimagesourcecommand.ts +++ b/packages/ckeditor5-image/src/image/replaceimagesourcecommand.ts @@ -50,9 +50,3 @@ export default class ReplaceImageSourceCommand extends Command { } ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface CommandsMap { - replaceImageSource: ReplaceImageSourceCommand; - } -} diff --git a/packages/ckeditor5-image/src/imageblock.ts b/packages/ckeditor5-image/src/imageblock.ts index cd08458dc75..d0e8c2a3f76 100644 --- a/packages/ckeditor5-image/src/imageblock.ts +++ b/packages/ckeditor5-image/src/imageblock.ts @@ -41,10 +41,3 @@ export default class ImageBlock extends Plugin { return 'ImageBlock'; } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageBlock.pluginName ]: ImageBlock; - } -} - diff --git a/packages/ckeditor5-image/src/imagecaption.ts b/packages/ckeditor5-image/src/imagecaption.ts index 084929fe1dc..ad6f9ea1159 100644 --- a/packages/ckeditor5-image/src/imagecaption.ts +++ b/packages/ckeditor5-image/src/imagecaption.ts @@ -33,9 +33,3 @@ export default class ImageCaption extends Plugin { return 'ImageCaption'; } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageCaption.pluginName ]: ImageCaption; - } -} diff --git a/packages/ckeditor5-image/src/imagecaption/imagecaptionediting.ts b/packages/ckeditor5-image/src/imagecaption/imagecaptionediting.ts index ab30fda7058..40b90c83c7d 100644 --- a/packages/ckeditor5-image/src/imagecaption/imagecaptionediting.ts +++ b/packages/ckeditor5-image/src/imagecaption/imagecaptionediting.ts @@ -272,9 +272,3 @@ export default class ImageCaptionEditing extends Plugin { } ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageCaptionEditing.pluginName ]: ImageCaptionEditing; - } -} diff --git a/packages/ckeditor5-image/src/imagecaption/imagecaptionui.ts b/packages/ckeditor5-image/src/imagecaption/imagecaptionui.ts index 1f7462b1a43..9a00fbc7b83 100644 --- a/packages/ckeditor5-image/src/imagecaption/imagecaptionui.ts +++ b/packages/ckeditor5-image/src/imagecaption/imagecaptionui.ts @@ -75,9 +75,3 @@ export default class ImageCaptionUI extends Plugin { } ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageCaptionUI.pluginName ]: ImageCaptionUI; - } -} diff --git a/packages/ckeditor5-image/src/imagecaption/imagecaptionutils.ts b/packages/ckeditor5-image/src/imagecaption/imagecaptionutils.ts index 66b3eb4a1d7..4a6cf74b352 100644 --- a/packages/ckeditor5-image/src/imagecaption/imagecaptionutils.ts +++ b/packages/ckeditor5-image/src/imagecaption/imagecaptionutils.ts @@ -78,9 +78,3 @@ export default class ImageCaptionUtils extends Plugin { return null; } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageCaptionUtils.pluginName ]: ImageCaptionUtils; - } -} diff --git a/packages/ckeditor5-image/src/imagecaption/toggleimagecaptioncommand.ts b/packages/ckeditor5-image/src/imagecaption/toggleimagecaptioncommand.ts index d71e17ccb4e..9388157f2bb 100644 --- a/packages/ckeditor5-image/src/imagecaption/toggleimagecaptioncommand.ts +++ b/packages/ckeditor5-image/src/imagecaption/toggleimagecaptioncommand.ts @@ -168,9 +168,3 @@ export default class ToggleImageCaptionCommand extends Command { writer.remove( captionElement ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface CommandsMap { - toggleImageCaption: ToggleImageCaptionCommand; - } -} diff --git a/packages/ckeditor5-image/src/imageconfig.ts b/packages/ckeditor5-image/src/imageconfig.ts index e2a464e8d8d..3ac553cb3e4 100644 --- a/packages/ckeditor5-image/src/imageconfig.ts +++ b/packages/ckeditor5-image/src/imageconfig.ts @@ -743,16 +743,3 @@ export interface ImageUploadConfig { */ types: Array; } - -declare module '@ckeditor/ckeditor5-core' { - interface EditorConfig { - - /** - * The configuration of the image features. Used by the image features in the `@ckeditor/ckeditor5-image` package. - * - * Read more in {@link module:image/imageconfig~ImageConfig}. - */ - image?: ImageConfig; - } - -} diff --git a/packages/ckeditor5-image/src/imageinline.ts b/packages/ckeditor5-image/src/imageinline.ts index 59c8402f2ff..0af1ea4d9d0 100644 --- a/packages/ckeditor5-image/src/imageinline.ts +++ b/packages/ckeditor5-image/src/imageinline.ts @@ -41,10 +41,3 @@ export default class ImageInline extends Plugin { return 'ImageInline'; } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageInline.pluginName ]: ImageInline; - } -} - diff --git a/packages/ckeditor5-image/src/imageinsert.ts b/packages/ckeditor5-image/src/imageinsert.ts index ec71b18e847..f14c611ae19 100644 --- a/packages/ckeditor5-image/src/imageinsert.ts +++ b/packages/ckeditor5-image/src/imageinsert.ts @@ -39,10 +39,3 @@ export default class ImageInsert extends Plugin { return [ ImageUpload, ImageInsertViaUrl, ImageInsertUI ]; } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageInsert.pluginName ]: ImageInsert; - } -} - diff --git a/packages/ckeditor5-image/src/imageinsert/imageinsertui.ts b/packages/ckeditor5-image/src/imageinsert/imageinsertui.ts index 03ca1eb13e7..a505d48d70d 100644 --- a/packages/ckeditor5-image/src/imageinsert/imageinsertui.ts +++ b/packages/ckeditor5-image/src/imageinsert/imageinsertui.ts @@ -176,9 +176,3 @@ export default class ImageInsertUI extends Plugin { return dropdownView; } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageInsertUI.pluginName ]: ImageInsertUI; - } -} diff --git a/packages/ckeditor5-image/src/imageinsert/utils.ts b/packages/ckeditor5-image/src/imageinsert/utils.ts index 1db012ff22a..eb9eb390dec 100644 --- a/packages/ckeditor5-image/src/imageinsert/utils.ts +++ b/packages/ckeditor5-image/src/imageinsert/utils.ts @@ -13,8 +13,6 @@ import { LabeledFieldView, createLabeledInputText, type View, type ButtonView } import type ImageInsertUI from './imageinsertui'; -import '../imageconfig'; - /** * Creates integrations object that will be passed to the * {@link module:image/imageinsert/ui/imageinsertpanelview~ImageInsertPanelView}. diff --git a/packages/ckeditor5-image/src/imageinsertviaurl.ts b/packages/ckeditor5-image/src/imageinsertviaurl.ts index 90d8860d8cd..a8044a28a98 100644 --- a/packages/ckeditor5-image/src/imageinsertviaurl.ts +++ b/packages/ckeditor5-image/src/imageinsertviaurl.ts @@ -36,9 +36,3 @@ export default class ImageInsertViaUrl extends Plugin { return [ ImageInsertUI ]; } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageInsertViaUrl.pluginName ]: ImageInsertViaUrl; - } -} diff --git a/packages/ckeditor5-image/src/imageresize.ts b/packages/ckeditor5-image/src/imageresize.ts index 4c7fd9941b8..a1181845fb2 100644 --- a/packages/ckeditor5-image/src/imageresize.ts +++ b/packages/ckeditor5-image/src/imageresize.ts @@ -34,9 +34,3 @@ export default class ImageResize extends Plugin { return 'ImageResize'; } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageResize.pluginName ]: ImageResize; - } -} diff --git a/packages/ckeditor5-image/src/imageresize/imageresizeediting.ts b/packages/ckeditor5-image/src/imageresize/imageresizeediting.ts index 5dce90701be..bf4a21abf66 100644 --- a/packages/ckeditor5-image/src/imageresize/imageresizeediting.ts +++ b/packages/ckeditor5-image/src/imageresize/imageresizeediting.ts @@ -11,7 +11,6 @@ import type { ViewElement } from 'ckeditor5/src/engine'; import { type Editor, Plugin, type PluginDependencies } from 'ckeditor5/src/core'; import ImageUtils from '../imageutils'; import ResizeImageCommand from './resizeimagecommand'; -import '../imageconfig'; /** * The image resize editing feature. @@ -134,9 +133,3 @@ export default class ImageResizeEditing extends Plugin { } ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageResizeEditing.pluginName ]: ImageResizeEditing; - } -} diff --git a/packages/ckeditor5-image/src/imageresize/imageresizehandles.ts b/packages/ckeditor5-image/src/imageresize/imageresizehandles.ts index d17c36529d6..681211db9c2 100644 --- a/packages/ckeditor5-image/src/imageresize/imageresizehandles.ts +++ b/packages/ckeditor5-image/src/imageresize/imageresizehandles.ts @@ -14,8 +14,6 @@ import { WidgetResize } from 'ckeditor5/src/widget'; import ImageLoadObserver, { type ImageLoadedEvent } from '../image/imageloadobserver'; import type ResizeImageCommand from './resizeimagecommand'; -import '../imageconfig'; - const RESIZABLE_IMAGES_CSS_SELECTOR = 'figure.image.ck-widget > img,' + 'figure.image.ck-widget > picture > img,' + diff --git a/packages/ckeditor5-image/src/imageresize/resizeimagecommand.ts b/packages/ckeditor5-image/src/imageresize/resizeimagecommand.ts index aaa5b73854a..5b2184e76fb 100644 --- a/packages/ckeditor5-image/src/imageresize/resizeimagecommand.ts +++ b/packages/ckeditor5-image/src/imageresize/resizeimagecommand.ts @@ -76,9 +76,3 @@ export default class ResizeImageCommand extends Command { } } } - -declare module '@ckeditor/ckeditor5-core' { - interface CommandsMap { - resizeImage: ResizeImageCommand; - } -} diff --git a/packages/ckeditor5-image/src/imagestyle.ts b/packages/ckeditor5-image/src/imagestyle.ts index e07257ee8fe..dfa6fddfb91 100644 --- a/packages/ckeditor5-image/src/imagestyle.ts +++ b/packages/ckeditor5-image/src/imagestyle.ts @@ -38,9 +38,3 @@ export default class ImageStyle extends Plugin { return 'ImageStyle'; } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageStyle.pluginName ]: ImageStyle; - } -} diff --git a/packages/ckeditor5-image/src/imagestyle/imagestylecommand.ts b/packages/ckeditor5-image/src/imagestyle/imagestylecommand.ts index b5bb5505d2f..812c7bd707b 100644 --- a/packages/ckeditor5-image/src/imagestyle/imagestylecommand.ts +++ b/packages/ckeditor5-image/src/imagestyle/imagestylecommand.ts @@ -131,9 +131,3 @@ export default class ImageStyleCommand extends Command { return !supportedTypes.includes( imageElement.name ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface CommandsMap { - imageStyle: ImageStyleCommand; - } -} diff --git a/packages/ckeditor5-image/src/imagestyle/imagestyleediting.ts b/packages/ckeditor5-image/src/imagestyle/imagestyleediting.ts index f149a0468d0..d922c88120e 100644 --- a/packages/ckeditor5-image/src/imagestyle/imagestyleediting.ts +++ b/packages/ckeditor5-image/src/imagestyle/imagestyleediting.ts @@ -149,9 +149,3 @@ export default class ImageStyleEditing extends Plugin { } ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageStyleEditing.pluginName ]: ImageStyleEditing; - } -} diff --git a/packages/ckeditor5-image/src/imagestyle/imagestyleui.ts b/packages/ckeditor5-image/src/imagestyle/imagestyleui.ts index ee581cad2fe..8c2d7c00e90 100644 --- a/packages/ckeditor5-image/src/imagestyle/imagestyleui.ts +++ b/packages/ckeditor5-image/src/imagestyle/imagestyleui.ts @@ -242,9 +242,3 @@ function getUIComponentName( name: string ): string { function getDropdownButtonTitle( dropdownTitle: string | undefined, buttonTitle: string ): string { return ( dropdownTitle ? dropdownTitle + ': ' : '' ) + buttonTitle; } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageStyleUI.pluginName ]: ImageStyleUI; - } -} diff --git a/packages/ckeditor5-image/src/imagetextalternative.ts b/packages/ckeditor5-image/src/imagetextalternative.ts index 4fc3b471664..c617619a4f1 100644 --- a/packages/ckeditor5-image/src/imagetextalternative.ts +++ b/packages/ckeditor5-image/src/imagetextalternative.ts @@ -35,9 +35,3 @@ export default class ImageTextAlternative extends Plugin { return 'ImageTextAlternative'; } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageTextAlternative.pluginName ]: ImageTextAlternative; - } -} diff --git a/packages/ckeditor5-image/src/imagetextalternative/imagetextalternativecommand.ts b/packages/ckeditor5-image/src/imagetextalternative/imagetextalternativecommand.ts index 95c225221b2..bca4766a310 100644 --- a/packages/ckeditor5-image/src/imagetextalternative/imagetextalternativecommand.ts +++ b/packages/ckeditor5-image/src/imagetextalternative/imagetextalternativecommand.ts @@ -57,9 +57,3 @@ export default class ImageTextAlternativeCommand extends Command { } ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface CommandsMap { - imageTextAlternative: ImageTextAlternativeCommand; - } -} diff --git a/packages/ckeditor5-image/src/imagetextalternative/imagetextalternativeediting.ts b/packages/ckeditor5-image/src/imagetextalternative/imagetextalternativeediting.ts index 5c81e4bced0..b290e125fb7 100644 --- a/packages/ckeditor5-image/src/imagetextalternative/imagetextalternativeediting.ts +++ b/packages/ckeditor5-image/src/imagetextalternative/imagetextalternativeediting.ts @@ -38,9 +38,3 @@ export default class ImageTextAlternativeEditing extends Plugin { this.editor.commands.add( 'imageTextAlternative', new ImageTextAlternativeCommand( this.editor ) ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageTextAlternativeEditing.pluginName ]: ImageTextAlternativeEditing; - } -} diff --git a/packages/ckeditor5-image/src/imagetextalternative/imagetextalternativeui.ts b/packages/ckeditor5-image/src/imagetextalternative/imagetextalternativeui.ts index f2b8b5fc98c..91911e40822 100644 --- a/packages/ckeditor5-image/src/imagetextalternative/imagetextalternativeui.ts +++ b/packages/ckeditor5-image/src/imagetextalternative/imagetextalternativeui.ts @@ -227,10 +227,3 @@ export default class ImageTextAlternativeUI extends Plugin { return !!this._balloon && this._balloon.hasView( this._form! ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageTextAlternativeUI.pluginName ]: ImageTextAlternativeUI; - - } -} diff --git a/packages/ckeditor5-image/src/imagetoolbar.ts b/packages/ckeditor5-image/src/imagetoolbar.ts index 32c5ef437ef..b5765121f63 100644 --- a/packages/ckeditor5-image/src/imagetoolbar.ts +++ b/packages/ckeditor5-image/src/imagetoolbar.ts @@ -65,9 +65,3 @@ export default class ImageToolbar extends Plugin { function normalizeDeclarativeConfig( config: Array ): Array { return config.map( item => isObject( item ) ? item.name : item ); } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageToolbar.pluginName ]: ImageToolbar; - } -} diff --git a/packages/ckeditor5-image/src/imageupload.ts b/packages/ckeditor5-image/src/imageupload.ts index a60f93938b7..6262b142b81 100644 --- a/packages/ckeditor5-image/src/imageupload.ts +++ b/packages/ckeditor5-image/src/imageupload.ts @@ -38,9 +38,3 @@ export default class ImageUpload extends Plugin { return [ ImageUploadEditing, ImageUploadUI, ImageUploadProgress ]; } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageUpload.pluginName ]: ImageUpload; - } -} diff --git a/packages/ckeditor5-image/src/imageupload/imageuploadediting.ts b/packages/ckeditor5-image/src/imageupload/imageuploadediting.ts index 3ef0b4da898..3a6fb11eb12 100644 --- a/packages/ckeditor5-image/src/imageupload/imageuploadediting.ts +++ b/packages/ckeditor5-image/src/imageupload/imageuploadediting.ts @@ -20,7 +20,6 @@ import ImageUtils from '../imageutils'; import UploadImageCommand from './uploadimagecommand'; import { fetchLocalImage, isLocalImage } from '../../src/imageupload/utils'; import { createImageTypeRegExp } from './utils'; -import '../imageconfig'; /** * The editing part of the image upload feature. It registers the `'uploadImage'` command @@ -420,12 +419,6 @@ function getImagesFromChangeItem( editor: Editor, item: Item ): Array { .map( value => value.item ); } -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageUploadEditing.pluginName ]: ImageUploadEditing; - } -} - /** * An event fired when an image is uploaded. You can hook into this event to provide * custom attributes to the {@link module:engine/model/element~Element image element} based on the data from diff --git a/packages/ckeditor5-image/src/imageupload/imageuploadprogress.ts b/packages/ckeditor5-image/src/imageupload/imageuploadprogress.ts index bf488d41c81..9a5a27e8277 100644 --- a/packages/ckeditor5-image/src/imageupload/imageuploadprogress.ts +++ b/packages/ckeditor5-image/src/imageupload/imageuploadprogress.ts @@ -278,10 +278,3 @@ function _displayLocalImage( imageUtils: ImageUtils, viewFigure: ViewElement, wr writer.setAttribute( 'src', loader.data, viewImg ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageUploadProgress.pluginName ]: ImageUploadProgress; - } -} - diff --git a/packages/ckeditor5-image/src/imageupload/imageuploadui.ts b/packages/ckeditor5-image/src/imageupload/imageuploadui.ts index 20a273d3c67..5f40a044ddf 100644 --- a/packages/ckeditor5-image/src/imageupload/imageuploadui.ts +++ b/packages/ckeditor5-image/src/imageupload/imageuploadui.ts @@ -13,8 +13,6 @@ import { FileDialogButtonView } from 'ckeditor5/src/upload'; import { createImageTypeRegExp } from './utils'; import type UploadImageCommand from './uploadimagecommand'; -import '../imageconfig'; - /** * The image upload button plugin. * @@ -74,9 +72,3 @@ export default class ImageUploadUI extends Plugin { editor.ui.componentFactory.add( 'imageUpload', componentCreator ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageUploadUI.pluginName ]: ImageUploadUI; - } -} diff --git a/packages/ckeditor5-image/src/imageupload/uploadimagecommand.ts b/packages/ckeditor5-image/src/imageupload/uploadimagecommand.ts index 458854d80a8..94b52d98b30 100644 --- a/packages/ckeditor5-image/src/imageupload/uploadimagecommand.ts +++ b/packages/ckeditor5-image/src/imageupload/uploadimagecommand.ts @@ -112,9 +112,3 @@ export default class UploadImageCommand extends Command { imageUtils.insertImage( { ...attributes, uploadId: loader.id }, position ); } } - -declare module '@ckeditor/ckeditor5-core' { - interface CommandsMap { - uploadImage: UploadImageCommand; - } -} diff --git a/packages/ckeditor5-image/src/imageutils.ts b/packages/ckeditor5-image/src/imageutils.ts index dd47cad6301..d8432b33501 100644 --- a/packages/ckeditor5-image/src/imageutils.ts +++ b/packages/ckeditor5-image/src/imageutils.ts @@ -24,7 +24,6 @@ import type { import { Plugin, type Editor } from 'ckeditor5/src/core'; import { findOptimalInsertionRange, isWidget, toWidget } from 'ckeditor5/src/widget'; import { determineImageTypeForInsertionAtSelection } from './image/utils'; -import './imageconfig'; /** * A set of helpers related to images. @@ -242,12 +241,6 @@ export default class ImageUtils extends Plugin { } } -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ ImageUtils.pluginName ]: ImageUtils; - } -} - /** * Checks if image is allowed by schema in optimal insertion parent. */ diff --git a/packages/ckeditor5-image/src/index.ts b/packages/ckeditor5-image/src/index.ts index 0d0fa8fe439..44f30cb57cc 100644 --- a/packages/ckeditor5-image/src/index.ts +++ b/packages/ckeditor5-image/src/index.ts @@ -31,3 +31,21 @@ export { default as ImageUploadEditing, ImageUploadCompleteEvent } from './image export { default as ImageUploadProgress } from './imageupload/imageuploadprogress'; export { default as ImageUploadUI } from './imageupload/imageuploadui'; export { default as PictureEditing } from './pictureediting'; + +export type { ImageConfig } from './imageconfig'; +export type { default as ImageBlock } from './imageblock'; +export type { default as ImageInline } from './imageinline'; +export type { default as ImageInsertViaUrl } from './imageinsertviaurl'; +export type { default as ImageUtils } from './imageutils'; +export type { default as ImageBlockEditing } from './image/imageblockediting'; +export type { default as ImageCaptionUI } from './imagecaption/imagecaptionui'; +export type { default as ImageTypeCommand } from './image/imagetypecommand'; +export type { default as InsertImageCommand } from './image/insertimagecommand'; +export type { default as ReplaceImageSourceCommand } from './image/replaceimagesourcecommand'; +export type { default as ToggleImageCaptionCommand } from './imagecaption/toggleimagecaptioncommand'; +export type { default as ResizeImageCommand } from './imageresize/resizeimagecommand'; +export type { default as ImageStyleCommand } from './imagestyle/imagestylecommand'; +export type { default as ImageTextAlternativeCommand } from './imagetextalternative/imagetextalternativecommand'; +export type { default as UploadImageCommand } from './imageupload/uploadimagecommand'; + +import './augmentation'; diff --git a/packages/ckeditor5-link/src/linkimageediting.ts b/packages/ckeditor5-link/src/linkimageediting.ts index 1e4d138f4b5..afbbd90bc2c 100644 --- a/packages/ckeditor5-link/src/linkimageediting.ts +++ b/packages/ckeditor5-link/src/linkimageediting.ts @@ -28,7 +28,7 @@ import LinkEditing from './linkediting'; import type ManualDecorator from './utils/manualdecorator'; import type LinkCommand from './linkcommand'; -import type ImageUtils from '@ckeditor/ckeditor5-image/src/imageutils'; +import type { ImageUtils } from '@ckeditor/ckeditor5-image'; /** * The link image engine feature. diff --git a/packages/ckeditor5-link/src/linkimageui.ts b/packages/ckeditor5-link/src/linkimageui.ts index b4f869058dd..52154f8517f 100644 --- a/packages/ckeditor5-link/src/linkimageui.ts +++ b/packages/ckeditor5-link/src/linkimageui.ts @@ -15,7 +15,7 @@ import type { ViewDocumentClickEvent } from 'ckeditor5/src/engine'; -import type ImageUtils from '@ckeditor/ckeditor5-image/src/imageutils'; +import type { ImageUtils } from '@ckeditor/ckeditor5-image'; import LinkUI from './linkui'; import LinkEditing from './linkediting';