From f13ecbacbd947b7cd636eb6e54dff9da6a5dda77 Mon Sep 17 00:00:00 2001
From: Przemyslaw Zan <p.zan@cksource.com>
Date: Thu, 23 Mar 2023 15:07:15 +0100
Subject: [PATCH 1/2] Changed import method.

---
 .../lib/templates/js/sample/ckeditor.js.txt   | 44 +++++++++----------
 .../lib/templates/ts/sample/ckeditor.ts.txt   | 44 +++++++++----------
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/packages/ckeditor5-package-generator/lib/templates/js/sample/ckeditor.js.txt b/packages/ckeditor5-package-generator/lib/templates/js/sample/ckeditor.js.txt
index 4c39aca2..a172171b 100644
--- a/packages/ckeditor5-package-generator/lib/templates/js/sample/ckeditor.js.txt
+++ b/packages/ckeditor5-package-generator/lib/templates/js/sample/ckeditor.js.txt
@@ -1,27 +1,27 @@
-import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor';
+import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic';
 import CKEditorInspector from '@ckeditor/ckeditor5-inspector';
 
-import Essentials from '@ckeditor/ckeditor5-essentials/src/essentials';
-import Autoformat from '@ckeditor/ckeditor5-autoformat/src/autoformat';
-import BlockQuote from '@ckeditor/ckeditor5-block-quote/src/blockquote';
-import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
-import Heading from '@ckeditor/ckeditor5-heading/src/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 Base64UploadAdapter from '@ckeditor/ckeditor5-upload/src/adapters/base64uploadadapter';
-import Indent from '@ckeditor/ckeditor5-indent/src/indent';
-import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
-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/src/paragraph';
-import Table from '@ckeditor/ckeditor5-table/src/table';
-import TableToolbar from '@ckeditor/ckeditor5-table/src/tabletoolbar';
-import CodeBlock from '@ckeditor/ckeditor5-code-block/src/codeblock';
-import Code from '@ckeditor/ckeditor5-basic-styles/src/code';
+import { Essentials } from '@ckeditor/ckeditor5-essentials';
+import { Autoformat } from '@ckeditor/ckeditor5-autoformat';
+import { BlockQuote } from '@ckeditor/ckeditor5-block-quote';
+import { Bold } from '@ckeditor/ckeditor5-basic-styles';
+import { Heading } from '@ckeditor/ckeditor5-heading';
+import { Image } from '@ckeditor/ckeditor5-image';
+import { ImageCaption } from '@ckeditor/ckeditor5-image';
+import { ImageStyle } from '@ckeditor/ckeditor5-image';
+import { ImageToolbar } from '@ckeditor/ckeditor5-image';
+import { ImageUpload } from '@ckeditor/ckeditor5-image';
+import { Base64UploadAdapter } from '@ckeditor/ckeditor5-upload';
+import { Indent } from '@ckeditor/ckeditor5-indent';
+import { Italic } from '@ckeditor/ckeditor5-basic-styles';
+import { Link } from '@ckeditor/ckeditor5-link';
+import { List } from '@ckeditor/ckeditor5-list';
+import { MediaEmbed } from '@ckeditor/ckeditor5-media-embed';
+import { Paragraph } from '@ckeditor/ckeditor5-paragraph';
+import { Table } from '@ckeditor/ckeditor5-table';
+import { TableToolbar } from '@ckeditor/ckeditor5-table';
+import { CodeBlock } from '@ckeditor/ckeditor5-code-block';
+import { Code } from '@ckeditor/ckeditor5-basic-styles';
 
 import <%= formattedNames.plugin.pascalCase %> from '../src/<%= formattedNames.plugin.lowerCaseMerged %>';
 
diff --git a/packages/ckeditor5-package-generator/lib/templates/ts/sample/ckeditor.ts.txt b/packages/ckeditor5-package-generator/lib/templates/ts/sample/ckeditor.ts.txt
index 30492119..6a641cd4 100644
--- a/packages/ckeditor5-package-generator/lib/templates/ts/sample/ckeditor.ts.txt
+++ b/packages/ckeditor5-package-generator/lib/templates/ts/sample/ckeditor.ts.txt
@@ -4,30 +4,30 @@ declare global {
 	}
 }
 
-import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor';
+import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic';
 import CKEditorInspector from '@ckeditor/ckeditor5-inspector';
 
