8
0
Просмотр исходного кода

Merge branch 'ckeditor5/t/389'

Piotrek Koszuliński 9 лет назад
Родитель
Сommit
e595fba0e1

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

+ 12 - 11
packages/ckeditor5-link/package.json

@@ -1,22 +1,23 @@
 {
-  "name": "ckeditor5-link",
+  "name": "@ckeditor/ckeditor5-link",
   "version": "0.4.0",
   "description": "Link feature 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"
+    "@ckeditor/ckeditor5-core": "*",
+    "@ckeditor/ckeditor5-engine": "*",
+    "@ckeditor/ckeditor5-theme-lark": "*",
+    "@ckeditor/ckeditor5-ui": "*"
   },
   "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": "*",
+    "@ckeditor/ckeditor5-utils": "*",
     "gulp": "^3.9.0",
     "guppy-pre-commit": "^0.4.0"
   },

+ 2 - 2
packages/ckeditor5-link/src/findlinkrange.js

@@ -7,8 +7,8 @@
  * @module link/findlinkrange
  */
 
-import Range from 'ckeditor5-engine/src/model/range';
-import Position from 'ckeditor5-engine/src/model/position';
+import Range from '@ckeditor/ckeditor5-engine/src/model/range';
+import Position from '@ckeditor/ckeditor5-engine/src/model/position';
 
 /**
  * Walk backward and forward from start position, node by node as long as they have the same `linkHref` attribute value and return

+ 6 - 6
packages/ckeditor5-link/src/link.js

@@ -7,16 +7,16 @@
  * @module link/link
  */
 
-import Plugin from 'ckeditor5-core/src/plugin';
-import ClickObserver from 'ckeditor5-engine/src/view/observer/clickobserver';
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
+import ClickObserver from '@ckeditor/ckeditor5-engine/src/view/observer/clickobserver';
 import LinkEngine from './linkengine';
 import LinkElement from './linkelement';
 
-import clickOutsideHandler from 'ckeditor5-ui/src/bindings/clickoutsidehandler';
-import escPressHandler from 'ckeditor5-ui/src/bindings/escpresshandler';
+import clickOutsideHandler from '@ckeditor/ckeditor5-ui/src/bindings/clickoutsidehandler';
+import escPressHandler from '@ckeditor/ckeditor5-ui/src/bindings/escpresshandler';
 
-import ButtonView from 'ckeditor5-ui/src/button/buttonview';
-import BalloonPanelView from 'ckeditor5-ui/src/balloonpanel/balloonpanelview';
+import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
+import BalloonPanelView from '@ckeditor/ckeditor5-ui/src/balloonpanel/balloonpanelview';
 
 import LinkFormView from './ui/linkformview';
 

+ 5 - 5
packages/ckeditor5-link/src/linkcommand.js

@@ -7,11 +7,11 @@
  * @module link/linkcommand
  */
 
-import Command from 'ckeditor5-core/src/command/command';
-import Text from 'ckeditor5-engine/src/model/text';
-import Range from 'ckeditor5-engine/src/model/range';
-import getSchemaValidRanges from 'ckeditor5-core/src/command/helpers/getschemavalidranges';
-import isAttributeAllowedInSelection from 'ckeditor5-core/src/command/helpers/isattributeallowedinselection';
+import Command from '@ckeditor/ckeditor5-core/src/command/command';
+import Text from '@ckeditor/ckeditor5-engine/src/model/text';
+import Range from '@ckeditor/ckeditor5-engine/src/model/range';
+import getSchemaValidRanges from '@ckeditor/ckeditor5-core/src/command/helpers/getschemavalidranges';
+import isAttributeAllowedInSelection from '@ckeditor/ckeditor5-core/src/command/helpers/isattributeallowedinselection';
 import findLinkRange from './findlinkrange';
 
 /**

+ 1 - 1
packages/ckeditor5-link/src/linkelement.js

@@ -7,7 +7,7 @@
  * @module link/linkelement
  */
 
