8
0
Эх сурвалжийг харах

Merge branch 'master' into t/ckeditor5-dev/371

Piotrek Koszuliński 7 жил өмнө
parent
commit
d1e7c98c4e

+ 1 - 0
docs/builds/guides/support/browser-compatibility.md

@@ -19,6 +19,7 @@ CKEditor 5 is currently supported in the following desktop browsers:
 	* Firefox (latest stable release).
 	* Firefox (latest stable release).
 	* Safari (latest stable release).
 	* Safari (latest stable release).
 	* Opera (latest stable release).
 	* Opera (latest stable release).
+	* Electron (latest stable release).
 * Good support:
 * Good support:
 	* Edge (latest stable release). Known issues:
 	* Edge (latest stable release). Known issues:
 		* Minor issues with selection: [1](https://github.com/ckeditor/ckeditor5-engine/issues/974), [2](https://github.com/ckeditor/ckeditor5-engine/issues/928).
 		* Minor issues with selection: [1](https://github.com/ckeditor/ckeditor5-engine/issues/974), [2](https://github.com/ckeditor/ckeditor5-engine/issues/928).

+ 3 - 3
docs/framework/guides/contributing/development-environment.md

@@ -149,7 +149,7 @@ Lerna is a tool used by many well-known projects such as [Babel.js](https://gith
 
 
 ## Running tests
 ## Running tests
 
 
-In order to run tests you need to use the `test` and `test:manual` tasks.
+In order to run tests you need to use the `test` and `manual` tasks.
 
 
 ```bash
 ```bash
 npm test -- --watch --coverage --source-map --files=engine
 npm test -- --watch --coverage --source-map --files=engine
@@ -165,10 +165,10 @@ This command will run the [`ckeditor5-engine`](https://github.com/ckeditor/ckedi
 
 
 **Note:** It is not possible to run tests of all packages with code coverage at once because the size of the project (the number of test files and source modules) exceeds webpack's capabilities (it runs out of memory).
 **Note:** It is not possible to run tests of all packages with code coverage at once because the size of the project (the number of test files and source modules) exceeds webpack's capabilities (it runs out of memory).
 
 
-To create a server for manual tests use the `test:manual` task:
+To create a server for manual tests use the `manual` task:
 
 
 ```bash
 ```bash
-npm run test:manual
+npm run manual
 ```
 ```
 
 
 It accepts the `--source-map` (`-s`) option. Note that it watches for changes in the JavaScript files only (see the [bug](https://github.com/ckeditor/ckeditor5-dev/issues/52)).
 It accepts the `--source-map` (`-s`) option. Note that it watches for changes in the JavaScript files only (see the [bug](https://github.com/ckeditor/ckeditor5-dev/issues/52)).

+ 1 - 1
docs/framework/guides/contributing/testing-environment.md

@@ -48,7 +48,7 @@ npm test -- -cw --files=basic-styles/bold*.js
 
 
 ## Running manual tests
 ## Running manual tests
 
 
-In order to start the manual tests server use the `npm run test:manual` task.
+In order to start the manual tests server use the `npm run manual` task.
 
 
 The task accepts the `--source-map` (alias `-s`) option.
 The task accepts the `--source-map` (alias `-s`) option.
 
 

+ 4 - 2
package.json

@@ -1,7 +1,8 @@
 {
 {
   "name": "ckeditor5",
   "name": "ckeditor5",
   "version": "10.1.0",
   "version": "10.1.0",
-  "description": "The development environment of CKEditor 5.",
+  "description": "The development environment of CKEditor 5 – the best browser-based rich text editor.",
+  "private": true,
   "keywords": [
   "keywords": [
     "CKEditor",
     "CKEditor",
     "ckeditor5",
     "ckeditor5",
@@ -102,7 +103,7 @@
     "lint": "eslint --quiet '**/*.js'",
     "lint": "eslint --quiet '**/*.js'",
     "precommit": "lint-staged",
     "precommit": "lint-staged",
     "test": "node --max_old_space_size=4096 node_modules/@ckeditor/ckeditor5-dev-tests/bin/test.js",
     "test": "node --max_old_space_size=4096 node_modules/@ckeditor/ckeditor5-dev-tests/bin/test.js",
-    "test:manual": "node --max_old_space_size=4096 node_modules/@ckeditor/ckeditor5-dev-tests/bin/test-manual.js",
+    "manual": "node --max_old_space_size=4096 node_modules/@ckeditor/ckeditor5-dev-tests/bin/test-manual.js",
     "reinstall": "rm -rf ./packages ./node_modules && mgit bootstrap && lerna bootstrap",
     "reinstall": "rm -rf ./packages ./node_modules && mgit bootstrap && lerna bootstrap",
     "docs": "node ./scripts/docs/build-docs.js",
     "docs": "node ./scripts/docs/build-docs.js",
     "docs:api": "node ./scripts/docs/build-api-docs.js",
     "docs:api": "node ./scripts/docs/build-api-docs.js",
@@ -114,6 +115,7 @@
     "changelog": "node ./scripts/release/changelog.js",
     "changelog": "node ./scripts/release/changelog.js",
     "release": "bash ./scripts/release-ckeditor5.sh",
     "release": "bash ./scripts/release-ckeditor5.sh",
     "release:dependencies": "node ./scripts/release/release-dependencies.js",
     "release:dependencies": "node ./scripts/release/release-dependencies.js",
+    "release:update-dependencies": "node ./scripts/update-dependencies-versions.js",
     "switch-to-dev-dev": "sh ./scripts/switch-to-dev-dev.sh"
     "switch-to-dev-dev": "sh ./scripts/switch-to-dev-dev.sh"
   },
   },
   "lint-staged": {
   "lint-staged": {

+ 1 - 0
scripts/docs/build-docs.js

@@ -58,6 +58,7 @@ function runUmberto( options ) {
 	return umberto.buildSingleProject( {
 	return umberto.buildSingleProject( {
 		configDir: 'docs',
 		configDir: 'docs',
 		clean: true,
 		clean: true,
+		dev: options.dev,
 		skipLiveSnippets: options.skipLiveSnippets,
 		skipLiveSnippets: options.skipLiveSnippets,
 		skipValidation: options.skipValidation,
 		skipValidation: options.skipValidation,
 		snippetOptions: {
 		snippetOptions: {

+ 4 - 0
scripts/release/release-ckeditor5.js

@@ -82,6 +82,10 @@ cli.provideToken()
 					continue;
 					continue;
 				}
 				}
 
 
+				if ( property == 'private' ) {
+					continue;
+				}
+
 				// Copy value from original package.json file.
 				// Copy value from original package.json file.
 				jsonFile[ property ] = packageJson[ property ];
 				jsonFile[ property ] = packageJson[ property ];
 			}
 			}

+ 54 - 0
scripts/update-dependencies-versions.js

@@ -0,0 +1,54 @@
+#!/usr/bin/env node
+
+/**
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+/* eslint-env node */
+
+'use strict';
+
+const path = require( 'path' );
+const { tools, logger } = require( '@ckeditor/ckeditor5-dev-utils' );
+
+const log = logger();
+const packageJsonPath = path.join( __dirname, '..', 'package.json' );
+
+log.info( 'Updating version of dependencies in "package.json"...' );
+let counter = 0;
+
+tools.updateJSONFile( packageJsonPath, packageJson => {
+	const dependencies = packageJson.dependencies;
+
+	for ( const packageName of Object.keys( dependencies ) ) {
+		try {
+			const dependencyPackageJson = require( packageName + '/package.json' );
+			const newVersion = '^' + dependencyPackageJson.version;
+
+			if ( packageJson.dependencies[ dependencyPackageJson.name ] !== newVersion ) {
+				counter += 1;
+			}
+
+			packageJson.dependencies[ dependencyPackageJson.name ] = newVersion;
+		} catch ( error ) {
+			log.warning( `Package "${ packageName }" is not installed and its version cannot be updated.` );
+		}
+	}
+
+	return packageJson;
+} );
+
+log.info( `Updated versions of ${ counter } packages.` );
+
+if ( counter ) {
+	log.info( 'Committing updated "package.json" file...' );
+
+	const response = tools.shExec( 'git add package.json && git commit -m "Internal: Updated dependencies."', { verbosity: 'error' } );
+
+	log.info( response.trim() );
+} else {
+	log.info( 'Nothing to update? It smells like troubles!' );
+}
+
+log.info( 'Done.' );