-import Essentials from '@ckeditor/ckeditor5-essentials/src/essentials';
-import Autoformat from '@ckeditor/ckeditor5-autoformat/src/autoformat';
-import BlockQuote from '@ckeditor/ckeditor5-block-quote/src/blockquote';
-import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
-import Heading from '@ckeditor/ckeditor5-heading/src/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 Base64UploadAdapter from '@ckeditor/ckeditor5-upload/src/adapters/base64uploadadapter';
-import Indent from '@ckeditor/ckeditor5-indent/src/indent';
-import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
-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/src/paragraph';
-import Table from '@ckeditor/ckeditor5-table/src/table';
-import TableToolbar from '@ckeditor/ckeditor5-table/src/tabletoolbar';
-import CodeBlock from '@ckeditor/ckeditor5-code-block/src/codeblock';
-import Code from '@ckeditor/ckeditor5-basic-styles/src/code';
+import { Essentials } from '@ckeditor/ckeditor5-essentials';
+import { Autoformat } from '@ckeditor/ckeditor5-autoformat';
+import { BlockQuote } from '@ckeditor/ckeditor5-block-quote';
+import { Bold } from '@ckeditor/ckeditor5-basic-styles';
+import { Heading } from '@ckeditor/ckeditor5-heading';
+import { Image } from '@ckeditor/ckeditor5-image';
+import { ImageCaption } from '@ckeditor/ckeditor5-image';
+import { ImageStyle } from '@ckeditor/ckeditor5-image';
+import { ImageToolbar } from '@ckeditor/ckeditor5-image';
+import { ImageUpload } from '@ckeditor/ckeditor5-image';
+import { Base64UploadAdapter } from '@ckeditor/ckeditor5-upload';
+import { Indent } from '@ckeditor/ckeditor5-indent';
+import { Italic } from '@ckeditor/ckeditor5-basic-styles';
+import { Link } from '@ckeditor/ckeditor5-link';
+import { List } from '@ckeditor/ckeditor5-list';
+import { MediaEmbed } from '@ckeditor/ckeditor5-media-embed';
+import { Paragraph } from '@ckeditor/ckeditor5-paragraph';
+import { Table } from '@ckeditor/ckeditor5-table';
+import { TableToolbar } from '@ckeditor/ckeditor5-table';
+import { CodeBlock } from '@ckeditor/ckeditor5-code-block';
+import { Code } from '@ckeditor/ckeditor5-basic-styles';
 
 import <%= formattedNames.plugin.pascalCase %> from '../src/<%= formattedNames.plugin.lowerCaseMerged %>';
 

From 47e9beea6cb41767d71f72671b04d69074812371 Mon Sep 17 00:00:00 2001
From: Przemyslaw Zan <p.zan@cksource.com>
Date: Thu, 23 Mar 2023 15:50:48 +0100
Subject: [PATCH 2/2] Removed duplicate imports.

---
 .../lib/templates/js/sample/ckeditor.js.txt   | 22 +++++++------------
 .../lib/templates/ts/sample/ckeditor.ts.txt   | 22 +++++++------------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/packages/ckeditor5-package-generator/lib/templates/js/sample/ckeditor.js.txt b/packages/ckeditor5-package-generator/lib/templates/js/sample/ckeditor.js.txt
index a172171b..b258ea7a 100644
--- a/packages/ckeditor5-package-generator/lib/templates/js/sample/ckeditor.js.txt
+++ b/packages/ckeditor5-package-generator/lib/templates/js/sample/ckeditor.js.txt
@@ -1,27 +1,21 @@
-import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic';
 import CKEditorInspector from '@ckeditor/ckeditor5-inspector';
 
-import { Essentials } from '@ckeditor/ckeditor5-essentials';
+import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic';
+
 import { Autoformat } from '@ckeditor/ckeditor5-autoformat';
+import { Bold, Code, Italic } from '@ckeditor/ckeditor5-basic-styles';
 import { BlockQuote } from '@ckeditor/ckeditor5-block-quote';
-import { Bold } from '@ckeditor/ckeditor5-basic-styles';
+import { CodeBlock } from '@ckeditor/ckeditor5-code-block';
+import { Essentials } from '@ckeditor/ckeditor5-essentials';
 import { Heading } from '@ckeditor/ckeditor5-heading';
