Преглед изворни кода

Merge branch 'ckeditor5/t/389'

Piotrek Koszuliński пре 9 година
родитељ
комит
68f0b0b71f
100 измењених фајлова са 432 додато и 428 уклоњено
  1. 2 6
      packages/ckeditor5-engine/.travis.yml
  2. 11 3
      packages/ckeditor5-engine/package.json
  3. 2 2
      packages/ckeditor5-engine/src/controller/datacontroller.js
  4. 1 1
      packages/ckeditor5-engine/src/controller/deletecontent.js
  5. 1 1
      packages/ckeditor5-engine/src/controller/editingcontroller.js
  6. 1 1
      packages/ckeditor5-engine/src/controller/insertcontent.js
  7. 1 1
      packages/ckeditor5-engine/src/controller/modifyselection.js
  8. 1 1
      packages/ckeditor5-engine/src/conversion/buildmodelconverter.js
  9. 1 1
      packages/ckeditor5-engine/src/conversion/buildviewconverter.js
  10. 2 2
      packages/ckeditor5-engine/src/conversion/mapper.js
  11. 3 3
      packages/ckeditor5-engine/src/conversion/modelconversiondispatcher.js
  12. 2 2
      packages/ckeditor5-engine/src/conversion/viewconsumable.js
  13. 3 3
      packages/ckeditor5-engine/src/conversion/viewconversiondispatcher.js
  14. 2 2
      packages/ckeditor5-engine/src/dev-utils/model.js
  15. 1 1
      packages/ckeditor5-engine/src/model/batch.js
  16. 1 1
      packages/ckeditor5-engine/src/model/delta/basic-transformations.js
  17. 1 1
      packages/ckeditor5-engine/src/model/delta/delta.js
  18. 1 1
      packages/ckeditor5-engine/src/model/delta/deltafactory.js
  19. 1 1
      packages/ckeditor5-engine/src/model/delta/mergedelta.js
  20. 1 1
      packages/ckeditor5-engine/src/model/delta/movedelta.js
  21. 1 1
      packages/ckeditor5-engine/src/model/delta/renamedelta.js
  22. 1 1
      packages/ckeditor5-engine/src/model/delta/splitdelta.js
  23. 1 1
      packages/ckeditor5-engine/src/model/delta/transform.js
  24. 1 1
      packages/ckeditor5-engine/src/model/delta/unwrapdelta.js
  25. 1 1
      packages/ckeditor5-engine/src/model/delta/wrapdelta.js
  26. 5 5
      packages/ckeditor5-engine/src/model/document.js
  27. 1 1
      packages/ckeditor5-engine/src/model/documentfragment.js
  28. 1 1
      packages/ckeditor5-engine/src/model/element.js
  29. 1 1
      packages/ckeditor5-engine/src/model/history.js
  30. 3 3
      packages/ckeditor5-engine/src/model/liveposition.js
  31. 2 2
      packages/ckeditor5-engine/src/model/liverange.js
  32. 3 3
      packages/ckeditor5-engine/src/model/liveselection.js
  33. 3 3
      packages/ckeditor5-engine/src/model/markerscollection.js
  34. 2 2
      packages/ckeditor5-engine/src/model/node.js
  35. 1 1
      packages/ckeditor5-engine/src/model/nodelist.js
  36. 2 2
      packages/ckeditor5-engine/src/model/operation/attributeoperation.js
  37. 2 2
      packages/ckeditor5-engine/src/model/operation/moveoperation.js
  38. 1 1
      packages/ckeditor5-engine/src/model/operation/operation.js
  39. 1 1
      packages/ckeditor5-engine/src/model/operation/renameoperation.js
  40. 1 1
      packages/ckeditor5-engine/src/model/operation/rootattributeoperation.js
  41. 1 1
      packages/ckeditor5-engine/src/model/operation/transform.js
  42. 3 3
      packages/ckeditor5-engine/src/model/position.js
  43. 1 1
      packages/ckeditor5-engine/src/model/range.js
  44. 4 4
      packages/ckeditor5-engine/src/model/schema.js
  45. 5 5
      packages/ckeditor5-engine/src/model/selection.js
  46. 1 1
      packages/ckeditor5-engine/src/model/textproxy.js
  47. 1 1
      packages/ckeditor5-engine/src/model/treewalker.js
  48. 1 1
      packages/ckeditor5-engine/src/model/writer.js
  49. 3 3
      packages/ckeditor5-engine/src/view/document.js
  50. 3 3
      packages/ckeditor5-engine/src/view/documentfragment.js
  51. 3 3
      packages/ckeditor5-engine/src/view/domconverter.js
  52. 3 3
      packages/ckeditor5-engine/src/view/editableelement.js
  53. 3 3
      packages/ckeditor5-engine/src/view/element.js
  54. 1 1
      packages/ckeditor5-engine/src/view/emptyelement.js
  55. 1 1
      packages/ckeditor5-engine/src/view/filler.js
  56. 3 3
      packages/ckeditor5-engine/src/view/node.js
  57. 1 1
      packages/ckeditor5-engine/src/view/observer/domeventdata.js
  58. 1 1
      packages/ckeditor5-engine/src/view/observer/fakeselectionobserver.js
  59. 1 1
      packages/ckeditor5-engine/src/view/observer/keyobserver.js
  60. 2 2
      packages/ckeditor5-engine/src/view/observer/observer.js
  61. 1 1
      packages/ckeditor5-engine/src/view/observer/selectionobserver.js
  62. 2 2
      packages/ckeditor5-engine/src/view/position.js
  63. 6 6
      packages/ckeditor5-engine/src/view/renderer.js
  64. 3 3
      packages/ckeditor5-engine/src/view/selection.js
  65. 1 1
      packages/ckeditor5-engine/src/view/textproxy.js
  66. 1 1
      packages/ckeditor5-engine/src/view/treewalker.js
  67. 2 2
      packages/ckeditor5-engine/src/view/writer.js
  68. 13 13
      packages/ckeditor5-engine/tests/controller/datacontroller.js
  69. 3 3
      packages/ckeditor5-engine/tests/controller/deletecontent.js
  70. 15 15
      packages/ckeditor5-engine/tests/controller/editingcontroller.js
  71. 4 4
      packages/ckeditor5-engine/tests/controller/getselectedcontent.js
  72. 6 6
      packages/ckeditor5-engine/tests/controller/insertcontent.js
  73. 5 5
      packages/ckeditor5-engine/tests/controller/modifyselection.js
  74. 24 24
      packages/ckeditor5-engine/tests/conversion/advanced-converters.js
  75. 18 18
      packages/ckeditor5-engine/tests/conversion/buildmodelconverter.js
  76. 14 14
      packages/ckeditor5-engine/tests/conversion/buildviewconverter.js
  77. 12 12
      packages/ckeditor5-engine/tests/conversion/mapper.js
  78. 16 16
      packages/ckeditor5-engine/tests/conversion/model-selection-to-view-converters.js
  79. 16 16
      packages/ckeditor5-engine/tests/conversion/model-to-view-converters.js
  80. 4 4
      packages/ckeditor5-engine/tests/conversion/modelconsumable.js
  81. 8 8
      packages/ckeditor5-engine/tests/conversion/modelconversiondispatcher.js
  82. 8 8
      packages/ckeditor5-engine/tests/conversion/view-selection-to-model-converters.js
  83. 9 9
      packages/ckeditor5-engine/tests/conversion/view-to-model-converters.js
  84. 4 4
      packages/ckeditor5-engine/tests/conversion/viewconsumable.js
  85. 5 5
      packages/ckeditor5-engine/tests/conversion/viewconversiondispatcher.js
  86. 1 1
      packages/ckeditor5-engine/tests/dataprocessor/basichtmlwriter.js
  87. 4 4
      packages/ckeditor5-engine/tests/dataprocessor/htmldataprocessor.js
  88. 4 4
      packages/ckeditor5-engine/tests/dataprocessor/xmldataprocessor.js
  89. 8 8
      packages/ckeditor5-engine/tests/dev-utils/model.js
  90. 12 12
      packages/ckeditor5-engine/tests/dev-utils/view.js
  91. 5 5
      packages/ckeditor5-engine/tests/manual/tickets/401/1.js
  92. 6 6
      packages/ckeditor5-engine/tests/manual/tickets/462/1.js
  93. 13 13
      packages/ckeditor5-engine/tests/manual/tickets/475/1.js
  94. 7 7
      packages/ckeditor5-engine/tests/manual/tickets/603/1.js
  95. 5 5
      packages/ckeditor5-engine/tests/manual/tickets/629/1.js
  96. 14 14
      packages/ckeditor5-engine/tests/manual/tickets/643/1.js
  97. 5 5
      packages/ckeditor5-engine/tests/model/_utils/utils.js
  98. 8 8
      packages/ckeditor5-engine/tests/model/batch.js
  99. 10 10
      packages/ckeditor5-engine/tests/model/delta/attributedelta.js
  100. 15 15
      packages/ckeditor5-engine/tests/model/delta/delta.js

+ 2 - 6
packages/ckeditor5-engine/.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 - 3
packages/ckeditor5-engine/package.json

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

+ 2 - 2
packages/ckeditor5-engine/src/controller/datacontroller.js

@@ -7,8 +7,8 @@
  * @module engine/controller/datacontroller
  */
 
-import mix from 'ckeditor5-utils/src/mix';
-import EmitterMixin from 'ckeditor5-utils/src/emittermixin';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
+import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
 
 import Mapper from '../conversion/mapper';
 

+ 1 - 1
packages/ckeditor5-engine/src/controller/deletecontent.js

@@ -10,7 +10,7 @@
 import LivePosition from '../model/liveposition';
 import Position from '../model/position';
 import Element from '../model/element';
