Merge pull request #8592 from ckeditor/i/8578

Internal: Move DLL definition to main CKEditor5 package. Closes #8578.
ckeditor · Dec 8, 2020 · 80790e6 · 80790e6
2 parents 322c74f + 5b9e536
commit 80790e6
Show file tree

Hide file tree

Showing 176 changed files with 780 additions and 681 deletions.
diff --git a/package.json b/package.json
@@ -38,6 +38,10 @@
     "@ckeditor/ckeditor5-cloud-services": "^23.1.0",
     "@ckeditor/ckeditor5-code-block": "^23.1.0",
     "@ckeditor/ckeditor5-core": "^23.1.0",
+    "@ckeditor/ckeditor5-dll-balloon": "^23.1.0",
+    "@ckeditor/ckeditor5-dll-classic": "^23.1.0",
+    "@ckeditor/ckeditor5-dll-decoupled-document": "^23.1.0",
+    "@ckeditor/ckeditor5-dll-inline": "^23.1.0",
     "@ckeditor/ckeditor5-easy-image": "^23.1.0",
     "@ckeditor/ckeditor5-editor-balloon": "^23.1.0",
     "@ckeditor/ckeditor5-editor-classic": "^23.1.0",
@@ -156,7 +160,7 @@
     "release:publish": "node ./scripts/release/publish.js",
     "switch-to-dev-dev": "sh ./scripts/switch-to-dev-dev.sh",
     "clean-up-svg-icons": "sh ./scripts/clean-up-svg-icons.sh",
