From e5a5bfe0d5f6da32eaa2367285460a757d999541 Mon Sep 17 00:00:00 2001 From: nod_ Date: Thu, 5 Dec 2024 11:14:11 +0100 Subject: [PATCH] Issue #3474108 by smustgrave, tomomi, quietone, nod_, spokje: Replace eslint-plugin-jquery with eslint-plugin-no-jquery --- core/.eslintrc.jquery.json | 100 +++++++++--------- core/misc/ajax.js | 2 +- .../filter/filter.filter_html.admin.js | 3 +- .../js/js_testing_ajax_request_test.js | 2 +- core/package.json | 2 +- core/yarn.lock | 8 +- 6 files changed, 59 insertions(+), 58 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 b29bf05a67f..8a031a5feae 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/filter/filter.filter_html.admin.js b/core/modules/filter/filter.filter_html.admin.js index 87eef5bb93c..d6f7d61d8ac 100644 --- a/core/modules/filter/filter.filter_html.admin.js +++ b/core/modules/filter/filter.filter_html.admin.js @@ -159,7 +159,7 @@ .forEach((tag) => { userTagsWithoutOverrides[tag] = this.userTags[tag]; }); - + // eslint-disable-next-line no-jquery/no-val this.$allowedHTMLFormItem.val( `${this._generateSetting( userTagsWithoutOverrides, @@ -168,6 +168,7 @@ } // Restore to original state. else { + // eslint-disable-next-line no-jquery/no-val this.$allowedHTMLFormItem.val(this._generateSetting(this.userTags)); } }, 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 4289e06b04c..6e093218d2a 100644 --- a/core/package.json +++ b/core/package.json @@ -70,7 +70,7 @@ "eslint-config-prettier": "^9.0.0", "eslint-formatter-gitlab": "^5.0.0", "eslint-plugin-import": "^2.25.4", - "eslint-plugin-jquery": "^1.5.1", + "eslint-plugin-no-jquery": "^3.0.2", "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-yml": "^1.8.0", "glob": "10.3.5", diff --git a/core/yarn.lock b/core/yarn.lock index 3215ce6834b..49c5aba11aa 100644 --- a/core/yarn.lock +++ b/core/yarn.lock @@ -3027,10 +3027,10 @@ eslint-plugin-import@^2.25.4: semver "^6.3.1" tsconfig-paths "^3.15.0" -eslint-plugin-jquery@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jquery/-/eslint-plugin-jquery-1.5.1.tgz#d6bac643acf9484ce76394e27e2b07baca06662e" - integrity sha512-L7v1eaK5t80C0lvUXPFP9MKnBOqPSKhCOYyzy4LZ0+iK+TJwN8S9gAkzzP1AOhypRIwA88HF6phQ9C7jnOpW8w== +eslint-plugin-no-jquery@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-3.0.2.tgz#34693874c260634cc06fdfd1896b2cc77c252e7e" + integrity sha512-n/+6p6PFhWDNPVLJj1463hw4OTIRBbROGcbhmtOHTgw7yihSKzkwZiQ00EJTneyeR3jRiw5lpWSMCCBhtb8t2g== eslint-plugin-prettier@^5.0.1: version "5.1.3"