8
0
Quellcode durchsuchen

Merge branch 'ckeditor5/t/389'

Piotrek Koszuliński vor 9 Jahren
Ursprung
Commit
f2cae7d30e

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

+ 10 - 10
packages/ckeditor5-heading/package.json

@@ -1,21 +1,21 @@
 {
-  "name": "ckeditor5-heading",
+  "name": "@ckeditor/ckeditor5-heading",
   "version": "0.6.0",
   "description": "Headings feature for CKEditor 5.",
   "keywords": [],
   "dependencies": {
-    "ckeditor5-core": "ckeditor/ckeditor5-core",
-    "ckeditor5-ui": "ckeditor/ckeditor5-ui",
-    "ckeditor5-utils": "ckeditor/ckeditor5-utils",
-    "ckeditor5-engine": "ckeditor/ckeditor5-engine",
-    "ckeditor5-paragraph": "ckeditor/ckeditor5-paragraph"
+    "@ckeditor/ckeditor5-core": "*",
+    "@ckeditor/ckeditor5-ui": "*",
+    "@ckeditor/ckeditor5-utils": "*",
+    "@ckeditor/ckeditor5-engine": "*",
+    "@ckeditor/ckeditor5-paragraph": "*"
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-dev-lint": "^2.0.0",
-    "ckeditor5-enter": "ckeditor/ckeditor5-enter",
-    "ckeditor5-editor-classic": "ckeditor/ckeditor5-editor-classic",
-    "ckeditor5-typing": "ckeditor/ckeditor5-typing",
-    "ckeditor5-undo": "ckeditor/ckeditor5-undo",
+    "@ckeditor/ckeditor5-enter": "*",
+    "@ckeditor/ckeditor5-editor-classic": "*",
+    "@ckeditor/ckeditor5-typing": "*",
+    "@ckeditor/ckeditor5-undo": "*",
     "gulp": "^3.9.0",
     "guppy-pre-commit": "^0.4.0"
   },

+ 4 - 4
packages/ckeditor5-heading/src/heading.js

@@ -9,12 +9,12 @@
 
 import HeadingEngine from './headingengine';
 
-import Plugin from 'ckeditor5-core/src/plugin';
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 
-import Model from 'ckeditor5-ui/src/model';
-import createListDropdown from 'ckeditor5-ui/src/dropdown/list/createlistdropdown';
+import Model from '@ckeditor/ckeditor5-ui/src/model';
+import createListDropdown from '@ckeditor/ckeditor5-ui/src/dropdown/list/createlistdropdown';
 
-import Collection from 'ckeditor5-utils/src/collection';
+import Collection from '@ckeditor/ckeditor5-utils/src/collection';
 
 /**
  * The headings feature. It introduces the `headings` drop-down list and the `heading` command which allow

+ 2 - 2
packages/ckeditor5-heading/src/headingcommand.js

@@ -7,8 +7,8 @@
  * @module heading/headingcommand
  */
 
-import Command from 'ckeditor5-core/src/command/command';
-import RootElement from 'ckeditor5-engine/src/model/rootelement';
+import Command from '@ckeditor/ckeditor5-core/src/command/command';
+import RootElement from '@ckeditor/ckeditor5-engine/src/model/rootelement';
 
 /**
  * The heading command. It is used by the {@link module:heading/heading~Heading heading feature} to apply headings.

+ 4 - 4
packages/ckeditor5-heading/src/headingengine.js

@@ -7,10 +7,10 @@
  * @module heading/headingengine
  */
 
-import Plugin from 'ckeditor5-core/src/plugin';
-import buildModelConverter from 'ckeditor5-engine/src/conversion/buildmodelconverter';
-import buildViewConverter from 'ckeditor5-engine/src/conversion/buildviewconverter';
-import Paragraph from 'ckeditor5-paragraph/src/paragraph';
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
+import buildModelConverter from '@ckeditor/ckeditor5-engine/src/conversion/buildmodelconverter';
+import buildViewConverter from '@ckeditor/ckeditor5-engine/src/conversion/buildviewconverter';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
 import HeadingCommand from './headingcommand';
 
 const formats = [

+ 5 - 5
packages/ckeditor5-heading/tests/heading.js

@@ -5,11 +5,11 @@
 
 /* globals document */
 
-import ClassicTestEditor from 'ckeditor5-core/tests/_utils/classictesteditor';
-import Heading from 'ckeditor5-heading/src/heading';
-import HeadingEngine from 'ckeditor5-heading/src/headingengine';
-import DropdownView from 'ckeditor5-ui/src/dropdown/dropdownview';
-import testUtils from 'ckeditor5-core/tests/_utils/utils';
+import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
+import Heading from '../src/heading';
+import HeadingEngine from '../src/headingengine';
+import DropdownView from '@ckeditor/ckeditor5-ui/src/dropdown/dropdownview';
+import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 
 testUtils.createSinonSandbox();
 

+ 4 - 4
packages/ckeditor5-heading/tests/headingcommand.js

@@ -3,10 +3,10 @@
  * For licensing, see LICENSE.md.
  */
 
-import ModelTestEditor from 'ckeditor5-core/tests/_utils/modeltesteditor';
-import HeadingCommand from 'ckeditor5-heading/src/headingcommand';
-import Range from 'ckeditor5-engine/src/model/range';
-import { setData, getData } from 'ckeditor5-engine/src/dev-utils/model';
+import ModelTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/modeltesteditor';
+import HeadingCommand from '../src/headingcommand';
+import Range from '@ckeditor/ckeditor5-engine/src/model/range';
+import { setData, getData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
 const formats = [
 	{ id: 'paragraph', viewElement: 'p', default: true },

+ 6 - 6
packages/ckeditor5-heading/tests/headingengine.js

@@ -3,12 +3,12 @@
  * For licensing, see LICENSE.md.
  */
 
-import HeadingEngine from 'ckeditor5-heading/src/headingengine';
-import Paragraph from 'ckeditor5-paragraph/src/paragraph';
-import VirtualTestEditor from 'ckeditor5-core/tests/_utils/virtualtesteditor';
-import HeadingCommand from 'ckeditor5-heading/src/headingcommand';
-import Enter from 'ckeditor5-enter/src/enter';
-import { getData } from 'ckeditor5-engine/src/dev-utils/model';
+import HeadingEngine from '../src/headingengine';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
+import HeadingCommand from '../src/headingcommand';
+import Enter from '@ckeditor/ckeditor5-enter/src/enter';
+import { getData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
 describe( 'HeadingEngine', () => {
 	let editor, document;

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

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

+ 4 - 4
packages/ckeditor5-heading/tests/tickets/40.js

@@ -3,10 +3,10 @@
  * For licensing, see LICENSE.md.
  */
 
-import HeadingEngine from 'ckeditor5-heading/src/headingengine';
-import VirtualTestEditor from 'ckeditor5-core/tests/_utils/virtualtesteditor';
-import Enter from 'ckeditor5-enter/src/enter';
-import { getData, setData } from 'ckeditor5-engine/src/dev-utils/model';
+import HeadingEngine from '../../src/headingengine';
+import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
+import Enter from '@ckeditor/ckeditor5-enter/src/enter';
+import { getData, setData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
 describe( 'Bug ckeditor5-heading#40', () => {
 	let editor;