-    "build:dll": "node ./scripts/build-dlls.js"
+    "build:dll": "webpack --config=webpack.config.dll.js && node ./scripts/build-dlls.js"
   },
   "lint-staged": {
     "**/*.js": [

diff --git a/packages/ckeditor5-basic-styles/package.json b/packages/ckeditor5-basic-styles/package.json
@@ -10,18 +10,18 @@
     "ckeditor5-plugin"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^23.1.0",
-    "@ckeditor/ckeditor5-typing": "^23.1.0",
-    "@ckeditor/ckeditor5-ui": "^23.1.0"
+    "ckeditor5": "^23.1.0"
   },
   "devDependencies": {
+    "@ckeditor/ckeditor5-core": "^23.1.0",
+    "@ckeditor/ckeditor5-dev-utils": "^20.0.0",
     "@ckeditor/ckeditor5-editor-classic": "^23.1.0",
     "@ckeditor/ckeditor5-engine": "^23.1.0",
     "@ckeditor/ckeditor5-essentials": "^23.1.0",
-    "@ckeditor/ckeditor5-dev-utils": "^20.0.0",
     "@ckeditor/ckeditor5-paragraph": "^23.1.0",
     "@ckeditor/ckeditor5-remove-format": "^23.1.0",
     "@ckeditor/ckeditor5-theme-lark": "^23.1.0",
+    "@ckeditor/ckeditor5-ui": "^23.1.0",
     "@ckeditor/ckeditor5-utils": "^23.1.0",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"

diff --git a/packages/ckeditor5-basic-styles/src/attributecommand.js b/packages/ckeditor5-basic-styles/src/attributecommand.js
@@ -7,7 +7,7 @@
  * @module basic-styles/attributecommand
  */
 
-import { Command } from '@ckeditor/ckeditor5-core/core';
+import { Command } from 'ckeditor5/src/core';
 
 /**
  * An extension of the base {@link module:core/command~Command} class, which provides utilities for a command

diff --git a/packages/ckeditor5-basic-styles/src/bold.js b/packages/ckeditor5-basic-styles/src/bold.js
@@ -7,7 +7,7 @@
  * @module basic-styles/bold
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
+import { Plugin } from 'ckeditor5/src/core';
 import BoldEditing from './bold/boldediting';
 import BoldUI from './bold/boldui';
 

diff --git a/packages/ckeditor5-basic-styles/src/bold/boldediting.js b/packages/ckeditor5-basic-styles/src/bold/boldediting.js
@@ -7,7 +7,7 @@
  * @module basic-styles/bold/boldediting
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
+import { Plugin } from 'ckeditor5/src/core';
 import AttributeCommand from '../attributecommand';
 
 const BOLD = 'bold';

diff --git a/packages/ckeditor5-basic-styles/src/bold/boldui.js b/packages/ckeditor5-basic-styles/src/bold/boldui.js
@@ -7,8 +7,8 @@
  * @module basic-styles/bold/boldui
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
-import { ButtonView } from '@ckeditor/ckeditor5-ui/ui';
+import { Plugin } from 'ckeditor5/src/core';
+import { ButtonView } from 'ckeditor5/src/ui';
 
 import boldIcon from '../../theme/icons/bold.svg';
 

diff --git a/packages/ckeditor5-basic-styles/src/code.js b/packages/ckeditor5-basic-styles/src/code.js
@@ -7,7 +7,7 @@
  * @module basic-styles/code
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
+import { Plugin } from 'ckeditor5/src/core';
 import CodeEditing from './code/codeediting';
 import CodeUI from './code/codeui';
 

diff --git a/packages/ckeditor5-basic-styles/src/code/codeediting.js b/packages/ckeditor5-basic-styles/src/code/codeediting.js
@@ -7,8 +7,8 @@
  * @module basic-styles/code/codeediting
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
-import { TwoStepCaretMovement, inlineHighlight } from '@ckeditor/ckeditor5-typing/typing';
+import { Plugin } from 'ckeditor5/src/core';
+import { TwoStepCaretMovement, inlineHighlight } from 'ckeditor5/src/typing';
 
 import AttributeCommand from '../attributecommand';
 

diff --git a/packages/ckeditor5-basic-styles/src/code/codeui.js b/packages/ckeditor5-basic-styles/src/code/codeui.js
@@ -7,8 +7,8 @@
  * @module basic-styles/code/codeui
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
-import { ButtonView } from '@ckeditor/ckeditor5-ui/ui';
+import { Plugin } from 'ckeditor5/src/core';
+import { ButtonView } from 'ckeditor5/src/ui';
 
 import codeIcon from '../../theme/icons/code.svg';
 

diff --git a/packages/ckeditor5-basic-styles/src/italic.js b/packages/ckeditor5-basic-styles/src/italic.js
@@ -7,7 +7,7 @@
  * @module basic-styles/italic
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
+import { Plugin } from 'ckeditor5/src/core';
 import ItalicEditing from './italic/italicediting';
 import ItalicUI from './italic/italicui';
 

diff --git a/packages/ckeditor5-basic-styles/src/italic/italicediting.js b/packages/ckeditor5-basic-styles/src/italic/italicediting.js
@@ -7,7 +7,7 @@
  * @module basic-styles/italic/italicediting
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
+import { Plugin } from 'ckeditor5/src/core';
 import AttributeCommand from '../attributecommand';
 
 const ITALIC = 'italic';

diff --git a/packages/ckeditor5-basic-styles/src/italic/italicui.js b/packages/ckeditor5-basic-styles/src/italic/italicui.js
@@ -7,8 +7,8 @@
  * @module basic-styles/italic/italicui
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
-import { ButtonView } from '@ckeditor/ckeditor5-ui/ui';
+import { Plugin } from 'ckeditor5/src/core';
+import { ButtonView } from 'ckeditor5/src/ui';
 
 import italicIcon from '../../theme/icons/italic.svg';
 

diff --git a/packages/ckeditor5-basic-styles/src/strikethrough.js b/packages/ckeditor5-basic-styles/src/strikethrough.js
@@ -7,7 +7,7 @@
  * @module basic-styles/strikethrough
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
+import { Plugin } from 'ckeditor5/src/core';
 import StrikethroughEditing from './strikethrough/strikethroughediting';
 import StrikethroughUI from './strikethrough/strikethroughui';
 

diff --git a/packages/ckeditor5-basic-styles/src/strikethrough/strikethroughediting.js b/packages/ckeditor5-basic-styles/src/strikethrough/strikethroughediting.js
@@ -7,7 +7,7 @@
  * @module basic-styles/strikethrough/strikethroughediting
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
+import { Plugin } from 'ckeditor5/src/core';
 import AttributeCommand from '../attributecommand';
 
 const STRIKETHROUGH = 'strikethrough';

diff --git a/packages/ckeditor5-basic-styles/src/strikethrough/strikethroughui.js b/packages/ckeditor5-basic-styles/src/strikethrough/strikethroughui.js
@@ -7,8 +7,8 @@
  * @module basic-styles/strikethrough/strikethroughui
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
-import { ButtonView } from '@ckeditor/ckeditor5-ui/ui';
+import { Plugin } from 'ckeditor5/src/core';
+import { ButtonView } from 'ckeditor5/src/ui';
 
 import strikethroughIcon from '../../theme/icons/strikethrough.svg';
 

diff --git a/packages/ckeditor5-basic-styles/src/subscript.js b/packages/ckeditor5-basic-styles/src/subscript.js
@@ -7,7 +7,7 @@
  * @module basic-styles/subscript
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
+import { Plugin } from 'ckeditor5/src/core';
 import SubscriptEditing from './subscript/subscriptediting';
 import SubscriptUI from './subscript/subscriptui';
 

diff --git a/packages/ckeditor5-basic-styles/src/subscript/subscriptediting.js b/packages/ckeditor5-basic-styles/src/subscript/subscriptediting.js
@@ -7,7 +7,7 @@
  * @module basic-styles/subscript/subscriptediting
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
+import { Plugin } from 'ckeditor5/src/core';
 import AttributeCommand from '../attributecommand';
 
 const SUBSCRIPT = 'subscript';

diff --git a/packages/ckeditor5-basic-styles/src/subscript/subscriptui.js b/packages/ckeditor5-basic-styles/src/subscript/subscriptui.js
@@ -7,8 +7,8 @@
  * @module basic-styles/subscript/subscriptui
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
-import { ButtonView } from '@ckeditor/ckeditor5-ui/ui';
+import { Plugin } from 'ckeditor5/src/core';
+import { ButtonView } from 'ckeditor5/src/ui';
 
 import subscriptIcon from '../../theme/icons/subscript.svg';
 

diff --git a/packages/ckeditor5-basic-styles/src/superscript.js b/packages/ckeditor5-basic-styles/src/superscript.js
@@ -7,7 +7,7 @@
  * @module basic-styles/superscript
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
+import { Plugin } from 'ckeditor5/src/core';
 import SuperscriptEditing from './superscript/superscriptediting';
 import SuperscriptUI from './superscript/superscriptui';
 

diff --git a/packages/ckeditor5-basic-styles/src/superscript/superscriptediting.js b/packages/ckeditor5-basic-styles/src/superscript/superscriptediting.js
@@ -7,7 +7,7 @@
  * @module basic-styles/superscript/superscriptediting
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
+import { Plugin } from 'ckeditor5/src/core';
 import AttributeCommand from '../attributecommand';
 
 const SUPERSCRIPT = 'superscript';

diff --git a/packages/ckeditor5-basic-styles/src/superscript/superscriptui.js b/packages/ckeditor5-basic-styles/src/superscript/superscriptui.js
@@ -7,8 +7,8 @@
  * @module basic-styles/superscript/superscriptui
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
-import { ButtonView } from '@ckeditor/ckeditor5-ui/ui';
+import { Plugin } from 'ckeditor5/src/core';
+import { ButtonView } from 'ckeditor5/src/ui';
 
 import superscriptIcon from '../../theme/icons/superscript.svg';
 

diff --git a/packages/ckeditor5-basic-styles/src/underline.js b/packages/ckeditor5-basic-styles/src/underline.js
@@ -7,7 +7,7 @@
  * @module basic-styles/underline
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
+import { Plugin } from 'ckeditor5/src/core';
 import UnderlineEditing from './underline/underlineediting';
 import UnderlineUI from './underline/underlineui';
 

diff --git a/packages/ckeditor5-basic-styles/src/underline/underlineediting.js b/packages/ckeditor5-basic-styles/src/underline/underlineediting.js
@@ -7,7 +7,7 @@
  * @module basic-styles/underline/underlineediting
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
+import { Plugin } from 'ckeditor5/src/core';
 import AttributeCommand from '../attributecommand';
 
 const UNDERLINE = 'underline';

diff --git a/packages/ckeditor5-basic-styles/src/underline/underlineui.js b/packages/ckeditor5-basic-styles/src/underline/underlineui.js
@@ -7,8 +7,8 @@
  * @module basic-styles/underline/underlineui
  */
 
-import { Plugin } from '@ckeditor/ckeditor5-core/core';
-import { ButtonView } from '@ckeditor/ckeditor5-ui/ui';
+import { Plugin } from 'ckeditor5/src/core';
+import { ButtonView } from 'ckeditor5/src/ui';
 
 import underlineIcon from '../../theme/icons/underline.svg';
 

diff --git a/packages/ckeditor5-basic-styles/webpack.config.js b/packages/ckeditor5-basic-styles/webpack.config.js
@@ -58,16 +58,8 @@ module.exports = {
 	},
 	plugins: [
 		new webpack.DllReferencePlugin( {
-			manifest: require( '../../packages/ckeditor5-dll/build/ckeditor5-dll.manifest.json' ),
-			scope: '@ckeditor/ckeditor5-core'
-		} ),
-		new webpack.DllReferencePlugin( {
-			manifest: require( '../../packages/ckeditor5-dll/build/ckeditor5-dll.manifest.json' ),
-			scope: '@ckeditor/ckeditor5-typing'
-		} ),
-		new webpack.DllReferencePlugin( {
-			manifest: require( '../../packages/ckeditor5-dll/build/ckeditor5-dll.manifest.json' ),
-			scope: '@ckeditor/ckeditor5-ui'
+			manifest: require( '../../build/ckeditor5-dll.manifest.json' ),
+			scope: 'ckeditor5/src'
 		} )
 	]
 };
diff --git a/packages/ckeditor5-core/core.js b/packages/ckeditor5-core/core.js
@@ -9,5 +9,11 @@
 
 export { default as Plugin } from './src/plugin';
 export { default as Command } from './src/command';
+
 export { default as Editor } from './src/editor/editor';
+export { default as EditorUI } from './src/editor/editorui';
 
+export { default as attachToForm } from './src/editor/utils/attachtoform';
+export { default as DataApiMixin } from './src/editor/utils/dataapimixin';
+export { default as ElementApiMixin } from './src/editor/utils/elementapimixin';
+export { default as secureSourceElement } from './src/editor/utils/securesourceelement';
diff --git a/packages/ckeditor5-dll-balloon/package.json b/packages/ckeditor5-dll-balloon/package.json
@@ -18,15 +18,18 @@
     "build:dll": "webpack --config=webpack.config.js"
   },
   "dependencies": {
-    "@ckeditor/ckeditor5-editor-balloon": "^23.1.0",
-    "@ckeditor/ckeditor5-paragraph": "^23.1.0",
+    "ckeditor5": "^23.1.0"
+  },
+  "devDependencies": {
+    "@ckeditor/ckeditor5-theme-lark": "^23.1.0",
     "@ckeditor/ckeditor5-clipboard": "^23.1.0",
+    "@ckeditor/ckeditor5-dev-utils": "^23.6.1",
+    "@ckeditor/ckeditor5-editor-balloon": "^23.1.0",
     "@ckeditor/ckeditor5-enter": "^23.1.0",
+    "@ckeditor/ckeditor5-paragraph": "^23.1.0",
+    "@ckeditor/ckeditor5-select-all": "^23.1.0",
     "@ckeditor/ckeditor5-typing": "^23.1.0",
     "@ckeditor/ckeditor5-undo": "^23.1.0",
-    "@ckeditor/ckeditor5-select-all": "^23.1.0"
-  },
-  "devDependencies": {
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   }

