Explorar o código

Merge branch 'ckeditor5/t/389'

Piotrek Koszuliński %!s(int64=9) %!d(string=hai) anos
pai
achega
ecea3bde15

+ 2 - 6
packages/ckeditor5-list/.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
-

+ 11 - 11
packages/ckeditor5-list/package.json

@@ -1,22 +1,22 @@
 {
-  "name": "ckeditor5-list",
+  "name": "@ckeditor/ckeditor5-list",
   "version": "0.4.0",
   "description": "Introduces ordered and unordered lists feature to CKEditor 5.",
   "keywords": [],
   "dependencies": {
-    "ckeditor5-engine": "ckeditor/ckeditor5-engine",
-    "ckeditor5-core": "ckeditor/ckeditor5-core",
-    "ckeditor5-ui": "ckeditor/ckeditor5-ui",
-    "ckeditor5-utils": "ckeditor/ckeditor5-utils"
+    "@ckeditor/ckeditor5-engine": "*",
+    "@ckeditor/ckeditor5-core": "*",
+    "@ckeditor/ckeditor5-ui": "*",
+    "@ckeditor/ckeditor5-utils": "*"
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-dev-lint": "^2.0.0",
-    "ckeditor5-editor-classic": "ckeditor/ckeditor5-editor-classic",
-    "ckeditor5-enter": "ckeditor/ckeditor5-enter",
-    "ckeditor5-heading": "ckeditor/ckeditor5-heading",
-    "ckeditor5-paragraph": "ckeditor/ckeditor5-paragraph",
-    "ckeditor5-typing": "ckeditor/ckeditor5-typing",
-    "ckeditor5-undo": "ckeditor/ckeditor5-undo",
+    "@ckeditor/ckeditor5-editor-classic": "*",
+    "@ckeditor/ckeditor5-enter": "*",
+    "@ckeditor/ckeditor5-heading": "*",
+    "@ckeditor/ckeditor5-paragraph": "*",
+    "@ckeditor/ckeditor5-typing": "*",
+    "@ckeditor/ckeditor5-undo": "*",
     "gulp": "^3.9.0",
     "guppy-pre-commit": "^0.4.0"
   },

+ 6 - 6
packages/ckeditor5-list/src/converters.js

@@ -9,13 +9,13 @@
 
 import ViewListItemElement from './viewlistitemelement';
 
-import ModelElement from 'ckeditor5-engine/src/model/element';
-import ModelPosition from 'ckeditor5-engine/src/model/position';
+import ModelElement from '@ckeditor/ckeditor5-engine/src/model/element';
+import ModelPosition from '@ckeditor/ckeditor5-engine/src/model/position';
 
-import ViewContainerElement from 'ckeditor5-engine/src/view/containerelement';
-import ViewPosition from 'ckeditor5-engine/src/view/position';
-import ViewRange from 'ckeditor5-engine/src/view/range';
-import viewWriter from 'ckeditor5-engine/src/view/writer';
+import ViewContainerElement from '@ckeditor/ckeditor5-engine/src/view/containerelement';
+import ViewPosition from '@ckeditor/ckeditor5-engine/src/view/position';
+import ViewRange from '@ckeditor/ckeditor5-engine/src/view/range';
+import viewWriter from '@ckeditor/ckeditor5-engine/src/view/writer';
 
 /**
  * Model to view converter for `listItem` model element insertion.

+ 1 - 1
packages/ckeditor5-list/src/indentcommand.js

@@ -7,7 +7,7 @@
  * @module list/indentcommand
  */
 
-import Command from 'ckeditor5-core/src/command/command';
+import Command from '@ckeditor/ckeditor5-core/src/command/command';
 import { getClosestListItem } from './utils';
 
 /**

+ 3 - 3
packages/ckeditor5-list/src/list.js

@@ -7,10 +7,10 @@
  * @module list/list
  */
 
-import Plugin from 'ckeditor5-core/src/plugin';
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import ListEngine from './listengine';
-import ButtonView from 'ckeditor5-ui/src/button/buttonview';
-import { parseKeystroke } from 'ckeditor5-utils/src/keyboard';
+import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
+import { parseKeystroke } from '@ckeditor/ckeditor5-utils/src/keyboard';
 
 import numberedListIcon from '../theme/icons/numberedlist.svg';
 import bulletedListIcon from '../theme/icons/bulletedlist.svg';

+ 1 - 1
packages/ckeditor5-list/src/listcommand.js

@@ -7,7 +7,7 @@
  * @module list/listcommand
  */
 
-import Command from 'ckeditor5-core/src/command/command';
+import Command from '@ckeditor/ckeditor5-core/src/command/command';
 import { getClosestListItem, getSelectedBlocks, getPositionBeforeBlock } from './utils';
 
 /**

+ 1 - 1
packages/ckeditor5-list/src/listengine.js

@@ -7,7 +7,7 @@
  * @module list/listengine
  */
 
-import Plugin from 'ckeditor5-core/src/plugin';
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import ListCommand from './listcommand';
 import IndentCommand from './indentcommand';
 

+ 1 - 1
packages/ckeditor5-list/src/utils.js

@@ -9,7 +9,7 @@
  * @module list/utils
  */
 
-import Position from 'ckeditor5-engine/src/model/position';
+import Position from '@ckeditor/ckeditor5-engine/src/model/position';
 
 /**
  * For given {@link module:engine/model/position~Position position}, returns the closest ancestor of that position which is a

+ 1 - 1
packages/ckeditor5-list/src/viewlistitemelement.js

@@ -7,7 +7,7 @@
  * @module list/viewlistitemelement
  */
 
-import ViewContainerElement from 'ckeditor5-engine/src/view/containerelement';
+import ViewContainerElement from '@ckeditor/ckeditor5-engine/src/view/containerelement';
 
 /**
  * View element class representing list item (`<li>`). It extends {@link module:engine/view/containerelement~ContainerElement}

+ 6 - 6
packages/ckeditor5-list/tests/indentcommand.js

@@ -3,12 +3,12 @@
  * For licensing, see LICENSE.md.
  */
 
-import Editor from 'ckeditor5-core/src/editor/editor';
-import Document from 'ckeditor5-engine/src/model/document';
-import IndentCommand from 'ckeditor5-list/src/indentcommand';
-import Range from 'ckeditor5-engine/src/model/range';
-import Position from 'ckeditor5-engine/src/model/position';
-import { setData, getData } from 'ckeditor5-engine/src/dev-utils/model';
+import Editor from '@ckeditor/ckeditor5-core/src/editor/editor';
+import Document from '@ckeditor/ckeditor5-engine/src/model/document';
+import IndentCommand from '../src/indentcommand';
+import Range from '@ckeditor/ckeditor5-engine/src/model/range';
+import Position from '@ckeditor/ckeditor5-engine/src/model/position';
+import { setData, getData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
 describe( 'IndentCommand', () => {
 	let editor, doc, root;

+ 6 - 6
packages/ckeditor5-list/tests/list.js

@@ -5,12 +5,12 @@
 
 /* globals document */
 
-import ClassicTestEditor from 'ckeditor5-core/tests/_utils/classictesteditor';
-import List from 'ckeditor5-list/src/list';
-import Paragraph from 'ckeditor5-paragraph/src/paragraph';
-import ListEngine from 'ckeditor5-list/src/listengine';
-import ButtonView from 'ckeditor5-ui/src/button/buttonview';
-import { getCode } from 'ckeditor5-utils/src/keyboard';
+import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
+import List from '../src/list';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import ListEngine from '../src/listengine';
+import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
+import { getCode } from '@ckeditor/ckeditor5-utils/src/keyboard';
 
 describe( 'List', () => {
 	let editor, bulletedListButton, numberedListButton, schema;

+ 6 - 6
packages/ckeditor5-list/tests/listcommand.js

@@ -3,12 +3,12 @@
  * For licensing, see LICENSE.md.
  */
 
-import Editor from 'ckeditor5-core/src/editor/editor';
-import Document from 'ckeditor5-engine/src/model/document';
-import ListCommand from 'ckeditor5-list/src/listcommand';
-import Range from 'ckeditor5-engine/src/model/range';
-import Position from 'ckeditor5-engine/src/model/position';
-import { setData, getData } from 'ckeditor5-engine/src/dev-utils/model';
+import Editor from '@ckeditor/ckeditor5-core/src/editor/editor';
+import Document from '@ckeditor/ckeditor5-engine/src/model/document';
+import ListCommand from '../src/listcommand';
+import Range from '@ckeditor/ckeditor5-engine/src/model/range';
+import Position from '@ckeditor/ckeditor5-engine/src/model/position';
+import { setData, getData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
 describe( 'ListCommand', () => {
 	let editor, command, doc, root;

+ 11 - 11
packages/ckeditor5-list/tests/listengine.js

@@ -3,20 +3,20 @@
  * For licensing, see LICENSE.md.
  */
 
-import ListEngine from 'ckeditor5-list/src/listengine';
-import ListCommand from 'ckeditor5-list/src/listcommand';
+import ListEngine from '../src/listengine';
+import ListCommand from '../src/listcommand';
 
-import ModelElement from 'ckeditor5-engine/src/model/element';
-import ModelText from 'ckeditor5-engine/src/model/text';
-import ModelPosition from 'ckeditor5-engine/src/model/position';
-import ModelRange from 'ckeditor5-engine/src/model/range';
+import ModelElement from '@ckeditor/ckeditor5-engine/src/model/element';
+import ModelText from '@ckeditor/ckeditor5-engine/src/model/text';
+import ModelPosition from '@ckeditor/ckeditor5-engine/src/model/position';
+import ModelRange from '@ckeditor/ckeditor5-engine/src/model/range';
 
-import ViewPosition from 'ckeditor5-engine/src/view/position';
-import Paragraph from 'ckeditor5-paragraph/src/paragraph';
+import ViewPosition from '@ckeditor/ckeditor5-engine/src/view/position';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
 
-import VirtualTestEditor from 'ckeditor5-core/tests/_utils/virtualtesteditor';
-import { getData as getModelData, setData as setModelData } from 'ckeditor5-engine/src/dev-utils/model';
-import { getData as getViewData } from 'ckeditor5-engine/src/dev-utils/view';
+import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
+import { getData as getModelData, setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
+import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
 
 describe( 'ListEngine', () => {
 	let editor, doc, root;

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

@@ -5,13 +5,13 @@
 
 /* globals console, window, document */
 
-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 List from 'ckeditor5-list/src/list';
+import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/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 List from '../../src/list';
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
 	plugins: [ Enter, Typing, Heading, Paragraph, Undo, List ],

+ 6 - 6
packages/ckeditor5-list/tests/utils.js

@@ -3,13 +3,13 @@
  * For licensing, see LICENSE.md.
  */
 
-import { getClosestListItem, getSelectedBlocks, getPositionBeforeBlock } from 'ckeditor5-list/src/utils';
+import { getClosestListItem, getSelectedBlocks, getPositionBeforeBlock } from '../src/utils';
 
-import Element from 'ckeditor5-engine/src/model/element';
-import Text from 'ckeditor5-engine/src/model/text';
-import Position from 'ckeditor5-engine/src/model/position';
-import Schema from 'ckeditor5-engine/src/model/schema';
-import Selection from 'ckeditor5-engine/src/model/selection';
+import Element from '@ckeditor/ckeditor5-engine/src/model/element';
+import Text from '@ckeditor/ckeditor5-engine/src/model/text';
+import Position from '@ckeditor/ckeditor5-engine/src/model/position';
+import Schema from '@ckeditor/ckeditor5-engine/src/model/schema';
+import Selection from '@ckeditor/ckeditor5-engine/src/model/selection';
 
 describe( 'getClosestListItem', () => {
 	const item = new Element( 'listItem', null, 'foobar' );

+ 3 - 3
packages/ckeditor5-list/tests/viewlistitemelement.js

@@ -3,9 +3,9 @@
  * For licensing, see LICENSE.md.
  */
 
-import ViewListItemElement from 'ckeditor5-list/src/viewlistitemelement';
-import ViewContainerElement from 'ckeditor5-engine/src/view/containerelement';
-import ViewText from 'ckeditor5-engine/src/view/text';
+import ViewListItemElement from '../src/viewlistitemelement';
+import ViewContainerElement from '@ckeditor/ckeditor5-engine/src/view/containerelement';
+import ViewText from '@ckeditor/ckeditor5-engine/src/view/text';
 
 describe( 'ViewListItemElement', () => {
 	it( 'should extend ViewContainerElement', () => {