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

Merge branch 'ckeditor5/t/389'

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

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

@@ -15,11 +15,7 @@ before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 install:
-  - npm install
-  - npm install @ckeditor/ckeditor5-dev-tests
-  - npm install codeclimate-test-reporter
+  - npm install gulp mgit2 lerna @ckeditor/ckeditor5-dev-tests @ckeditor/ckeditor5-dev-lint
+  - ckeditor5-dev-tests-install-dependencies
 script:
   - node_modules/.bin/ckeditor5-dev-tests-travis
-after_success:
-  - node_modules/.bin/codeclimate-test-reporter < build/.automated-tests/coverage/lcov.info
-

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

@@ -1,22 +1,23 @@
 {
-  "name": "ckeditor5-clipboard",
+  "name": "@ckeditor/ckeditor5-clipboard",
   "version": "0.3.0",
   "description": "Clipboard integration for CKEditor 5.",
   "keywords": [],
   "dependencies": {
-    "ckeditor5-core": "ckeditor/ckeditor5-core",
-    "ckeditor5-engine": "ckeditor/ckeditor5-engine"
+    "@ckeditor/ckeditor5-core": "*",
+    "@ckeditor/ckeditor5-engine": "*"
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-dev-lint": "^2.0.0",
-    "ckeditor5-basic-styles": "ckeditor/ckeditor5-basic-styles",
-    "ckeditor5-paragraph": "ckeditor/ckeditor5-paragraph",
-    "ckeditor5-enter": "ckeditor/ckeditor5-enter",
-    "ckeditor5-heading": "ckeditor/ckeditor5-heading",
-    "ckeditor5-link": "ckeditor/ckeditor5-link",
-    "ckeditor5-list": "ckeditor/ckeditor5-list",
-    "ckeditor5-typing": "ckeditor/ckeditor5-typing",
-    "ckeditor5-undo": "ckeditor/ckeditor5-undo",
+    "@ckeditor/ckeditor5-basic-styles": "*",
+    "@ckeditor/ckeditor5-editor-classic": "*",
+    "@ckeditor/ckeditor5-paragraph": "*",
+    "@ckeditor/ckeditor5-enter": "*",
+    "@ckeditor/ckeditor5-heading": "*",
+    "@ckeditor/ckeditor5-link": "*",
+    "@ckeditor/ckeditor5-list": "*",
+    "@ckeditor/ckeditor5-typing": "*",
+    "@ckeditor/ckeditor5-undo": "*",
     "gulp": "^3.9.1",
     "guppy-pre-commit": "^0.4.0"
   },

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

@@ -7,14 +7,14 @@
  * @module clipboard/clipboard
  */
 
-import Plugin from 'ckeditor5-core/src/plugin';
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 
 import ClipboardObserver from './clipboardobserver';
 
 import plainTextToHtml from './utils/plaintexttohtml';
 import normalizeClipboardHtml from './utils/normalizeclipboarddata';
 
-import HtmlDataProcessor from 'ckeditor5-engine/src/dataprocessor/htmldataprocessor';
+import HtmlDataProcessor from '@ckeditor/ckeditor5-engine/src/dataprocessor/htmldataprocessor';
 
 /**
  * The clipboard feature. Currently, it's only responsible for intercepting the `paste` event and

+ 1 - 1
packages/ckeditor5-clipboard/src/clipboardobserver.js

@@ -7,7 +7,7 @@
  * @module clipboard/clipboardobserver
  */
 
-import DomEventObserver from 'ckeditor5-engine/src/view/observer/domeventobserver';
+import DomEventObserver from '@ckeditor/ckeditor5-engine/src/view/observer/domeventobserver';
 import DataTransfer from './datatransfer';
 
 /**

+ 8 - 8
packages/ckeditor5-clipboard/tests/clipboard.js

@@ -3,21 +3,21 @@
  * For licensing, see LICENSE.md.
  */
 
-import VirtualTestEditor from 'ckeditor5-core/tests/_utils/virtualtesteditor';
-import Clipboard from 'ckeditor5-clipboard/src/clipboard';
-import Paragraph from 'ckeditor5-paragraph/src/paragraph';
+import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
+import Clipboard from '../src/clipboard';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
 
-import ClipboardObserver from 'ckeditor5-clipboard/src/clipboardobserver';
+import ClipboardObserver from '../src/clipboardobserver';
 
-import { stringify as stringifyView } from 'ckeditor5-engine/src/dev-utils/view';
+import { stringify as stringifyView } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
 import {
 	stringify as stringifyModel,
 	setData as setModelData,
 	getData as getModelData
-} from 'ckeditor5-engine/src/dev-utils/model';
+} from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
-import ViewDocumentFragment from 'ckeditor5-engine/src/view/documentfragment';
-import ViewText from 'ckeditor5-engine/src/view/text';
+import ViewDocumentFragment from '@ckeditor/ckeditor5-engine/src/view/documentfragment';
+import ViewText from '@ckeditor/ckeditor5-engine/src/view/text';
 
 describe( 'Clipboard feature', () => {
 	let editor, editingView;

+ 3 - 3
packages/ckeditor5-clipboard/tests/clipboardobserver.js

@@ -5,9 +5,9 @@
 
 /* globals document */
 
-import ClipboardObserver from 'ckeditor5-clipboard/src/clipboardobserver';
-import ViewDocument from 'ckeditor5-engine/src/view/document';
-import DataTransfer from 'ckeditor5-clipboard/src/datatransfer';
+import ClipboardObserver from '../src/clipboardobserver';
+import ViewDocument from '@ckeditor/ckeditor5-engine/src/view/document';
+import DataTransfer from '../src/datatransfer';
 
 describe( 'ClipboardObserver', () => {
 	let viewDocument, observer;

+ 1 - 1
packages/ckeditor5-clipboard/tests/datatransfer.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-import DataTransfer from 'ckeditor5-clipboard/src/datatransfer';
+import DataTransfer from '../src/datatransfer';
 
 describe( 'DataTransfer', () => {
 	describe( 'getData', () => {

+ 12 - 12
packages/ckeditor5-clipboard/tests/manual/copycut.js

@@ -5,19 +5,19 @@
 
 /* globals console, window, document */
 
-import ClassicEditor from 'ckeditor5-editor-classic/src/classic';
-import Typing from 'ckeditor5-typing/src/typing';
-import Paragraph from 'ckeditor5-paragraph/src/paragraph';
-import Undo from 'ckeditor5-undo/src/undo';
-import Enter from 'ckeditor5-enter/src/enter';
-import Clipboard from 'ckeditor5-clipboard/src/clipboard';
-import Link from 'ckeditor5-link/src/link';
-import List from 'ckeditor5-list/src/list';
-import Heading from 'ckeditor5-heading/src/heading';
-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 Typing from '@ckeditor/ckeditor5-typing/src/typing';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import Undo from '@ckeditor/ckeditor5-undo/src/undo';
+import Enter from '@ckeditor/ckeditor5-enter/src/enter';
+import Clipboard from '../../src/clipboard';
+import Link from '@ckeditor/ckeditor5-link/src/link';
+import List from '@ckeditor/ckeditor5-list/src/list';
+import Heading from '@ckeditor/ckeditor5-heading/src/heading';
+import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
+import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
 
-import { stringify as stringifyView } from 'ckeditor5-engine/src/dev-utils/view';
+import { stringify as stringifyView } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
 	plugins: [

+ 12 - 12
packages/ckeditor5-clipboard/tests/manual/pasting.js

@@ -5,19 +5,19 @@
 
 /* globals console, window, document */
 
-import ClassicEditor from 'ckeditor5-editor-classic/src/classic';
-import Typing from 'ckeditor5-typing/src/typing';
-import Paragraph from 'ckeditor5-paragraph/src/paragraph';
-import Undo from 'ckeditor5-undo/src/undo';
-import Enter from 'ckeditor5-enter/src/enter';
-import Clipboard from 'ckeditor5-clipboard/src/clipboard';
-import Link from 'ckeditor5-link/src/link';
-import List from 'ckeditor5-list/src/list';
-import Heading from 'ckeditor5-heading/src/heading';
-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 Typing from '@ckeditor/ckeditor5-typing/src/typing';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import Undo from '@ckeditor/ckeditor5-undo/src/undo';
+import Enter from '@ckeditor/ckeditor5-enter/src/enter';
+import Clipboard from '../../src/clipboard';
+import Link from '@ckeditor/ckeditor5-link/src/link';
+import List from '@ckeditor/ckeditor5-list/src/list';
+import Heading from '@ckeditor/ckeditor5-heading/src/heading';
+import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
+import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
 
-import { stringify as stringifyView } from 'ckeditor5-engine/src/dev-utils/view';
+import { stringify as stringifyView } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
 	plugins: [

+ 1 - 1
packages/ckeditor5-clipboard/tests/utils/normalizeclipboarddata.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-import normalizeClipboardData from 'ckeditor5-clipboard/src/utils/normalizeclipboarddata';
+import normalizeClipboardData from '../../src/utils/normalizeclipboarddata';
 
 describe( 'normalizeClipboardData', () => {
 	it( 'should strip all span.Apple-converted-space', () => {

+ 1 - 1
packages/ckeditor5-clipboard/tests/utils/plaintexttohtml.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-import plainTextToHtml from 'ckeditor5-clipboard/src/utils/plaintexttohtml';
+import plainTextToHtml from '../../src/utils/plaintexttohtml';
 
 describe( 'plainTextToHtml', () => {
 	it( 'encodes < and >', () => {