Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove base editors from the editor build #8595

Merged
merged 8 commits into from
Dec 8, 2020
Merged

Remove base editors from the editor build #8595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2073b09
Remove ClassicEditor from the editor DLL build.
jodator Dec 7, 2020
46307f5
Remove BalloonEditor from the editor DLL build.
jodator Dec 7, 2020
055fc85
Remove DecoupledEditor from the editor DLL build.
jodator Dec 7, 2020
23f6f53
Remove InlineEditor from the editor DLL build.
jodator Dec 7, 2020
2e1c795
Add missing theme-lark dependencies to dll builds.
jodator Dec 7, 2020
fd92efe
Make table package DLL compatible.
jodator Dec 7, 2020
e14dec6
Add missing dependencies.
jodator Dec 7, 2020
d4da278
Merge pull request #8600 from ckeditor/i/8599
pomek Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/ckeditor5-core/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
2 changes: 2 additions & 0 deletions packages/ckeditor5-dll-balloon/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
"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",
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-dll-balloon/src/ckeditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

// The editor creator to use.

import { BalloonEditor as BalloonEditorBase } from 'ckeditor5/src/ballooneditor';
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';
Expand Down
32 changes: 32 additions & 0 deletions packages/ckeditor5-dll-balloon/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

const path = require( 'path' );
const webpack = require( 'webpack' );
const { styles } = require( '@ckeditor/ckeditor5-dev-utils' );

