Przeglądaj źródła

Merge remote-tracking branch 'boilerplate/esnext'

Piotrek Koszuliński 10 lat temu
rodzic
commit
8bc641cae8

+ 2 - 0
dev/tasks/jscs-config.json

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

+ 2 - 0
dev/tasks/jshint-config.json

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

+ 1 - 1
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
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() {

+ 1 - 1
package.json

@@ -22,9 +22,9 @@
     "benderjs-sinon": "^0.2.3",
     "del": "^1.2.0",
     "grunt": "^0",
+    "grunt-jscs": "^2.0.0",
     "grunt-contrib-jshint": "^0",
     "grunt-githooks": "^0",
-    "grunt-jscs": "^2.0.0",
     "ncp": "^2.0.0",
     "replace": "^0.3.0",
     "shelljs": "^0"