浏览代码

Other: Changed the build structure. TODO. Closes ckeditor/ckeditor5#1038.

Piotrek Koszuliński 7 年之前
父节点
当前提交
6571fd86a4

+ 0 - 9
packages/ckeditor5-build-decoupled-document/bin/build-ckeditor.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-echo "Building 'build/ckeditor.js'..."
-echo ""
-
-webpack --mode production
-
-echo ""
-echo "Done."

+ 0 - 18
packages/ckeditor5-build-decoupled-document/bin/create-entry-file.js

@@ -1,18 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
- */
-
-'use strict';
-
-const path = require( 'path' );
-const { bundler } = require( '@ckeditor/ckeditor5-dev-utils' );
-const buildConfig = require( '../build-config' );
-
-console.log( 'Creating the entry file...' );
-
-bundler.createEntryFile( path.join( 'src', 'ckeditor.js' ), buildConfig );
-
-console.log( 'Done.' );

+ 0 - 90
packages/ckeditor5-build-decoupled-document/build-config.js

@@ -1,90 +0,0 @@
-/**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
- */
-
-'use strict';
-
-module.exports = {
-	// The editor creator to use.
-	editor: '@ckeditor/ckeditor5-editor-decoupled/src/decouplededitor',
-
-	// The name under which the editor will be exported.
-	moduleName: 'DecoupledEditor',
-
-	// Plugins to include in the build.
-	plugins: [
-		'@ckeditor/ckeditor5-essentials/src/essentials',
-
-		'@ckeditor/ckeditor5-alignment/src/alignment',
-		'@ckeditor/ckeditor5-font/src/fontsize',
-		'@ckeditor/ckeditor5-font/src/fontfamily',
-		'@ckeditor/ckeditor5-highlight/src/highlight',
-		'@ckeditor/ckeditor5-adapter-ckfinder/src/uploadadapter',
-		'@ckeditor/ckeditor5-autoformat/src/autoformat',
-		'@ckeditor/ckeditor5-basic-styles/src/bold',
-		'@ckeditor/ckeditor5-basic-styles/src/italic',
-		'@ckeditor/ckeditor5-basic-styles/src/strikethrough',
-		'@ckeditor/ckeditor5-basic-styles/src/underline',
-		'@ckeditor/ckeditor5-block-quote/src/blockquote',
-		'@ckeditor/ckeditor5-easy-image/src/easyimage',
-		'@ckeditor/ckeditor5-heading/src/heading',
-		'@ckeditor/ckeditor5-image/src/image',
-		'@ckeditor/ckeditor5-image/src/imagecaption',
-		'@ckeditor/ckeditor5-image/src/imagestyle',
-		'@ckeditor/ckeditor5-image/src/imagetoolbar',
-		'@ckeditor/ckeditor5-image/src/imageupload',
-		'@ckeditor/ckeditor5-link/src/link',
-		'@ckeditor/ckeditor5-list/src/list',
-		'@ckeditor/ckeditor5-paragraph/src/paragraph',
-		'@ckeditor/ckeditor5-table/src/table',
-		'@ckeditor/ckeditor5-table/src/tabletoolbar'
-	],
-
-	// Editor config.
-	config: {
-		toolbar: {
-			items: [
-				'heading',
-				'|',
-				'fontsize',
-				'fontfamily',
-				'|',
-				'bold',
-				'italic',
-				'underline',
-				'strikethrough',
-				'highlight',
-				'|',
-				'alignment',
-				'|',
-				'numberedList',
-				'bulletedList',
-				'|',
-				'link',
-				'blockquote',
-				'imageUpload',
-				'insertTable',
-				'|',
-				'undo',
-				'redo'
-			]
-		},
-
-		image: {
-			styles: [
-				'full',
-				'alignLeft',
-				'alignRight'
-			],
-			toolbar: [ 'imageStyle:alignLeft', 'imageStyle:full', 'imageStyle:alignRight', '|', 'imageTextAlternative' ]
-		},
-
-		table: {
-			toolbar: [ 'tableColumn', 'tableRow', 'mergeTableCells' ]
-		},
-
-		// UI language. Language codes follow the https://en.wikipedia.org/wiki/ISO_639-1 format.
-		language: 'en'
-	}
-};

+ 1 - 3
packages/ckeditor5-build-decoupled-document/package.json

@@ -65,9 +65,7 @@
     "url": "https://github.com/ckeditor/ckeditor5-build-decoupled-document.git"
   },
   "scripts": {
-    "build": "npm run create-entry-file && npm run build-ckeditor",
-    "create-entry-file": "node bin/create-entry-file.js",
-    "build-ckeditor": "sh bin/build-ckeditor.sh",
+    "build": "webpack --mode production",
     "preversion": "npm run build; if [ -n \"$(git status src/ckeditor.js build/ --porcelain)\" ]; then git add -u src/ckeditor.js build/ && git commit -m 'Internal: Build.'; fi"
   }
 }

+ 14 - 14
packages/ckeditor5-build-decoupled-document/src/ckeditor.js