-import compareArrays from 'ckeditor5-utils/src/comparearrays';
+import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
 
 /**
  * Deletes content of the selection and merge siblings. The resulting selection is always collapsed.

+ 1 - 1
packages/ckeditor5-engine/src/controller/editingcontroller.js

@@ -26,7 +26,7 @@ import {
 	clearFakeSelection
 } from '../conversion/model-selection-to-view-converters';
 
-import EmitterMixin from 'ckeditor5-utils/src/emittermixin';
+import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
 
 /**
  * Controller for the editing pipeline. The editing pipeline controls {@link ~EditingController#model model} rendering,

+ 1 - 1
packages/ckeditor5-engine/src/controller/insertcontent.js

@@ -12,7 +12,7 @@ import LivePosition from '../model/liveposition';
 import Text from '../model/text';
 import Element from '../model/element';
 import Range from '../model/range';
-import log from 'ckeditor5-utils/src/log';
+import log from '@ckeditor/ckeditor5-utils/src/log';
 
 /**
  * Inserts content into the editor (specified selection) as one would expect the paste

+ 1 - 1
packages/ckeditor5-engine/src/controller/modifyselection.js

@@ -10,7 +10,7 @@
 import Position from '../model/position';
 import TreeWalker from '../model/treewalker';
 import Range from '../model/range';
-import { isInsideSurrogatePair, isInsideCombinedSymbol } from 'ckeditor5-utils/src/unicode';
+import { isInsideSurrogatePair, isInsideCombinedSymbol } from '@ckeditor/ckeditor5-utils/src/unicode';
 
 /**
  * Modifies the selection. Currently, the supported modifications are:

+ 1 - 1
packages/ckeditor5-engine/src/conversion/buildmodelconverter.js

@@ -22,7 +22,7 @@ import { convertSelectionAttribute } from './model-selection-to-view-converters'
 import ViewAttributeElement from '../view/attributeelement';
 import ViewContainerElement from '../view/containerelement';
 
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * Provides chainable, high-level API to easily build basic model-to-view converters that are appended to given

+ 1 - 1
packages/ckeditor5-engine/src/conversion/buildviewconverter.js

@@ -11,7 +11,7 @@ import Matcher from '../view/matcher';
 import ModelElement from '../model/element';
 import ModelPosition from '../model/position';
 import modelWriter from '../model/writer';
-import isIterable from 'ckeditor5-utils/src/isiterable';
+import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
 
 /**
  * Provides chainable, high-level API to easily build basic view-to-model converters that are appended to given

+ 2 - 2
packages/ckeditor5-engine/src/conversion/mapper.js

@@ -14,8 +14,8 @@ import ViewPosition from '../view/position';
 import ViewRange from '../view/range';
 import ViewText from '../view/text';
 
-import EmitterMixin from 'ckeditor5-utils/src/emittermixin';
-import mix from 'ckeditor5-utils/src/mix';
+import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
 
 /**
  * Maps elements and positions between {@link module:engine/view/document~Document view} and {@link module:engine/model/model model}.

+ 3 - 3
packages/ckeditor5-engine/src/conversion/modelconversiondispatcher.js

@@ -10,9 +10,9 @@
 import Consumable from './modelconsumable';
 import Range from '../model/range';
 import TextProxy from '../model/textproxy';
-import EmitterMixin from 'ckeditor5-utils/src/emittermixin';
-import mix from 'ckeditor5-utils/src/mix';
-import extend from 'ckeditor5-utils/src/lib/lodash/extend';
+import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
+import extend from '@ckeditor/ckeditor5-utils/src/lib/lodash/extend';
 
 /**
  * `ModelConversionDispatcher` is a central point of {@link module:engine/model/model model} conversion, which is

+ 2 - 2
packages/ckeditor5-engine/src/conversion/viewconsumable.js

@@ -7,8 +7,8 @@
  * @module engine/conversion/viewconsumable
  */
 
-import isArray from 'ckeditor5-utils/src/lib/lodash/isArray';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import isArray from '@ckeditor/ckeditor5-utils/src/lib/lodash/isArray';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 import ViewElement from '../view/element';
 import ViewText from '../view/text';
 import ViewDocumentFragment from '../view/documentfragment';

+ 3 - 3
packages/ckeditor5-engine/src/conversion/viewconversiondispatcher.js

@@ -10,9 +10,9 @@
 import ViewConsumable from './viewconsumable';
 import ViewElement from '../view/element';
 import ViewText from '../view/text';
-import EmitterMixin from 'ckeditor5-utils/src/emittermixin';
-import mix from 'ckeditor5-utils/src/mix';
-import extend from 'ckeditor5-utils/src/lib/lodash/extend';
+import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
+import extend from '@ckeditor/ckeditor5-utils/src/lib/lodash/extend';
 
 /**
  * `ViewConversionDispatcher` is a central point of {@link module:engine/view/view view} conversion, which is a process of

+ 2 - 2
packages/ckeditor5-engine/src/dev-utils/model.js

@@ -30,14 +30,14 @@ import ViewElement from '../view/containerelement';
 import ViewAttributeElement from '../view/attributeelement';
 
 import Mapper from '../conversion/mapper';
-import { parse as viewParse, stringify as viewStringify } from 'ckeditor5-engine/src/dev-utils/view';
+import { parse as viewParse, stringify as viewStringify } from '../../src/dev-utils/view';
 import {
 	convertRangeSelection,
 	convertCollapsedSelection,
 	convertSelectionAttribute
 } from '../conversion/model-selection-to-view-converters';
 import { insertText, insertElement, wrapItem } from '../conversion/model-to-view-converters';
-import isPlainObject from 'ckeditor5-utils/src/lib/lodash/isPlainObject';
+import isPlainObject from '@ckeditor/ckeditor5-utils/src/lib/lodash/isPlainObject';
 
 /**
  * Writes the contents of the {@link module:engine/model/document~Document Document} to an HTML-like string.

+ 1 - 1
packages/ckeditor5-engine/src/model/batch.js

@@ -7,7 +7,7 @@
  * @module engine/model/batch
  */
 
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * `Batch` instance groups document changes ({@link module:engine/model/delta/delta~Delta deltas}). All deltas grouped in a single `Batch`

+ 1 - 1
packages/ckeditor5-engine/src/model/delta/basic-transformations.js

@@ -29,7 +29,7 @@ import UnwrapDelta from './unwrapdelta';
 import RenameDelta from './renamedelta';
 import RemoveDelta from './removedelta';
 
-import compareArrays from 'ckeditor5-utils/src/comparearrays';
+import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
 
 // Provide transformations for default deltas.
 

+ 1 - 1
packages/ckeditor5-engine/src/model/delta/delta.js

@@ -7,7 +7,7 @@
  * @module engine/model/delta/delta
  */
 
-import clone from 'ckeditor5-utils/src/lib/lodash/clone';
+import clone from '@ckeditor/ckeditor5-utils/src/lib/lodash/clone';
 import DeltaFactory from './deltafactory';
 
 /**

+ 1 - 1
packages/ckeditor5-engine/src/model/delta/deltafactory.js

@@ -7,7 +7,7 @@
  * @module engine/model/delta/deltafactory
  */
 
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 import OperationFactory from '../operation/operationfactory';
 

+ 1 - 1
packages/ckeditor5-engine/src/model/delta/mergedelta.js

@@ -15,7 +15,7 @@ import Position from '../position';
 import Element from '../element';
 import RemoveOperation from '../operation/removeoperation';
 import MoveOperation from '../operation/moveoperation';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * @classdesc

+ 1 - 1
packages/ckeditor5-engine/src/model/delta/movedelta.js

@@ -13,7 +13,7 @@ import { register } from '../batch';
 import MoveOperation from '../operation/moveoperation';
 import Position from '../position';
 import Range from '../range';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * @classdesc

+ 1 - 1
packages/ckeditor5-engine/src/model/delta/renamedelta.js

