浏览代码

Merge tag 'v1.0.0-beta.1' into stable

Release: v1.0.0-beta.1.
Piotrek Koszuliński 7 年之前
父节点
当前提交
7eedf2a38a
共有 56 个文件被更改,包括 160 次插入59 次删除
  1. 1 0
      packages/ckeditor5-build-classic/.gitignore
  2. 43 0
      packages/ckeditor5-build-classic/CHANGELOG.md
  3. 1 1
      packages/ckeditor5-build-classic/LICENSE.md
  4. 1 1
      packages/ckeditor5-build-classic/README.md
  5. 1 1
      packages/ckeditor5-build-classic/bin/create-entry-file.js
  6. 11 8
      packages/ckeditor5-build-classic/build-config.js
  7. 4 3
      packages/ckeditor5-build-classic/build/ckeditor.js
  8. 1 1
      packages/ckeditor5-build-classic/build/ckeditor.js.map
  9. 1 0
      packages/ckeditor5-build-classic/build/translations/ast.js
  10. 1 0
      packages/ckeditor5-build-classic/build/translations/bg.js
  11. 1 0
      packages/ckeditor5-build-classic/build/translations/da.js
  12. 1 0
      packages/ckeditor5-build-classic/build/translations/de.js
  13. 1 0
      packages/ckeditor5-build-classic/build/translations/el.js
  14. 1 0
      packages/ckeditor5-build-classic/build/translations/en-au.js
  15. 1 0
      packages/ckeditor5-build-classic/build/translations/eo.js
  16. 1 0
      packages/ckeditor5-build-classic/build/translations/es.js
  17. 1 0
      packages/ckeditor5-build-classic/build/translations/et.js
  18. 1 0
      packages/ckeditor5-build-classic/build/translations/eu.js
  19. 1 0
      packages/ckeditor5-build-classic/build/translations/fi.js
  20. 1 0
      packages/ckeditor5-build-classic/build/translations/fr.js
  21. 1 0
      packages/ckeditor5-build-classic/build/translations/gl.js
  22. 1 0
      packages/ckeditor5-build-classic/build/translations/gu.js
  23. 1 0
      packages/ckeditor5-build-classic/build/translations/hr.js
  24. 1 0
      packages/ckeditor5-build-classic/build/translations/hu.js
  25. 1 0
      packages/ckeditor5-build-classic/build/translations/it.js
  26. 1 0
      packages/ckeditor5-build-classic/build/translations/ja.js
  27. 1 0
      packages/ckeditor5-build-classic/build/translations/km.js
  28. 1 0
      packages/ckeditor5-build-classic/build/translations/kn.js
  29. 1 0
      packages/ckeditor5-build-classic/build/translations/ko.js
  30. 1 0
      packages/ckeditor5-build-classic/build/translations/ku.js
  31. 1 0
      packages/ckeditor5-build-classic/build/translations/nb.js
  32. 1 0
      packages/ckeditor5-build-classic/build/translations/ne.js
  33. 1 0
      packages/ckeditor5-build-classic/build/translations/nl.js
  34. 1 0
      packages/ckeditor5-build-classic/build/translations/oc.js
  35. 1 0
      packages/ckeditor5-build-classic/build/translations/pl.js
  36. 1 0
      packages/ckeditor5-build-classic/build/translations/pt-br.js
  37. 1 0
      packages/ckeditor5-build-classic/build/translations/pt.js
  38. 1 0
      packages/ckeditor5-build-classic/build/translations/ro.js
  39. 1 0
      packages/ckeditor5-build-classic/build/translations/ru.js
  40. 1 0
      packages/ckeditor5-build-classic/build/translations/si.js
  41. 1 0
      packages/ckeditor5-build-classic/build/translations/sk.js
  42. 1 0
      packages/ckeditor5-build-classic/build/translations/sq.js
  43. 1 0
      packages/ckeditor5-build-classic/build/translations/sv.js
  44. 1 0
      packages/ckeditor5-build-classic/build/translations/tr.js
  45. 1 0
      packages/ckeditor5-build-classic/build/translations/tt.js
  46. 1 0
      packages/ckeditor5-build-classic/build/translations/ug.js
  47. 1 0
      packages/ckeditor5-build-classic/build/translations/uk.js
  48. 1 0
      packages/ckeditor5-build-classic/build/translations/zh-cn.js
  49. 1 0
      packages/ckeditor5-build-classic/build/translations/zh.js
  50. 21 22
      packages/ckeditor5-build-classic/package.json
  51. 1 1
      packages/ckeditor5-build-classic/sample/index.html
  52. 12 7
      packages/ckeditor5-build-classic/src/ckeditor.js
  53. 4 4
      packages/ckeditor5-build-classic/tests/ckeditor.js
  54. 1 1
      packages/ckeditor5-build-classic/tests/manual/ckeditor-cjs-version.js
  55. 1 1
      packages/ckeditor5-build-classic/tests/manual/ckeditor.js
  56. 16 8
      packages/ckeditor5-build-classic/webpack.config.js

