Merge branch 'main' into node-20-ci

client-common.json

@@ -1,16 +1,3 @@
 {
-	"extends": [
-		"./common"
-	],
-	"env": {
-		"browser": true
-	},
-	"plugins": [ "unicorn" ],
-	"rules": {
-		"no-alert": "error",
-		"no-console": "error",
-		"no-implied-eval": "error",
-		"unicorn/no-invalid-remove-event-listener": "error",
-		"security/detect-possible-timing-attacks": "off"
-	}
+	"extends": "./client/common"
 }

client-es5.json

@@ -0,0 +1,3 @@
+{
+	"extends": "./client/es5"
+}

client-es6.json

@@ -1,7 +1,3 @@
 {
-	"extends": [
-		"./client-common",
-		"./language/es6",
-		"./vue-es6"
-	]
+	"extends": "./client/es6"
 }

client.json

@@ -1,5 +1,3 @@
 {
-	"extends": [
-		"./client-es6"
-	]
+	"extends": "./client/es6"
 }

client/common.json

@@ -0,0 +1,16 @@
+{
+	"extends": [
+		"../common"
+	],
+	"env": {
+		"browser": true
+	},
+	"plugins": [ "unicorn" ],
+	"rules": {
+		"no-alert": "error",
+		"no-console": "error",
+		"no-implied-eval": "error",
+		"unicorn/no-invalid-remove-event-listener": "error",
+		"security/detect-possible-timing-attacks": "off"
+	}
+}

client-es5.js → client/es5.json

@@ -1,11 +1,8 @@
-'use strict';
-
-/* eslint-disable quote-props, quotes */
-module.exports = {
+{
 	"extends": [
-		"./client-common",
-		"./language/es5",
-		"./vue2-es5"
+		"./common",
+		"../language/es5",
+		"../vue2/es5"
 	],
 	"rules": {
 		"no-restricted-properties": [
@@ -16,4 +13,4 @@ module.exports = {
 			}
 		]
 	}
-};
+}

client/es6.json

@@ -0,0 +1,7 @@
+{
+	"extends": [
+		"./common",
+		"../language/es6",
+		"../vue/es6"
+	]
+}

mediawiki-qunit.json

@@ -1,18 +1,3 @@
 {
-	"extends": [
-		"./client-common",
-		"./language/es2022",
-		"./jquery",
-		"./mediawiki",
-		"./qunit"
-	],
-	"globals": {
-		"sinon": "readonly"
-	},
-	"rules": {
-		"compat/compat": [ "error", "last 2 chrome versions, last 2 firefox versions, last 2 safari versions" ],
-		"max-len": "off",
-		"no-jquery/no-global-selector": "off",
-		"no-jquery/no-parse-html-literal": "off"
-	}
+	"extends": "./mediawiki/qunit"
 }

mediawiki.json

@@ -0,0 +1,3 @@
+{
+	"extends": "./mediawiki/common"
+}

mediawiki.js → mediawiki/common.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const commonRules = require( './common' );
+const commonRules = require( '../common' );
 const browsers = require( 'browserslist-config-wikimedia/modern' );
 
 /* eslint-disable quote-props, quotes */
@@ -55,6 +55,8 @@ config.rules[ 'max-len' ][ 1 ].ignorePattern =
 	')';
 // Duplicate JSON override from common rules to prevent max-len rule here taking precedent
 const jsonOverride = commonRules.overrides.find( ( override ) => override.parser === 'eslint-plugin-json-es' );
+// Adjust path, keep in sync with common.json
+jsonOverride.extends = '../json';
 config.overrides.push( jsonOverride );
 
 module.exports = config;

mediawiki/qunit.json

@@ -0,0 +1,18 @@
+{
+	"extends": [
+		"../client/common",
+		"../language/es2022",
+		"../jquery",
+		"../mediawiki",
+		"../qunit"
+	],
+	"globals": {
+		"sinon": "readonly"
+	},
+	"rules": {
+		"compat/compat": [ "error", "last 2 chrome versions, last 2 firefox versions, last 2 safari versions" ],
+		"max-len": "off",
+		"no-jquery/no-global-selector": "off",
+		"no-jquery/no-parse-html-literal": "off"
+	}
+}

package.json

@@ -27,15 +27,15 @@
 		"common.json",
 		"client.json",
 		"client-common.json",
-		"client-es5.js",
+		"client-es5.json",
 		"client-es6.json",
 		"node.json",
 		"jest.json",
 		"jquery.json",
 		"jsdoc.json",
 		"jsduck.json",
 		"json.json",
-		"mediawiki.js",
+		"mediawiki.json",
 		"mediawiki-qunit.json",
 		"mocha.json",
 		"qunit.json",
@@ -46,12 +46,16 @@
 		"vue3-common.json",
 		"vue-es5.json",
 		"vue-es6.json",
-		"vue2-es5.js",
-		"vue2-es6.js",
-		"vue3-es6.js",
-		"vue-wrappers.js",
+		"vue2-es5.json",
+		"vue2-es6.json",
+		"vue3-es6.json",
 		"yaml.json",
