Browse Source

Merge branch 'ckeditor5/t/389'

Piotrek Koszuliński 9 năm trước cách đây
mục cha
commit
f1a753213c

+ 2 - 6
packages/ckeditor5-enter/.travis.yml

@@ -15,11 +15,7 @@ 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
-after_success:
-  - node_modules/.bin/codeclimate-test-reporter < build/.automated-tests/coverage/lcov.info
-

+ 9 - 9
packages/ckeditor5-enter/package.json

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

+ 1 - 1
packages/ckeditor5-enter/src/enter.js

@@ -7,7 +7,7 @@
  * @module enter/enter
  */
 
-import Plugin from 'ckeditor5-core/src/plugin';
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import EnterCommand from './entercommand';
 import EnterObserver from './enterobserver';
 

+ 2 - 2
packages/ckeditor5-enter/src/entercommand.js

@@ -7,8 +7,8 @@
  * @module enter/entercommand
  */
 
-import Command from 'ckeditor5-core/src/command/command';
-import Position from 'ckeditor5-engine/src/model/position';
+import Command from '@ckeditor/ckeditor5-core/src/command/command';
+import Position from '@ckeditor/ckeditor5-engine/src/model/position';
 
 /**
  * Enter command. It is used by the {@link module:enter/enter~Enter Enter feature} to handle the <kbd>Enter</kbd> key.

+ 3 - 3
packages/ckeditor5-enter/src/enterobserver.js

@@ -7,9 +7,9 @@
  * @module enter/enterobserver
  */
 
-import Observer from 'ckeditor5-engine/src/view/observer/observer';
-import DomEventData from 'ckeditor5-engine/src/view/observer/domeventdata';
-import { keyCodes } from 'ckeditor5-utils/src/keyboard';
+import Observer from '@ckeditor/ckeditor5-engine/src/view/observer/observer';
+import DomEventData from '@ckeditor/ckeditor5-engine/src/view/observer/domeventdata';
+import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
 
 /**
  * Enter observer introduces the {@link module:engine/view/document~Document#event:enter} event.

+ 4 - 4
packages/ckeditor5-enter/tests/enter.js

@@ -3,10 +3,10 @@
  * For licensing, see LICENSE.md.
  */
 
-import VirtualTestEditor from 'ckeditor5-core/tests/_utils/virtualtesteditor';
-import Enter from 'ckeditor5-enter/src/enter';
-import EnterCommand from 'ckeditor5-enter/src/entercommand';
-import DomEventData from 'ckeditor5-engine/src/view/observer/domeventdata';
+import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
+import Enter from '../src/enter';
+import EnterCommand from '../src/entercommand';
+import DomEventData from '@ckeditor/ckeditor5-engine/src/view/observer/domeventdata';
 
 describe( 'Enter feature', () => {
 	let editor, editingView;

+ 3 - 3
packages/ckeditor5-enter/tests/entercommand.js

@@ -3,9 +3,9 @@
  * For licensing, see LICENSE.md.
  */
 
-import ModelTestEditor from 'ckeditor5-core/tests/_utils/modeltesteditor';
-import EnterCommand from 'ckeditor5-enter/src/entercommand';
-import { getData, setData } from 'ckeditor5-engine/src/dev-utils/model';
+import ModelTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/modeltesteditor';
+import EnterCommand from '../src/entercommand';
+import { getData, setData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
 describe( 'EnterCommand', () => {
 	let editor, doc, schema, command;

+ 4 - 4
packages/ckeditor5-enter/tests/enterobserver.js

@@ -5,10 +5,10 @@
 
 /* globals document */
 
-import ViewDocument from 'ckeditor5-engine/src/view/document';
-import EnterObserver from 'ckeditor5-enter/src/enterobserver';
-import DomEventData from 'ckeditor5-engine/src/view/observer/domeventdata';
-import { getCode } from 'ckeditor5-utils/src/keyboard';
+import ViewDocument from '@ckeditor/ckeditor5-engine/src/view/document';
+import EnterObserver from '../src/enterobserver';
+import DomEventData from '@ckeditor/ckeditor5-engine/src/view/observer/domeventdata';
+import { getCode } from '@ckeditor/ckeditor5-utils/src/keyboard';
 
 describe( 'EnterObserver', () => {
 	let viewDocument, observer;

+ 7 - 7
packages/ckeditor5-enter/tests/manual/enter.js

@@ -5,13 +5,13 @@
 
 /* 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 Undo from 'ckeditor5-undo/src/undo';
-import Bold from 'ckeditor5-basic-styles/src/bold';
-import Italic from 'ckeditor5-basic-styles/src/italic';
+import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classic';
+import Enter from '../../src/enter';
+import Typing from '@ckeditor/ckeditor5-typing/src/typing';
+import Heading from '@ckeditor/ckeditor5-heading/src/heading';
+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';
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
 	plugins: [ Enter, Typing, Heading, Undo, Bold, Italic ],