-import { Image } from '@ckeditor/ckeditor5-image';
-import { ImageCaption } from '@ckeditor/ckeditor5-image';
-import { ImageStyle } from '@ckeditor/ckeditor5-image';
-import { ImageToolbar } from '@ckeditor/ckeditor5-image';
-import { ImageUpload } from '@ckeditor/ckeditor5-image';
-import { Base64UploadAdapter } from '@ckeditor/ckeditor5-upload';
+import { Image, ImageCaption, ImageStyle, ImageToolbar, ImageUpload } from '@ckeditor/ckeditor5-image';
 import { Indent } from '@ckeditor/ckeditor5-indent';
-import { Italic } from '@ckeditor/ckeditor5-basic-styles';
 import { Link } from '@ckeditor/ckeditor5-link';
 import { List } from '@ckeditor/ckeditor5-list';
 import { MediaEmbed } from '@ckeditor/ckeditor5-media-embed';
 import { Paragraph } from '@ckeditor/ckeditor5-paragraph';
-import { Table } from '@ckeditor/ckeditor5-table';
-import { TableToolbar } from '@ckeditor/ckeditor5-table';
-import { CodeBlock } from '@ckeditor/ckeditor5-code-block';
-import { Code } from '@ckeditor/ckeditor5-basic-styles';
+import { Table, TableToolbar } from '@ckeditor/ckeditor5-table';
+import { Base64UploadAdapter } from '@ckeditor/ckeditor5-upload';
 
 import <%= formattedNames.plugin.pascalCase %> from '../src/<%= formattedNames.plugin.lowerCaseMerged %>';
 
diff --git a/packages/ckeditor5-package-generator/lib/templates/ts/sample/ckeditor.ts.txt b/packages/ckeditor5-package-generator/lib/templates/ts/sample/ckeditor.ts.txt
index 6a641cd4..1d3846d1 100644
--- a/packages/ckeditor5-package-generator/lib/templates/ts/sample/ckeditor.ts.txt
+++ b/packages/ckeditor5-package-generator/lib/templates/ts/sample/ckeditor.ts.txt
@@ -4,30 +4,24 @@ declare global {
 	}
 }
 
-import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic';
 import CKEditorInspector from '@ckeditor/ckeditor5-inspector';
 
-import { Essentials } from '@ckeditor/ckeditor5-essentials';
+import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic';
+
 import { Autoformat } from '@ckeditor/ckeditor5-autoformat';
+import { Bold, Code, Italic } from '@ckeditor/ckeditor5-basic-styles';
 import { BlockQuote } from '@ckeditor/ckeditor5-block-quote';
-import { Bold } from '@ckeditor/ckeditor5-basic-styles';
+import { CodeBlock } from '@ckeditor/ckeditor5-code-block';
+import { Essentials } from '@ckeditor/ckeditor5-essentials';
 import { Heading } from '@ckeditor/ckeditor5-heading';
-import { Image } from '@ckeditor/ckeditor5-image';
-import { ImageCaption } from '@ckeditor/ckeditor5-image';
-import { ImageStyle } from '@ckeditor/ckeditor5-image';
-import { ImageToolbar } from '@ckeditor/ckeditor5-image';
-import { ImageUpload } from '@ckeditor/ckeditor5-image';
-import { Base64UploadAdapter } from '@ckeditor/ckeditor5-upload';
+import { Image, ImageCaption, ImageStyle, ImageToolbar, ImageUpload } from '@ckeditor/ckeditor5-image';
 import { Indent } from '@ckeditor/ckeditor5-indent';
-import { Italic } from '@ckeditor/ckeditor5-basic-styles';
 import { Link } from '@ckeditor/ckeditor5-link';
 import { List } from '@ckeditor/ckeditor5-list';
 import { MediaEmbed } from '@ckeditor/ckeditor5-media-embed';
 import { Paragraph } from '@ckeditor/ckeditor5-paragraph';
-import { Table } from '@ckeditor/ckeditor5-table';
-import { TableToolbar } from '@ckeditor/ckeditor5-table';
-import { CodeBlock } from '@ckeditor/ckeditor5-code-block';
-import { Code } from '@ckeditor/ckeditor5-basic-styles';
+import { Table, TableToolbar } from '@ckeditor/ckeditor5-table';
+import { Base64UploadAdapter } from '@ckeditor/ckeditor5-upload';
 
 import <%= formattedNames.plugin.pascalCase %> from '../src/<%= formattedNames.plugin.lowerCaseMerged %>';