-		"language"
+		"client/",
+		"language/",
+		"mediawiki/",
+		"vue/",
+		"vue2/",
+		"vue3/"
 	],
 	"contributors": [
 		"James D. Forrester <[email protected]>",

readme.md

@@ -18,18 +18,18 @@ It also automatically applies the Vue plugin and Vue-specific rules to `.vue` fi
 `.eslintrc.json`:
 ```json
 {
-	"extends": "wikimedia/client-es6"
+	"extends": "wikimedia/client/es6"
 }
 ```
-If you want to only allow ES5 code and browser native functions, you can use `wikimedia/client-es5` instead.
+If you want to only allow ES5 code and browser native functions, you can use `wikimedia/client/es5` instead.
 
 #### jQuery
 This config adds the jQuery `$` global, and additional rules preventing the use of jQuery features which are deprecated, have performance issues, or have simple ES6 alternatives.
 `.eslintrc.json`:
 ```json
 {
 	"extends": [
-		"wikimedia/client-es6",
+		"wikimedia/client/es6",
 		"wikimedia/jquery"
 	]
 }
@@ -41,7 +41,7 @@ Code that runs in MediaWiki can use this config. It enforces rules that are spec
 ```json
 {
 	"extends": [
-		"wikimedia/client-es6",
+		"wikimedia/client/es6",
 		"wikimedia/mediawiki"
 	]
 }
@@ -54,7 +54,7 @@ You can extend the above config by also adding a second `.eslintrc.json` file in
 ```json
 {
 	"extends": [
-		"wikimedia/mediawiki-qunit"
+		"wikimedia/mediawiki/qunit"
 	]
 }
 ```

test/fixtures/client/common/.eslintrc.json

@@ -0,0 +1,4 @@
+{
+	"root": true,
+	"extends": "../../../../client/common"
+}

test/fixtures/client/es5/.eslintrc.json

@@ -0,0 +1,4 @@
+{
+	"root": true,
+	"extends": "../../../../client/es5"
+}

test/fixtures/client/es6/.eslintrc.json

@@ -0,0 +1,4 @@
+{
+	"root": true,
+	"extends": "../../../../client/es6"
+}

test/fixtures/jest/.eslintrc.json

@@ -1,7 +1,7 @@
 {
 	"root": true,
 	"extends": [
-		"../../../client-es6",
+		"../../../client/es6",
 		"../../../mediawiki",
 		"../../../jest"
 	]

test/fixtures/jquery/.eslintrc.json

@@ -1,7 +1,7 @@
 {
 	"root": true,
 	"extends": [
-		"../../../client-es5",
+		"../../../client/es5",
 		"../../../jquery"
 	]
 }

test/fixtures/jsdoc/.eslintrc.json

@@ -1,7 +1,7 @@
 {
 	"root": true,
 	"extends": [
-		"../../../client-es6",
+		"../../../client/es6",
 		"../../../jsdoc"
 	],
 	"rules": {

test/fixtures/jsduck/.eslintrc.json

@@ -1,7 +1,7 @@
 {
 	"root": true,
 	"extends": [
-		"../../../client-es5",
+		"../../../client/es5",
 		"../../../jsduck"
 	],
 	"rules": {

test/fixtures/mediawiki/.eslintrc.json → test/fixtures/mediawiki/common/.eslintrc.json

@@ -1,8 +1,8 @@
 {
 	"root": true,
 	"extends": [
-		"../../../client-es5",
-		"../../../mediawiki"
+		"../../../../client/es5",
+		"../../../../mediawiki"
 	],
 	"rules": {
 		"json-es/use-valid-json": "off"

test/fixtures/mediawiki/common/es6/.eslintrc.json

@@ -0,0 +1,7 @@
+{
+	"root": true,
+	"extends": [
+		"../../../../../client/es6",
+		"../../../../../mediawiki"
+	]
+}

test/fixtures/mediawiki-qunit/.eslintrc.json → test/fixtures/mediawiki/qunit/.eslintrc.json

@@ -1,6 +1,6 @@
 {
 	"root": true,
 	"extends": [
-		"../../../mediawiki-qunit"
+		"../../../../mediawiki/qunit"
 	]
 }

test/fixtures/mocha/.eslintrc.json

@@ -10,7 +10,7 @@
 		{
 			"files": [ "*-client.js" ],
 			"extends": [
-				"../../../client-es5"
+				"../../../client/es5"
 			]
 		},
 		{

test/fixtures/qunit/.eslintrc.json

@@ -1,7 +1,7 @@
 {
 	"root": true,
 	"extends": [
-		"../../../client-common",
+		"../../../client/common",
 		"../../../language/es2017",
 		"../../../qunit"
 	]

test/fixtures/vue-es5/.eslintrc.json → test/fixtures/vue/es5/.eslintrc.json

@@ -1,6 +1,6 @@
 {
 	"root": true,
-	"extends": "../../../vue-es5",
+	"extends": "../../../../vue/es5",
 	"globals": {
 		"module": "readonly"
 	}

test/fixtures/vue-es6/.eslintrc.json → test/fixtures/vue/es6/.eslintrc.json

@@ -1,6 +1,6 @@
 {
 	"root": true,
-	"extends": "../../../vue-es6",
+	"extends": "../../../../vue/es6",
 	"globals": {
 		"module": "readonly"
 	}

test/fixtures/vue-wrappers/.eslintrc.json → test/fixtures/vue/wrappers/.eslintrc.json

@@ -1,6 +1,6 @@
 {
 	"root": true,
-	"extends": "../../../vue2-common",
+	"extends": "../../../../vue2/common",
 	"globals": {
 		"module": "readonly"
 	}

test/fixtures/vue2-common/.eslintrc.json → test/fixtures/vue2/common/.eslintrc.json

@@ -1,6 +1,6 @@
 {
 	"root": true,
-	"extends": "../../../vue2-common",
+	"extends": "../../../../vue2/common",
 	"globals": {
 		"module": "readonly"
 	}