Selaa lähdekoodia

Merge branch 'master' into t/397

Aleksander Nowodzinski 9 vuotta sitten
vanhempi
sitoutus
f79d5c1e51
5 muutettua tiedostoa jossa 30 lisäystä ja 8 poistoa
  1. 1 1
      .travis.yml
  2. 1 1
      CONTRIBUTING.md
  3. 18 0
      gulpfile.js
  4. 1 1
      lerna.json
  5. 9 5
      package.json

+ 1 - 1
.travis.yml

@@ -19,4 +19,4 @@ install:
   - mgit bootstrap --resolver-url-template="https://github.com/\${ path }.git"
   - lerna bootstrap
 script:
-  - node --max_old_space_size=4096 ./node_modules/.bin/ckeditor5-dev-tests --reporter=dots
+  - npm t

+ 1 - 1
CONTRIBUTING.md

@@ -66,4 +66,4 @@ The issues pages can be used for feature requests.
 
 To accept contributions sent to us in form of code, documentation or translations, a Contributor License Agreement (CLA) must be in place in order to clarify the intellectual property license granted with them. This license is for your protection as a contributor as well as the protection of us and our users; it does not change your rights to use your own contributions for any other purpose.
 
-To sign the CLA and to have more information, please follow this link: [http://ckeditor.com/cla](http://ckeditor.com/cla).
+To sign the CLA and to have more information, please follow this link: [http://cla.ckeditor.com/](http://cla.ckeditor.com/).

+ 18 - 0
gulpfile.js

@@ -46,3 +46,21 @@ function getTestOptions() {
 	return require( '@ckeditor/ckeditor5-dev-tests' )
 		.parseArguments( process.argv.slice( 2 ) );
 }
+
+// Releasing. -----------------------------------------------------------------
+
+gulp.task( 'changelog:dependencies', () => {
+	return require( '@ckeditor/ckeditor5-dev-env' )
+		.generateChangelogForDependencies( {
+			cwd: process.cwd(),
+			packages: 'packages'
+		} );
+} );
+
+gulp.task( 'release:dependencies', () => {
+	return require( '@ckeditor/ckeditor5-dev-env' )
+		.releaseDependencies( {
+			cwd: process.cwd(),
+			packages: 'packages'
+		} );
+} );

+ 1 - 1
lerna.json

@@ -1,5 +1,5 @@
 {
-  "lerna": "2.0.0-beta.36",
+  "lerna": "2.0.0-beta.37",
   "packages": [
     "packages/*",
     "."

+ 9 - 5
package.json

@@ -29,13 +29,14 @@
     "@ckeditor/ckeditor5-utils": "^0.7.0"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-dev-docs": "^6.1.0",
-    "@ckeditor/ckeditor5-dev-lint": "^2.0.0",
-    "@ckeditor/ckeditor5-dev-tests": "^7.0.0",
+    "@ckeditor/ckeditor5-dev-docs": "^6.1.2",
+    "@ckeditor/ckeditor5-dev-env": "^4.0.0",
+    "@ckeditor/ckeditor5-dev-lint": "^2.0.2",
+    "@ckeditor/ckeditor5-dev-tests": "^7.0.2",
     "gulp": "^3.9.0",
     "guppy-pre-commit": "^0.4.0",
-    "lerna": "2.0.0-beta.36",
-    "mgit2": "^0.5.0"
+    "lerna": "2.0.0-beta.37",
+    "mgit2": "^0.5.1"
   },
   "engines": {
     "node": ">=6.0.0",
@@ -48,5 +49,8 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/ckeditor/ckeditor5.git"
+  },
+  "scripts": {
+    "test": "node --max_old_space_size=4096 ./node_modules/.bin/ckeditor5-dev-tests --reporter=dots"
   }
 }