浏览代码

Merge branch 'master' into t/45

Szymon Kupś 9 年之前
父节点
当前提交
7ddd6c831a

+ 4 - 6
packages/ckeditor5-editor-classic/.travis.yml

@@ -15,11 +15,9 @@ before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 install:
-  - npm install
-  - npm install @ckeditor/ckeditor5-dev-tests
-  - npm install codeclimate-test-reporter
+  - npm install gulp mgit2 lerna @ckeditor/ckeditor5-dev-tests @ckeditor/ckeditor5-dev-lint
+  - ckeditor5-dev-tests-install-dependencies
 script:
-  - node_modules/.bin/ckeditor5-dev-tests-travis
+  - ckeditor5-dev-tests-travis
 after_success:
-  - node_modules/.bin/codeclimate-test-reporter < build/.automated-tests/coverage/lcov.info
-
+  - codeclimate-test-reporter < coverage/lcov.info

+ 12 - 12
packages/ckeditor5-editor-classic/package.json

@@ -1,23 +1,23 @@
 {
-  "name": "ckeditor5-editor-classic",
+  "name": "@ckeditor/ckeditor5-editor-classic",
   "version": "0.6.0",
   "description": "Classic Editor for CKEditor 5.",
   "keywords": [],
   "dependencies": {
-    "ckeditor5-core": "ckeditor/ckeditor5-core",
-    "ckeditor5-engine": "ckeditor/ckeditor5-engine",
-    "ckeditor5-theme-lark": "ckeditor/ckeditor5-theme-lark",
-    "ckeditor5-ui": "ckeditor/ckeditor5-ui",
-    "ckeditor5-utils": "ckeditor/ckeditor5-utils"
+    "@ckeditor/ckeditor5-core": "*",
+    "@ckeditor/ckeditor5-engine": "*",
+    "@ckeditor/ckeditor5-theme-lark": "*",
+    "@ckeditor/ckeditor5-ui": "*",
+    "@ckeditor/ckeditor5-utils": "*"
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-dev-lint": "^2.0.0",
-    "ckeditor5-basic-styles": "ckeditor/ckeditor5-basic-styles",
-    "ckeditor5-enter": "ckeditor/ckeditor5-enter",
-    "ckeditor5-heading": "ckeditor/ckeditor5-heading",
-    "ckeditor5-paragraph": "ckeditor/ckeditor5-paragraph",
-    "ckeditor5-undo": "ckeditor/ckeditor5-undo",
-    "ckeditor5-typing": "ckeditor/ckeditor5-typing",
+    "@ckeditor/ckeditor5-basic-styles": "*",
+    "@ckeditor/ckeditor5-enter": "*",
+    "@ckeditor/ckeditor5-heading": "*",
+    "@ckeditor/ckeditor5-paragraph": "*",
+    "@ckeditor/ckeditor5-undo": "*",
+    "@ckeditor/ckeditor5-typing": "*",
     "gulp": "^3.9.0",
     "guppy-pre-commit": "^0.4.0"
   },

+ 3 - 3
packages/ckeditor5-editor-classic/src/classic.js

@@ -7,11 +7,11 @@
  * @module editor-classic/classic
  */
 
-import StandardEditor from 'ckeditor5-core/src/editor/standardeditor';
-import HtmlDataProcessor from 'ckeditor5-engine/src/dataprocessor/htmldataprocessor';
+import StandardEditor from '@ckeditor/ckeditor5-core/src/editor/standardeditor';
+import HtmlDataProcessor from '@ckeditor/ckeditor5-engine/src/dataprocessor/htmldataprocessor';
 import ClassicEditorUI from './classiceditorui';
 import ClassicEditorUIView from './classiceditoruiview';
-import ElementReplacer from 'ckeditor5-utils/src/elementreplacer';
+import ElementReplacer from '@ckeditor/ckeditor5-utils/src/elementreplacer';
 
 import '../theme/theme.scss';
 

+ 2 - 2
packages/ckeditor5-editor-classic/src/classiceditorui.js

@@ -7,8 +7,8 @@
  * @module editor-classic/classiceditorui
  */
 
-import ComponentFactory from 'ckeditor5-ui/src/componentfactory';
-import FocusTracker from 'ckeditor5-utils/src/focustracker';
+import ComponentFactory from '@ckeditor/ckeditor5-ui/src/componentfactory';
+import FocusTracker from '@ckeditor/ckeditor5-utils/src/focustracker';
 
 /**
  * The classic editor UI class.

+ 3 - 3
packages/ckeditor5-editor-classic/src/classiceditoruiview.js

@@ -7,9 +7,9 @@
  * @module editor-classic/classiceditoruiview
  */
 
-import BoxedEditorUIView from 'ckeditor5-ui/src/editorui/boxed/boxededitoruiview';
-import InlineEditableUIView from 'ckeditor5-ui/src/editableui/inline/inlineeditableuiview';
-import StickyToolbarView from 'ckeditor5-ui/src/toolbar/sticky/stickytoolbarview';
+import BoxedEditorUIView from '@ckeditor/ckeditor5-ui/src/editorui/boxed/boxededitoruiview';
+import InlineEditableUIView from '@ckeditor/ckeditor5-ui/src/editableui/inline/inlineeditableuiview';
+import StickyToolbarView from '@ckeditor/ckeditor5-ui/src/toolbar/sticky/stickytoolbarview';
 
 /**
  * Classic editor UI view. Uses inline editable and sticky toolbar, all

+ 9 - 9
packages/ckeditor5-editor-classic/tests/classic.js

@@ -5,18 +5,18 @@
 
 /* globals document */
 
-import ClassicEditorUI from 'ckeditor5-editor-classic/src/classiceditorui';
-import ClassicEditorUIView from 'ckeditor5-editor-classic/src/classiceditoruiview';
+import ClassicEditorUI from '../src/classiceditorui';
+import ClassicEditorUIView from '../src/classiceditoruiview';
 
-import HtmlDataProcessor from 'ckeditor5-engine/src/dataprocessor/htmldataprocessor';
+import HtmlDataProcessor from '@ckeditor/ckeditor5-engine/src/dataprocessor/htmldataprocessor';
 
-import ClassicEditor from 'ckeditor5-editor-classic/src/classic';
-import Plugin from 'ckeditor5-core/src/plugin';
-import Paragraph from 'ckeditor5-paragraph/src/paragraph';
-import Bold from 'ckeditor5-basic-styles/src/bold';
+import ClassicEditor from '../src/classic';
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
 
-import testUtils from 'ckeditor5-core/tests/_utils/utils';
-import count from 'ckeditor5-utils/src/count';
+import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
+import count from '@ckeditor/ckeditor5-utils/src/count';
 
 testUtils.createSinonSandbox();
 

+ 9 - 9
packages/ckeditor5-editor-classic/tests/classiceditorui.js

@@ -5,15 +5,15 @@
 
 /* globals document, Event */
 
-import ComponentFactory from 'ckeditor5-ui/src/componentfactory';
-import FocusTracker from 'ckeditor5-utils/src/focustracker';
-import ClassicEditorUI from 'ckeditor5-editor-classic/src/classiceditorui';
-import ClassicEditorUIView from 'ckeditor5-editor-classic/src/classiceditoruiview';
-import ClassicTestEditor from 'ckeditor5-core/tests/_utils/classictesteditor';
-import View from 'ckeditor5-ui/src/view';
-
-import testUtils from 'ckeditor5-core/tests/_utils/utils';
-import utils from 'ckeditor5-utils/tests/_utils/utils';
+import ComponentFactory from '@ckeditor/ckeditor5-ui/src/componentfactory';
+import FocusTracker from '@ckeditor/ckeditor5-utils/src/focustracker';
+import ClassicEditorUI from '../src/classiceditorui';
+import ClassicEditorUIView from '../src/classiceditoruiview';
+import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
+import View from '@ckeditor/ckeditor5-ui/src/view';
+
+import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
+import utils from '@ckeditor/ckeditor5-utils/tests/_utils/utils';
 
 testUtils.createSinonSandbox();
 

+ 4 - 4
packages/ckeditor5-editor-classic/tests/classiceditoruiview.js

@@ -5,10 +5,10 @@
 
 /* globals document */
 
-import ClassicEditorUIView from 'ckeditor5-editor-classic/src/classiceditoruiview';
-import StickyToolbarView from 'ckeditor5-ui/src/toolbar/sticky/stickytoolbarview';
-import InlineEditableUIView from 'ckeditor5-ui/src/editableui/inline/inlineeditableuiview';
-import Locale from 'ckeditor5-utils/src/locale';
+import ClassicEditorUIView from '../src/classiceditoruiview';
+import StickyToolbarView from '@ckeditor/ckeditor5-ui/src/toolbar/sticky/stickytoolbarview';
+import InlineEditableUIView from '@ckeditor/ckeditor5-ui/src/editableui/inline/inlineeditableuiview';
+import Locale from '@ckeditor/ckeditor5-utils/src/locale';
 
 describe( 'ClassicEditorUIView', () => {
 	let locale, view;

+ 9 - 9
packages/ckeditor5-editor-classic/tests/manual/classic.js

@@ -5,15 +5,15 @@
 
 /* globals console:false, document, window */
 
-import ClassicEditor from 'ckeditor5-editor-classic/src/classic';
-import Enter from 'ckeditor5-enter/src/enter';
-import Typing from 'ckeditor5-typing/src/typing';
-import Heading from 'ckeditor5-heading/src/heading';
-import Paragraph from 'ckeditor5-paragraph/src/paragraph';
-import Undo from 'ckeditor5-undo/src/undo';
-import Bold from 'ckeditor5-basic-styles/src/bold';
-import Italic from 'ckeditor5-basic-styles/src/italic';
-import testUtils from 'ckeditor5-utils/tests/_utils/utils';
+import ClassicEditor from '../../src/classic';
+import Enter from '@ckeditor/ckeditor5-enter/src/enter';
+import Typing from '@ckeditor/ckeditor5-typing/src/typing';
+import Heading from '@ckeditor/ckeditor5-heading/src/heading';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import Undo from '@ckeditor/ckeditor5-undo/src/undo';
+import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
+import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
+import testUtils from '@ckeditor/ckeditor5-utils/tests/_utils/utils';
 
 let editor, editable, observer;
 

+ 1 - 1
packages/ckeditor5-editor-classic/theme/theme.scss

@@ -1,7 +1,7 @@
 // Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 // For licensing, see LICENSE.md or http://ckeditor.com/license
 
-@import '~ckeditor5-theme-lark/theme/theme.scss';
+@import '~@ckeditor/ckeditor5-theme-lark/theme/theme.scss';
 
 @include ck-editor {
 	@include ck-rounded-corners();