浏览代码

Merge tag 'v1.0.0-beta.1' into stable

Release: v1.0.0-beta.1.
Piotrek Koszuliński 7 年之前
父节点
当前提交
4d87404807

+ 1 - 1
packages/ckeditor5-cloud-services/.eslintrc.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

文件差异内容过多而无法显示
+ 15 - 11
packages/ckeditor5-cloud-services/.travis.yml


+ 11 - 0
packages/ckeditor5-cloud-services/CHANGELOG.md

@@ -1,6 +1,17 @@
 Changelog
 =========
 
+## [1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-cloudservices/compare/v1.0.0-alpha.1...v1.0.0-beta.1) (2018-03-15)
+
+### Other changes
+
+* Removed the default value of `config.cloudServices.uploadUrl`. Closes [#12](https://github.com/ckeditor/ckeditor5-cloudservices/issues/12). ([d718e54](https://github.com/ckeditor/ckeditor5-cloudservices/commit/d718e54))
+
+### BREAKING CHANGES
+
+* The `config.cloudServices.uploadUrl` needs to be defined to your organization's CKEditor Cloud Services upload URL.
+
+
 ## 1.0.0-alpha.1 (2017-11-14)
 
 ### Features

+ 1 - 1
packages/ckeditor5-cloud-services/LICENSE.md

@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 **CKEditor 5 Cloud Services** – https://github.com/ckeditor/ckeditor5-cloudservices <br>
-Copyright (c) 2003-2017, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2018, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved.
 
 Licensed under the terms of any of the following licenses at your choice:
 

+ 3 - 1
packages/ckeditor5-cloud-services/README.md

@@ -4,7 +4,9 @@ CKEditor 5 Cloud Services
 [![Join the chat at https://gitter.im/ckeditor/ckeditor5](https://badges.gitter.im/ckeditor/ckeditor5.svg)](https://gitter.im/ckeditor/ckeditor5?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-cloudservices.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-cloudservices)
 [![Build Status](https://travis-ci.org/ckeditor/ckeditor5-cloudservices.svg?branch=master)](https://travis-ci.org/ckeditor/ckeditor5-cloudservices)
-[![Test Coverage](https://codeclimate.com/github/ckeditor/ckeditor5-cloudservices/badges/coverage.svg)](https://codeclimate.com/github/ckeditor/ckeditor5-cloudservices/coverage)
+[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)](https://www.browserstack.com/automate/public-build/d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)
+[![Coverage Status](https://coveralls.io/repos/github/ckeditor/ckeditor5-cloudservices/badge.svg?branch=master)](https://coveralls.io/github/ckeditor/ckeditor5-cloudservices?branch=master)
+<br>
 [![Dependency Status](https://david-dm.org/ckeditor/ckeditor5-cloudservices/status.svg)](https://david-dm.org/ckeditor/ckeditor5-cloudservices)
 [![devDependency Status](https://david-dm.org/ckeditor/ckeditor5-cloudservices/dev-status.svg)](https://david-dm.org/ckeditor/ckeditor5-cloudservices?type=dev)
 

+ 6 - 6
packages/ckeditor5-cloud-services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-cloudservices",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-beta.1",
   "description": "CKEditor 5's Cloud Services integration layer.",
   "keywords": [
     "ckeditor5",
@@ -8,14 +8,14 @@
   ],
   "dependencies": {
     "@ckeditor/ckeditor-cloudservices-core": "^0.2.0",
-    "@ckeditor/ckeditor5-core": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-utils": "^1.0.0-alpha.2"
+    "@ckeditor/ckeditor5-core": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-utils": "^1.0.0-beta.1"
   },
   "devDependencies": {
-    "eslint": "^4.8.0",
-    "eslint-config-ckeditor5": "^1.0.6",
+    "eslint": "^4.15.0",
+    "eslint-config-ckeditor5": "^1.0.7",
     "husky": "^0.14.3",
-    "lint-staged": "^4.2.3"
+    "lint-staged": "^6.0.0"
   },
   "engines": {
     "node": ">=6.0.0",

+ 6 - 8
packages/ckeditor5-cloud-services/src/cloudservices.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 
@@ -45,10 +45,6 @@ export default class CloudServices extends Plugin {
 		 * @member {String} #uploadUrl
 		 */
 
-		if ( !this.uploadUrl ) {
-			this.uploadUrl = 'https://files.cke-cs.com/upload/';
-		}
-
 		/**
 		 * Other plugins use this token for the authorization process. It handles token requesting and refreshing.
 		 * Its value is `null` when {@link module:cloudservices/cloudservices~CloudServicesConfig#tokenUrl} is not provided.
@@ -85,8 +81,8 @@ CloudServices.Token = Token;
  *		ClassicEditor
  *			.create( document.querySelector( '#editor' ), {
  *				cloudServices: {
- *					uploadUrl: 'https://your-organisation-id.cke-cs.com/easyimage/upload/',
- *					tokenUrl: 'https://example.com/cs-token-endpoint'
+ *					tokenUrl: 'https://example.com/cs-token-endpoint',
+ *					uploadUrl: 'https://your-organization-id.cke-cs.com/easyimage/upload/'
  *				}
  *			} )
  *			.then( ... )
@@ -121,5 +117,7 @@ CloudServices.Token = Token;
  *
  * Note: Make sure to also set the {@link module:cloudservices/cloudservices~CloudServicesConfig#tokenUrl} configuration option.
  *
- * @member {String} [module:cloudservices/cloudservices~CloudServicesConfig#uploadUrl]
+ * Read more in [Cloud Services Quick start](https://docs.ckeditor.com/cs/latest/guides/quick-start.html).
+ *
+ * @member {String} module:cloudservices/cloudservices~CloudServicesConfig#uploadUrl
  */

+ 10 - 3
packages/ckeditor5-cloud-services/tests/_utils/cloudservices-config.js

@@ -1,12 +1,19 @@
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 
 // WARNING: The URLs below should not be used for any other purpose than Easy Image plugin development.
 // Images uploaded using the testing token service may be deleted automatically at any moment.
-// If you would like to try the Easy Image service, please wait until the official launch of Easy Image and sign up for a free trial.
+// If you would like to try the Easy Image service, please sign up for a free trial (https://ckeditor.com/ckeditor-cloud-services/).
 // Images uploaded during the free trial will not be deleted for the whole trial period and additionally the trial service can be converted
 // into a subscription at any moment, allowing you to preserve all uploaded images.
 
-export const TOKEN_URL = 'https://j2sns7jmy0.execute-api.eu-central-1.amazonaws.com/prod/token-new';
+export const TOKEN_URL = 'https://33333.cke-cs.com/token/dev/ijrDsqFix838Gh3wGO3F77FSW94BwcLXprJ4APSp3XQ26xsUHTi0jcb1hoBt';
+
+export const UPLOAD_URL = 'https://33333.cke-cs.com/easyimage/upload/';
+
+export const CS_CONFIG = {
+	tokenUrl: TOKEN_URL,
+	uploadUrl: UPLOAD_URL
+};

+ 1 - 1
packages/ckeditor5-cloud-services/tests/_utils/tokenmock.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 3 - 3
packages/ckeditor5-cloud-services/tests/cloudservices.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 
@@ -53,7 +53,7 @@ describe( 'CloudServices', () => {
 				} );
 		} );
 
-		it( 'should expose default uploadUrl if is not provided', () => {
+		it( 'should not expose any default uploadUrl', () => {
 			return ClassicTestEditor
 				.create( element, {
 					plugins: [ CloudServices ]
@@ -61,7 +61,7 @@ describe( 'CloudServices', () => {
 				.then( editor => {
 					const cloudServicesPlugin = editor.plugins.get( CloudServices );
 
-					expect( cloudServicesPlugin.uploadUrl ).to.equal( 'https://files.cke-cs.com/upload/' );
+					expect( cloudServicesPlugin.uploadUrl ).to.be.undefined;
 				} );
 		} );