diff --git a/packages/ckeditor5-dll-balloon/src/ckeditor.js b/packages/ckeditor5-dll-balloon/src/ckeditor.js
@@ -5,13 +5,13 @@
 
 // The editor creator to use.
 
-import { BalloonEditor as BalloonEditorBase } from '@ckeditor/ckeditor5-editor-balloon/ballooneditor';
-import { Paragraph } from '@ckeditor/ckeditor5-paragraph/paragraph';
-import { Clipboard } from '@ckeditor/ckeditor5-clipboard/clipboard';
-import { Enter, ShiftEnter } from '@ckeditor/ckeditor5-enter/enter';
-import { Typing } from '@ckeditor/ckeditor5-typing/typing';
-import { Undo } from '@ckeditor/ckeditor5-undo/undo';
-import { SelectAll } from '@ckeditor/ckeditor5-select-all/selectall';
+import BalloonEditorBase from '@ckeditor/ckeditor5-editor-balloon/src/ballooneditor';
+import { Paragraph } from 'ckeditor5/src/paragraph';
+import { Clipboard } from 'ckeditor5/src/clipboard';
+import { Enter, ShiftEnter } from 'ckeditor5/src/enter';
+import { Typing } from 'ckeditor5/src/typing';
+import { Undo } from 'ckeditor5/src/undo';
+import { SelectAll } from 'ckeditor5/src/selectall';
 
 export default class BalloonEditor extends BalloonEditorBase {}
 

