jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393877 )
Change subject: Update dependencies to accommodate eslint config updates
......................................................................
Update dependencies to accommodate eslint config updates
Needed to prevent eslint-related errors in CI builds.
Also add an nsprc with an exception for moment.js to fix the build until
an upstream fix is released.
Bug: T181564
Change-Id: Icaf8b2cd5bde633b82cadb3fdc8eae32b5c6911b
---
A .nsprc
M lib/swagger-ui.js
M package.json
3 files changed, 11 insertions(+), 5 deletions(-)
Approvals:
Mobrovac: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.nsprc b/.nsprc
new file mode 100644
index 0000000..98b2ef4
--- /dev/null
+++ b/.nsprc
@@ -0,0 +1,5 @@
+{
+ "exceptions": [
+ "https://nodesecurity.io/advisories/532";
+ ]
+}
diff --git a/lib/swagger-ui.js b/lib/swagger-ui.js
index 9e39ff5..a85985c 100644
--- a/lib/swagger-ui.js
+++ b/lib/swagger-ui.js
@@ -33,7 +33,7 @@
.replace(/((?:src|href)=['"])/g, '$1?doc&path=')
// Some self-promotion
.replace(/<a id="logo".*?<\/a>/,
- `<a id="logo"
href="${app.info.homepage}">${app.info.name}</a>`)
+ `<a id="logo"
href="${app.info.homepage}">${app.info.name}</a>`)
.replace(/<title>[^<]*<\/title>/,
`<title>${app.info.name}</title>`)
// Replace the default url with ours, switch off validation &
// limit the size of documents to apply syntax highlighting to
diff --git a/package.json b/package.json
index 9d8d083..c0446ba 100644
--- a/package.json
+++ b/package.json
@@ -45,16 +45,17 @@
"wikipedia-edits-scorer": "^1.5.7"
},
"devDependencies": {
+ "ajv": "^5.5.0",
"extend": "^3.0.1",
"istanbul": "^0.4.5",
"mocha": "^4.0.1",
"mocha-jshint": "^2.3.1",
"mocha-lcov-reporter": "^1.3.0",
"nsp": "^2.8.1",
- "mocha-eslint": "^3.0.1",
- "eslint": "^3.12.0",
- "eslint-config-node-services": "^2.0.2",
- "eslint-config-wikimedia": "^0.4.0",
+ "mocha-eslint": "^4.1.0",
+ "eslint": "^4.12.0",
+ "eslint-config-node-services": "^2.2.5",
+ "eslint-config-wikimedia": "^0.5.0",
"eslint-plugin-json": "^1.2.0",
"eslint-plugin-jsdoc": "^3.0.0"
},
--
To view, visit https://gerrit.wikimedia.org/r/393877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icaf8b2cd5bde633b82cadb3fdc8eae32b5c6911b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Ppchelko <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