+ 1 - 0
packages/ckeditor5-build-classic/.gitignore

@@ -1 +1,2 @@
 node_modules/
+package-lock.json

+ 43 - 0
packages/ckeditor5-build-classic/CHANGELOG.md

@@ -1,6 +1,49 @@
 Changelog
 =========
 
+## [1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-build-classic/compare/v1.0.0-alpha.2...v1.0.0-beta.1) (2018-03-15)
+
+### Dependencies
+
+Major releases (contain breaking changes):
+
+* [@ckeditor/ckeditor5-adapter-ckfinder](https://www.npmjs.com/package/@ckeditor/ckeditor5-adapter-ckfinder): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-adapter-ckfinder/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-autoformat](https://www.npmjs.com/package/@ckeditor/ckeditor5-autoformat): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-autoformat/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-basic-styles](https://www.npmjs.com/package/@ckeditor/ckeditor5-basic-styles): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-basic-styles/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-block-quote](https://www.npmjs.com/package/@ckeditor/ckeditor5-block-quote): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-block-quote/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-clipboard](https://www.npmjs.com/package/@ckeditor/ckeditor5-clipboard): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-clipboard/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-cloudservices](https://www.npmjs.com/package/@ckeditor/ckeditor5-cloudservices): v1.0.0-alpha.1 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-cloudservices/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-core](https://www.npmjs.com/package/@ckeditor/ckeditor5-core): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-core/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-easy-image](https://www.npmjs.com/package/@ckeditor/ckeditor5-easy-image): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-easy-image/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-editor-classic](https://www.npmjs.com/package/@ckeditor/ckeditor5-editor-classic): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-editor-classic/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-engine](https://www.npmjs.com/package/@ckeditor/ckeditor5-engine): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-engine/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-enter](https://www.npmjs.com/package/@ckeditor/ckeditor5-enter): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-enter/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-essentials](https://www.npmjs.com/package/@ckeditor/ckeditor5-essentials): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-essentials/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-heading](https://www.npmjs.com/package/@ckeditor/ckeditor5-heading): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-heading/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-image](https://www.npmjs.com/package/@ckeditor/ckeditor5-image): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-image/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-link](https://www.npmjs.com/package/@ckeditor/ckeditor5-link): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-link/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-list](https://www.npmjs.com/package/@ckeditor/ckeditor5-list): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-list/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-paragraph](https://www.npmjs.com/package/@ckeditor/ckeditor5-paragraph): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-paragraph/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-theme-lark](https://www.npmjs.com/package/@ckeditor/ckeditor5-theme-lark): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-theme-lark/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-typing](https://www.npmjs.com/package/@ckeditor/ckeditor5-typing): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-typing/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-ui](https://www.npmjs.com/package/@ckeditor/ckeditor5-ui): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-ui/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-undo](https://www.npmjs.com/package/@ckeditor/ckeditor5-undo): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-undo/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-upload](https://www.npmjs.com/package/@ckeditor/ckeditor5-upload): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-upload/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-utils](https://www.npmjs.com/package/@ckeditor/ckeditor5-utils): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-utils/releases/tag/v1.0.0-beta.1)
+* [@ckeditor/ckeditor5-widget](https://www.npmjs.com/package/@ckeditor/ckeditor5-widget): v1.0.0-alpha.2 => [v1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-widget/releases/tag/v1.0.0-beta.1)
+
+### Features
+
+Besides new features introduced by the dependencies, this version also introduces the following features:
+
+* Added the image upload button to the build. See [ckeditor/ckeditor5#870](https://github.com/ckeditor/ckeditor5/issues/870). ([f6cab12](https://github.com/ckeditor/ckeditor5-build-classic/commit/f6cab12))
+
+### Other changes
+
+* Aligned build and `webpack.config.js` to the new Translation Service ([ckeditor/ckeditor5#624](https://github.com/ckeditor/ckeditor5/issues/624)). ([a349ffb](https://github.com/ckeditor/ckeditor5-build-classic/commit/a349ffb))
+* Changed the webpack configuration so the styles are processed using PostCSS instead of SASS (see [ckeditor/ckeditor5-ui#144](https://github.com/ckeditor/ckeditor5-ui/issues/144)). ([040b92f](https://github.com/ckeditor/ckeditor5-build-classic/commit/040b92f))
+
+
 ## [1.0.0-alpha.2](https://github.com/ckeditor/ckeditor5-build-classic.git/compare/v1.0.0-alpha.1...v1.0.0-alpha.2) (2017-11-14)
 
 ### Dependencies

+ 1 - 1
packages/ckeditor5-build-classic/LICENSE.md

@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 **CKEditor 5 classic editor build** – https://github.com/ckeditor/ckeditor5-build-classic <br>
-Copyright (c) 2003-2017, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2018, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved.
 
 Licensed under the terms of any of the following licenses at your choice:
 

+ 1 - 1
packages/ckeditor5-build-classic/README.md

@@ -6,7 +6,7 @@ CKEditor 5 classic editor build
 [![Dependency Status](https://david-dm.org/ckeditor/ckeditor5-build-classic/status.svg)](https://david-dm.org/ckeditor/ckeditor5-build-classic)
 [![devDependency Status](https://david-dm.org/ckeditor/ckeditor5-build-classic/dev-status.svg)](https://david-dm.org/ckeditor/ckeditor5-build-classic?type=dev)
 
-The classic editor build for CKEditor 5. Read more about the [classic editor build](https://ckeditor5.github.io/docs/nightly/ckeditor5/latest/builds/guides/overview.html#Classic-editor) and see the [demo](https://ckeditor5.github.io/docs/nightly/ckeditor5/latest/examples/builds/classic-editor.html).
+The classic editor build for CKEditor 5. Read more about the [classic editor build](https://ckeditor5.github.io/docs/nightly/ckeditor5/latest/builds/guides/overview.html#classic-editor) and see the [demo](https://ckeditor5.github.io/docs/nightly/ckeditor5/latest/examples/builds/classic-editor.html).
 
 ## Documentation
 

+ 1 - 1
packages/ckeditor5-build-classic/bin/create-entry-file.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 11 - 8
packages/ckeditor5-build-classic/build-config.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 
@@ -27,25 +27,25 @@ module.exports = {
 		'@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-upload/src/imageupload',
+		'@ckeditor/ckeditor5-image/src/imageupload',
 	],
 
-	// UI language. Language codes follow the https://en.wikipedia.org/wiki/ISO_639-1 format.
-	language: 'en',
-
 	// Editor config.
 	config: {
 		toolbar: {
 			items: [
-				'headings',
+				'heading',
+				'|',
 				'bold',
 				'italic',
 				'link',
 				'bulletedList',
 				'numberedList',
+				'imageUpload',
 				'blockQuote',
 				'undo',
 				'redo'
@@ -53,7 +53,10 @@ module.exports = {
 		},
 
 		image: {
-			toolbar: [ 'imageStyleFull', 'imageStyleSide', '|', 'imageTextAlternative' ]
-		}
+			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+		},
+
+		// UI language. Language codes follow the https://en.wikipedia.org/wiki/ISO_639-1 format.
+		language: 'en'
 	}
 };

文件差异内容过多而无法显示
+ 4 - 3
packages/ckeditor5-build-classic/build/ckeditor.js


文件差异内容过多而无法显示
+ 1 - 1
packages/ckeditor5-build-classic/build/ckeditor.js.map


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/ast.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/bg.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/da.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/de.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/el.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/en-au.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/eo.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/es.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/et.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/eu.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/fi.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/fr.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/gl.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/gu.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/hr.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/hu.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/it.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/ja.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/km.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/kn.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/ko.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/ku.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/nb.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/ne.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/nl.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/oc.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/pl.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/pt-br.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/pt.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/ro.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/ru.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/si.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/sk.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/sq.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/sv.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/tr.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/tt.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/ug.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/uk.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/zh-cn.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-classic/build/translations/zh.js


+ 21 - 22
packages/ckeditor5-build-classic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-build-classic",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-beta.1",
   "description": "CKEditor 5 classic editor build.",
   "keywords": [
     "ckeditor5",
@@ -14,28 +14,27 @@
     "build"
   ],
   "devDependencies": {
-    "@ckeditor/ckeditor5-adapter-ckfinder": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-autoformat": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-basic-styles": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-block-quote": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-dev-utils": "^4.0.1",
-    "@ckeditor/ckeditor5-dev-webpack-plugin": "^2.0.18",
-    "@ckeditor/ckeditor5-easy-image": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-editor-classic": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-essentials": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-heading": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-image": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-link": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-list": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-paragraph": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-upload": "^1.0.0-alpha.2",
-    "babel-minify-webpack-plugin": "^0.2.0",
-    "css-loader": "^0.28.7",
-    "node-sass": "^4.5.3",
+    "@ckeditor/ckeditor5-adapter-ckfinder": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-autoformat": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-basic-styles": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-block-quote": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-dev-utils": "^7.0.3",
+    "@ckeditor/ckeditor5-dev-webpack-plugin": "^3.0.4",
+    "@ckeditor/ckeditor5-easy-image": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-editor-classic": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-essentials": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-heading": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-image": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-link": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-list": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-paragraph": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-theme-lark": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-upload": "^1.0.0-beta.1",
+    "babel-minify-webpack-plugin": "^0.3.0",
+    "postcss-loader": "^2.0.10",
     "raw-loader": "^0.5.1",
-    "sass-loader": "^6.0.6",
-    "style-loader": "^0.18.2",
-    "webpack": "^3.6.0",
+    "style-loader": "^0.19.1",
+    "webpack": "^3.10.0",
     "webpack-sources": "1.0.1"
   },
   "engines": {

+ 1 - 1
packages/ckeditor5-build-classic/sample/index.html

@@ -17,7 +17,7 @@
 <div id="editor">
 	<h2>Sample</h2>
 
-	<p>This is an instance of the <a href="https://ckeditor5.github.io/docs/nightly/ckeditor5/latest/builds/guides/overview.html#Classic-editor">classic editor build</a>.</p>
+	<p>This is an instance of the <a href="https://ckeditor5.github.io/docs/nightly/ckeditor5/latest/builds/guides/overview.html#classic-editor">classic editor build</a>.</p>
 
 	<figure class="image">
 		<img src="../tests/manual/sample.jpg" alt="Autumn fields" />

+ 12 - 7
packages/ckeditor5-build-classic/src/ckeditor.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 
@@ -16,10 +16,11 @@ 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 LinkPlugin from '@ckeditor/ckeditor5-link/src/link';
 import ListPlugin from '@ckeditor/ckeditor5-list/src/list';
 import ParagraphPlugin from '@ckeditor/ckeditor5-paragraph/src/paragraph';
-import ImageuploadPlugin from '@ckeditor/ckeditor5-upload/src/imageupload';
+import Imageupload1Plugin from '@ckeditor/ckeditor5-image/src/imageupload';
 
 export default class ClassicEditor extends ClassicEditorBase {}
 
@@ -37,20 +38,23 @@ ClassicEditor.build = {
 		ImagecaptionPlugin,
 		ImagestylePlugin,
 		ImagetoolbarPlugin,
+		ImageuploadPlugin,
 		LinkPlugin,
 		ListPlugin,
 		ParagraphPlugin,
-		ImageuploadPlugin
+		Imageupload1Plugin
 	],
 	config: {
 		toolbar: {
 			items: [
-				'headings',
+				'heading',
+				'|',
 				'bold',
 				'italic',
 				'link',
 				'bulletedList',
 				'numberedList',
+				'imageUpload',
 				'blockQuote',
 				'undo',
 				'redo'
@@ -58,11 +62,12 @@ ClassicEditor.build = {
 		},
 		image: {
 			toolbar: [
-				'imageStyleFull',
-				'imageStyleSide',
+				'imageStyle:full',
+				'imageStyle:side',
 				'|',
 				'imageTextAlternative'
 			]
-		}
+		},
+		language: 'en'
 	}
 };

+ 4 - 4
packages/ckeditor5-build-classic/tests/ckeditor.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 
@@ -172,7 +172,7 @@ describe( 'ClassicEditor build', () => {
 		} );
 
 		// https://github.com/ckeditor/ckeditor5/issues/572
-		it( 'allows configure toolbar items through config.toolbar', () => {
+		it( 'allows configuring toolbar items through config.toolbar', () => {
 			return ClassicEditor
 				.create( editorElement, {
 					toolbar: [ 'bold' ]
@@ -185,7 +185,7 @@ describe( 'ClassicEditor build', () => {
 		} );
 
 		// https://github.com/ckeditor/ckeditor5/issues/572
-		it( 'allows configure toolbar offset without overriding toolbar items', () => {
+		it( 'allows configuring toolbar offset without overriding toolbar items', () => {
 			return ClassicEditor
 				.create( editorElement, {
 					toolbar: {
@@ -195,7 +195,7 @@ describe( 'ClassicEditor build', () => {
 				.then( newEditor => {
 					editor = newEditor;
 
-					expect( editor.ui.view.toolbar.items.length ).to.equal( 9 );
+					expect( editor.ui.view.toolbar.items.length ).to.equal( 11 );
 					expect( editor.ui.view.stickyPanel.viewportTopOffset ).to.equal( 42 );
 				} );
 		} );

+ 1 - 1
packages/ckeditor5-build-classic/tests/manual/ckeditor-cjs-version.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-build-classic/tests/manual/ckeditor.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 16 - 8
packages/ckeditor5-build-classic/webpack.config.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 
@@ -9,7 +9,7 @@
 
 const path = require( 'path' );
 const webpack = require( 'webpack' );
-const { bundler } = require( '@ckeditor/ckeditor5-dev-utils' );
+const { bundler, styles } = require( '@ckeditor/ckeditor5-dev-utils' );
 const CKEditorWebpackPlugin = require( '@ckeditor/ckeditor5-dev-webpack-plugin' );
 const BabiliPlugin = require( 'babel-minify-webpack-plugin' );
 const buildConfig = require( './build-config' );
@@ -29,7 +29,8 @@ module.exports = {
 
 	plugins: [
 		new CKEditorWebpackPlugin( {
-			languages: [ buildConfig.language ]
+			language: buildConfig.config.language,
+			additionalLanguages: 'all'
 		} ),
 		new BabiliPlugin( null, {
 			comments: false
@@ -48,16 +49,23 @@ module.exports = {
 				use: [ 'raw-loader' ]
 			},
 			{
-				test: /\.scss$/,
+				test: /\.css$/,
 				use: [
-					'style-loader',
 					{
-						loader: 'css-loader',
+						loader: 'style-loader',
 						options: {
-							minimize: true
+							singleton: true
 						}
 					},
-					'sass-loader'
+					{
+						loader: 'postcss-loader',
+						options: styles.getPostCssConfig( {
+							themeImporter: {
+								themePath: require.resolve( '@ckeditor/ckeditor5-theme-lark' )
+							},
+							minify: true
+						} )
+					},
 				]
 			}
 		]