Bladeren bron

Merge branch 'master' into t/397

Piotrek Koszuliński 9 jaren geleden
bovenliggende
commit
5cb5daf6b2
5 gewijzigde bestanden met toevoegingen van 79 en 31 verwijderingen
  1. 32 0
      CHANGELOG.md
  2. 14 0
      gulpfile.js
  3. 6 5
      mgit.json
  4. 24 23
      package.json
  5. 3 3
      scripts/fix-src-imports.js

+ 32 - 0
CHANGELOG.md

@@ -0,0 +1,32 @@
+Changelog
+=========
+
+## [0.8.0](https://github.com/ckeditor/ckeditor5-autoformat/compare/v0.7.0...v0.8.0) (2017-03-06)
+
+New packages:
+
+* [@ckeditor/ckeditor5-presets](https://www.npmjs.com/package/@ckeditor/ckeditor5-presets): v0.1.1
+
+Minor releases (possible breaking changes):
+
+* [@ckeditor/ckeditor5-core](https://www.npmjs.com/package/@ckeditor/ckeditor5-core): v0.6.0 => v0.7.0
+* [@ckeditor/ckeditor5-engine](https://www.npmjs.com/package/@ckeditor/ckeditor5-engine): v0.7.0 => v0.8.0
+* [@ckeditor/ckeditor5-enter](https://www.npmjs.com/package/@ckeditor/ckeditor5-enter): v0.7.0 => v0.8.0
+* [@ckeditor/ckeditor5-heading](https://www.npmjs.com/package/@ckeditor/ckeditor5-heading): v0.7.0 => v0.8.0
+* [@ckeditor/ckeditor5-image](https://www.npmjs.com/package/@ckeditor/ckeditor5-image): v0.3.0 => v0.4.0
+* [@ckeditor/ckeditor5-typing](https://www.npmjs.com/package/@ckeditor/ckeditor5-typing): v0.7.0 => v0.8.0
+* [@ckeditor/ckeditor5-utils](https://www.npmjs.com/package/@ckeditor/ckeditor5-utils): v0.7.0 => v0.8.0
+
+Patch releases (bug fixes, internal changes):
+
+* [@ckeditor/ckeditor5-autoformat](https://www.npmjs.com/package/@ckeditor/ckeditor5-autoformat): v0.4.0 => v0.4.1
+* [@ckeditor/ckeditor5-basic-styles](https://www.npmjs.com/package/@ckeditor/ckeditor5-basic-styles): v0.7.0 => v0.7.1
+* [@ckeditor/ckeditor5-clipboard](https://www.npmjs.com/package/@ckeditor/ckeditor5-clipboard): v0.4.0 => v0.4.1
+* [@ckeditor/ckeditor5-editor-classic](https://www.npmjs.com/package/@ckeditor/ckeditor5-editor-classic): v0.7.0 => v0.7.1
+* [@ckeditor/ckeditor5-link](https://www.npmjs.com/package/@ckeditor/ckeditor5-link): v0.5.0 => v0.5.1
+* [@ckeditor/ckeditor5-list](https://www.npmjs.com/package/@ckeditor/ckeditor5-list): v0.5.0 => v0.5.1
+* [@ckeditor/ckeditor5-markdown-gfm](https://www.npmjs.com/package/@ckeditor/ckeditor5-markdown-gfm): v0.4.0 => v0.4.1
+* [@ckeditor/ckeditor5-paragraph](https://www.npmjs.com/package/@ckeditor/ckeditor5-paragraph): v0.6.0 => v0.6.1
+* [@ckeditor/ckeditor5-theme-lark](https://www.npmjs.com/package/@ckeditor/ckeditor5-theme-lark): v0.6.0 => v0.6.1
+* [@ckeditor/ckeditor5-ui](https://www.npmjs.com/package/@ckeditor/ckeditor5-ui): v0.7.0 => v0.7.1
+* [@ckeditor/ckeditor5-undo](https://www.npmjs.com/package/@ckeditor/ckeditor5-undo): v0.7.0 => v0.7.1

+ 14 - 0
gulpfile.js

@@ -47,6 +47,20 @@ function getTestOptions() {
 		.parseArguments( process.argv.slice( 2 ) );
 }
 
+// Translations. --------------------------------------------------------------
+
+gulp.task( 'translations:collect', () => {
+	return require( '@ckeditor/ckeditor5-dev-env' ).collectTranslations();
+} );
+
+gulp.task( 'translations:upload', () => {
+	return require( '@ckeditor/ckeditor5-dev-env' ).uploadTranslations();
+} );
+
+gulp.task( 'translations:download', () => {
+	return require( '@ckeditor/ckeditor5-dev-env' ).downloadTranslations();
+} );
+
 // Releasing. -----------------------------------------------------------------
 
 gulp.task( 'changelog:dependencies', () => {

+ 6 - 5
mgit.json

@@ -4,20 +4,21 @@
     "@ckeditor/ckeditor5-autoformat": "ckeditor/ckeditor5-autoformat",
     "@ckeditor/ckeditor5-basic-styles": "ckeditor/ckeditor5-basic-styles",
     "@ckeditor/ckeditor5-clipboard": "ckeditor/ckeditor5-clipboard",
-    "@ckeditor/ckeditor5-core": "ckeditor/ckeditor5-core#t/62",
-    "@ckeditor/ckeditor5-editor-classic": "ckeditor/ckeditor5-editor-classic#t/48",
+    "@ckeditor/ckeditor5-core": "ckeditor/ckeditor5-core",
+    "@ckeditor/ckeditor5-editor-classic": "ckeditor/ckeditor5-editor-classic",
     "@ckeditor/ckeditor5-editor-inline": "ckeditor/ckeditor5-editor-inline#t/1",
     "@ckeditor/ckeditor5-engine": "ckeditor/ckeditor5-engine",
     "@ckeditor/ckeditor5-enter": "ckeditor/ckeditor5-enter",
     "@ckeditor/ckeditor5-heading": "ckeditor/ckeditor5-heading",
-    "@ckeditor/ckeditor5-image": "ckeditor/ckeditor5-image#t/52",
-    "@ckeditor/ckeditor5-link": "ckeditor/ckeditor5-link#t/83",
+    "@ckeditor/ckeditor5-image": "ckeditor/ckeditor5-image",
+    "@ckeditor/ckeditor5-link": "ckeditor/ckeditor5-link",
     "@ckeditor/ckeditor5-list": "ckeditor/ckeditor5-list",
     "@ckeditor/ckeditor5-markdown-gfm": "ckeditor/ckeditor5-markdown-gfm",
     "@ckeditor/ckeditor5-paragraph": "ckeditor/ckeditor5-paragraph",
+    "@ckeditor/ckeditor5-presets": "ckeditor/ckeditor5-presets",
     "@ckeditor/ckeditor5-theme-lark": "ckeditor/ckeditor5-theme-lark#t/73",
     "@ckeditor/ckeditor5-typing": "ckeditor/ckeditor5-typing",
-    "@ckeditor/ckeditor5-ui": "ckeditor/ckeditor5-ui#t/152",
+    "@ckeditor/ckeditor5-ui": "ckeditor/ckeditor5-ui",
     "@ckeditor/ckeditor5-undo": "ckeditor/ckeditor5-undo",
     "@ckeditor/ckeditor5-utils": "ckeditor/ckeditor5-utils"
   }

+ 24 - 23
package.json

@@ -1,6 +1,6 @@
 {
   "name": "ckeditor5",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "The development version of CKEditor; the best browser-based WYSIWYG editor.",
   "keywords": [
     "CKEditor",
@@ -8,31 +8,32 @@
     "WYSIWYG"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-autoformat": "^0.4.0",
-    "@ckeditor/ckeditor5-basic-styles": "^0.7.0",
-    "@ckeditor/ckeditor5-clipboard": "^0.4.0",
-    "@ckeditor/ckeditor5-core": "^0.6.0",
-    "@ckeditor/ckeditor5-editor-classic": "^0.7.0",
-    "@ckeditor/ckeditor5-editor-inline": "^0.0.1",
-    "@ckeditor/ckeditor5-engine": "^0.7.0",
-    "@ckeditor/ckeditor5-enter": "^0.7.0",
-    "@ckeditor/ckeditor5-heading": "^0.7.0",
-    "@ckeditor/ckeditor5-image": "^0.3.0",
-    "@ckeditor/ckeditor5-link": "^0.5.0",
-    "@ckeditor/ckeditor5-list": "^0.5.0",
-    "@ckeditor/ckeditor5-markdown-gfm": "^0.4.0",
-    "@ckeditor/ckeditor5-paragraph": "^0.6.0",
-    "@ckeditor/ckeditor5-theme-lark": "^0.6.0",
-    "@ckeditor/ckeditor5-typing": "^0.7.0",
-    "@ckeditor/ckeditor5-ui": "^0.7.0",
-    "@ckeditor/ckeditor5-undo": "^0.7.0",
-    "@ckeditor/ckeditor5-utils": "^0.7.0"
+    "@ckeditor/ckeditor5-autoformat": "v0.4.1",
+    "@ckeditor/ckeditor5-basic-styles": "v0.7.1",
+    "@ckeditor/ckeditor5-clipboard": "v0.4.1",
+    "@ckeditor/ckeditor5-core": "v0.7.0",
+    "@ckeditor/ckeditor5-editor-classic": "v0.7.1",
+    "@ckeditor/ckeditor5-editor-inline": "*",
+    "@ckeditor/ckeditor5-engine": "v0.8.0",
+    "@ckeditor/ckeditor5-enter": "v0.8.0",
+    "@ckeditor/ckeditor5-heading": "v0.8.0",
+    "@ckeditor/ckeditor5-image": "v0.4.0",
+    "@ckeditor/ckeditor5-link": "v0.5.1",
+    "@ckeditor/ckeditor5-list": "v0.5.1",
+    "@ckeditor/ckeditor5-markdown-gfm": "v0.4.1",
+    "@ckeditor/ckeditor5-paragraph": "v0.6.1",
+    "@ckeditor/ckeditor5-presets": "v0.1.1",
+    "@ckeditor/ckeditor5-theme-lark": "v0.6.1",
+    "@ckeditor/ckeditor5-typing": "v0.8.0",
+    "@ckeditor/ckeditor5-ui": "v0.7.1",
+    "@ckeditor/ckeditor5-undo": "v0.7.1",
+    "@ckeditor/ckeditor5-utils": "v0.8.0"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-dev-docs": "^6.1.2",
-    "@ckeditor/ckeditor5-dev-env": "^4.0.0",
+    "@ckeditor/ckeditor5-dev-docs": "^6.1.5",
+    "@ckeditor/ckeditor5-dev-env": "^4.2.0",
     "@ckeditor/ckeditor5-dev-lint": "^2.0.2",
-    "@ckeditor/ckeditor5-dev-tests": "^7.0.2",
+    "@ckeditor/ckeditor5-dev-tests": "^7.0.5",
     "gulp": "^3.9.0",
     "guppy-pre-commit": "^0.4.0",
     "lerna": "2.0.0-beta.37",

+ 3 - 3
scripts/fix-src-imports.js

@@ -12,7 +12,7 @@ const path = require( 'path' );
 const glob = require( 'glob' );
 
 const srcDir = path.join( process.cwd(), 'src' );
-const srcPath = path.join( srcDir , '**', '*.js' );
+const srcPath = path.join( srcDir, '**', '*.js' );
 
 for ( const filePath of glob.sync( srcPath ) ) {
 	const fileDepth = countOcurrences( filePath.replace( srcDir + '/', '' ), path.sep );
@@ -21,12 +21,12 @@ for ( const filePath of glob.sync( srcPath ) ) {
 	const fileContent = fs.readFileSync( filePath, 'utf-8' )
 		.replace( /\nimport[^']+?'((\.\.\/)+[\w-]+)\/[^']+?'/gm, fix );
 
-	fs.writeFileSync( filePath, fileContent , 'utf-8' );
+	fs.writeFileSync( filePath, fileContent, 'utf-8' );
 }
 
 function fixImport( wholeImport, pathStart, fileDepth ) {
 	const indexOfPathStart = wholeImport.indexOf( '../' );
-	const packageShortName = pathStart.split( '/' ).slice( -1 )[0];
+	const packageShortName = pathStart.split( '/' ).slice( -1 )[ 0 ];
 	const importDepth = countOcurrences( pathStart, '../' );
 
 	if ( importDepth <= fileDepth ) {