cyberes
/
ProtectedContactPage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Drop jsonlint and use ESLint for JSON linting instead 

Bug: T220036
Change-Id: I2f8d1fa462f0b298067e56924f313ddaaeacf44c
This commit is contained in:
Taavi Väänänen 2019-12-08 11:23:55 +02:00
parent 8ff3b41a62
commit fa99a11866
3 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Gruntfile.js
View File

@ -8,14 +8,16 @@
module.exports = function ( grunt ) { module.exports = function ( grunt ) {
var conf = grunt.file.readJSON( 'extension.json' ); var conf = grunt.file.readJSON( 'extension.json' );
grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-eslint' ); grunt.loadNpmTasks( 'grunt-eslint' );
grunt.initConfig( { grunt.initConfig( {
banana: conf.MessagesDirs, banana: conf.MessagesDirs,
eslint: { eslint: {
options: {
extensions: [ '.js', '.json' ]
},
all: [ all: [
'**/*.js', '**/*.js{,on}',
'!node_modules/**', '!node_modules/**',
'!vendor/**' '!vendor/**'
] ]
@ -29,6 +31,6 @@ module.exports = function ( grunt ) {
} }
} ); } );
grunt.registerTask( 'test', [ 'eslint', 'banana', 'jsonlint' ] ); grunt.registerTask( 'test', [ 'eslint', 'banana' ] );
grunt.registerTask( 'default', 'test' ); grunt.registerTask( 'default', 'test' );
}; };

39
package-lock.json generated
View File

@ -24,30 +24,6 @@
"js-tokens": "^4.0.0" "js-tokens": "^4.0.0"
} }
}, },
"@prantlf/jsonlint": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/@prantlf/jsonlint/-/jsonlint-6.2.1.tgz",
"integrity": "sha512-/qPFlMyAYpebu+xS7W9XUlpBrpWyHq9ElslIxfOpfKOxWy+p++gicvxtn7f4GJQ3ikyM738/IIDf6Ngl9ta18w==",
"dev": true,
"requires": {
"ajv": "6.10.0",
"commander": "2.20.0"
},
"dependencies": {
"ajv": {
"version": "6.10.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
"integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
"dev": true,
"requires": {
"fast-deep-equal": "^2.0.1",
"fast-json-stable-stringify": "^2.0.0",
"json-schema-traverse": "^0.4.1",
"uri-js": "^4.2.2"
}
}
}
},
"abbrev": { "abbrev": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@ -228,12 +204,6 @@
"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
"dev": true "dev": true
}, },
"commander": {
"version": "2.20.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
"integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
"dev": true
},
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@ -742,15 +712,6 @@
"eslint": "^6.0.1" "eslint": "^6.0.1"
} }
}, },
"grunt-jsonlint": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/grunt-jsonlint/-/grunt-jsonlint-2.0.0.tgz",
"integrity": "sha512-bCodmPAoHxujSST/Pn5FdR6K1QytaZhlYW3dyU5Ut27h1usDBPnoBLWb7EoPE2EmW1UgQTrSNu/qP9tUMBSrZg==",
"dev": true,
"requires": {
"@prantlf/jsonlint": "6.2.1"
}
},
"grunt-known-options": { "grunt-known-options": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.tgz", "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.tgz",

3
package.json
View File

@ -11,7 +11,6 @@
"eslint-config-wikimedia": "0.15.0", "eslint-config-wikimedia": "0.15.0",
"grunt": "1.0.4", "grunt": "1.0.4",
"grunt-banana-checker": "0.8.1", "grunt-banana-checker": "0.8.1",
"grunt-eslint": "22.0.0", "grunt-eslint": "22.0.0"
"grunt-jsonlint": "2.0.0"
} }
} }