Browse Source

Merge remote-tracking branch 'boilerplate/esnext'

Piotrek Koszuliński 10 years ago
parent
commit
5793f9f19f

+ 2 - 0
packages/ckeditor5-utils/dev/tasks/jscs-config.json → packages/ckeditor5-utils/.jscsrc

@@ -1,4 +1,6 @@
 {
+	"esnext": true,
+
 	"requireCurlyBraces": [
 		"if", "else", "for", "while", "do", "switch", "try", "catch"
 	],

+ 2 - 0
packages/ckeditor5-utils/dev/tasks/jshint-config.json → packages/ckeditor5-utils/.jshintrc

@@ -1,4 +1,6 @@
 {
+	"esnext": true,
+
 	"immed": true,
 	"latedef": "nofunc",
 	"noarg": true,

+ 1 - 1
packages/ckeditor5-utils/dev/tasks/jscs.js

@@ -7,7 +7,7 @@ var tools = require( './utils/tools' );
 module.exports = function( grunt ) {
 	tools.setupMultitaskConfig( grunt, {
 		task: 'jscs',
-		defaultOptions: grunt.file.readJSON( 'dev/tasks/jscs-config.json' ),
+		defaultOptions: grunt.file.readJSON( '.jscsrc' ),
 		addGitIgnore: 'excludeFiles',
 		targets: {
 			all: function() {

+ 1 - 1
packages/ckeditor5-utils/dev/tasks/jshint.js

@@ -7,7 +7,7 @@ var tools = require( './utils/tools' );
 module.exports = function( grunt ) {
 	tools.setupMultitaskConfig( grunt, {
 		task: 'jshint',
-		defaultOptions: grunt.file.readJSON( 'dev/tasks/jshint-config.json' ),
+		defaultOptions: grunt.file.readJSON( '.jshintrc' ),
 		addGitIgnore: 'ignores',
 		targets: {
 			all: function() {