@@ -13,7 +13,7 @@ import { register } from '../batch';
 import RenameOperation from '../operation/renameoperation';
 import Element from '../element';
 import Position from '../position';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * To provide specific OT behavior and better collisions solving, the {@link module:engine/model/batch~Batch#rename Batch#rename} method

+ 1 - 1
packages/ckeditor5-engine/src/model/delta/splitdelta.js

@@ -14,7 +14,7 @@ import Position from '../position';
 import Element from '../element';
 import InsertOperation from '../operation/insertoperation';
 import MoveOperation from '../operation/moveoperation';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 import MergeDelta from '../delta/mergedelta';
 
 /**

+ 1 - 1
packages/ckeditor5-engine/src/model/delta/transform.js

@@ -10,7 +10,7 @@
 import Delta from './delta';
 import operationTransform from '../operation/transform';
 import NoOperation from '../operation/nooperation';
-import arrayUtils from 'ckeditor5-utils/src/lib/lodash/array';
+import arrayUtils from '@ckeditor/ckeditor5-utils/src/lib/lodash/array';
 
 const specialCases = new Map();
 

+ 1 - 1
packages/ckeditor5-engine/src/model/delta/unwrapdelta.js

@@ -14,7 +14,7 @@ import { register } from '../batch';
 import Position from '../position';
 import RemoveOperation from '../operation/removeoperation';
 import MoveOperation from '../operation/moveoperation';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * @classdesc

+ 1 - 1
packages/ckeditor5-engine/src/model/delta/wrapdelta.js

@@ -16,7 +16,7 @@ import Range from '../range';
 import Element from '../element';
 import InsertOperation from '../operation/insertoperation';
 import MoveOperation from '../operation/moveoperation';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * @classdesc

+ 5 - 5
packages/ckeditor5-engine/src/model/document.js

@@ -20,11 +20,11 @@ import LiveSelection from './liveselection';
 import Schema from './schema';
 import TreeWalker from './treewalker';
 import MarkersCollection from './markerscollection';
-import clone from 'ckeditor5-utils/src/lib/lodash/clone';
-import EmitterMixin from 'ckeditor5-utils/src/emittermixin';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
-import mix from 'ckeditor5-utils/src/mix';
-import { isInsideSurrogatePair, isInsideCombinedSymbol } from 'ckeditor5-utils/src/unicode';
+import clone from '@ckeditor/ckeditor5-utils/src/lib/lodash/clone';
+import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
+import { isInsideSurrogatePair, isInsideCombinedSymbol } from '@ckeditor/ckeditor5-utils/src/unicode';
 
 const graveyardName = '$graveyard';
 

+ 1 - 1
packages/ckeditor5-engine/src/model/documentfragment.js

@@ -10,7 +10,7 @@
 import NodeList from './nodelist';
 import Element from './element';
 import Text from './text';
-import isIterable from 'ckeditor5-utils/src/isiterable';
+import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
 
 /**
  * DocumentFragment represents a part of model which does not have a common root but it's top-level nodes

+ 1 - 1
packages/ckeditor5-engine/src/model/element.js

@@ -10,7 +10,7 @@
 import Node from './node';
 import NodeList from './nodelist';
 import Text from './text';
-import isIterable from 'ckeditor5-utils/src/isiterable';
+import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
 
 /**
  * Model element. Type of {@link module:engine/model/node~Node node} that has a {@link module:engine/model/element~Element#name name} and

+ 1 - 1
packages/ckeditor5-engine/src/model/history.js

@@ -7,7 +7,7 @@
  * @module engine/model/history
  */
 
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * `History` keeps the track of all the deltas applied to the {@link module:engine/model/document~Document document}. Deltas stored in

+ 3 - 3
packages/ckeditor5-engine/src/model/liveposition.js

@@ -10,9 +10,9 @@
 import RootElement from './rootelement';
 import Position from './position';
 import Range from './range';
-import EmitterMixin from 'ckeditor5-utils/src/emittermixin';
-import mix from 'ckeditor5-utils/src/mix';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * `LivePosition` is a type of {@link module:engine/model/position~Position Position}

+ 2 - 2
packages/ckeditor5-engine/src/model/liverange.js

@@ -8,8 +8,8 @@
  */
 
 import Range from './range';
-import EmitterMixin from 'ckeditor5-utils/src/emittermixin';
-import mix from 'ckeditor5-utils/src/mix';
+import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
 
 /**
  * `LiveRange` is a type of {@link module:engine/model/range~Range Range}

+ 3 - 3
packages/ckeditor5-engine/src/model/liveselection.js

@@ -12,9 +12,9 @@ import Range from './range';
 import LiveRange from './liverange';
 import Text from './text';
 import TextProxy from './textproxy';
-import toMap from 'ckeditor5-utils/src/tomap';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
-import log from 'ckeditor5-utils/src/log';
+import toMap from '@ckeditor/ckeditor5-utils/src/tomap';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import log from '@ckeditor/ckeditor5-utils/src/log';
 
 import Selection from './selection';
 

+ 3 - 3
packages/ckeditor5-engine/src/model/markerscollection.js

@@ -5,9 +5,9 @@
 
 import LiveRange from './liverange';
 import Range from './range';
-import EmitterMixin from 'ckeditor5-utils/src/emittermixin';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
-import mix from 'ckeditor5-utils/src/mix';
+import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
 
 /**
  * Manages and stores markers.

+ 2 - 2
packages/ckeditor5-engine/src/model/node.js

@@ -7,8 +7,8 @@
  * @module engine/model/node
  */
 
-import toMap from 'ckeditor5-utils/src/tomap';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import toMap from '@ckeditor/ckeditor5-utils/src/tomap';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * Model node. Most basic structure of model tree.

+ 1 - 1
packages/ckeditor5-engine/src/model/nodelist.js

@@ -8,7 +8,7 @@
  */
 
 import Node from './node';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * Provides an interface to operate on a list of {@link module:engine/model/node~Node nodes}. `NodeList` is used internally

+ 2 - 2
packages/ckeditor5-engine/src/model/operation/attributeoperation.js

@@ -9,9 +9,9 @@
 
 import Operation from './operation';
 import Range from '../range';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 import writer from '../writer';
-import isEqual from 'ckeditor5-utils/src/lib/lodash/isEqual';
+import isEqual from '@ckeditor/ckeditor5-utils/src/lib/lodash/isEqual';
 
 /**
  * Operation to change nodes' attribute.

+ 2 - 2
packages/ckeditor5-engine/src/model/operation/moveoperation.js

@@ -10,8 +10,8 @@
 import Operation from './operation';
 import Position from '../position';
 import Range from '../range';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
-import compareArrays from 'ckeditor5-utils/src/comparearrays';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
 import writer from './../writer';
 
 /**

+ 1 - 1
packages/ckeditor5-engine/src/model/operation/operation.js

@@ -7,7 +7,7 @@
  * @module engine/model/operation/operation
  */
 
-import clone from 'ckeditor5-utils/src/lib/lodash/clone';
+import clone from '@ckeditor/ckeditor5-utils/src/lib/lodash/clone';
 
 /**
  * Abstract base operation class.

+ 1 - 1
packages/ckeditor5-engine/src/model/operation/renameoperation.js

@@ -9,7 +9,7 @@
 
 import Operation from './operation';
 import Element from '../element';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 import Position from '../position';
 
 /**

+ 1 - 1
packages/ckeditor5-engine/src/model/operation/rootattributeoperation.js

@@ -8,7 +8,7 @@
  */
 
 import Operation from './operation';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * Operation to change root element's attribute. Using this class you can add, remove or change value of the attribute.

+ 1 - 1
packages/ckeditor5-engine/src/model/operation/transform.js

@@ -15,7 +15,7 @@ import MoveOperation from './moveoperation';
 import RemoveOperation from './removeoperation';
 import NoOperation from './nooperation';
 import Range from '../range';
-import compareArrays from 'ckeditor5-utils/src/comparearrays';
+import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
 
 /**
  * Transforms given {@link module:engine/model/operation/operation~Operation operation}

+ 3 - 3
packages/ckeditor5-engine/src/model/position.js

@@ -9,9 +9,9 @@
 
 import DocumentFragment from './documentfragment';
 import Element from './element';
-import last from 'ckeditor5-utils/src/lib/lodash/last';
-import compareArrays from 'ckeditor5-utils/src/comparearrays';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import last from '@ckeditor/ckeditor5-utils/src/lib/lodash/last';
+import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 import Text from './text';
 
 /**

+ 1 - 1
packages/ckeditor5-engine/src/model/range.js

@@ -9,7 +9,7 @@
 
 import Position from './position';
 import TreeWalker from './treewalker';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * Range class. Range is iterable.

+ 4 - 4
packages/ckeditor5-engine/src/model/schema.js

@@ -9,10 +9,10 @@
 
 import Position from './position';
 import Element from './element';
-import clone from 'ckeditor5-utils/src/lib/lodash/clone';
-import isArray from 'ckeditor5-utils/src/lib/lodash/isArray';
-import isString from 'ckeditor5-utils/src/lib/lodash/isString';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import clone from '@ckeditor/ckeditor5-utils/src/lib/lodash/clone';
+import isArray from '@ckeditor/ckeditor5-utils/src/lib/lodash/isArray';
+import isString from '@ckeditor/ckeditor5-utils/src/lib/lodash/isString';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * Schema is a definition of the structure of the document. It allows to define which tree model items (element, text, etc.)

+ 5 - 5
packages/ckeditor5-engine/src/model/selection.js

@@ -10,11 +10,11 @@
 import Position from './position';
 import Element from './element';
 import Range from './range';
-import EmitterMixin from 'ckeditor5-utils/src/emittermixin';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
-import mix from 'ckeditor5-utils/src/mix';
-import toMap from 'ckeditor5-utils/src/tomap';
-import mapsEqual from 'ckeditor5-utils/src/mapsequal';
+import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
+import toMap from '@ckeditor/ckeditor5-utils/src/tomap';
+import mapsEqual from '@ckeditor/ckeditor5-utils/src/mapsequal';
 
 /**
  * `Selection` is a group of {@link module:engine/model/range~Range ranges} which has a direction specified by

+ 1 - 1
packages/ckeditor5-engine/src/model/textproxy.js

@@ -7,7 +7,7 @@
  * @module engine/model/textproxy
  */
 
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * `TextProxy` represents a part of {@link module:engine/model/text~Text text node}.

+ 1 - 1
packages/ckeditor5-engine/src/model/treewalker.js

@@ -11,7 +11,7 @@ import Text from './text';
 import TextProxy from './textproxy';
 import Element from './element';
 import Position from './position';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * Position iterator class. It allows to iterate forward and backward over the document.

+ 1 - 1
packages/ckeditor5-engine/src/model/writer.js

@@ -13,7 +13,7 @@ import TextProxy from './textproxy';
 import Range from './range';
 import DocumentFragment from './documentfragment';
 import NodeList from './nodelist';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * Contains functions used for composing model tree, grouped together under "model writer" name. Those functions

+ 3 - 3
packages/ckeditor5-engine/src/view/document.js

@@ -12,14 +12,14 @@ import Renderer from './renderer';
 import DomConverter from './domconverter';
 import RootEditableElement from './rooteditableelement';
 import { injectQuirksHandling } from './filler';
-import log from 'ckeditor5-utils/src/log';
+import log from '@ckeditor/ckeditor5-utils/src/log';
 import MutationObserver from './observer/mutationobserver';
 import SelectionObserver from './observer/selectionobserver';
 import FocusObserver from './observer/focusobserver';
 import KeyObserver from './observer/keyobserver';
 import FakeSelectionObserver from './observer/fakeselectionobserver';
-import mix from 'ckeditor5-utils/src/mix';
-import ObservableMixin from 'ckeditor5-utils/src/observablemixin';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
+import ObservableMixin from '@ckeditor/ckeditor5-utils/src/observablemixin';
 
 /**
  * Document class creates an abstract layer over the content editable area.

+ 3 - 3
packages/ckeditor5-engine/src/view/documentfragment.js

@@ -8,9 +8,9 @@
  */
 
 import Text from './text';
-import mix from 'ckeditor5-utils/src/mix';
-import isIterable from 'ckeditor5-utils/src/isiterable';
-import EmitterMixin from 'ckeditor5-utils/src/emittermixin';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
+import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
+import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
 
 /**
  * DocumentFragment class.

+ 3 - 3
packages/ckeditor5-engine/src/view/domconverter.js

@@ -19,9 +19,9 @@ import ViewContainerElement from './containerelement';
 import ViewTreeWalker from './treewalker';
 import { BR_FILLER, INLINE_FILLER_LENGTH, isBlockFiller, isInlineFiller, startsWithFiller, getDataWithoutFiller } from './filler';
 
-import indexOf from 'ckeditor5-utils/src/dom/indexof';
-import getAncestors from 'ckeditor5-utils/src/dom/getancestors';
-import getCommonAncestor from 'ckeditor5-utils/src/dom/getcommonancestor';
+import indexOf from '@ckeditor/ckeditor5-utils/src/dom/indexof';
+import getAncestors from '@ckeditor/ckeditor5-utils/src/dom/getancestors';
+import getCommonAncestor from '@ckeditor/ckeditor5-utils/src/dom/getcommonancestor';
 
 /**
  * DomConverter is a set of tools to do transformations between DOM nodes and view nodes. It also handles

+ 3 - 3
packages/ckeditor5-engine/src/view/editableelement.js

@@ -8,9 +8,9 @@
  */
 
 import ContainerElement from './containerelement';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
-import mix from 'ckeditor5-utils/src/mix';
-import ObservableMixin from 'ckeditor5-utils/src/observablemixin';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
+import ObservableMixin from '@ckeditor/ckeditor5-utils/src/observablemixin';
 
 const documentSymbol = Symbol( 'document' );
 

+ 3 - 3
packages/ckeditor5-engine/src/view/element.js

@@ -9,9 +9,9 @@
 
 import Node from './node';
 import Text from './text';
-import objectToMap from 'ckeditor5-utils/src/objecttomap';
-import isIterable from 'ckeditor5-utils/src/isiterable';
-import isPlainObject from 'ckeditor5-utils/src/lib/lodash/isPlainObject';
+import objectToMap from '@ckeditor/ckeditor5-utils/src/objecttomap';
+import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
+import isPlainObject from '@ckeditor/ckeditor5-utils/src/lib/lodash/isPlainObject';
 import Matcher from './matcher';
 
 /**

+ 1 - 1
packages/ckeditor5-engine/src/view/emptyelement.js

@@ -8,7 +8,7 @@
  */
 
 import Element from './element';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 import Node from './node';
 
 /**

+ 1 - 1
packages/ckeditor5-engine/src/view/filler.js

@@ -5,7 +5,7 @@
 
 /* globals window, Range, Text */
 
-import { keyCodes } from 'ckeditor5-utils/src/keyboard';
+import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
 
 /**
  * Set of utils related to block and inline fillers handling.

+ 3 - 3
packages/ckeditor5-engine/src/view/node.js

@@ -7,9 +7,9 @@
  * @module engine/view/node
  */
 
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
-import EmitterMixin from 'ckeditor5-utils/src/emittermixin';
-import mix from 'ckeditor5-utils/src/mix';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
 
 /**
  * Abstract tree view node class.

+ 1 - 1
packages/ckeditor5-engine/src/view/observer/domeventdata.js

@@ -7,7 +7,7 @@
  * @module engine/view/observer/domeventdata
  */
 
-import extend from 'ckeditor5-utils/src/lib/lodash/extend';
+import extend from '@ckeditor/ckeditor5-utils/src/lib/lodash/extend';
 
 /**
  * Information about a DOM event in context of the {@link module:engine/view/document~Document}.

+ 1 - 1
packages/ckeditor5-engine/src/view/observer/fakeselectionobserver.js

@@ -9,7 +9,7 @@
 
 import Observer from './observer';
 import ViewSelection from '../selection';
-import { keyCodes } from 'ckeditor5-utils/src/keyboard';
+import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
 
 /**
  * Fake selection observer class. If view selection is fake it is placed in dummy DOM container. This observer listens

+ 1 - 1
packages/ckeditor5-engine/src/view/observer/keyobserver.js

@@ -8,7 +8,7 @@
  */
 
 import DomEventObserver from './domeventobserver';
-import { getCode } from 'ckeditor5-utils/src/keyboard';
+import { getCode } from '@ckeditor/ckeditor5-utils/src/keyboard';
 
 /**
  * {@link module:engine/view/document~Document#event:keydown Key down} event observer.

+ 2 - 2
packages/ckeditor5-engine/src/view/observer/observer.js

@@ -7,8 +7,8 @@
  * @module engine/view/observer/observer
  */
 
-import DomEmitterMixin from 'ckeditor5-utils/src/dom/emittermixin';
-import mix from 'ckeditor5-utils/src/mix';
+import DomEmitterMixin from '@ckeditor/ckeditor5-utils/src/dom/emittermixin';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
 
 /**
  * Abstract base observer class. Observers are classes which observe changes on DOM elements, do the preliminary

+ 1 - 1
packages/ckeditor5-engine/src/view/observer/selectionobserver.js

@@ -11,7 +11,7 @@
 
 import Observer from './observer';
 import MutationObserver from './mutationobserver';
-import log from 'ckeditor5-utils/src/log';
+import log from '@ckeditor/ckeditor5-utils/src/log';
 
 /**
  * Selection observer class observes selection changes in the document. If selection changes on the document this

+ 2 - 2
packages/ckeditor5-engine/src/view/position.js

@@ -10,8 +10,8 @@
 import Text from './text';
 import TextProxy from './textproxy';
 
-import compareArrays from 'ckeditor5-utils/src/comparearrays';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 import EditableElement from './editableelement';
 
 /**

+ 6 - 6
packages/ckeditor5-engine/src/view/renderer.js

@@ -12,12 +12,12 @@ import ViewElement from './element';
 import ViewPosition from './position';
 import { INLINE_FILLER, INLINE_FILLER_LENGTH, startsWithFiller, isInlineFiller, isBlockFiller } from './filler';
 
-import mix from 'ckeditor5-utils/src/mix';
-import diff from 'ckeditor5-utils/src/diff';
-import insertAt from 'ckeditor5-utils/src/dom/insertat';
-import remove from 'ckeditor5-utils/src/dom/remove';
-import ObservableMixin from 'ckeditor5-utils/src/observablemixin';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
+import diff from '@ckeditor/ckeditor5-utils/src/diff';
+import insertAt from '@ckeditor/ckeditor5-utils/src/dom/insertat';
+import remove from '@ckeditor/ckeditor5-utils/src/dom/remove';
+import ObservableMixin from '@ckeditor/ckeditor5-utils/src/observablemixin';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /* global Range */
 

+ 3 - 3
packages/ckeditor5-engine/src/view/selection.js

@@ -7,11 +7,11 @@
  * @module engine/view/selection
  */
 
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 import Range from './range';
 import Position from './position';
-import mix from 'ckeditor5-utils/src/mix';
-import EmitterMixin from 'ckeditor5-utils/src/emittermixin';
+import mix from '@ckeditor/ckeditor5-utils/src/mix';
+import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
 import Element from './element';
 
 /**

+ 1 - 1
packages/ckeditor5-engine/src/view/textproxy.js

@@ -7,7 +7,7 @@
  * @module engine/view/textproxy
  */
 
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * TextProxy is a wrapper for substring of {@link module:engine/view/text~Text}. Instance of this class is created by

+ 1 - 1
packages/ckeditor5-engine/src/view/treewalker.js

@@ -11,7 +11,7 @@ import Element from './element';
 import Text from './text';
 import TextProxy from './textproxy';
 import Position from './position';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 /**
  * Position iterator class. It allows to iterate forward and backward over the document.

+ 2 - 2
packages/ckeditor5-engine/src/view/writer.js

@@ -14,9 +14,9 @@ import EmptyElement from './emptyelement';
 import Text from './text';
 import Range from './range';
 import TreeWalker from './treewalker';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 import DocumentFragment from './documentfragment';
-import isIterable from 'ckeditor5-utils/src/isiterable';
+import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
 
 /**
  * Contains functions used for composing view tree.

+ 13 - 13
packages/ckeditor5-engine/tests/controller/datacontroller.js

@@ -3,24 +3,24 @@
  * For licensing, see LICENSE.md.
  */
 
-import ModelDocument from 'ckeditor5-engine/src/model/document';
-import DataController from 'ckeditor5-engine/src/controller/datacontroller';
-import HtmlDataProcessor from 'ckeditor5-engine/src/dataprocessor/htmldataprocessor';
+import ModelDocument from '../../src/model/document';
+import DataController from '../../src/controller/datacontroller';
+import HtmlDataProcessor from '../../src/dataprocessor/htmldataprocessor';
 
-import buildViewConverter  from 'ckeditor5-engine/src/conversion/buildviewconverter';
-import buildModelConverter  from 'ckeditor5-engine/src/conversion/buildmodelconverter';
+import buildViewConverter  from '../../src/conversion/buildviewconverter';
+import buildModelConverter  from '../../src/conversion/buildmodelconverter';
 
-import ModelDocumentFragment from 'ckeditor5-engine/src/model/documentfragment';
-import ModelElement from 'ckeditor5-engine/src/model/element';
-import ModelText from 'ckeditor5-engine/src/model/text';
-import ModelSelection from 'ckeditor5-engine/src/model/selection';
+import ModelDocumentFragment from '../../src/model/documentfragment';
+import ModelElement from '../../src/model/element';
+import ModelText from '../../src/model/text';
+import ModelSelection from '../../src/model/selection';
 
-import ViewDocumentFragment from 'ckeditor5-engine/src/view/documentfragment';
+import ViewDocumentFragment from '../../src/view/documentfragment';
 
-import { getData, setData, stringify, parse as parseModel } from 'ckeditor5-engine/src/dev-utils/model';
-import { parse as parseView } from 'ckeditor5-engine/src/dev-utils/view';
+import { getData, setData, stringify, parse as parseModel } from '../../src/dev-utils/model';
+import { parse as parseView } from '../../src/dev-utils/view';
 
-import count from 'ckeditor5-utils/src/count';
+import count from '@ckeditor/ckeditor5-utils/src/count';
 
 describe( 'DataController', () => {
 	let modelDocument, htmlDataProcessor, data, schema;

+ 3 - 3
packages/ckeditor5-engine/tests/controller/deletecontent.js

@@ -3,9 +3,9 @@
  * For licensing, see LICENSE.md.
  */
 
-import Document from 'ckeditor5-engine/src/model/document';
-import deleteContent from 'ckeditor5-engine/src/controller/deletecontent';
-import { setData, getData } from 'ckeditor5-engine/src/dev-utils/model';
+import Document from '../../src/model/document';
+import deleteContent from '../../src/controller/deletecontent';
+import { setData, getData } from '../../src/dev-utils/model';
 
 describe( 'DataController', () => {
 	let doc;

+ 15 - 15
packages/ckeditor5-engine/tests/controller/editingcontroller.js

@@ -5,27 +5,27 @@
 
 /* globals setTimeout, Range, document */
 
-import EmitterMixin from 'ckeditor5-utils/src/emittermixin';
+import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
 
-import EditingController from 'ckeditor5-engine/src/controller/editingcontroller';
+import EditingController from '../../src/controller/editingcontroller';
 
-import ViewDocument from 'ckeditor5-engine/src/view/document';
+import ViewDocument from '../../src/view/document';
 
-import Mapper from 'ckeditor5-engine/src/conversion/mapper';
-import ModelConversionDispatcher from 'ckeditor5-engine/src/conversion/modelconversiondispatcher';
-import buildModelConverter from 'ckeditor5-engine/src/conversion/buildmodelconverter';
+import Mapper from '../../src/conversion/mapper';
+import ModelConversionDispatcher from '../../src/conversion/modelconversiondispatcher';
+import buildModelConverter from '../../src/conversion/buildmodelconverter';
 
-import ModelDocument from 'ckeditor5-engine/src/model/document';
-import ModelPosition from 'ckeditor5-engine/src/model/position';
-import ModelElement from 'ckeditor5-engine/src/model/element';
-import ModelRange from 'ckeditor5-engine/src/model/range';
-import ModelLiveRange from 'ckeditor5-engine/src/model/liverange';
-import ModelDocumentFragment from 'ckeditor5-engine/src/model/documentfragment';
+import ModelDocument from '../../src/model/document';
+import ModelPosition from '../../src/model/position';
+import ModelElement from '../../src/model/element';
+import ModelRange from '../../src/model/range';
+import ModelLiveRange from '../../src/model/liverange';
+import ModelDocumentFragment from '../../src/model/documentfragment';
 
-import createElement from 'ckeditor5-utils/src/dom/createelement';
+import createElement from '@ckeditor/ckeditor5-utils/src/dom/createelement';
 
-import { parse, getData as getModelData } from 'ckeditor5-engine/src/dev-utils/model';
-import { getData as getViewData } from 'ckeditor5-engine/src/dev-utils/view';
+import { parse, getData as getModelData } from '../../src/dev-utils/model';
+import { getData as getViewData } from '../../src/dev-utils/view';
 
 describe( 'EditingController', () => {
 	describe( 'constructor()', () => {

+ 4 - 4
packages/ckeditor5-engine/tests/controller/getselectedcontent.js

@@ -3,10 +3,10 @@
  * For licensing, see LICENSE.md.
  */
 
-import Document from 'ckeditor5-engine/src/model/document';
-import DocumentFragment from 'ckeditor5-engine/src/model/documentfragment';
-import getSelectedContent from 'ckeditor5-engine/src/controller/getselectedcontent';
-import { setData, stringify } from 'ckeditor5-engine/src/dev-utils/model';
+import Document from '../../src/model/document';
+import DocumentFragment from '../../src/model/documentfragment';
+import getSelectedContent from '../../src/controller/getselectedcontent';
+import { setData, stringify } from '../../src/dev-utils/model';
 
 describe( 'Delete utils', () => {
 	let doc;

+ 6 - 6
packages/ckeditor5-engine/tests/controller/insertcontent.js

@@ -3,14 +3,14 @@
  * For licensing, see LICENSE.md.
  */
 
-import Document from 'ckeditor5-engine/src/model/document';
-import DataController from 'ckeditor5-engine/src/controller/datacontroller';
-import insertContent from 'ckeditor5-engine/src/controller/insertcontent';
+import Document from '../../src/model/document';
+import DataController from '../../src/controller/datacontroller';
+import insertContent from '../../src/controller/insertcontent';
 
-import DocumentFragment from 'ckeditor5-engine/src/model/documentfragment';
-import Text from 'ckeditor5-engine/src/model/text';
+import DocumentFragment from '../../src/model/documentfragment';
+import Text from '../../src/model/text';
 
-import { setData, getData, parse } from 'ckeditor5-engine/src/dev-utils/model';
+import { setData, getData, parse } from '../../src/dev-utils/model';
 
 describe( 'DataController', () => {
 	let doc, dataController;

+ 5 - 5
packages/ckeditor5-engine/tests/controller/modifyselection.js

@@ -3,11 +3,11 @@
  * For licensing, see LICENSE.md.
  */
 
-import Document from 'ckeditor5-engine/src/model/document';
-import DataController from 'ckeditor5-engine/src/controller/datacontroller';
-import Selection from 'ckeditor5-engine/src/model/selection';
-import modifySelection from 'ckeditor5-engine/src/controller/modifyselection';
-import { setData, stringify } from 'ckeditor5-engine/src/dev-utils/model';
+import Document from '../../src/model/document';
+import DataController from '../../src/controller/datacontroller';
+import Selection from '../../src/model/selection';
+import modifySelection from '../../src/controller/modifyselection';
+import { setData, stringify } from '../../src/dev-utils/model';
 
 describe( 'DataController', () => {
 	let document, dataController;

+ 24 - 24
packages/ckeditor5-engine/tests/conversion/advanced-converters.js

@@ -3,27 +3,27 @@
  * For licensing, see LICENSE.md.
  */
 
-import ModelDocument from 'ckeditor5-engine/src/model/document';
-import ModelDocumentFragment from 'ckeditor5-engine/src/model/documentfragment';
-import ModelElement from 'ckeditor5-engine/src/model/element';
-import ModelText from 'ckeditor5-engine/src/model/text';
-import ModelTextProxy from 'ckeditor5-engine/src/model/textproxy';
-import ModelRange from 'ckeditor5-engine/src/model/range';
-import ModelPosition from 'ckeditor5-engine/src/model/position';
-import ModelWalker from 'ckeditor5-engine/src/model/treewalker';
-import modelWriter from 'ckeditor5-engine/src/model/writer';
-
-import ViewElement from 'ckeditor5-engine/src/view/element';
-import ViewContainerElement from 'ckeditor5-engine/src/view/containerelement';
-import ViewAttributeElement from 'ckeditor5-engine/src/view/attributeelement';
-import ViewText from 'ckeditor5-engine/src/view/text';
-import viewWriter from 'ckeditor5-engine/src/view/writer';
-import ViewPosition from 'ckeditor5-engine/src/view/position';
-import ViewRange from 'ckeditor5-engine/src/view/range';
-
-import Mapper from 'ckeditor5-engine/src/conversion/mapper';
-import ModelConversionDispatcher from 'ckeditor5-engine/src/conversion/modelconversiondispatcher';
-import ViewConversionDispatcher from 'ckeditor5-engine/src/conversion/viewconversiondispatcher';
+import ModelDocument from '../../src/model/document';
+import ModelDocumentFragment from '../../src/model/documentfragment';
+import ModelElement from '../../src/model/element';
+import ModelText from '../../src/model/text';
+import ModelTextProxy from '../../src/model/textproxy';
+import ModelRange from '../../src/model/range';
+import ModelPosition from '../../src/model/position';
+import ModelWalker from '../../src/model/treewalker';
+import modelWriter from '../../src/model/writer';
+
+import ViewElement from '../../src/view/element';
+import ViewContainerElement from '../../src/view/containerelement';
+import ViewAttributeElement from '../../src/view/attributeelement';
+import ViewText from '../../src/view/text';
+import viewWriter from '../../src/view/writer';
+import ViewPosition from '../../src/view/position';
+import ViewRange from '../../src/view/range';
+
+import Mapper from '../../src/conversion/mapper';
+import ModelConversionDispatcher from '../../src/conversion/modelconversiondispatcher';
+import ViewConversionDispatcher from '../../src/conversion/viewconversiondispatcher';
 
 import {
 	insertElement,
@@ -35,10 +35,10 @@ import {
 	move,
 	remove,
 	eventNameToConsumableType
-} from 'ckeditor5-engine/src/conversion/model-to-view-converters';
-import { convertToModelFragment, convertText } from 'ckeditor5-engine/src/conversion/view-to-model-converters';
+} from '../../src/conversion/model-to-view-converters';
+import { convertToModelFragment, convertText } from '../../src/conversion/view-to-model-converters';
 
-import { createRangeOnElementOnly } from 'ckeditor5-engine/tests/model/_utils/utils';
+import { createRangeOnElementOnly } from '../../tests/model/_utils/utils';
 
 describe( 'advanced-converters', () => {
 	let modelDoc, modelRoot, viewRoot, mapper, modelDispatcher, viewDispatcher;

+ 18 - 18
packages/ckeditor5-engine/tests/conversion/buildmodelconverter.js

@@ -3,38 +3,38 @@
  * For licensing, see LICENSE.md.
  */
 
-import buildModelConverter from 'ckeditor5-engine/src/conversion/buildmodelconverter';
+import buildModelConverter from '../../src/conversion/buildmodelconverter';
 
-import ModelDocument from 'ckeditor5-engine/src/model/document';
-import ModelElement from 'ckeditor5-engine/src/model/element';
-import ModelText from 'ckeditor5-engine/src/model/text';
-import ModelRange from 'ckeditor5-engine/src/model/range';
-import ModelPosition from 'ckeditor5-engine/src/model/position';
-import modelWriter from 'ckeditor5-engine/src/model/writer';
+import ModelDocument from '../../src/model/document';
+import ModelElement from '../../src/model/element';
+import ModelText from '../../src/model/text';
+import ModelRange from '../../src/model/range';
+import ModelPosition from '../../src/model/position';
+import modelWriter from '../../src/model/writer';
 
-import ViewDocument from 'ckeditor5-engine/src/view/document';
-import ViewElement from 'ckeditor5-engine/src/view/element';
-import ViewContainerElement from 'ckeditor5-engine/src/view/containerelement';
-import ViewAttributeElement from 'ckeditor5-engine/src/view/attributeelement';
-import ViewText from 'ckeditor5-engine/src/view/text';
+import ViewDocument from '../../src/view/document';
+import ViewElement from '../../src/view/element';
+import ViewContainerElement from '../../src/view/containerelement';
+import ViewAttributeElement from '../../src/view/attributeelement';
+import ViewText from '../../src/view/text';
 
-import Mapper from 'ckeditor5-engine/src/conversion/mapper';
-import ModelConversionDispatcher from 'ckeditor5-engine/src/conversion/modelconversiondispatcher';
+import Mapper from '../../src/conversion/mapper';
+import ModelConversionDispatcher from '../../src/conversion/modelconversiondispatcher';
 
 import {
 	insertText,
 	move,
 	remove
-} from 'ckeditor5-engine/src/conversion/model-to-view-converters';
+} from '../../src/conversion/model-to-view-converters';
 
 import {
 	convertCollapsedSelection,
 	clearAttributes
-} from 'ckeditor5-engine/src/conversion/model-selection-to-view-converters';
+} from '../../src/conversion/model-selection-to-view-converters';
 
-import { createRangeOnElementOnly } from 'ckeditor5-engine/tests/model/_utils/utils';
+import { createRangeOnElementOnly } from '../../tests/model/_utils/utils';
 
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 function viewAttributesToString( item ) {
 	let result = '';

+ 14 - 14
packages/ckeditor5-engine/tests/conversion/buildviewconverter.js

@@ -3,24 +3,24 @@
  * For licensing, see LICENSE.md.
  */
 
-import buildViewConverter from 'ckeditor5-engine/src/conversion/buildviewconverter';
+import buildViewConverter from '../../src/conversion/buildviewconverter';
 
-import ModelSchema from 'ckeditor5-engine/src/model/schema';
-import ModelDocument from 'ckeditor5-engine/src/model/document';
-import ModelElement from 'ckeditor5-engine/src/model/element';
-import ModelTextProxy from 'ckeditor5-engine/src/model/textproxy';
-import ModelRange from 'ckeditor5-engine/src/model/range';
-import ModelWalker from 'ckeditor5-engine/src/model/treewalker';
+import ModelSchema from '../../src/model/schema';
+import ModelDocument from '../../src/model/document';
+import ModelElement from '../../src/model/element';
+import ModelTextProxy from '../../src/model/textproxy';
+import ModelRange from '../../src/model/range';
+import ModelWalker from '../../src/model/treewalker';
 
-import ViewDocumentFragment from 'ckeditor5-engine/src/view/documentfragment';
-import ViewContainerElement from 'ckeditor5-engine/src/view/containerelement';
-import ViewAttributeElement from 'ckeditor5-engine/src/view/attributeelement';
-import ViewText from 'ckeditor5-engine/src/view/text';
-import ViewMatcher from 'ckeditor5-engine/src/view/matcher';
+import ViewDocumentFragment from '../../src/view/documentfragment';
+import ViewContainerElement from '../../src/view/containerelement';
+import ViewAttributeElement from '../../src/view/attributeelement';
+import ViewText from '../../src/view/text';
+import ViewMatcher from '../../src/view/matcher';
 
-import ViewConversionDispatcher from 'ckeditor5-engine/src/conversion/viewconversiondispatcher';
+import ViewConversionDispatcher from '../../src/conversion/viewconversiondispatcher';
 
-import { convertToModelFragment, convertText } from 'ckeditor5-engine/src/conversion/view-to-model-converters';
+import { convertToModelFragment, convertText } from '../../src/conversion/view-to-model-converters';
 
 function modelAttributesToString( item ) {
 	let result = '';

+ 12 - 12
packages/ckeditor5-engine/tests/conversion/mapper.js

@@ -3,18 +3,18 @@
  * For licensing, see LICENSE.md.
  */
 
-import Mapper from 'ckeditor5-engine/src/conversion/mapper';
-
-import ModelElement from 'ckeditor5-engine/src/model/element';
-import ModelRootElement from 'ckeditor5-engine/src/model/rootelement';
-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 ViewElement from 'ckeditor5-engine/src/view/element';
-import ViewText from 'ckeditor5-engine/src/view/text';
-import ViewPosition from 'ckeditor5-engine/src/view/position';
-import ViewRange from 'ckeditor5-engine/src/view/range';
+import Mapper from '../../src/conversion/mapper';
+
+import ModelElement from '../../src/model/element';
+import ModelRootElement from '../../src/model/rootelement';
+import ModelText from '../../src/model/text';
+import ModelPosition from '../../src/model/position';
+import ModelRange from '../../src/model/range';
+
+import ViewElement from '../../src/view/element';
+import ViewText from '../../src/view/text';
+import ViewPosition from '../../src/view/position';
+import ViewRange from '../../src/view/range';
 
 describe( 'Mapper', () => {
 	describe( 'clearBindings', () => {

+ 16 - 16
packages/ckeditor5-engine/tests/conversion/model-selection-to-view-converters.js

@@ -3,34 +3,34 @@
  * For licensing, see LICENSE.md.
  */
 
-import ModelDocument from 'ckeditor5-engine/src/model/document';
-import ModelElement from 'ckeditor5-engine/src/model/element';
-import ModelRange from 'ckeditor5-engine/src/model/range';
-import ModelPosition from 'ckeditor5-engine/src/model/position';
-
-import ViewDocument from 'ckeditor5-engine/src/view/document';
-import ViewContainerElement from 'ckeditor5-engine/src/view/containerelement';
-import ViewAttributeElement from 'ckeditor5-engine/src/view/attributeelement';
-import { mergeAttributes } from 'ckeditor5-engine/src/view/writer';
-
-import Mapper from 'ckeditor5-engine/src/conversion/mapper';
-import ModelConversionDispatcher from 'ckeditor5-engine/src/conversion/modelconversiondispatcher';
+import ModelDocument from '../../src/model/document';
+import ModelElement from '../../src/model/element';
+import ModelRange from '../../src/model/range';
+import ModelPosition from '../../src/model/position';
+
+import ViewDocument from '../../src/view/document';
+import ViewContainerElement from '../../src/view/containerelement';
+import ViewAttributeElement from '../../src/view/attributeelement';
+import { mergeAttributes } from '../../src/view/writer';
+
+import Mapper from '../../src/conversion/mapper';
+import ModelConversionDispatcher from '../../src/conversion/modelconversiondispatcher';
 import {
 	convertRangeSelection,
 	convertCollapsedSelection,
 	convertSelectionAttribute,
 	clearAttributes,
 	clearFakeSelection
-} from 'ckeditor5-engine/src/conversion/model-selection-to-view-converters';
+} from '../../src/conversion/model-selection-to-view-converters';
 
 import {
 	insertElement,
 	insertText,
 	wrapItem
-} from 'ckeditor5-engine/src/conversion/model-to-view-converters';
+} from '../../src/conversion/model-to-view-converters';
 
-import { stringify as stringifyView } from 'ckeditor5-engine/src/dev-utils/view';
-import { setData as setModelData } from 'ckeditor5-engine/src/dev-utils/model';
+import { stringify as stringifyView } from '../../src/dev-utils/view';
+import { setData as setModelData } from '../../src/dev-utils/model';
 
 describe( 'model-selection-to-view-converters', () => {
 	let dispatcher, mapper;

+ 16 - 16
packages/ckeditor5-engine/tests/conversion/model-to-view-converters.js

@@ -3,20 +3,20 @@
  * For licensing, see LICENSE.md.
  */
 
-import ModelDocument from 'ckeditor5-engine/src/model/document';
-import ModelElement from 'ckeditor5-engine/src/model/element';
-import ModelText from 'ckeditor5-engine/src/model/text';
-import ModelRange from 'ckeditor5-engine/src/model/range';
-import ModelPosition from 'ckeditor5-engine/src/model/position';
-import modelWriter from 'ckeditor5-engine/src/model/writer';
-
-import ViewElement from 'ckeditor5-engine/src/view/element';
-import ViewContainerElement from 'ckeditor5-engine/src/view/containerelement';
-import ViewAttributeElement from 'ckeditor5-engine/src/view/attributeelement';
-import ViewText from 'ckeditor5-engine/src/view/text';
-
-import Mapper from 'ckeditor5-engine/src/conversion/mapper';
-import ModelConversionDispatcher from 'ckeditor5-engine/src/conversion/modelconversiondispatcher';
+import ModelDocument from '../../src/model/document';
+import ModelElement from '../../src/model/element';
+import ModelText from '../../src/model/text';
+import ModelRange from '../../src/model/range';
+import ModelPosition from '../../src/model/position';
+import modelWriter from '../../src/model/writer';
+
+import ViewElement from '../../src/view/element';
+import ViewContainerElement from '../../src/view/containerelement';
+import ViewAttributeElement from '../../src/view/attributeelement';
+import ViewText from '../../src/view/text';
+
+import Mapper from '../../src/conversion/mapper';
+import ModelConversionDispatcher from '../../src/conversion/modelconversiondispatcher';
 import {
 	insertElement,
 	insertText,
@@ -29,9 +29,9 @@ import {
 	move,
 	remove,
 	rename
-} from 'ckeditor5-engine/src/conversion/model-to-view-converters';
+} from '../../src/conversion/model-to-view-converters';
 
-import { createRangeOnElementOnly } from 'ckeditor5-engine/tests/model/_utils/utils';
+import { createRangeOnElementOnly } from '../../tests/model/_utils/utils';
 
 describe( 'model-to-view-converters', () => {
 	let dispatcher, modelDoc, modelRoot, mapper, viewRoot;

+ 4 - 4
packages/ckeditor5-engine/tests/conversion/modelconsumable.js

@@ -3,10 +3,10 @@
  * For licensing, see LICENSE.md.
  */
 
-import ModelConsumable from 'ckeditor5-engine/src/conversion/modelconsumable';
-import ModelElement from 'ckeditor5-engine/src/model/element';
-import ModelTextProxy from 'ckeditor5-engine/src/model/textproxy';
-import ModelText from 'ckeditor5-engine/src/model/text';
+import ModelConsumable from '../../src/conversion/modelconsumable';
+import ModelElement from '../../src/model/element';
+import ModelTextProxy from '../../src/model/textproxy';
+import ModelText from '../../src/model/text';
 
 describe( 'ModelConsumable', () => {
 	let modelConsumable, modelElement;

+ 8 - 8
packages/ckeditor5-engine/tests/conversion/modelconversiondispatcher.js

@@ -3,14 +3,14 @@
  * For licensing, see LICENSE.md.
  */
 
-import ModelConversionDispatcher from 'ckeditor5-engine/src/conversion/modelconversiondispatcher';
-import ModelDocument from 'ckeditor5-engine/src/model/document';
-import ModelText from 'ckeditor5-engine/src/model/text';
-import ModelElement from 'ckeditor5-engine/src/model/element';
-import ModelRange from 'ckeditor5-engine/src/model/range';
-import ModelPosition from 'ckeditor5-engine/src/model/position';
-import RemoveOperation from 'ckeditor5-engine/src/model/operation/removeoperation';
-import { wrapInDelta } from 'ckeditor5-engine/tests/model/_utils/utils';
+import ModelConversionDispatcher from '../../src/conversion/modelconversiondispatcher';
+import ModelDocument from '../../src/model/document';
+import ModelText from '../../src/model/text';
+import ModelElement from '../../src/model/element';
+import ModelRange from '../../src/model/range';
+import ModelPosition from '../../src/model/position';
+import RemoveOperation from '../../src/model/operation/removeoperation';
+import { wrapInDelta } from '../../tests/model/_utils/utils';
 
 describe( 'ModelConversionDispatcher', () => {
 	let dispatcher, doc, root;

+ 8 - 8
packages/ckeditor5-engine/tests/conversion/view-selection-to-model-converters.js

@@ -3,17 +3,17 @@
  * For licensing, see LICENSE.md.
  */
 
-import ViewDocument from 'ckeditor5-engine/src/view/document';
-import ViewSelection from 'ckeditor5-engine/src/view/selection';
-import ViewRange from 'ckeditor5-engine/src/view/range';
+import ViewDocument from '../../src/view/document';
+import ViewSelection from '../../src/view/selection';
+import ViewRange from '../../src/view/range';
 
-import ModelDocument from 'ckeditor5-engine/src/model/document';
+import ModelDocument from '../../src/model/document';
 
-import Mapper from 'ckeditor5-engine/src/conversion/mapper';
-import { convertSelectionChange } from 'ckeditor5-engine/src/conversion/view-selection-to-model-converters';
+import Mapper from '../../src/conversion/mapper';
+import { convertSelectionChange } from '../../src/conversion/view-selection-to-model-converters';
 
-import { setData as modelSetData, getData as modelGetData } from 'ckeditor5-engine/src/dev-utils/model';
-import { setData as viewSetData } from 'ckeditor5-engine/src/dev-utils/view';
+import { setData as modelSetData, getData as modelGetData } from '../../src/dev-utils/model';
+import { setData as viewSetData } from '../../src/dev-utils/view';
 
 describe( 'convertSelectionChange', () => {
 	let model, view, mapper, convertSelection, modelRoot, viewRoot;

+ 9 - 9
packages/ckeditor5-engine/tests/conversion/view-to-model-converters.js

@@ -3,17 +3,17 @@
  * For licensing, see LICENSE.md.
  */
 
-import ViewConversionDispatcher from 'ckeditor5-engine/src/conversion/viewconversiondispatcher';
-import ViewContainerElement from 'ckeditor5-engine/src/view/containerelement';
-import ViewDocumentFragment from 'ckeditor5-engine/src/view/documentfragment';
-import ViewText from 'ckeditor5-engine/src/view/text';
+import ViewConversionDispatcher from '../../src/conversion/viewconversiondispatcher';
+import ViewContainerElement from '../../src/view/containerelement';
+import ViewDocumentFragment from '../../src/view/documentfragment';
+import ViewText from '../../src/view/text';
 
-import ModelSchema from 'ckeditor5-engine/src/model/schema';
-import ModelDocumentFragment from 'ckeditor5-engine/src/model/documentfragment';
-import ModelElement from 'ckeditor5-engine/src/model/element';
-import ModelText from 'ckeditor5-engine/src/model/text';
+import ModelSchema from '../../src/model/schema';
+import ModelDocumentFragment from '../../src/model/documentfragment';
+import ModelElement from '../../src/model/element';
+import ModelText from '../../src/model/text';
 
-import { convertToModelFragment, convertText } from 'ckeditor5-engine/src/conversion/view-to-model-converters';
+import { convertToModelFragment, convertText } from '../../src/conversion/view-to-model-converters';
 
 describe( 'view-to-model-converters', () => {
 	let dispatcher, schema, objWithContext;

+ 4 - 4
packages/ckeditor5-engine/tests/conversion/viewconsumable.js

@@ -3,10 +3,10 @@
  * For licensing, see LICENSE.md.
  */
 
-import ViewElement from 'ckeditor5-engine/src/view/element';
-import ViewText from 'ckeditor5-engine/src/view/text';
-import ViewDocumentFragment from 'ckeditor5-engine/src/view/documentfragment';
-import ViewConsumable from 'ckeditor5-engine/src/conversion/viewconsumable';
+import ViewElement from '../../src/view/element';
+import ViewText from '../../src/view/text';
+import ViewDocumentFragment from '../../src/view/documentfragment';
+import ViewConsumable from '../../src/conversion/viewconsumable';
 
 describe( 'ViewConsumable', () => {
 	let viewConsumable;

+ 5 - 5
packages/ckeditor5-engine/tests/conversion/viewconversiondispatcher.js

@@ -3,11 +3,11 @@
  * For licensing, see LICENSE.md.
  */
 
-import ViewConversionDispatcher from 'ckeditor5-engine/src/conversion/viewconversiondispatcher';
-import ViewContainerElement from 'ckeditor5-engine/src/view/containerelement';
-import ViewAttributeElement from 'ckeditor5-engine/src/view/attributeelement';
-import ViewDocumentFragment from 'ckeditor5-engine/src/view/documentfragment';
-import ViewText from 'ckeditor5-engine/src/view/text';
+import ViewConversionDispatcher from '../../src/conversion/viewconversiondispatcher';
+import ViewContainerElement from '../../src/view/containerelement';
+import ViewAttributeElement from '../../src/view/attributeelement';
+import ViewDocumentFragment from '../../src/view/documentfragment';
+import ViewText from '../../src/view/text';
 
 describe( 'ViewConversionDispatcher', () => {
 	describe( 'constructor()', () => {

+ 1 - 1
packages/ckeditor5-engine/tests/dataprocessor/basichtmlwriter.js

@@ -5,7 +5,7 @@
 
 /* globals document */
 
-import BasicHtmlWriter from 'ckeditor5-engine/src/dataprocessor/basichtmlwriter';
+import BasicHtmlWriter from '../../src/dataprocessor/basichtmlwriter';
 
 describe( 'BasicHtmlWriter', () => {
 	const basicHtmlWriter = new BasicHtmlWriter();

+ 4 - 4
packages/ckeditor5-engine/tests/dataprocessor/htmldataprocessor.js

@@ -5,10 +5,10 @@
 
 /* globals setTimeout, window */
 
-import HtmlDataProcessor from 'ckeditor5-engine/src/dataprocessor/htmldataprocessor';
-import xssTemplates from 'ckeditor5-engine/tests/dataprocessor/_utils/xsstemplates';
-import ViewDocumentFragment from 'ckeditor5-engine/src/view/documentfragment';
-import { stringify, parse } from 'ckeditor5-engine/src/dev-utils/view';
+import HtmlDataProcessor from '../../src/dataprocessor/htmldataprocessor';
+import xssTemplates from '../../tests/dataprocessor/_utils/xsstemplates';
+import ViewDocumentFragment from '../../src/view/documentfragment';
+import { stringify, parse } from '../../src/dev-utils/view';
 
 describe( 'HtmlDataProcessor', () => {
 	const dataProcessor = new HtmlDataProcessor();

+ 4 - 4
packages/ckeditor5-engine/tests/dataprocessor/xmldataprocessor.js

@@ -5,10 +5,10 @@
 
 /* globals window */
 
-import XmlDataProcessor from 'ckeditor5-engine/src/dataprocessor/xmldataprocessor';
-import xssTemplates from 'ckeditor5-engine/tests/dataprocessor/_utils/xsstemplates';
-import ViewDocumentFragment from 'ckeditor5-engine/src/view/documentfragment';
-import { stringify, parse } from 'ckeditor5-engine/src/dev-utils/view';
+import XmlDataProcessor from '../../src/dataprocessor/xmldataprocessor';
+import xssTemplates from '../../tests/dataprocessor/_utils/xsstemplates';
+import ViewDocumentFragment from '../../src/view/documentfragment';
+import { stringify, parse } from '../../src/dev-utils/view';
 
 describe( 'XmlDataProcessor', () => {
 	let dataProcessor;

+ 8 - 8
packages/ckeditor5-engine/tests/dev-utils/model.js

@@ -3,14 +3,14 @@
  * For licensing, see LICENSE.md.
  */
 
-import { stringify, parse, getData, setData } from 'ckeditor5-engine/src/dev-utils/model';
-import Document from 'ckeditor5-engine/src/model/document';
-import DocumentFragment from 'ckeditor5-engine/src/model/documentfragment';
-import Element from 'ckeditor5-engine/src/model/element';
-import Text from 'ckeditor5-engine/src/model/text';
-import Range from 'ckeditor5-engine/src/model/range';
-import Position from 'ckeditor5-engine/src/model/position';
-import count from 'ckeditor5-utils/src/count';
+import { stringify, parse, getData, setData } from '../../src/dev-utils/model';
+import Document from '../../src/model/document';
+import DocumentFragment from '../../src/model/documentfragment';
+import Element from '../../src/model/element';
+import Text from '../../src/model/text';
+import Range from '../../src/model/range';
+import Position from '../../src/model/position';
+import count from '@ckeditor/ckeditor5-utils/src/count';
 
 describe( 'model test utils', () => {
 	let document, root, selection, sandbox;

+ 12 - 12
packages/ckeditor5-engine/tests/dev-utils/view.js

@@ -5,18 +5,18 @@
 
 /* globals document */
 
-import { parse, stringify, getData, setData }from 'ckeditor5-engine/src/dev-utils/view';
-import DocumentFragment from 'ckeditor5-engine/src/view/documentfragment';
-import Position from 'ckeditor5-engine/src/view/position';
-import Element from 'ckeditor5-engine/src/view/element';
-import AttributeElement from 'ckeditor5-engine/src/view/attributeelement';
-import ContainerElement from 'ckeditor5-engine/src/view/containerelement';
-import EmptyElement from 'ckeditor5-engine/src/view/emptyelement';
-import Text from 'ckeditor5-engine/src/view/text';
-import Selection from 'ckeditor5-engine/src/view/selection';
-import Range from 'ckeditor5-engine/src/view/range';
-import Document from 'ckeditor5-engine/src/view/document';
-import XmlDataProcessor from 'ckeditor5-engine/src/dataprocessor/xmldataprocessor';
+import { parse, stringify, getData, setData }from '../../src/dev-utils/view';
+import DocumentFragment from '../../src/view/documentfragment';
+import Position from '../../src/view/position';
+import Element from '../../src/view/element';
+import AttributeElement from '../../src/view/attributeelement';
+import ContainerElement from '../../src/view/containerelement';
+import EmptyElement from '../../src/view/emptyelement';
+import Text from '../../src/view/text';
+import Selection from '../../src/view/selection';
+import Range from '../../src/view/range';
+import Document from '../../src/view/document';
+import XmlDataProcessor from '../../src/dataprocessor/xmldataprocessor';
 
 describe( 'view test utils', () => {
 	describe( 'getData, setData', () => {

+ 5 - 5
packages/ckeditor5-engine/tests/manual/tickets/401/1.js

@@ -5,11 +5,11 @@
 
 /* globals console, 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 Paragraph from 'ckeditor5-paragraph/src/paragraph';
-import Bold from 'ckeditor5-basic-styles/src/bold';
+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 Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
 
 ClassicEditor.create( document.getElementById( 'editor' ), {
 	plugins: [ Enter, Typing, Paragraph, Bold ],

+ 6 - 6
packages/ckeditor5-engine/tests/manual/tickets/462/1.js

@@ -5,12 +5,12 @@
 
 /* globals console, window, document, setInterval */
 
-import ClassicEditor from 'ckeditor5-editor-classic/src/classic';
-import Enter from 'ckeditor5-enter/src/enter';
-import Typing from 'ckeditor5-typing/src/typing';
-import Paragraph from 'ckeditor5-paragraph/src/paragraph';
-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 '@ckeditor/ckeditor5-enter/src/enter';
+import Typing from '@ckeditor/ckeditor5-typing/src/typing';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+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, Paragraph, Bold, Italic ],

+ 13 - 13
packages/ckeditor5-engine/tests/manual/tickets/475/1.js

@@ -5,24 +5,24 @@
 
 /* globals document */
 
-import ClassicEditor from 'ckeditor5-editor-classic/src/classic';
+import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classic';
 
-import Plugin from 'ckeditor5-core/src/plugin';
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 
-import TreeWalker from 'ckeditor5-engine/src/model/treewalker';
-import Position from 'ckeditor5-engine/src/model/position';
-import Range from 'ckeditor5-engine/src/model/range';
-import LivePosition from 'ckeditor5-engine/src/model/liveposition';
+import TreeWalker from '../../../../src/model/treewalker';
+import Position from '../../../../src/model/position';
+import Range from '../../../../src/model/range';
+import LivePosition from '../../../../src/model/liveposition';
 
-import buildModelConverter from 'ckeditor5-engine/src/conversion/buildmodelconverter';
-import buildViewConverter from 'ckeditor5-engine/src/conversion/buildviewconverter';
+import buildModelConverter from '../../../../src/conversion/buildmodelconverter';
+import buildViewConverter from '../../../../src/conversion/buildviewconverter';
 
-import AttributeElement from 'ckeditor5-engine/src/view/attributeelement';
+import AttributeElement from '../../../../src/view/attributeelement';
 
-import Enter from 'ckeditor5-enter/src/enter';
-import Typing from 'ckeditor5-typing/src/typing';
-import Paragraph from 'ckeditor5-paragraph/src/paragraph';
-import Undo from 'ckeditor5-undo/src/undo';
+import Enter from '@ckeditor/ckeditor5-enter/src/enter';
+import Typing from '@ckeditor/ckeditor5-typing/src/typing';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import Undo from '@ckeditor/ckeditor5-undo/src/undo';
 
 class Link extends Plugin {
 	init() {

+ 7 - 7
packages/ckeditor5-engine/tests/manual/tickets/603/1.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 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 '@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 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, Paragraph, Heading, Bold, Italic ],

+ 5 - 5
packages/ckeditor5-engine/tests/manual/tickets/629/1.js

@@ -5,11 +5,11 @@
 
 /* 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 Paragraph from 'ckeditor5-paragraph/src/paragraph';
-import Bold from 'ckeditor5-basic-styles/src/bold';
+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 Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
 	plugins: [ Enter, Typing, Paragraph, Bold ],

+ 14 - 14
packages/ckeditor5-engine/tests/manual/tickets/643/1.js

@@ -5,20 +5,20 @@
 
 /* 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 Paragraph from 'ckeditor5-paragraph/src/paragraph';
-import Bold from 'ckeditor5-basic-styles/src/bold';
-import Italic from 'ckeditor5-basic-styles/src/italic';
-import List from 'ckeditor5-list/src/list';
-import Heading from 'ckeditor5-heading/src/heading';
-import Undo from 'ckeditor5-undo/src/undo';
-
-import buildModelConverter from 'ckeditor5-engine/src/conversion/buildmodelconverter';
-import Position from 'ckeditor5-engine/src/model/position';
-import LiveRange from 'ckeditor5-engine/src/model/liverange';
-import ViewAttributeElement from 'ckeditor5-engine/src/view/attributeelement';
+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 Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
+import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
+import List from '@ckeditor/ckeditor5-list/src/list';
+import Heading from '@ckeditor/ckeditor5-heading/src/heading';
+import Undo from '@ckeditor/ckeditor5-undo/src/undo';
+
+import buildModelConverter from '../../../../src/conversion/buildmodelconverter';
+import Position from '../../../../src/model/position';
+import LiveRange from '../../../../src/model/liverange';
+import ViewAttributeElement from '../../../../src/view/attributeelement';
 
 let model = null;
 

+ 5 - 5
packages/ckeditor5-engine/tests/model/_utils/utils.js

@@ -3,11 +3,11 @@
  * For licensing, see LICENSE.md.
  */
 
-import Range from 'ckeditor5-engine/src/model/range';
-import TreeWalker from 'ckeditor5-engine/src/model/treewalker';
-import Text from 'ckeditor5-engine/src/model/text';
-import TextProxy from 'ckeditor5-engine/src/model/textproxy';
-import Delta from 'ckeditor5-engine/src/model/delta/delta';
+import Range from '../../../src/model/range';
+import TreeWalker from '../../../src/model/treewalker';
+import Text from '../../../src/model/text';
+import TextProxy from '../../../src/model/textproxy';
+import Delta from '../../../src/model/delta/delta';
 
 /**
  * Returns tree structure as a simplified string. Elements are uppercase and characters are lowercase.

+ 8 - 8
packages/ckeditor5-engine/tests/model/batch.js

@@ -3,14 +3,14 @@
  * For licensing, see LICENSE.md.
  */
 
-import deltas from 'ckeditor5-engine/src/model/delta/basic-deltas'; // jshint ignore:line
-
-import Document from 'ckeditor5-engine/src/model/document';
-import Batch from 'ckeditor5-engine/src/model/batch';
-import { register } from 'ckeditor5-engine/src/model/batch';
-import Delta from 'ckeditor5-engine/src/model/delta/delta';
-import Operation from 'ckeditor5-engine/src/model/operation/operation';
-import CKEditorError from 'ckeditor5-utils/src/ckeditorerror';
+import deltas from '../../src/model/delta/basic-deltas'; // jshint ignore:line
+
+import Document from '../../src/model/document';
+import Batch from '../../src/model/batch';
+import { register } from '../../src/model/batch';
+import Delta from '../../src/model/delta/delta';
+import Operation from '../../src/model/operation/operation';
+import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 describe( 'Batch', () => {
 	it( 'should have registered basic methods', () => {

+ 10 - 10
packages/ckeditor5-engine/tests/model/delta/attributedelta.js

@@ -3,16 +3,16 @@
  * For licensing, see LICENSE.md.
  */
 
-import count from 'ckeditor5-utils/src/count';
-import Document from 'ckeditor5-engine/src/model/document';
-import Text from 'ckeditor5-engine/src/model/text';
-import Range from 'ckeditor5-engine/src/model/range';
-import Position from 'ckeditor5-engine/src/model/position';
-import Element from 'ckeditor5-engine/src/model/element';
-
-import AttributeDelta from 'ckeditor5-engine/src/model/delta/attributedelta';
-import { RootAttributeDelta } from 'ckeditor5-engine/src/model/delta/attributedelta';
-import AttributeOperation from 'ckeditor5-engine/src/model/operation/attributeoperation';
+import count from '@ckeditor/ckeditor5-utils/src/count';
+import Document from '../../../src/model/document';
+import Text from '../../../src/model/text';
+import Range from '../../../src/model/range';
+import Position from '../../../src/model/position';
+import Element from '../../../src/model/element';
+
+import AttributeDelta from '../../../src/model/delta/attributedelta';
+import { RootAttributeDelta } from '../../../src/model/delta/attributedelta';
+import AttributeOperation from '../../../src/model/operation/attributeoperation';
 
 describe( 'Batch', () => {
 	let batch, doc, root;

+ 15 - 15
packages/ckeditor5-engine/tests/model/delta/delta.js

@@ -3,21 +3,21 @@
  * For licensing, see LICENSE.md.
  */
 
-import count from 'ckeditor5-utils/src/count';
-import Delta from 'ckeditor5-engine/src/model/delta/delta';
-import Operation from 'ckeditor5-engine/src/model/operation/operation';
-import AttributeOperation from 'ckeditor5-engine/src/model/operation/attributeoperation';
-import InsertOperation from 'ckeditor5-engine/src/model/operation/insertoperation';
-import MoveOperation from 'ckeditor5-engine/src/model/operation/moveoperation';
-import NoOperation from 'ckeditor5-engine/src/model/operation/nooperation';
-import ReinsertOperation from 'ckeditor5-engine/src/model/operation/reinsertoperation';
-import RemoveOperation from 'ckeditor5-engine/src/model/operation/removeoperation';
-import RootAttributeOperation from 'ckeditor5-engine/src/model/operation/rootattributeoperation';
-import DeltaFactory from 'ckeditor5-engine/src/model/delta/deltafactory';
-import Document from 'ckeditor5-engine/src/model/document';
-import Position from 'ckeditor5-engine/src/model/position';
-import Range from 'ckeditor5-engine/src/model/range';
-import { jsonParseStringify } from 'ckeditor5-engine/tests/model/_utils/utils';
+import count from '@ckeditor/ckeditor5-utils/src/count';
+import Delta from '../../../src/model/delta/delta';
+import Operation from '../../../src/model/operation/operation';
+import AttributeOperation from '../../../src/model/operation/attributeoperation';
+import InsertOperation from '../../../src/model/operation/insertoperation';
+import MoveOperation from '../../../src/model/operation/moveoperation';
+import NoOperation from '../../../src/model/operation/nooperation';
+import ReinsertOperation from '../../../src/model/operation/reinsertoperation';
+import RemoveOperation from '../../../src/model/operation/removeoperation';
+import RootAttributeOperation from '../../../src/model/operation/rootattributeoperation';
+import DeltaFactory from '../../../src/model/delta/deltafactory';
+import Document from '../../../src/model/document';
+import Position from '../../../src/model/position';
+import Range from '../../../src/model/range';
+import { jsonParseStringify } from '../../../tests/model/_utils/utils';
 
 // Some test examples of operations.
 class FooOperation extends Operation {

Неке датотеке нису приказане због велике количине промена