jenkins-bot has submitted this change and it was merged.
Change subject: Gruntfile cleanup
......................................................................
Gruntfile cleanup
Change-Id: I43604998687200f046e2a74bfa205df77c164371
---
R .jscsrc
M Gruntfile.js
M Makefile
3 files changed, 4 insertions(+), 8 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jscs.json b/.jscsrc
similarity index 74%
rename from .jscs.json
rename to .jscsrc
index 84b7fd4..b5e995c 100644
--- a/.jscs.json
+++ b/.jscsrc
@@ -9,5 +9,5 @@
"checkRedundantParams": true
},
"validateIndentation": "\t",
- "excludeFiles": ["javascripts/externals/*","javascripts/externals/*/*",
"javascripts/README.md"]
+ "excludeFiles": ["javascripts/externals/**/*.js", "javascripts/README.md"]
}
diff --git a/Gruntfile.js b/Gruntfile.js
index 87b90a7..58ee11f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -14,12 +14,11 @@
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.initConfig( {
- pkg: grunt.file.readJSON( 'package.json' ),
URL: process.env.URL || 'http://127.0.0.1:8080/w/index.php/',
QUNIT_FILTER: (process.env.QUNIT_FILTER &&
'&filter='+process.env.QUNIT_FILTER) || '',
files: {
js: 'javascripts/**/*.js',
- jsTests: 'tests/qunit/**/*.js',
+ jsTests: 'tests/qunit/**/*.js'
},
jshint: {
options: {
@@ -31,10 +30,7 @@
]
},
jscs: {
- src: '<%= jshint.all %>',
- options: {
- config: '.jscs.json'
- }
+ src: '<%= jshint.all %>'
},
qunit: {
all: {
diff --git a/Makefile b/Makefile
index f360c1f..f2245de 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@
@find javascripts -type f -name "*.js" -not -path "**externals**" -exec
node_modules/.bin/js-beautify -r {} \;
jscs: nodecheck ## Check the JavaScript coding style
- @node_modules/.bin/jscs javascripts/* --config .jscs.json
+ @node_modules/.bin/jscs javascripts/* --config .jscsrc
jshinttests: nodecheck ## Lint the QUnit tests
@node_modules/.bin/jshint tests/qunit/* --config .jshintrc
--
To view, visit https://gerrit.wikimedia.org/r/169548
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43604998687200f046e2a74bfa205df77c164371
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Robmoen <rm...@wikimedia.org>
Gerrit-Reviewer: Awjrichards <aricha...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
