diff --git a/.eslintrc.json b/.eslintrc.json index c47c6ae6..1a3f189b 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -2,10 +2,10 @@ "root": true, "extends": [ "wikimedia/client", - "wikimedia/jquery" + "wikimedia/jquery", + "wikimedia/mediawiki" ], "globals": { - "mw": false, "OO": false } } diff --git a/Gruntfile.js b/Gruntfile.js index 03e77640..ddbbd01a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -19,7 +19,7 @@ module.exports = function ( grunt ) { cache: true }, all: [ - '**/*.js{,on}', + '**/*.{js,json}', '!{vendor,node_modules}/**' ] } diff --git a/package-lock.json b/package-lock.json index 01d3dc56..8dac72f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -345,37 +345,46 @@ } }, "eslint-config-wikimedia": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.15.0.tgz", - "integrity": "sha512-aW3ETh3MSZCNrEeehZZfLBGhaH1t928/YkQ9p7a4aB1ZX1G8uuw8jj7izkr0iJj3da42ZPZbnsjT3G5nmAwinw==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.15.1.tgz", + "integrity": "sha512-Q7bpGBIzOqXmPEh4R5zgIDGZepCji77YHOWZT++U4P+tgbs0DisDwgP6krn7pPt3E7tc7L6876PpU1g0JQhAcw==", "dev": true, "requires": { - "eslint": "^6.5.1", - "eslint-plugin-json": "^1.4.0", - "eslint-plugin-mediawiki": "^0.1.0", - "eslint-plugin-no-jquery": "^2.3.0", + "eslint": "^6.8.0", + "eslint-plugin-json": "^2.1.1", + "eslint-plugin-mediawiki": "^0.2.1", + "eslint-plugin-no-jquery": "^2.3.2", "eslint-plugin-qunit": "^4.0.0" } }, "eslint-plugin-json": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-json/-/eslint-plugin-json-1.4.0.tgz", - "integrity": "sha512-CECvgRAWtUzuepdlPWd+VA7fhyF9HT183pZnl8wQw5x699Mk/MbME/q8xtULBfooi3LUbj6fToieNmsvUcDxWA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-json/-/eslint-plugin-json-2.1.1.tgz", + "integrity": "sha512-Ktsab8ij33V2KFLhh4alC1FYztdmbV32DeMZYYUCZm4kKLW1s4DrleKKgtbAHSJsmshCK5QGOZtfyc2r3jCRsg==", "dev": true, "requires": { - "vscode-json-languageservice": "^3.2.1" + "lodash": "^4.17.15", + "vscode-json-languageservice": "^3.5.1" + }, + "dependencies": { + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true + } } }, "eslint-plugin-mediawiki": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-mediawiki/-/eslint-plugin-mediawiki-0.1.0.tgz", - "integrity": "sha512-OiRH4axfR+TOFbw/7fKHakgleo0z9nXAiLzN7Bo1iqQNK9QTTK0v1MqQUfJXy4SfDQih7g1yHUDl80Ea1oinmQ==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-mediawiki/-/eslint-plugin-mediawiki-0.2.1.tgz", + "integrity": "sha512-KMjmOi5JSXMJ0LX5SWO8p0I4psdAs52CQJ8zVu1y8aluWoRUQRK0CtArgc+olTUjOzL37O6nlNO2PNWpy0mRuw==", "dev": true }, "eslint-plugin-no-jquery": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.3.1.tgz", - "integrity": "sha512-/fiQUBSOMUETnfBuiK5ewvtRbek1IRTy5ov/6RZ6nlybvZ337vyGaNPWM1KgaIoIeN7dairNrPfq0h7A0tpT3A==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.3.2.tgz", + "integrity": "sha512-8M9GByb/JOO+dktgbFeC/YAMaqlscInO3fH3A9fLxZduH1NTXsIAUrimas6zDwOLBvEXpRaEZycc2QAl+W+Agw==", "dev": true }, "eslint-plugin-qunit": { @@ -694,9 +703,9 @@ } }, "grunt-banana-checker": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/grunt-banana-checker/-/grunt-banana-checker-0.8.1.tgz", - "integrity": "sha512-fx3lqZZFL9EihNI4BpwNmcjsb5tCVfa/xWVXLT3fipSOrLr/BsWdAUTltscTx55/tSwSR8VbJOulI00e1WTtoA==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/grunt-banana-checker/-/grunt-banana-checker-0.9.0.tgz", + "integrity": "sha512-SqPiB6OazWqR8USL0NymtuT5Br3mD9WBBsM1rHC/3wIi2SrZNM6/+j9CIeuEM5oCn+AtO2Y0+rzzFyOdC9afAg==", "dev": true }, "grunt-eslint": { @@ -935,9 +944,9 @@ "dev": true }, "jsonc-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.0.tgz", - "integrity": "sha512-4fLQxW1j/5fWj6p78vAlAafoCKtuBm6ghv+Ij5W2DrDx0qE+ZdEl2c6Ko1mgJNF5ftX1iEWQQ4Ap7+3GlhjkOA==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.1.tgz", + "integrity": "sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w==", "dev": true }, "levn": { @@ -1612,34 +1621,34 @@ } }, "vscode-json-languageservice": { - "version": "3.4.11", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.4.11.tgz", - "integrity": "sha512-26Qv1SFp6x3XmCqU1BRceRsSKRO3xkQa6/K8ziSRt52/LQPiw5ipSxlGVSlzIoi5LCmQVEqUajhiVEMNlFXhNw==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.5.2.tgz", + "integrity": "sha512-9cUvBq00O08lpWVVOx6tQ1yLxCHss79nsUdEAVYGomRyMbnPBmc0AkYPcXI9WK1EM6HBo0R9Zo3NjFhcICpy4A==", "dev": true, "requires": { - "jsonc-parser": "^2.2.0", - "vscode-languageserver-textdocument": "^1.0.0-next.5", - "vscode-languageserver-types": "^3.15.0-next.9", + "jsonc-parser": "^2.2.1", + "vscode-languageserver-textdocument": "^1.0.1", + "vscode-languageserver-types": "^3.15.1", "vscode-nls": "^4.1.1", "vscode-uri": "^2.1.1" } }, "vscode-languageserver-textdocument": { - "version": "1.0.0-next.5", - "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.0-next.5.tgz", - "integrity": "sha512-1jp/zAidN/bF/sqPimhBX1orH5G4rzRw63k75TesukJDuxm8yW79ECStWbDSy41BHGOwSGN4M69QFvhancSr5A==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz", + "integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==", "dev": true }, "vscode-languageserver-types": { - "version": "3.15.0-next.9", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.9.tgz", - "integrity": "sha512-Rl/8qJ6932nrHCdPn+9y0x08uLVQaSLRG+U4JzhyKpWU4eJbVaDRoAcz1Llj7CErJGbPr6kdBvShPy5fRfR+Uw==", + "version": "3.15.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz", + "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==", "dev": true }, "vscode-nls": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.1.tgz", - "integrity": "sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz", + "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==", "dev": true }, "vscode-uri": { diff --git a/package.json b/package.json index 90ce1d1b..9f643984 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,9 @@ "test": "grunt test" }, "devDependencies": { - "eslint-config-wikimedia": "0.15.0", + "eslint-config-wikimedia": "0.15.1", "grunt": "1.1.0", - "grunt-banana-checker": "0.8.1", + "grunt-banana-checker": "0.9.0", "grunt-eslint": "22.0.0" } }