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

Merge branch 'ckeditor5/t/389'

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

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

@@ -1,21 +1,22 @@
 {
-  "name": "ckeditor5-undo",
+  "name": "@ckeditor/ckeditor5-undo",
   "version": "0.6.0",
   "description": "Undo manager for CKEditor 5.",
   "keywords": [],
   "dependencies": {
-    "ckeditor5-core": "ckeditor/ckeditor5-core",
-    "ckeditor5-engine": "ckeditor/ckeditor5-engine",
-    "ckeditor5-ui": "ckeditor/ckeditor5-ui"
+    "@ckeditor/ckeditor5-core": "*",
+    "@ckeditor/ckeditor5-engine": "*",
+    "@ckeditor/ckeditor5-ui": "*"
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-dev-lint": "^2.0.0",
-    "ckeditor5-basic-styles": "ckeditor/ckeditor5-basic-styles",
-    "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",
+    "@ckeditor/ckeditor5-basic-styles": "*",
+    "@ckeditor/ckeditor5-editor-classic": "*",
+    "@ckeditor/ckeditor5-enter": "*",
+    "@ckeditor/ckeditor5-heading": "*",
+    "@ckeditor/ckeditor5-paragraph": "*",
+    "@ckeditor/ckeditor5-typing": "*",
+    "@ckeditor/ckeditor5-utils": "*",
     "gulp": "^3.9.0",
     "guppy-pre-commit": "^0.4.0"
   },

+ 1 - 1
packages/ckeditor5-undo/src/basecommand.js

@@ -7,7 +7,7 @@
  * @module undo/basecommand
  */
 
-import Command from 'ckeditor5-core/src/command/command';
+import Command from '@ckeditor/ckeditor5-core/src/command/command';
 
 /**
  * Base class for undo feature commands: {@link module:undo/undocommand~UndoCommand} and {@link module:undo/redocommand~RedoCommand}.

+ 1 - 1
packages/ckeditor5-undo/src/redocommand.js

@@ -8,7 +8,7 @@
  */
 
 import BaseCommand from './basecommand';
-import { transformDeltaSets } from 'ckeditor5-engine/src/model/delta/transform';
+import { transformDeltaSets } from '@ckeditor/ckeditor5-engine/src/model/delta/transform';
 
 /**
  * The redo command stores {@link module:engine/model/batch~Batch batches} that were used to undo a batch by

+ 2 - 2
packages/ckeditor5-undo/src/undo.js

@@ -7,9 +7,9 @@
  * @module undo/undo
  */
 
-import Plugin from 'ckeditor5-core/src/plugin';
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import UndoEngine from './undoengine';
-import ButtonView from 'ckeditor5-ui/src/button/buttonview';
+import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
 
 import undoIcon from '../theme/icons/undo.svg';
 import redoIcon from '../theme/icons/redo.svg';

+ 1 - 1
packages/ckeditor5-undo/src/undocommand.js

@@ -9,7 +9,7 @@
 
 import BaseCommand from './basecommand';
 import { transformRangesByDeltas } from './basecommand';
-import { transformDeltaSets } from 'ckeditor5-engine/src/model/delta/transform';
+import { transformDeltaSets } from '@ckeditor/ckeditor5-engine/src/model/delta/transform';
 
 /**
  * The undo command stores {@link module:engine/model/batch~Batch batches} applied to the

+ 1 - 1
packages/ckeditor5-undo/src/undoengine.js

@@ -7,7 +7,7 @@
  * @module undo/undoengine
  */
 
-import Plugin from 'ckeditor5-core/src/plugin';
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import UndoCommand from './undocommand';
 import RedoCommand from './redocommand';
 

+ 2 - 2
packages/ckeditor5-undo/tests/basecommand.js

@@ -3,8 +3,8 @@
  * For licensing, see LICENSE.md.
  */
 
-import ModelTestEditor from 'ckeditor5-core/tests/_utils/modeltesteditor';
-import BaseCommand from 'ckeditor5-undo/src/basecommand';
+import ModelTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/modeltesteditor';
+import BaseCommand from '../src/basecommand';
 
 describe( 'BaseCommand', () => {
 	let editor, doc, root, base;

+ 8 - 8
packages/ckeditor5-undo/tests/manual/undo.js

@@ -5,14 +5,14 @@
 
 /* globals console:false, document, window */
 
-import ClassicEditor from 'ckeditor5-editor-classic/src/classic';
-import Enter from 'ckeditor5-enter/src/enter';
-import Typing from 'ckeditor5-typing/src/typing';
-import Paragraph from 'ckeditor5-paragraph/src/paragraph';
-import Heading from 'ckeditor5-heading/src/heading';
-import Undo from 'ckeditor5-undo/src/undo';
-import Bold from 'ckeditor5-basic-styles/src/bold';
-import Italic from 'ckeditor5-basic-styles/src/italic';
+import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classic';
+import Enter from '@ckeditor/ckeditor5-enter/src/enter';
+import Typing from '@ckeditor/ckeditor5-typing/src/typing';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import Heading from '@ckeditor/ckeditor5-heading/src/heading';
+import Undo from '../../src/undo';
+import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
+import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
 	plugins: [ Enter, Typing, Paragraph, Heading, Undo, Bold, Italic ],

+ 6 - 6
packages/ckeditor5-undo/tests/redocommand.js

@@ -3,12 +3,12 @@
  * For licensing, see LICENSE.md.
  */
 
-import ModelTestEditor from 'ckeditor5-core/tests/_utils/modeltesteditor';
-import Range from 'ckeditor5-engine/src/model/range';
-import Position from 'ckeditor5-engine/src/model/position';
-import UndoCommand from 'ckeditor5-undo/src/undocommand';
-import RedoCommand from 'ckeditor5-undo/src/redocommand';
-import { itemAt, getText } from 'ckeditor5-engine/tests/model/_utils/utils';
+import ModelTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/modeltesteditor';
+import Range from '@ckeditor/ckeditor5-engine/src/model/range';
+import Position from '@ckeditor/ckeditor5-engine/src/model/position';
+import UndoCommand from '../src/undocommand';
+import RedoCommand from '../src/redocommand';
+import { itemAt, getText } from '@ckeditor/ckeditor5-engine/tests/model/_utils/utils';
 
 describe( 'RedoCommand', () => {
 	let editor, doc, root, redo, undo;

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

@@ -5,12 +5,12 @@
 
 /* globals document */
 
-import ClassicTestEditor from 'ckeditor5-core/tests/_utils/classictesteditor';
-import Undo from 'ckeditor5-undo/src/undo';
-import UndoEngine from 'ckeditor5-undo/src/undoengine';
-import ButtonView from 'ckeditor5-ui/src/button/buttonview';
-import testUtils from 'ckeditor5-core/tests/_utils/utils';
-import { keyCodes } from 'ckeditor5-utils/src/keyboard';
+import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
+import Undo from '../src/undo';
+import UndoEngine from '../src/undoengine';
+import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
+import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
+import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
 
 testUtils.createSinonSandbox();
 

+ 7 - 7
packages/ckeditor5-undo/tests/undocommand.js

@@ -3,13 +3,13 @@
  * For licensing, see LICENSE.md.
  */
 
-import ModelTestEditor from 'ckeditor5-core/tests/_utils/modeltesteditor';
-import Range from 'ckeditor5-engine/src/model/range';
-import Position from 'ckeditor5-engine/src/model/position';
-import Text from 'ckeditor5-engine/src/model/text';
-import UndoCommand from 'ckeditor5-undo/src/undocommand';
-import AttributeDelta from 'ckeditor5-engine/src/model/delta/attributedelta';
-import { itemAt, getText } from 'ckeditor5-engine/tests/model/_utils/utils';
+import ModelTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/modeltesteditor';
+import Range from '@ckeditor/ckeditor5-engine/src/model/range';
+import Position from '@ckeditor/ckeditor5-engine/src/model/position';
+import Text from '@ckeditor/ckeditor5-engine/src/model/text';
+import UndoCommand from '../src/undocommand';
+import AttributeDelta from '@ckeditor/ckeditor5-engine/src/model/delta/attributedelta';
+import { itemAt, getText } from '@ckeditor/ckeditor5-engine/tests/model/_utils/utils';
 
 describe( 'UndoCommand', () => {
 	let editor, doc, root, undo;

+ 5 - 5
packages/ckeditor5-undo/tests/undoengine-integration.js

@@ -3,12 +3,12 @@
  * For licensing, see LICENSE.md.
  */
 
-import ModelTestEditor from 'ckeditor5-core/tests/_utils/modeltesteditor';
-import Range from 'ckeditor5-engine/src/model/range';
-import Position from 'ckeditor5-engine/src/model/position';
-import UndoEngine from 'ckeditor5-undo/src/undoengine';
+import ModelTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/modeltesteditor';
+import Range from '@ckeditor/ckeditor5-engine/src/model/range';
+import Position from '@ckeditor/ckeditor5-engine/src/model/position';
+import UndoEngine from '../src/undoengine';
 
-import { setData, getData } from 'ckeditor5-engine/src/dev-utils/model';
+import { setData, getData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
 describe( 'UndoEngine integration', () => {
 	let editor, doc, root;

+ 3 - 3
packages/ckeditor5-undo/tests/undoengine.js

@@ -3,9 +3,9 @@
  * For licensing, see LICENSE.md.
  */
 
-import ModelTestEditor from 'ckeditor5-core/tests/_utils/modeltesteditor';
-import Position from 'ckeditor5-engine/src/model/position';
-import UndoEngine from 'ckeditor5-undo/src/undoengine';
+import ModelTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/modeltesteditor';
+import Position from '@ckeditor/ckeditor5-engine/src/model/position';
+import UndoEngine from '../src/undoengine';
 
 describe( 'UndoEngine', () => {
 	let editor, undo, batch, doc, root;