Explorar el Código

Moved jscs to dev/tasks. Now the tasks need to be more declarative.

fredck hace 11 años
padre
commit
605b0e9f3c

+ 0 - 69
packages/ckeditor5-ui/dev/tasks/jscs-config.json

@@ -1,69 +0,0 @@
-{
-	"excludeFiles": [
-		"node_modules/*",
-		"build/*"
-	],
-	"requireCurlyBraces": [
-		"if", "else", "for", "while", "do", "switch", "try", "catch"
-	],
-	"requireSpaceAfterKeywords": [
-		"if", "else", "for", "while", "do", "switch", "return", "try", "catch"
-	],
-	"requireSpaceBeforeBlockStatements": true,
-	"requireParenthesesAroundIIFE": true,
-	"requireSpacesInConditionalExpression": {
-		"afterTest": true,
-		"beforeConsequent": true,
-		"afterConsequent": true,
-		"beforeAlternate": true
-	},
-	"requireSpacesInFunctionExpression": {
-		"beforeOpeningCurlyBrace": true
-	},
-	"disallowSpacesInFunctionExpression": {
-		"beforeOpeningRoundBrace": true
-	},
-	"requireBlocksOnNewline": true,
-	"requireSpacesInsideObjectBrackets": "all",
-	"requireSpacesInsideArrayBrackets": "all",
-	"disallowSpaceAfterObjectKeys": true,
-	"requireCommaBeforeLineBreak": true,
-	"requireOperatorBeforeLineBreak": [
-		"?", "=", "+", "-", "/", "*", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "|", "||", "&", "&&", "^", "+=", "*=",
-		"-=", "/=", "^="
-	],
-	"requireSpaceBeforeBinaryOperators": [
-		"+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "|", "||", "&", "&&", "^", "+=", "*=", "-=",
-		"/=", "^="
-	],
-	"requireSpaceAfterBinaryOperators": [
-		"+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "|", "||", "&", "&&", "^", "+=", "*=", "-=",
-		"/=", "^="
-	],
-	"disallowSpaceAfterPrefixUnaryOperators": [
-		"++", "--", "+", "-", "~", "!"
-	],
-	"disallowSpaceBeforePostfixUnaryOperators": [
-		"++", "--"
-	],
-	"disallowKeywords": [
-		"with"
-	],
-	"validateLineBreaks": "LF",
-	"validateQuoteMarks": {
-		"mark": "'",
-		"escape": true
-	},
-	"validateIndentation": "\t",
-	"disallowMixedSpacesAndTabs": true,
-	"disallowTrailingWhitespace": true,
-	"disallowKeywordsOnNewLine": [
-		"else", "catch"
-	],
-	"maximumLineLength": 120,
-	"safeContextKeyword": [
-		"that"
-	],
-	"requireDotNotation": true,
-	"disallowYodaConditions": true
-}

+ 78 - 0
packages/ckeditor5-ui/dev/tasks/jscs.js

@@ -0,0 +1,78 @@
+'use strict';
+
+module.exports = function( grunt ) {
+	grunt.config.merge( {
+		jscs: {
+			src: [ '**/*.js' ],
+			options: defaultConfig
+		}
+	} );
+
+	grunt.loadNpmTasks( 'grunt-jscs' );
+};
+
+var defaultConfig = {
+	'requireCurlyBraces': [
+		'if', 'else', 'for', 'while', 'do', 'switch', 'try', 'catch'
+	],
+	'requireSpaceAfterKeywords': [
+		'if', 'else', 'for', 'while', 'do', 'switch', 'return', 'try', 'catch'
+	],
+	'requireSpaceBeforeBlockStatements': true,
+	'requireParenthesesAroundIIFE': true,
+	'requireSpacesInConditionalExpression': {
+		'afterTest': true,
+		'beforeConsequent': true,
+		'afterConsequent': true,
+		'beforeAlternate': true
+	},
+	'requireSpacesInFunctionExpression': {
+		'beforeOpeningCurlyBrace': true
+	},
+	'disallowSpacesInFunctionExpression': {
+		'beforeOpeningRoundBrace': true
+	},
+	'requireBlocksOnNewline': true,
+	'requireSpacesInsideObjectBrackets': 'all',
+	'requireSpacesInsideArrayBrackets': 'all',
+	'disallowSpaceAfterObjectKeys': true,
+	'requireCommaBeforeLineBreak': true,
+	'requireOperatorBeforeLineBreak': [
+		'?', '=', '+', '-', '/', '*', '==', '===', '!=', '!==', '>', '>=', '<', '<=', '|', '||', '&', '&&', '^', '+=', '*=',
+		'-=', '/=', '^='
+	],
+	'requireSpaceBeforeBinaryOperators': [
+		'+', '-', '/', '*', '=', '==', '===', '!=', '!==', '>', '>=', '<', '<=', '|', '||', '&', '&&', '^', '+=', '*=', '-=',
+		'/=', '^='
+	],
+	'requireSpaceAfterBinaryOperators': [
+		'+', '-', '/', '*', '=', '==', '===', '!=', '!==', '>', '>=', '<', '<=', '|', '||', '&', '&&', '^', '+=', '*=', '-=',
+		'/=', '^='
+	],
+	'disallowSpaceAfterPrefixUnaryOperators': [
+		'++', '--', '+', '-', '~', '!'
+	],
+	'disallowSpaceBeforePostfixUnaryOperators': [
+		'++', '--'
+	],
+	'disallowKeywords': [
+		'with'
+	],
+	'validateLineBreaks': 'LF',
+	'validateQuoteMarks': {
+		'mark': '\'',
+		'escape': true
+	},
+	'validateIndentation': '\t',
+	'disallowMixedSpacesAndTabs': true,
+	'disallowTrailingWhitespace': true,
+	'disallowKeywordsOnNewLine': [
+		'else', 'catch'
+	],
+	'maximumLineLength': 120,
+	'safeContextKeyword': [
+		'that'
+	],
+	'requireDotNotation': true,
+	'disallowYodaConditions': true
+};

+ 5 - 4
packages/ckeditor5-ui/gruntfile.js

@@ -10,9 +10,11 @@ module.exports = function( grunt ) {
 		},
 
 		jscs: {
-			src: '*.js',
 			options: {
-				config: 'dev/tasks/jscs-config.json'
+				'excludeFiles': [
+					'node_modules/**',
+					'build/**'
+				]
 			}
 		},
 
@@ -23,8 +25,7 @@ module.exports = function( grunt ) {
 		}
 	} );
 
-	// Load all grunt plugins.
-	require( 'load-grunt-tasks' )( grunt );
+	grunt.loadTasks( 'dev/tasks' );
 
 	// Default tasks.
 	grunt.registerTask( 'default', [ 'jshint', 'jscs' ] );