module.exports = {
mode: 'development',
Expand All @@ -22,6 +23,37 @@ module.exports = {
libraryTarget: 'umd',
libraryExport: 'default'
},
module: {
rules: [
{
test: /\.svg$/,
use: [ 'raw-loader' ]
},
{
test: /\.css$/,
use: [
{
loader: 'style-loader',
options: {
injectType: 'singletonStyleTag',
attributes: {
'data-cke': true
}
}
},
{
loader: 'postcss-loader',
options: styles.getPostCssConfig( {
themeImporter: {
themePath: require.resolve( '@ckeditor/ckeditor5-theme-lark' )
},
minify: true
} )
}
]
}
]
},
plugins: [
new webpack.DllReferencePlugin( {
manifest: require( '../../build/ckeditor5-dll.manifest.json' ),
Expand Down
2 changes: 2 additions & 0 deletions packages/ckeditor5-dll-classic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
"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-classic": "^23.1.0",
"@ckeditor/ckeditor5-enter": "^23.1.0",
"@ckeditor/ckeditor5-paragraph": "^23.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-dll-classic/src/ckeditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

// The editor creator to use.
import { ClassicEditor as ClassicEditorBase } from 'ckeditor5/src/classiceditor';
import ClassicEditorBase from '@ckeditor/ckeditor5-editor-classic/src/classiceditor';
import { Paragraph } from 'ckeditor5/src/paragraph';
import { Clipboard } from 'ckeditor5/src/clipboard';
import { Enter, ShiftEnter } from 'ckeditor5/src/enter';
Expand Down
32 changes: 32 additions & 0 deletions packages/ckeditor5-dll-classic/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

const path = require( 'path' );
const webpack = require( 'webpack' );
const { styles } = require( '@ckeditor/ckeditor5-dev-utils' );

module.exports = {
mode: 'development',
Expand All @@ -22,6 +23,37 @@ module.exports = {
libraryTarget: 'umd',
libraryExport: 'default'
},
module: {
rules: [
{
test: /\.svg$/,
use: [ 'raw-loader' ]
},
{
test: /\.css$/,
use: [
{
loader: 'style-loader',
options: {
injectType: 'singletonStyleTag',
attributes: {
'data-cke': true
}
}
},
{
loader: 'postcss-loader',
options: styles.getPostCssConfig( {
themeImporter: {
themePath: require.resolve( '@ckeditor/ckeditor5-theme-lark' )
},
minify: true
} )
}
]
}
]
},
plugins: [
new webpack.DllReferencePlugin( {
manifest: require( '../../build/ckeditor5-dll.manifest.json' ),
Expand Down
2 changes: 2 additions & 0 deletions packages/ckeditor5-dll-decoupled-document/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
"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-decoupled": "^23.1.0",
"@ckeditor/ckeditor5-enter": "^23.1.0",
"@ckeditor/ckeditor5-paragraph": "^23.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-dll-decoupled-document/src/ckeditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

// The editor creator to use.
import { DecoupledEditor as DecoupledEditorBase } from 'ckeditor5/src/decouplededitor';
import DecoupledEditorBase from '@ckeditor/ckeditor5-editor-decoupled/src/decouplededitor';
import { Paragraph } from 'ckeditor5/src/paragraph';
import { Clipboard } from 'ckeditor5/src/clipboard';
import { Enter, ShiftEnter } from 'ckeditor5/src/enter';
Expand Down
32 changes: 32 additions & 0 deletions packages/ckeditor5-dll-decoupled-document/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

const path = require( 'path' );
const webpack = require( 'webpack' );
const { styles } = require( '@ckeditor/ckeditor5-dev-utils' );

module.exports = {
mode: 'development',
Expand All @@ -22,6 +23,37 @@ module.exports = {
libraryTarget: 'umd',
libraryExport: 'default'
},
module: {
rules: [
{
test: /\.svg$/,
use: [ 'raw-loader' ]
},
{
test: /\.css$/,
use: [
{
loader: 'style-loader',
options: {
injectType: 'singletonStyleTag',
attributes: {
'data-cke': true
}
}
},
{
loader: 'postcss-loader',
options: styles.getPostCssConfig( {
themeImporter: {
themePath: require.resolve( '@ckeditor/ckeditor5-theme-lark' )
},
minify: true
} )
}
]
}
]
},
plugins: [
new webpack.DllReferencePlugin( {
manifest: require( '../../build/ckeditor5-dll.manifest.json' ),
Expand Down
2 changes: 2 additions & 0 deletions packages/ckeditor5-dll-inline/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
"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-inline": "^23.1.0",
"@ckeditor/ckeditor5-enter": "^23.1.0",
"@ckeditor/ckeditor5-paragraph": "^23.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-dll-inline/src/ckeditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

// The editor creator to use.
import { InlineEditor as InlineEditorBase } from 'ckeditor5/src/inlineeditor';
import InlineEditorBase from '@ckeditor/ckeditor5-editor-inline/src/inlineeditor';
import { Paragraph } from 'ckeditor5/src/paragraph';
import { Clipboard } from 'ckeditor5/src/clipboard';
import { Enter, ShiftEnter } from 'ckeditor5/src/enter';
Expand Down
32 changes: 32 additions & 0 deletions packages/ckeditor5-dll-inline/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

const path = require( 'path' );
const webpack = require( 'webpack' );
const { styles } = require( '@ckeditor/ckeditor5-dev-utils' );

module.exports = {
mode: 'development',
Expand All @@ -22,6 +23,37 @@ module.exports = {
libraryTarget: 'umd',
libraryExport: 'default'
},
module: {
rules: [
{
test: /\.svg$/,
use: [ 'raw-loader' ]
},
{
test: /\.css$/,
use: [
{
loader: 'style-loader',
options: {
injectType: 'singletonStyleTag',
attributes: {
'data-cke': true
}
}
},
{
loader: 'postcss-loader',
options: styles.getPostCssConfig( {
themeImporter: {
themePath: require.resolve( '@ckeditor/ckeditor5-theme-lark' )
},
minify: true
} )
}
]
}
]
},
plugins: [
new webpack.DllReferencePlugin( {
manifest: require( '../../build/ckeditor5-dll.manifest.json' ),
Expand Down
13 changes: 8 additions & 5 deletions packages/ckeditor5-editor-balloon/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,22 @@
"ckeditor5-editor"
],
"dependencies": {
"@ckeditor/ckeditor5-core": "^23.1.0",
"@ckeditor/ckeditor5-engine": "^23.1.0",
"@ckeditor/ckeditor5-ui": "^23.1.0",
"@ckeditor/ckeditor5-utils": "^23.1.0",
"ckeditor5": "^23.1.0",
"lodash-es": "^4.17.15"
},
"devDependencies": {
"@ckeditor/ckeditor5-basic-styles": "^23.1.0",
"@ckeditor/ckeditor5-core": "^23.1.0",
"@ckeditor/ckeditor5-dev-utils": "^23.1.0",
"@ckeditor/ckeditor5-engine": "^23.1.0",
"@ckeditor/ckeditor5-enter": "^23.1.0",
"@ckeditor/ckeditor5-heading": "^23.1.0",
"@ckeditor/ckeditor5-paragraph": "^23.1.0",
"@ckeditor/ckeditor5-theme-lark": "^23.1.0",
"@ckeditor/ckeditor5-typing": "^23.1.0",
"@ckeditor/ckeditor5-undo": "^23.1.0"
"@ckeditor/ckeditor5-ui": "^23.1.0",
"@ckeditor/ckeditor5-undo": "^23.1.0",
"@ckeditor/ckeditor5-utils": "^23.1.0"
},
"engines": {
"node": ">=12.0.0",
Expand Down
19 changes: 7 additions & 12 deletions packages/ckeditor5-editor-balloon/src/ballooneditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,15 @@
* @module editor-balloon/ballooneditor
*/

import Editor from '@ckeditor/ckeditor5-core/src/editor/editor';
import HtmlDataProcessor from '@ckeditor/ckeditor5-engine/src/dataprocessor/htmldataprocessor';
import BalloonToolbar from '@ckeditor/ckeditor5-ui/src/toolbar/balloon/balloontoolbar';
import { Editor, DataApiMixin, ElementApiMixin, attachToForm, secureSourceElement } from 'ckeditor5/src/core';
import { HtmlDataProcessor } from 'ckeditor5/src/engine';
import { BalloonToolbar } from 'ckeditor5/src/ui';
import { CKEditorError, setDataInElement, getDataFromElement, mix } from 'ckeditor5/src/utils';

import { isElement } from 'lodash-es';

import BalloonEditorUI from './ballooneditorui';
import BalloonEditorUIView from './ballooneditoruiview';
import setDataInElement from '@ckeditor/ckeditor5-utils/src/dom/setdatainelement';
import getDataFromElement from '@ckeditor/ckeditor5-utils/src/dom/getdatafromelement';
import DataApiMixin from '@ckeditor/ckeditor5-core/src/editor/utils/dataapimixin';
import ElementApiMixin from '@ckeditor/ckeditor5-core/src/editor/utils/elementapimixin';
import attachToForm from '@ckeditor/ckeditor5-core/src/editor/utils/attachtoform';
import mix from '@ckeditor/ckeditor5-utils/src/mix';
import { isElement } from 'lodash-es';
import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
import secureSourceElement from '@ckeditor/ckeditor5-core/src/editor/utils/securesourceelement';

/**
* The {@glink builds/guides/overview#balloon-editor balloon editor} implementation (Medium-like editor).
Expand Down
6 changes: 3 additions & 3 deletions packages/ckeditor5-editor-balloon/src/ballooneditorui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
* @module editor-balloon/ballooneditorui
*/

import EditorUI from '@ckeditor/ckeditor5-core/src/editor/editorui';
import enableToolbarKeyboardFocus from '@ckeditor/ckeditor5-ui/src/toolbar/enabletoolbarkeyboardfocus';
import { enablePlaceholder } from '@ckeditor/ckeditor5-engine/src/view/placeholder';
import { EditorUI } from 'ckeditor5/src/core';
import { enableToolbarKeyboardFocus } from 'ckeditor5/src/ui';
import { enablePlaceholder } from 'ckeditor5/src/engine';

/**
* The balloon editor UI class.
Expand Down
3 changes: 1 addition & 2 deletions packages/ckeditor5-editor-balloon/src/ballooneditoruiview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
* @module editor-balloon/ballooneditoruiview
*/

import EditorUIView from '@ckeditor/ckeditor5-ui/src/editorui/editoruiview';
import InlineEditableUIView from '@ckeditor/ckeditor5-ui/src/editableui/inline/inlineeditableuiview';
import { EditorUIView, InlineEditableUIView } from 'ckeditor5/src/ui';

/**
* Contextual editor UI view. Uses the {@link module:ui/editableui/inline/inlineeditableuiview~InlineEditableUIView}.
Expand Down
8 changes: 6 additions & 2 deletions src/ballooneditor.js → ...keditor5-editor-classic/editor-classic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
*/

/**
* @module dll/ballooneditor
* @module editor-classic
*/

export * from '@ckeditor/ckeditor5-editor-balloon/ballooneditor';
import ClassicEditor from './src/classiceditor';

export default {
ClassicEditor
};
Loading