From 48f3e0cf9d58a43ca3284982ca89a24447c6e3c7 Mon Sep 17 00:00:00 2001 From: nod_ Date: Fri, 13 Sep 2024 16:33:23 +0200 Subject: [PATCH] Issue #3474108 by tomomi: Replace eslint-plugin-jquery with eslint-plugin-no-jquery --- core/.eslintrc.jquery.json | 100 +++++++++--------- core/misc/ajax.js | 2 +- .../js/js_testing_ajax_request_test.js | 2 +- core/package.json | 2 +- core/yarn.lock | 12 +-- 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/core/.eslintrc.jquery.json b/core/.eslintrc.jquery.json index 905c8040ca7..164ac299c17 100644 --- a/core/.eslintrc.jquery.json +++ b/core/.eslintrc.jquery.json @@ -1,56 +1,56 @@ { "plugins": [ - "jquery" + "no-jquery" ], "rules": { - "jquery/no-ajax": 0, - "jquery/no-ajax-events": 2, - "jquery/no-animate": 2, - "jquery/no-attr": 0, - "jquery/no-bind": 2, - "jquery/no-class": 0, - "jquery/no-clone": 2, - "jquery/no-closest": 0, - "jquery/no-css": 2, - "jquery/no-data": 0, - "jquery/no-deferred": 0, - "jquery/no-delegate": 2, - "jquery/no-each": 0, - "jquery/no-extend": 0, - "jquery/no-fade": 0, - "jquery/no-filter": 0, - "jquery/no-find": 0, - "jquery/no-global-eval": 2, - "jquery/no-grep": 2, - "jquery/no-has": 0, - "jquery/no-hide": 0, - "jquery/no-html": 0, - "jquery/no-in-array": 0, - "jquery/no-is-array": 0, - "jquery/no-is-function": 2, - "jquery/no-is": 2, - "jquery/no-load": 2, - "jquery/no-map": 2, - "jquery/no-merge": 2, - "jquery/no-param": 2, - "jquery/no-parent": 0, - "jquery/no-parents": 0, - "jquery/no-parse-html": 2, - "jquery/no-prop": 0, - "jquery/no-proxy": 2, - "jquery/no-ready": 2, - "jquery/no-serialize": 2, - "jquery/no-show": 0, - "jquery/no-size": 2, - "jquery/no-sizzle": 0, - "jquery/no-slide": 0, - "jquery/no-submit": 2, - "jquery/no-text": 2, - "jquery/no-toggle": 0, - "jquery/no-trigger": 0, - "jquery/no-trim": 2, - "jquery/no-val": 2, - "jquery/no-when": 2, - "jquery/no-wrap": 0 + "no-jquery/no-ajax": 0, + "no-jquery/no-ajax-events": 2, + "no-jquery/no-animate": 2, + "no-jquery/no-attr": 0, + "no-jquery/no-bind": 2, + "no-jquery/no-class": 0, + "no-jquery/no-clone": 2, + "no-jquery/no-closest": 0, + "no-jquery/no-css": 2, + "no-jquery/no-data": 0, + "no-jquery/no-deferred": 0, + "no-jquery/no-delegate": 2, + "no-jquery/no-each": 0, + "no-jquery/no-extend": 0, + "no-jquery/no-fade": 0, + "no-jquery/no-filter": 0, + "no-jquery/no-find": 0, + "no-jquery/no-global-eval": 2, + "no-jquery/no-grep": 2, + "no-jquery/no-has": 0, + "no-jquery/no-hide": 0, + "no-jquery/no-html": 0, + "no-jquery/no-in-array": 0, + "no-jquery/no-is-array": 0, + "no-jquery/no-is-function": 2, + "no-jquery/no-is": 2, + "no-jquery/no-load": 2, + "no-jquery/no-map": 2, + "no-jquery/no-merge": 2, + "no-jquery/no-param": 2, + "no-jquery/no-parent": 0, + "no-jquery/no-parents": 0, + "no-jquery/no-parse-html": 2, + "no-jquery/no-prop": 0, + "no-jquery/no-proxy": 2, + "no-jquery/no-ready": 2, + "no-jquery/no-serialize": 2, + "no-jquery/no-show": 0, + "no-jquery/no-size": 2, + "no-jquery/no-sizzle": 0, + "no-jquery/no-slide": 0, + "no-jquery/no-submit": 2, + "no-jquery/no-text": 2, + "no-jquery/no-toggle": 0, + "no-jquery/no-trigger": 0, + "no-jquery/no-trim": 2, + "no-jquery/no-val": 2, + "no-jquery/no-when": 2, + "no-jquery/no-wrap": 0 } } \ No newline at end of file diff --git a/core/misc/ajax.js b/core/misc/ajax.js index 89b9d927669..bf99ed8636a 100644 --- a/core/misc/ajax.js +++ b/core/misc/ajax.js @@ -1525,7 +1525,7 @@ * The XMLHttpRequest status. */ css(ajax, response, status) { - // eslint-disable-next-line jquery/no-css + // eslint-disable-next-line no-jquery/no-css $(response.selector).css(response.argument); }, diff --git a/core/modules/system/tests/modules/js_testing_ajax_request_test/js/js_testing_ajax_request_test.js b/core/modules/system/tests/modules/js_testing_ajax_request_test/js/js_testing_ajax_request_test.js index 471ea82764c..1b3da0b7685 100644 --- a/core/modules/system/tests/modules/js_testing_ajax_request_test/js/js_testing_ajax_request_test.js +++ b/core/modules/system/tests/modules/js_testing_ajax_request_test/js/js_testing_ajax_request_test.js @@ -5,7 +5,7 @@ window.drupalCumulativeXhrCount = 0; (function ($) { // jQuery.active alone is unable to detect whether an XHR request ever occurred. - /* eslint-disable jquery/no-ajax-events */ + /* eslint-disable no-jquery/no-ajax-events */ $(document) .on('ajaxSend', function () { window.drupalCumulativeXhrCount++; diff --git a/core/package.json b/core/package.json index f466e001dff..d4b545e6cad 100644 --- a/core/package.json +++ b/core/package.json @@ -69,7 +69,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-formatter-gitlab": "^5.1.0", "eslint-plugin-import": "^2.29.1", - "eslint-plugin-jquery": "^1.5.1", + "eslint-plugin-no-jquery": "^3.0.2", "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-yml": "^1.14.0", "glob": "11.0.0", diff --git a/core/yarn.lock b/core/yarn.lock index 1145aee6505..7230d884a64 100644 --- a/core/yarn.lock +++ b/core/yarn.lock @@ -2406,7 +2406,7 @@ __metadata: eslint-config-prettier: "npm:^9.1.0" eslint-formatter-gitlab: "npm:^5.1.0" eslint-plugin-import: "npm:^2.29.1" - eslint-plugin-jquery: "npm:^1.5.1" + eslint-plugin-no-jquery: "npm:^3.0.2" eslint-plugin-prettier: "npm:^5.2.1" eslint-plugin-yml: "npm:^1.14.0" glob: "npm:11.0.0" @@ -4389,12 +4389,12 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jquery@npm:^1.5.1": - version: 1.5.1 - resolution: "eslint-plugin-jquery@npm:1.5.1" +"eslint-plugin-no-jquery@npm:^3.0.2": + version: 3.0.2 + resolution: "eslint-plugin-no-jquery@npm:3.0.2" peerDependencies: - eslint: ">=5.4.0" - checksum: 10c0/2b72a3c7600b7524e9f6d323bfcb5f9e6557c86e9bc7e473913bc7b94d2c3bf17f61dfd9d0f72d089a955de2930625cbcb0e991e7f92e7b56b6fe1930123c678 + eslint: ">=8.0.0" + checksum: 10c0/1f8564ba673553779d41d8239d080bd1774dfe5b588a12b89015499168160297647c860b8c34eeaeab90b6f222190703f19a8d7fab4d45c1ff780feca3c55600 languageName: node linkType: hard