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

Merge branch 'master' into t/138

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

+ 5 - 6
packages/ckeditor5-ui/.travis.yml

@@ -15,11 +15,10 @@ 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 codeclimate-test-reporter
+  - npm install @ckeditor/ckeditor5-dev-tests @ckeditor/ckeditor5-dev-lint
+  - ckeditor5-dev-tests-install-dependencies
 script:
-  - node_modules/.bin/ckeditor5-dev-tests-travis
+  - ckeditor5-dev-tests-travis
 after_success:
-  - node_modules/.bin/codeclimate-test-reporter < build/.automated-tests/coverage/lcov.info
-
+  - codeclimate-test-reporter < coverage/lcov.info

+ 3 - 0
packages/ckeditor5-ui/lang/contexts.json

@@ -0,0 +1,3 @@
+{
+	"Rich Text Editor, %0": "Title of the CKEditor5 editor."
+}

+ 14 - 4
packages/ckeditor5-ui/package.json

@@ -1,17 +1,27 @@
 {
-  "name": "ckeditor5-ui",
+  "name": "@ckeditor/ckeditor5-ui",
   "version": "0.6.0",
   "description": "The UI framework of CKEditor 5.",
   "keywords": [
     "CKEditor"
   ],
   "dependencies": {
-    "ckeditor5-theme-lark": "ckeditor/ckeditor5-theme-lark",
-    "ckeditor5-utils": "ckeditor/ckeditor5-utils"
+    "@ckeditor/ckeditor5-theme-lark": "*",
+    "@ckeditor/ckeditor5-utils": "*"
   },
   "devDependencies": {
+    "@ckeditor/ckeditor5-basic-styles": "*",
+    "@ckeditor/ckeditor5-core": "*",
     "@ckeditor/ckeditor5-dev-lint": "^2.0.0",
-    "ckeditor5-core": "ckeditor/ckeditor5-core",
+    "@ckeditor/ckeditor5-editor-classic": "*",
+    "@ckeditor/ckeditor5-engine": "*",
+    "@ckeditor/ckeditor5-enter": "*",
+    "@ckeditor/ckeditor5-heading": "*",
+    "@ckeditor/ckeditor5-image": "*",
+    "@ckeditor/ckeditor5-link": "*",
+    "@ckeditor/ckeditor5-paragraph": "*",
+    "@ckeditor/ckeditor5-typing": "*",
+    "@ckeditor/ckeditor5-undo": "*",
     "del": "^2.2.0",
     "gulp": "^3.9.0",
     "guppy-pre-commit": "^0.4.0",

+ 1 - 1
packages/ckeditor5-ui/tests/dropdown/manual/dropdown.js

@@ -11,7 +11,7 @@ import Collection from '@ckeditor/ckeditor5-utils/src/collection';
 import createDropdown from '../../../src/dropdown/createdropdown';
 import createListDropdown from '../../../src/dropdown/list/createlistdropdown';
 
-import 'ckeditor5-theme-lark/theme/theme.scss';
+import '@ckeditor/ckeditor5-theme-lark/theme/theme.scss';
 
 function renderInto( selector, view ) {
 	view.init().then( () => {

+ 1 - 1
packages/ckeditor5-ui/tests/manual/icon/icon.js

@@ -7,7 +7,7 @@
 
 import IconView from '../../../src/icon/iconview';
 
-import 'ckeditor5-theme-lark/theme/theme.scss';
+import '@ckeditor/ckeditor5-theme-lark/theme/theme.scss';
 
 const wrapper = document.querySelector( '#inline-svg' );
 

+ 1 - 1
packages/ckeditor5-ui/tests/manual/stickytoolbarview/stickytoolbarview.js

@@ -8,7 +8,7 @@
 import testUtils from '../../../tests/_utils/utils';
 import StickyToolbarView from '../../../src/toolbar/sticky/stickytoolbarview';
 
-import 'ckeditor5-theme-lark/theme/theme.scss';
+import '@ckeditor/ckeditor5-theme-lark/theme/theme.scss';
 
 testUtils.createTestUIView( {
 	top: '.ck-editor__top'

+ 1 - 1
packages/ckeditor5-ui/tests/manual/tickets/126/1.js

@@ -7,7 +7,7 @@
 
 import BalloonPanelView from '../../../../src/balloonpanel/balloonpanelview';
 
-import 'ckeditor5-theme-lark/theme/theme.scss';
+import '@ckeditor/ckeditor5-theme-lark/theme/theme.scss';
 
 window.createPanel = ( selector ) => {
 	const view = new BalloonPanelView();