Merge branch 'master' into i/8953

ckeditor · Feb 2, 2021 · 21d3463 · 21d3463
2 parents e2cece4 + b278fde
commit 21d3463
Show file tree

Hide file tree

Showing 493 changed files with 5,185 additions and 1,301 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -7,6 +7,32 @@
 
 'use strict';
 
+const fs = require( 'fs' );
+const path = require( 'path' );
+
+const dllPackages = fs.readdirSync( path.join( __dirname, 'src' ) ).map( directory => directory.replace( /\.js$/, '' ) );
+
 module.exports = {
-	extends: 'ckeditor5'
+	extends: 'ckeditor5',
+	settings: {
+		dllPackages
+	},
+	rules: {
+		'ckeditor5-rules/ckeditor-imports': 'error'
+	},
+	overrides: [
+		{
+			files: [ '**/tests/**/*.js' ],
+			rules: {
+				'no-unused-expressions': 'off',
+				'ckeditor5-rules/ckeditor-imports': 'off'
+			}
+		},
+		{
+			files: [ '**/docs/**/*.js' ],
+			rules: {
+				'ckeditor5-rules/ckeditor-imports': 'off'
+			}
+		}
+	]
 };
diff --git a/docs/_snippets/examples/custom-build.js b/docs/_snippets/examples/custom-build.js
@@ -15,6 +15,9 @@ import Strikethrough from '@ckeditor/ckeditor5-basic-styles/src/strikethrough';
 import Code from '@ckeditor/ckeditor5-basic-styles/src/code';
 import Highlight from '@ckeditor/ckeditor5-highlight/src/highlight';
 import EasyImage from '@ckeditor/ckeditor5-easy-image/src/easyimage';
+import Image from '@ckeditor/ckeditor5-image/src/image';
+import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload';
+import CloudServices from '@ckeditor/ckeditor5-cloud-services/src/cloudservices';
 
 import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config';
 
@@ -29,7 +32,10 @@ ClassicEditor
 			Strikethrough,
 			Code,
 			Highlight,
-			EasyImage
+			EasyImage,
+			Image,
+			ImageUpload,
+			CloudServices
 		],
 		toolbar: {
 			items: [ 'bold', 'italic', 'underline', 'strikethrough', 'code', '|', 'highlight', '|', 'undo', 'redo' ],

diff --git a/docs/_snippets/examples/multi-root-editor.js b/docs/_snippets/examples/multi-root-editor.js
@@ -37,6 +37,7 @@ import Table from '@ckeditor/ckeditor5-table/src/table';
 import TableToolbar from '@ckeditor/ckeditor5-table/src/tabletoolbar';
 import MediaEmbed from '@ckeditor/ckeditor5-media-embed/src/mediaembed';
 import EasyImage from '@ckeditor/ckeditor5-easy-image/src/easyimage';
+import CloudServices from '@ckeditor/ckeditor5-cloud-services/src/cloudservices';
 import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config';
 
 /**
@@ -388,7 +389,7 @@ MultirootEditor
 		footerright: document.querySelector( '#footer-right' )
 	}, {
 		plugins: [ Essentials, Paragraph, Heading, Bold, Italic, List, Link, BlockQuote, Image, ImageCaption,
-			ImageStyle, ImageToolbar, ImageUpload, Table, TableToolbar, MediaEmbed, EasyImage ],
+			ImageStyle, ImageToolbar, ImageUpload, Table, TableToolbar, MediaEmbed, EasyImage, CloudServices ],
 		toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'imageUpload', 'blockQuote',
 			'insertTable', 'mediaEmbed', 'undo', 'redo' ],
 		image: {

diff --git a/docs/_snippets/features/mathtype.js b/docs/_snippets/features/mathtype.js
@@ -8,6 +8,8 @@
 import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor';
 import ArticlePluginSet from '@ckeditor/ckeditor5-core/tests/_utils/articlepluginset';
 import EasyImage from '@ckeditor/ckeditor5-easy-image/src/easyimage';
+import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload';
+import CloudServices from '@ckeditor/ckeditor5-cloud-services/src/cloudservices';
 import MathType from '@wiris/mathtype-ckeditor5';
 import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config';
 
@@ -16,6 +18,8 @@ ClassicEditor
 		plugins: [
 			ArticlePluginSet,
 			EasyImage,
+			ImageUpload,
+			CloudServices,
 			MathType
 		],
 		toolbar: {

diff --git a/docs/_snippets/features/wproofreader.js b/docs/_snippets/features/wproofreader.js
@@ -8,13 +8,15 @@
 import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor';
 import ArticlePluginSet from '@ckeditor/ckeditor5-core/tests/_utils/articlepluginset';
 import EasyImage from '@ckeditor/ckeditor5-easy-image/src/easyimage';
+import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload';
+import CloudServices from '@ckeditor/ckeditor5-cloud-services/src/cloudservices';
 import WProofreader from '@webspellchecker/wproofreader-ckeditor5/src/wproofreader';
 
 import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config';
 
 ClassicEditor
 	.create( document.querySelector( '#snippet-wproofreader' ), {
-		plugins: [ ArticlePluginSet, EasyImage, WProofreader ],
+		plugins: [ ArticlePluginSet, EasyImage, ImageUpload, CloudServices, WProofreader ],
 		wproofreader: {
 			serviceId: '1:Eebp63-lWHbt2-ASpHy4-AYUpy2-fo3mk4-sKrza1-NsuXy4-I1XZC2-0u2F54-aqYWd1-l3Qf14-umd',
 			lang: 'en_AI',