-import AttributeElement from 'ckeditor5-engine/src/view/attributeelement';
+import AttributeElement from '@ckeditor/ckeditor5-engine/src/view/attributeelement';
 
 /**
  * This class is to mark specific {@link module:engine/view/node~Node} as {@link module:link/linkelement~LinkElement}.

+ 3 - 3
packages/ckeditor5-link/src/linkengine.js

@@ -7,9 +7,9 @@
  * @module link/linkengine
  */
 
-import Plugin from 'ckeditor5-core/src/plugin';
-import buildModelConverter from 'ckeditor5-engine/src/conversion/buildmodelconverter';
-import buildViewConverter from 'ckeditor5-engine/src/conversion/buildviewconverter';
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
+import buildModelConverter from '@ckeditor/ckeditor5-engine/src/conversion/buildmodelconverter';
+import buildViewConverter from '@ckeditor/ckeditor5-engine/src/conversion/buildviewconverter';
 import LinkElement from './linkelement';
 import LinkCommand from './linkcommand';
 import UnlinkCommand from './unlinkcommand';

+ 6 - 6
packages/ckeditor5-link/src/ui/linkformview.js

@@ -7,14 +7,14 @@
  * @module link/ui/linkformview
  */
 
-import View from 'ckeditor5-ui/src/view';
-import Template from 'ckeditor5-ui/src/template';
+import View from '@ckeditor/ckeditor5-ui/src/view';
+import Template from '@ckeditor/ckeditor5-ui/src/template';
 
-import ButtonView from 'ckeditor5-ui/src/button/buttonview';
-import LabeledInputView from 'ckeditor5-ui/src/labeledinput/labeledinputview';
-import InputTextView from 'ckeditor5-ui/src/inputtext/inputtextview';
+import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
+import LabeledInputView from '@ckeditor/ckeditor5-ui/src/labeledinput/labeledinputview';
+import InputTextView from '@ckeditor/ckeditor5-ui/src/inputtext/inputtextview';
 
-import submitHandler from 'ckeditor5-ui/src/bindings/submithandler';
+import submitHandler from '@ckeditor/ckeditor5-ui/src/bindings/submithandler';
 
 /**
  * The link form view controller class.

+ 1 - 1
packages/ckeditor5-link/src/unlinkcommand.js

@@ -7,7 +7,7 @@
  * @module link/unlinkcommand
  */
 
-import Command from 'ckeditor5-core/src/command/command';
+import Command from '@ckeditor/ckeditor5-core/src/command/command';
 import findLinkRange from './findlinkrange';
 
 /**

+ 5 - 5
packages/ckeditor5-link/tests/findlinkrange.js

@@ -3,11 +3,11 @@
  * For licensing, see LICENSE.md.
  */
 
