Bladeren bron

Merge branch 'ckeditor5/t/389'

Piotrek Koszuliński 9 jaren geleden
bovenliggende
commit
849c633c83

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

@@ -1,21 +1,22 @@
 {
-  "name": "ckeditor5-basic-styles",
+  "name": "@ckeditor/ckeditor5-basic-styles",
   "version": "0.6.0",
   "description": "Basic styles feature 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-editor-classic": "ckeditor/ckeditor5-editor-classic",
-    "ckeditor5-enter": "ckeditor/ckeditor5-enter",
-    "ckeditor5-heading": "ckeditor/ckeditor5-heading",
-    "ckeditor5-paragraph": "ckeditor/ckeditor5-paragraph",
-    "ckeditor5-typing": "ckeditor/ckeditor5-typing",
-    "ckeditor5-undo": "ckeditor/ckeditor5-undo",
+    "@ckeditor/ckeditor5-editor-classic": "*",
+    "@ckeditor/ckeditor5-enter": "*",
+    "@ckeditor/ckeditor5-heading": "*",
+    "@ckeditor/ckeditor5-paragraph": "*",
+    "@ckeditor/ckeditor5-typing": "*",
+    "@ckeditor/ckeditor5-undo": "*",
+    "@ckeditor/ckeditor5-utils": "*",
     "gulp": "^3.9.0",
     "guppy-pre-commit": "^0.4.0"
   },

+ 2 - 2
packages/ckeditor5-basic-styles/src/bold.js

@@ -7,9 +7,9 @@
  * @module basic-styles/bold
  */
 
-import Plugin from 'ckeditor5-core/src/plugin';
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import BoldEngine from './boldengine';
-import ButtonView from 'ckeditor5-ui/src/button/buttonview';
+import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
 import boldIcon from '../theme/icons/bold.svg';
 
 /**

+ 4 - 4
packages/ckeditor5-basic-styles/src/boldengine.js

@@ -7,10 +7,10 @@
  * @module basic-styles/boldengine
  */
 
-import Plugin from 'ckeditor5-core/src/plugin';
-import buildModelConverter from 'ckeditor5-engine/src/conversion/buildmodelconverter';
-import buildViewConverter from 'ckeditor5-engine/src/conversion/buildviewconverter';
-import ToggleAttributeCommand from 'ckeditor5-core/src/command/toggleattributecommand';
+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 ToggleAttributeCommand from '@ckeditor/ckeditor5-core/src/command/toggleattributecommand';
 
 const BOLD = 'bold';
 

+ 2 - 2
packages/ckeditor5-basic-styles/src/italic.js

@@ -7,9 +7,9 @@
  * @module basic-styles/italic
  */
 
-import Plugin from 'ckeditor5-core/src/plugin';
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import ItalicEngine from './italicengine';
-import ButtonView from 'ckeditor5-ui/src/button/buttonview';
+import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
 import italicIcon from '../theme/icons/italic.svg';
 
 /**

+ 4 - 4
packages/ckeditor5-basic-styles/src/italicengine.js

@@ -7,10 +7,10 @@
  * @module basic-styles/italicengine
  */
 
-import Plugin from 'ckeditor5-core/src/plugin';
-import buildModelConverter from 'ckeditor5-engine/src/conversion/buildmodelconverter';
-import buildViewConverter from 'ckeditor5-engine/src/conversion/buildviewconverter';
-import ToggleAttributeCommand from 'ckeditor5-core/src/command/toggleattributecommand';
+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 ToggleAttributeCommand from '@ckeditor/ckeditor5-core/src/command/toggleattributecommand';
 
 const ITALIC = 'italic';
 

+ 6 - 6
packages/ckeditor5-basic-styles/tests/bold.js

@@ -5,12 +5,12 @@
 
 /* globals document */
 
-import ClassicTestEditor from 'ckeditor5-core/tests/_utils/classictesteditor';
-import Bold from 'ckeditor5-basic-styles/src/bold';
-import BoldEngine from 'ckeditor5-basic-styles/src/boldengine';
-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 Bold from '../src/bold';
+import BoldEngine from '../src/boldengine';
+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();
 

+ 5 - 5
packages/ckeditor5-basic-styles/tests/boldengine.js

@@ -3,11 +3,11 @@
  * For licensing, see LICENSE.md.
  */
 
-import BoldEngine from 'ckeditor5-basic-styles/src/boldengine';
-import VirtualTestEditor from 'ckeditor5-core/tests/_utils/virtualtesteditor';
-import { getData as getModelData, setData as setModelData } from 'ckeditor5-engine/src/dev-utils/model';
-import { getData as getViewData } from 'ckeditor5-engine/src/dev-utils/view';
-import ToggleAttributeCommand from 'ckeditor5-core/src/command/toggleattributecommand';
+import BoldEngine from '../src/boldengine';
+import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
+import { getData as getModelData, setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
+import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
+import ToggleAttributeCommand from '@ckeditor/ckeditor5-core/src/command/toggleattributecommand';
 
 describe( 'BoldEngine', () => {
 	let editor, doc;

+ 6 - 6
packages/ckeditor5-basic-styles/tests/italic.js

@@ -5,12 +5,12 @@
 
 /* globals document */
 
-import ClassicTestEditor from 'ckeditor5-core/tests/_utils/classictesteditor';
-import Italic from 'ckeditor5-basic-styles/src/italic';
-import ItalicEngine from 'ckeditor5-basic-styles/src/italicengine';
-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 Italic from '../src/italic';
+import ItalicEngine from '../src/italicengine';
+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();
 

+ 5 - 5
packages/ckeditor5-basic-styles/tests/italicengine.js

@@ -3,11 +3,11 @@
  * For licensing, see LICENSE.md.
  */
 
-import ItalicEngine from 'ckeditor5-basic-styles/src/italicengine';
-import VirtualTestEditor from 'ckeditor5-core/tests/_utils/virtualtesteditor';
-import { getData as getModelData, setData as setModelData } from 'ckeditor5-engine/src/dev-utils/model';
-import { getData as getViewData } from 'ckeditor5-engine/src/dev-utils/view';
-import ToggleAttributeCommand from 'ckeditor5-core/src/command/toggleattributecommand';
+import ItalicEngine from '../src/italicengine';
+import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
+import { getData as getModelData, setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
+import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
+import ToggleAttributeCommand from '@ckeditor/ckeditor5-core/src/command/toggleattributecommand';
 
 describe( 'ItalicEngine', () => {
 	let editor, doc;

+ 7 - 7
packages/ckeditor5-basic-styles/tests/manual/basic-styles.js

@@ -5,13 +5,13 @@
 
 /* globals console:false, window, document */
 
-import ClassicEditor from 'ckeditor5-editor-classic/src/classic';
-import Enter from 'ckeditor5-enter/src/enter';
-import Typing from 'ckeditor5-typing/src/typing';
-import Paragraph from 'ckeditor5-paragraph/src/paragraph';
-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 Undo from '@ckeditor/ckeditor5-undo/src/undo';
+import Bold from '../../src/bold';
+import Italic from '../../src/italic';
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
 	plugins: [ Enter, Typing, Paragraph, Undo, Bold, Italic ],