diff --git a/packages/ckeditor5-dll-balloon/tests/ckeditor.js b/packages/ckeditor5-dll-balloon/tests/ckeditor.js
@@ -6,12 +6,12 @@
 /* globals document */
 
 import BaseBalloonEditor from '@ckeditor/ckeditor5-editor-balloon/src/ballooneditor';
-import { Paragraph } from '@ckeditor/ckeditor5-paragraph/paragraph';
-import { Clipboard } from '@ckeditor/ckeditor5-clipboard/clipboard';
-import { Enter, ShiftEnter } from '@ckeditor/ckeditor5-enter/enter';
-import { Typing } from '@ckeditor/ckeditor5-typing/typing';
-import { Undo } from '@ckeditor/ckeditor5-undo/undo';
-import { SelectAll } from '@ckeditor/ckeditor5-select-all/selectall';
+import { Paragraph } from 'ckeditor5/src/paragraph';
+import { Clipboard } from 'ckeditor5/src/clipboard';
+import { Enter, ShiftEnter } from 'ckeditor5/src/enter';
+import { Typing } from 'ckeditor5/src/typing';
+import { Undo } from 'ckeditor5/src/undo';
+import { SelectAll } from 'ckeditor5/src/selectall';
 
 import BalloonEditor from '../src/ckeditor';