-import findLinkRange from 'ckeditor5-link/src/findlinkrange';
-import Document from 'ckeditor5-engine/src/model/document';
-import Range from 'ckeditor5-engine/src/model/range';
-import Position from 'ckeditor5-engine/src/model/position';
-import { setData } from 'ckeditor5-engine/src/dev-utils/model';
+import findLinkRange from '../src/findlinkrange';
+import Document from '@ckeditor/ckeditor5-engine/src/model/document';
+import Range from '@ckeditor/ckeditor5-engine/src/model/range';
+import Position from '@ckeditor/ckeditor5-engine/src/model/position';
+import { setData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
 describe( 'findLinkRange', () => {
 	let document, root;

+ 12 - 12
packages/ckeditor5-link/tests/link.js

@@ -5,18 +5,18 @@
 
 /* globals document */
 
-import ClassicTestEditor from 'ckeditor5-core/tests/_utils/classictesteditor';
-import testUtils from 'ckeditor5-core/tests/_utils/utils';
-import { keyCodes } from 'ckeditor5-utils/src/keyboard';
-import { setData as setModelData } from 'ckeditor5-engine/src/dev-utils/model';
-
-import Link from 'ckeditor5-link/src/link';
-import LinkEngine from 'ckeditor5-link/src/linkengine';
-import ButtonView from 'ckeditor5-ui/src/button/buttonview';
-import BalloonPanelView from 'ckeditor5-ui/src/balloonpanel/balloonpanelview';
-
-import Range from 'ckeditor5-engine/src/view/range';
-import ClickObserver from 'ckeditor5-engine/src/view/observer/clickobserver';
+import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
+import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
+import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
+import { setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
+
+import Link from '../src/link';
+import LinkEngine from '../src/linkengine';
+import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
+import BalloonPanelView from '@ckeditor/ckeditor5-ui/src/balloonpanel/balloonpanelview';
+
+import Range from '@ckeditor/ckeditor5-engine/src/view/range';
+import ClickObserver from '@ckeditor/ckeditor5-engine/src/view/observer/clickobserver';
 
 testUtils.createSinonSandbox();
 

+ 3 - 3
packages/ckeditor5-link/tests/linkcommand.js

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

+ 2 - 2
packages/ckeditor5-link/tests/linkelement.js

@@ -3,8 +3,8 @@
  * For licensing, see LICENSE.md.
  */
 
-import LinkElement from 'ckeditor5-link/src/linkelement';
-import AttributeElement from 'ckeditor5-engine/src/view/attributeelement';
+import LinkElement from '../src/linkelement';
+import AttributeElement from '@ckeditor/ckeditor5-engine/src/view/attributeelement';
 
 describe( 'LinkElement', () => {
 	it( 'should extend AttributeElement', () => {

+ 7 - 7
packages/ckeditor5-link/tests/linkengine.js

@@ -3,13 +3,13 @@
  * For licensing, see LICENSE.md.
  */
 
-import LinkEngine from 'ckeditor5-link/src/linkengine';
-import LinkCommand from 'ckeditor5-link/src/linkcommand';
-import LinkElement from 'ckeditor5-link/src/linkelement';
-import UnlinkCommand from 'ckeditor5-link/src/unlinkcommand';
-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 LinkEngine from '../src/linkengine';
+import LinkCommand from '../src/linkcommand';
+import LinkElement from '../src/linkelement';
+import UnlinkCommand from '../src/unlinkcommand';
+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( 'LinkEngine', () => {
 	let editor, doc;

+ 6 - 6
packages/ckeditor5-link/tests/manual/link.js

@@ -5,12 +5,12 @@
 
 /* globals console:false, 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 Link from 'ckeditor5-link/src/link';
-import Paragraph from 'ckeditor5-paragraph/src/paragraph';
-import Undo from 'ckeditor5-undo/src/undo';
+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 Link from '../../src/link';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import Undo from '@ckeditor/ckeditor5-undo/src/undo';
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
 	plugins: [ Link, Typing, Paragraph, Undo, Enter ],

+ 2 - 2
packages/ckeditor5-link/tests/ui/linkformview.js

@@ -3,8 +3,8 @@
  * For licensing, see LICENSE.md.
  */
 
-import View from 'ckeditor5-ui/src/view';
-import LinkFormView from 'ckeditor5-link/src/ui/linkformview';
+import View from '@ckeditor/ckeditor5-ui/src/view';
+import LinkFormView from '../../src/ui/linkformview';
 
 describe( 'LinkFormView', () => {
 	let view;

+ 4 - 4
packages/ckeditor5-link/tests/unlinkcommand.js

@@ -3,10 +3,10 @@
  * For licensing, see LICENSE.md.
  */
 
-import ModelTestEditor from 'ckeditor5-core/tests/_utils/modeltesteditor';
-import UnlinkCommand from 'ckeditor5-link/src/unlinkcommand';
-import { setData, getData } from 'ckeditor5-engine/src/dev-utils/model';
-import testUtils from 'ckeditor5-core/tests/_utils/utils';
+import ModelTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/modeltesteditor';
+import UnlinkCommand from '../src/unlinkcommand';
+import { setData, getData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
+import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 
 testUtils.createSinonSandbox();
 

+ 1 - 1
packages/ckeditor5-link/theme/components/linkform.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/helpers/_spacing';
+@import '~@ckeditor/ckeditor5-theme-lark/theme/helpers/_spacing';
 
 .ck-link {
 	&-form {