@@ -9,20 +9,20 @@ import AlignmentPlugin from '@ckeditor/ckeditor5-alignment/src/alignment';
 import FontsizePlugin from '@ckeditor/ckeditor5-font/src/fontsize';
 import FontfamilyPlugin from '@ckeditor/ckeditor5-font/src/fontfamily';
 import HighlightPlugin from '@ckeditor/ckeditor5-highlight/src/highlight';
-import UploadadapterPlugin from '@ckeditor/ckeditor5-adapter-ckfinder/src/uploadadapter';
+import UploadAdapterPlugin from '@ckeditor/ckeditor5-adapter-ckfinder/src/uploadadapter';
 import AutoformatPlugin from '@ckeditor/ckeditor5-autoformat/src/autoformat';
 import BoldPlugin from '@ckeditor/ckeditor5-basic-styles/src/bold';
 import ItalicPlugin from '@ckeditor/ckeditor5-basic-styles/src/italic';
 import StrikethroughPlugin from '@ckeditor/ckeditor5-basic-styles/src/strikethrough';
 import UnderlinePlugin from '@ckeditor/ckeditor5-basic-styles/src/underline';
-import BlockquotePlugin from '@ckeditor/ckeditor5-block-quote/src/blockquote';
-import EasyimagePlugin from '@ckeditor/ckeditor5-easy-image/src/easyimage';
+import BlockQuotePlugin from '@ckeditor/ckeditor5-block-quote/src/blockquote';
+import EasyImagePlugin from '@ckeditor/ckeditor5-easy-image/src/easyimage';
 import HeadingPlugin from '@ckeditor/ckeditor5-heading/src/heading';
 import ImagePlugin from '@ckeditor/ckeditor5-image/src/image';
-import ImagecaptionPlugin from '@ckeditor/ckeditor5-image/src/imagecaption';
-import ImagestylePlugin from '@ckeditor/ckeditor5-image/src/imagestyle';
-import ImagetoolbarPlugin from '@ckeditor/ckeditor5-image/src/imagetoolbar';
-import ImageuploadPlugin from '@ckeditor/ckeditor5-image/src/imageupload';
+import ImageCaptionPlugin from '@ckeditor/ckeditor5-image/src/imagecaption';
+import ImageStylePlugin from '@ckeditor/ckeditor5-image/src/imagestyle';
+import ImageToolbarPlugin from '@ckeditor/ckeditor5-image/src/imagetoolbar';
+import ImageUploadPlugin from '@ckeditor/ckeditor5-image/src/imageupload';
 import LinkPlugin from '@ckeditor/ckeditor5-link/src/link';
 import ListPlugin from '@ckeditor/ckeditor5-list/src/list';
 import ParagraphPlugin from '@ckeditor/ckeditor5-paragraph/src/paragraph';
@@ -37,20 +37,20 @@ DecoupledEditor.builtinPlugins = [
 	FontsizePlugin,
 	FontfamilyPlugin,
 	HighlightPlugin,
-	UploadadapterPlugin,
+	UploadAdapterPlugin,
 	AutoformatPlugin,
 	BoldPlugin,
 	ItalicPlugin,
 	StrikethroughPlugin,
 	UnderlinePlugin,
-	BlockquotePlugin,
-	EasyimagePlugin,
+	BlockQuotePlugin,
+	EasyImagePlugin,
 	HeadingPlugin,
 	ImagePlugin,
-	ImagecaptionPlugin,
-	ImagestylePlugin,
-	ImagetoolbarPlugin,
-	ImageuploadPlugin,
+	ImageCaptionPlugin,
+	ImageStylePlugin,
+	ImageToolbarPlugin,
+	ImageUploadPlugin,
 	LinkPlugin,
 	ListPlugin,
 	ParagraphPlugin,

+ 7 - 4
packages/ckeditor5-build-decoupled-document/webpack.config.js

@@ -12,7 +12,6 @@ const webpack = require( 'webpack' );
 const { bundler, styles } = require( '@ckeditor/ckeditor5-dev-utils' );
 const CKEditorWebpackPlugin = require( '@ckeditor/ckeditor5-dev-webpack-plugin' );
 const UglifyJsWebpackPlugin = require( 'uglifyjs-webpack-plugin' );
-const buildConfig = require( './build-config' );
 
 module.exports = {
 	devtool: 'source-map',
@@ -21,11 +20,13 @@ module.exports = {
 	entry: path.resolve( __dirname, 'src', 'ckeditor.js' ),
 
 	output: {
+		// The name under which the editor will be exported.
+		library: 'DecoupledEditor',
+
 		path: path.resolve( __dirname, 'build' ),
 		filename: 'ckeditor.js',
 		libraryTarget: 'umd',
-		libraryExport: 'default',
-		library: buildConfig.moduleName
+		libraryExport: 'default'
 	},
 
 	optimization: {
@@ -46,7 +47,9 @@ module.exports = {
 
 	plugins: [
 		new CKEditorWebpackPlugin( {
-			language: buildConfig.config.language,
+			// UI language. Language codes follow the https://en.wikipedia.org/wiki/ISO_639-1 format.
+			// When changing the built-in language, remember to also change it in the editor's configuration (src/ckeditor.js).
+			language: 'en',
 			additionalLanguages: 'all'
 		} ),
 		new webpack.BannerPlugin( {