diff --git a/docs/_snippets/build-balloon-block.js b/docs/_snippets/build-balloon-block.js index 57e39ee85c5..0d41cc7a36c 100644 --- a/docs/_snippets/build-balloon-block.js +++ b/docs/_snippets/build-balloon-block.js @@ -14,7 +14,6 @@ import { BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -46,7 +45,6 @@ export class BalloonBlockEditor extends BalloonEditorBase { BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, diff --git a/docs/_snippets/build-balloon.js b/docs/_snippets/build-balloon.js index 99afe9b6108..6e901dde1c4 100644 --- a/docs/_snippets/build-balloon.js +++ b/docs/_snippets/build-balloon.js @@ -13,7 +13,6 @@ import { BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -45,7 +44,6 @@ export class BalloonEditor extends BalloonEditorBase { BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, diff --git a/docs/_snippets/build-classic.js b/docs/_snippets/build-classic.js index 76c3a5de2f6..3263deb696f 100644 --- a/docs/_snippets/build-classic.js +++ b/docs/_snippets/build-classic.js @@ -11,7 +11,6 @@ import { Italic, BlockQuote, CKBox, - EasyImage, Heading, Image, ImageCaption, @@ -43,7 +42,6 @@ export class ClassicEditor extends ClassicEditorBase { Italic, BlockQuote, CloudServices, - EasyImage, Heading, Image, ImageCaption, diff --git a/docs/_snippets/build-decoupled-document.js b/docs/_snippets/build-decoupled-document.js index 1bd2f218429..2cc6d163bb0 100644 --- a/docs/_snippets/build-decoupled-document.js +++ b/docs/_snippets/build-decoupled-document.js @@ -18,7 +18,6 @@ import { Underline, BlockQuote, CKBox, - EasyImage, Heading, Image, ImageCaption, @@ -57,7 +56,6 @@ export class DecoupledEditor extends DecoupledEditorBase { BlockQuote, CKBox, CloudServices, - EasyImage, Heading, Image, ImageCaption, diff --git a/docs/_snippets/build-inline.js b/docs/_snippets/build-inline.js index 6d93429a095..241a9ad8ee5 100644 --- a/docs/_snippets/build-inline.js +++ b/docs/_snippets/build-inline.js @@ -13,7 +13,6 @@ import { BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -44,7 +43,6 @@ export class InlineEditor extends InlineEditorBase { BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, diff --git a/docs/_snippets/build-multi-root.js b/docs/_snippets/build-multi-root.js index f530e985c7d..96e1b3a9467 100644 --- a/docs/_snippets/build-multi-root.js +++ b/docs/_snippets/build-multi-root.js @@ -13,7 +13,6 @@ import { BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -44,7 +43,6 @@ export class MultiRootEditor extends MultiRootEditorBase { BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, diff --git a/docs/_snippets/examples/bottom-toolbar-editor.js b/docs/_snippets/examples/bottom-toolbar-editor.js index 4051bf5471e..423ff6ba0fe 100644 --- a/docs/_snippets/examples/bottom-toolbar-editor.js +++ b/docs/_snippets/examples/bottom-toolbar-editor.js @@ -5,7 +5,7 @@ import { Plugin, IconFontColor, Font, Indent, List, Alignment, Autoformat, BlockQuote, DropdownView, - ToolbarView, createDropdown, EasyImage, Essentials, Heading, HorizontalLine, Image, + ToolbarView, createDropdown, Essentials, Heading, HorizontalLine, Image, ImageInsert, ImageCaption, ImageStyle, ImageToolbar, ImageUpload, ImageResize, Link, MediaEmbed, Paragraph, RemoveFormat, Bold, Italic, Strikethrough, Superscript, Subscript, Underline, Table, TableToolbar @@ -108,7 +108,6 @@ DecoupledEditor Autoformat, BlockQuote, Bold, - EasyImage, Essentials, Font, Heading, diff --git a/docs/_snippets/examples/inline-editor.js b/docs/_snippets/examples/inline-editor.js index 222d3622285..d675f7ca079 100644 --- a/docs/_snippets/examples/inline-editor.js +++ b/docs/_snippets/examples/inline-editor.js @@ -47,7 +47,6 @@ Array.from( inlineInjectElements ).forEach( inlineElement => { 'ImageToolbar', 'ImageUpload', 'List', - 'EasyImage', 'CKFinder', 'CKFinderUploadAdapter' ]; diff --git a/docs/_snippets/mini-inspector.js b/docs/_snippets/mini-inspector.js index b567345fe7c..2397a76b77a 100644 --- a/docs/_snippets/mini-inspector.js +++ b/docs/_snippets/mini-inspector.js @@ -6,7 +6,7 @@ import { DecoupledEditor, Essentials, Alignment, FontSize, FontFamily, FontColor, FontBackgroundColor, CKFinderUploadAdapter, Autoformat, Bold, Italic, Strikethrough, Underline, BlockQuote, CKBox, - CKFinder, EasyImage, Heading, Image, ImageCaption, ImageResize, ImageStyle, ImageToolbar, + CKFinder, Heading, Image, ImageCaption, ImageResize, ImageStyle, ImageToolbar, ImageUpload, PictureEditing, Indent, IndentBlock, Link, List, ListProperties, MediaEmbed, Paragraph, PasteFromOffice, Table, TableToolbar, TextTransformation, CloudServices } from 'ckeditor5'; @@ -31,7 +31,6 @@ export class MiniInspectorEditor extends DecoupledEditor { CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, diff --git a/docs/framework/custom-editor-creator.md b/docs/framework/custom-editor-creator.md index c124b8a96df..bfaf05eeff7 100644 --- a/docs/framework/custom-editor-creator.md +++ b/docs/framework/custom-editor-creator.md @@ -428,7 +428,7 @@ MultirootEditor .create( { licenseKey: '', // Or 'GPL'. plugins: [ Essentials, Paragraph, Heading, Bold, Italic, List, Link, BlockQuote, Image, ImageCaption, - ImageStyle, ImageToolbar, ImageUpload, Table, TableToolbar, MediaEmbed, EasyImage ], + ImageStyle, ImageToolbar, ImageUpload, Table, TableToolbar, MediaEmbed ], toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'uploadImage', 'blockQuote', 'insertTable', 'mediaEmbed', 'undo', 'redo' ], image: { diff --git a/docs/getting-started/setup/optimizing-build-size.md b/docs/getting-started/setup/optimizing-build-size.md index 0797db34d56..f1a1dea504c 100644 --- a/docs/getting-started/setup/optimizing-build-size.md +++ b/docs/getting-started/setup/optimizing-build-size.md @@ -164,7 +164,6 @@ import { BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -205,7 +204,6 @@ ClassicEditor.create( { CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -276,7 +274,6 @@ import { BlockQuote } from '@ckeditor/ckeditor5-block-quote/dist/index.js'; import { CKBox } from '@ckeditor/ckeditor5-ckbox/dist/index.js'; import { CKFinder } from '@ckeditor/ckeditor5-ckfinder/dist/index.js'; import { CloudServices } from '@ckeditor/ckeditor5-cloud-services/dist/index.js'; -import { EasyImage } from '@ckeditor/ckeditor5-easy-image/dist/index.js'; import { Heading } from '@ckeditor/ckeditor5-heading/dist/index.js'; import { Image, ImageCaption, ImageStyle, ImageToolbar, ImageUpload, PictureEditing } from '@ckeditor/ckeditor5-image/dist/index.js'; import { Indent } from '@ckeditor/ckeditor5-indent/dist/index.js'; @@ -336,7 +333,6 @@ import '@ckeditor/ckeditor5-block-quote/dist/index.css'; import '@ckeditor/ckeditor5-ckbox/dist/index.css'; import '@ckeditor/ckeditor5-ckfinder/dist/index.css'; import '@ckeditor/ckeditor5-cloud-services/dist/index.css'; -import '@ckeditor/ckeditor5-easy-image/dist/index.css'; import '@ckeditor/ckeditor5-heading/dist/index.css'; import '@ckeditor/ckeditor5-image/dist/index.css'; import '@ckeditor/ckeditor5-indent/dist/index.css'; @@ -361,7 +357,6 @@ ClassicEditor.create( { CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, diff --git a/docs/updating/nim-migration/customized-builds.md b/docs/updating/nim-migration/customized-builds.md index 255fefe81c2..5636a22b558 100644 --- a/docs/updating/nim-migration/customized-builds.md +++ b/docs/updating/nim-migration/customized-builds.md @@ -236,7 +236,6 @@ import { BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -269,7 +268,6 @@ export default class ClassicEditor extends ClassicEditorBase { CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, diff --git a/docs/updating/nim-migration/predefined-builds.md b/docs/updating/nim-migration/predefined-builds.md index 9c4d58beb83..3b4f9ab514b 100644 --- a/docs/updating/nim-migration/predefined-builds.md +++ b/docs/updating/nim-migration/predefined-builds.md @@ -75,7 +75,6 @@ If you are using predefined builds from npm, follow the steps below: BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -108,7 +107,6 @@ If you are using predefined builds from npm, follow the steps below: CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -188,7 +186,6 @@ If you are using predefined builds from npm, follow the steps below: BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -221,7 +218,6 @@ If you are using predefined builds from npm, follow the steps below: CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -301,7 +297,6 @@ If you are using predefined builds from npm, follow the steps below: BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -334,7 +329,6 @@ If you are using predefined builds from npm, follow the steps below: CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -415,7 +409,6 @@ If you are using predefined builds from npm, follow the steps below: BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -457,7 +450,6 @@ If you are using predefined builds from npm, follow the steps below: CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -546,7 +538,6 @@ If you are using predefined builds from npm, follow the steps below: BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -589,7 +580,6 @@ If you are using predefined builds from npm, follow the steps below: CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -682,7 +672,6 @@ If you are using predefined builds from npm, follow the steps below: BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -715,7 +704,6 @@ If you are using predefined builds from npm, follow the steps below: CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -854,7 +842,6 @@ One notable difference between the old build and the new ESM build is that the f BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -885,7 +872,6 @@ One notable difference between the old build and the new ESM build is that the f CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -967,7 +953,6 @@ One notable difference between the old build and the new ESM build is that the f BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -998,7 +983,6 @@ One notable difference between the old build and the new ESM build is that the f CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -1080,7 +1064,6 @@ One notable difference between the old build and the new ESM build is that the f BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -1111,7 +1094,6 @@ One notable difference between the old build and the new ESM build is that the f CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -1194,7 +1176,6 @@ One notable difference between the old build and the new ESM build is that the f BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -1234,7 +1215,6 @@ One notable difference between the old build and the new ESM build is that the f CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -1325,7 +1305,6 @@ One notable difference between the old build and the new ESM build is that the f BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -1366,7 +1345,6 @@ One notable difference between the old build and the new ESM build is that the f CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -1461,7 +1439,6 @@ One notable difference between the old build and the new ESM build is that the f BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -1492,7 +1469,6 @@ One notable difference between the old build and the new ESM build is that the f CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -1591,7 +1567,6 @@ One notable difference between the old build and the new ESM build is that the f CKFinder, CloudServices, CodeBlock, - EasyImage, Essentials, Heading, Image, @@ -1684,7 +1659,6 @@ One notable difference between the old build and the new ESM build is that the f CloudServices, CodeBlock, Comments, - EasyImage, Essentials, ExportPdf, ExportWord, @@ -1898,7 +1872,6 @@ One notable difference between the old build and the new ESM build is that the f BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -1929,7 +1902,6 @@ One notable difference between the old build and the new ESM build is that the f CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -2011,7 +1983,6 @@ One notable difference between the old build and the new ESM build is that the f BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -2042,7 +2013,6 @@ One notable difference between the old build and the new ESM build is that the f CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -2124,7 +2094,6 @@ One notable difference between the old build and the new ESM build is that the f BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -2155,7 +2124,6 @@ One notable difference between the old build and the new ESM build is that the f CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -2238,7 +2206,6 @@ One notable difference between the old build and the new ESM build is that the f BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -2278,7 +2245,6 @@ One notable difference between the old build and the new ESM build is that the f CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -2369,7 +2335,6 @@ One notable difference between the old build and the new ESM build is that the f BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -2410,7 +2375,6 @@ One notable difference between the old build and the new ESM build is that the f CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -2505,7 +2469,6 @@ One notable difference between the old build and the new ESM build is that the f BlockQuote, CKBox, CKFinder, - EasyImage, Heading, Image, ImageCaption, @@ -2536,7 +2499,6 @@ One notable difference between the old build and the new ESM build is that the f CKBox, CKFinder, CloudServices, - EasyImage, Heading, Image, ImageCaption, @@ -2635,7 +2597,6 @@ One notable difference between the old build and the new ESM build is that the f CKFinder, CloudServices, CodeBlock, - EasyImage, Essentials, Heading, Image, @@ -2728,7 +2689,6 @@ One notable difference between the old build and the new ESM build is that the f CloudServices, CodeBlock, Comments, - EasyImage, Essentials, ExportPdf, ExportWord, diff --git a/docs/updating/updating-ckeditor-5.md b/docs/updating/updating-ckeditor-5.md index d018ab6a98d..5b706efb166 100644 --- a/docs/updating/updating-ckeditor-5.md +++ b/docs/updating/updating-ckeditor-5.md @@ -56,7 +56,6 @@ This can be done by updating the `package.json` file with the latest editor vers "@ckeditor/ckeditor5-block-quote": "^{@var ckeditor5-version}", "@ckeditor/ckeditor5-ckfinder": "^{@var ckeditor5-version}", "@ckeditor/ckeditor5-cloud-services": "^{@var ckeditor5-version}", - "@ckeditor/ckeditor5-easy-image": "^{@var ckeditor5-version}", "@ckeditor/ckeditor5-editor-classic": "^{@var ckeditor5-version}", "@ckeditor/ckeditor5-essentials": "^{@var ckeditor5-version}", "@ckeditor/ckeditor5-heading": "^{@var ckeditor5-version}", diff --git a/packages/ckeditor5-cloud-services/src/cloudservicesconfig.ts b/packages/ckeditor5-cloud-services/src/cloudservicesconfig.ts index f1762f30f37..654eb326079 100644 --- a/packages/ckeditor5-cloud-services/src/cloudservicesconfig.ts +++ b/packages/ckeditor5-cloud-services/src/cloudservicesconfig.ts @@ -20,8 +20,7 @@ export type TokenUrl = string | ( () => Promise ); * .create( { * attachTo: document.querySelector( '#editor' ), * cloudServices: { - * tokenUrl: 'https://example.com/cs-token-endpoint', - * uploadUrl: 'https://your-organization-id.cke-cs.com/easyimage/upload/' + * tokenUrl: 'https://example.com/cs-token-endpoint' * } * } ) * .then( ... ) @@ -95,8 +94,7 @@ export interface CloudServicesConfig { * to refresh the token. * * You can find more information about token endpoints in the - * [Easy Image](https://ckeditor.com/docs/cs/latest/developer-resources/easy-image/service-details.html) guide - * and [Cloud Services - Token endpoint](https://ckeditor.com/docs/cs/latest/developer-resources/security/token-endpoint.html) + * [Cloud Services - Token endpoint](https://ckeditor.com/docs/cs/latest/developer-resources/security/token-endpoint.html) * documentation. * * Without a properly working token endpoint (token URL) CKEditor plugins will not be able to connect to CKEditor Cloud Services. @@ -105,15 +103,10 @@ export interface CloudServicesConfig { /** * The endpoint URL for [CKEditor Cloud Services](https://ckeditor.com/ckeditor-cloud-services) uploads. - * This option must be set for Easy Image to work correctly. + * This option is used by the legacy Easy Image product. * - * The upload URL is unique for each customer and can be found in the - * [CKEditor Ecosystem customer dashboard](https://dashboard.ckeditor.com) after subscribing to the Easy Image service. - * To learn more, check the [Easy Image](https://ckeditor.com/docs/cs/latest/developer-resources/easy-image/service-details.html) guide. - * - * Note: Easy Image is a legacy product and only maintained for existing clients. - * - * Note: Make sure to also set the {@link module:cloud-services/cloudservicesconfig~CloudServicesConfig#tokenUrl} configuration option. + * Note: Easy Image is a legacy product and only maintained for existing clients. Make sure to also set the + * {@link module:cloud-services/cloudservicesconfig~CloudServicesConfig#tokenUrl} configuration option. */ uploadUrl?: string; diff --git a/packages/ckeditor5-heading/docs/_snippets/features/title.js b/packages/ckeditor5-heading/docs/_snippets/features/title.js index 6af0b8037ae..9df55b150de 100644 --- a/packages/ckeditor5-heading/docs/_snippets/features/title.js +++ b/packages/ckeditor5-heading/docs/_snippets/features/title.js @@ -13,7 +13,6 @@ import { BlockQuote, CKBox, CKBoxImageEdit, - EasyImage, Heading, Title, Image, @@ -52,7 +51,6 @@ BalloonEditor.builtinPlugins = [ CKBox, CKBoxImageEdit, CloudServices, - EasyImage, Heading, Image, ImageInsert, diff --git a/packages/ckeditor5-ui/docs/_snippets/examples/bootstrap-ui.js b/packages/ckeditor5-ui/docs/_snippets/examples/bootstrap-ui.js index 35cf2d35f10..4d334bf4493 100644 --- a/packages/ckeditor5-ui/docs/_snippets/examples/bootstrap-ui.js +++ b/packages/ckeditor5-ui/docs/_snippets/examples/bootstrap-ui.js @@ -10,15 +10,12 @@ import { ItalicEditing, UnderlineEditing, Clipboard, - CloudServices, Editor, ElementApiMixin, attachToForm, - EasyImage, Enter, HeadingEditing, Image, - ImageUpload, Paragraph, Typing, EditorUI, @@ -29,8 +26,6 @@ import { getDataFromElement } from 'ckeditor5'; -import { CS_CONFIG } from '@snippets/index.js'; - // Extending the Editor class, which brings base editor API. export default class BootstrapEditor extends ElementApiMixin( Editor ) { constructor( element, config ) { @@ -281,10 +276,9 @@ class BootstrapEditorUI extends EditorUI { BootstrapEditor .create( $( '#editor' ).get( 0 ), { plugins: [ - Clipboard, Enter, Typing, Paragraph, EasyImage, Image, ImageUpload, CloudServices, + Clipboard, Enter, Typing, Paragraph, Image, BoldEditing, ItalicEditing, UnderlineEditing, HeadingEditing, UndoEditing - ], - cloudServices: CS_CONFIG + ] } ) .then( editor => { window.editor = editor; diff --git a/packages/ckeditor5-upload/src/filerepository.ts b/packages/ckeditor5-upload/src/filerepository.ts index 8ea36558e19..112df142ee5 100644 --- a/packages/ckeditor5-upload/src/filerepository.ts +++ b/packages/ckeditor5-upload/src/filerepository.ts @@ -30,8 +30,7 @@ import { FileReader } from './filereader.js'; * * To use it, first you need an upload adapter. Upload adapter's job is to handle communication with the server * (sending the file and handling server's response). You can use one of the existing plugins introducing upload adapters - * (e.g. {@link module:easy-image/cloudservicesuploadadapter~CloudServicesUploadAdapter} or - * {@link module:adapter-ckfinder/uploadadapter~CKFinderUploadAdapter}) or write your own one – see + * (e.g. {@link module:adapter-ckfinder/uploadadapter~CKFinderUploadAdapter}) or write your own one – see * the {@glink framework/deep-dive/upload-adapter Custom image upload adapter deep-dive} guide. * * Then, you can use {@link module:upload/filerepository~FileRepository#createLoader `createLoader()`} and the returned @@ -628,8 +627,7 @@ export interface UploadAdapter { * ``` * * NOTE: When returning multiple images, the widest returned one should equal the default one. It is essential to - * correctly set `width` attribute of the image. See this discussion: - * https://github.com/ckeditor/ckeditor5-easy-image/issues/4 for more information. + * correctly set `width` attribute of the image. * * Take a look at {@link module:upload/filerepository~UploadAdapter example Adapter implementation} and * {@link module:upload/filerepository~FileRepository#createUploadAdapter createUploadAdapter method}.