jenkins-bot has submitted this change and it was merged.
Change subject: Upgrade to jscs 2.0 and pin versions of serialization components
......................................................................
Upgrade to jscs 2.0 and pin versions of serialization components
Disable some rules that we don't yet follow.
Ignore extensions directory that may be there from composer.
the serialization components need to be pinned to 1.4.0. apparently
more recent versions have some incompatibilities. In the deployment
build, we will update wikibase only,
Bug: T107124
Change-Id: I40763f23ad907bb5dbe496fad370d22df0d091be
(cherry picked from commit db9224a519a05b2a7f80c8d3b6084f96b6e4fda6)
---
M .jscsrc
M composer.json
M package.json
3 files changed, 20 insertions(+), 6 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jscsrc b/.jscsrc
index f66f6bd..312c030 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -3,12 +3,26 @@
"preset": "wikimedia",
// ----
- // Rules from wikimedia preset we don't follow
+ // Rules from wikimedia preset we don't yet? follow
"validateIndentation": null,
"requireMultipleVarDecl": null,
"disallowDanglingUnderscores": null,
- "requireSpacesInsideArrayBrackets": null,
+ "requireSpacesInsideBrackets": null,
+ "requireVarDeclFirst": null,
+ "jsDoc": {
+ // what we don't yet follow is commented out
+ //"checkAnnotations": "jsduck5",
+ //"checkParamNames": true,
+ "requireParamTypes": true,
+ "checkRedundantParams": true,
+ //"checkReturnTypes": true,
+ "checkRedundantReturns": true,
+ //"requireReturnTypes": true,
+ //"checkTypes": "capitalizedNativeCase",
+ "checkRedundantAccess": true
+ //"requireNewlineAfterDescription": true
+ },
// ----
// Own rules
@@ -24,5 +38,5 @@
"else"
],
- "excludeFiles": [ "node_modules/**", "vendor/**" ]
+ "excludeFiles": [ "node_modules/**", "vendor/**", "extensions/**" ]
}
diff --git a/composer.json b/composer.json
index 87885c5..943f9fd 100644
--- a/composer.json
+++ b/composer.json
@@ -37,9 +37,9 @@
"wikibase/data-model": "~3.0",
"wikibase/data-model-javascript": "^1.0.2",
- "wikibase/data-model-serialization": "~1.4",
+ "wikibase/data-model-serialization": "~1.4.0",
"wikibase/javascript-api": "~1.0",
- "wikibase/internal-serialization": "~1.4",
+ "wikibase/internal-serialization": "~1.4.0",
"wikibase/serialization-javascript": "~2.0",
"diff/diff": "~2.0|~1.0"
diff --git a/package.json b/package.json
index 2e22208..43022cd 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
"author": "The Wikidata team",
"license": "GPL-2.0+",
"devDependencies": {
- "jscs": "",
+ "jscs": ">=2.0",
"jshint": ""
}
}
--
To view, visit https://gerrit.wikimedia.org/r/227638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40763f23ad907bb5dbe496fad370d22df0d091be
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.26wmf13
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
