Build: improve specificity of eslint config; add ecma versions

Closes gh-5501
This commit is contained in:
Timmy Willison 2024-06-06 09:56:44 -04:00 committed by GitHub
parent 46b9e4803e
commit 74970524e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 142 additions and 126 deletions

View File

@ -15,26 +15,6 @@ export default [
] ]
}, },
{
files: [
"eslint.config.js",
"Gruntfile.cjs",
"test/bundler_smoke_tests/**/*",
"test/node_smoke_tests/**",
"test/promises_aplus_adapters/**",
"test/middleware-mockserver.cjs"
],
languageOptions: {
globals: {
...globals.node
}
},
rules: {
...jqueryConfig.rules,
strict: [ "error", "global" ]
}
},
// Source // Source
{ {
files: [ "src/**" ], files: [ "src/**" ],
@ -42,6 +22,7 @@ export default [
import: importPlugin import: importPlugin
}, },
languageOptions: { languageOptions: {
ecmaVersion: 2015,
// The browser env is not enabled on purpose so that code takes // The browser env is not enabled on purpose so that code takes
// all browser-only globals from window instead of assuming // all browser-only globals from window instead of assuming
@ -84,6 +65,7 @@ export default [
outerIIFEBody: 0 outerIIFEBody: 0
} }
], ],
"no-implicit-globals": "error",
"one-var": [ "error", { var: "always" } ], "one-var": [ "error", { var: "always" } ],
strict: [ "error", "function" ] strict: [ "error", "function" ]
} }
@ -159,7 +141,10 @@ export default [
// Tests // Tests
{ {
files: [ files: [
"test/**" "test/*",
"test/data/**",
"test/integration/**",
"test/unit/**"
], ],
ignores: [ ignores: [
"test/data/jquery-3.7.1.js", "test/data/jquery-3.7.1.js",
@ -170,11 +155,11 @@ export default [
"test/data/core/jquery-iterability-transpiled.js" "test/data/core/jquery-iterability-transpiled.js"
], ],
languageOptions: { languageOptions: {
ecmaVersion: 2015,
sourceType: "script",
globals: { globals: {
...globals.browser, ...globals.browser,
require: false, require: false,
Promise: false,
Symbol: false,
trustedTypes: false, trustedTypes: false,
QUnit: false, QUnit: false,
ajaxTest: false, ajaxTest: false,
@ -186,32 +171,43 @@ export default [
moduleTeardown: false, moduleTeardown: false,
url: false, url: false,
q: false, q: false,
jQuery: true, jQuery: false,
sinon: true, $: false,
amdDefined: true, sinon: false,
fireNative: true, amdDefined: false,
Globals: true, fireNative: false,
hasPHP: true, Globals: false,
isLocal: true, hasPHP: false,
supportjQuery: true, isLocal: false,
originaljQuery: true, supportjQuery: false,
$: true, originaljQuery: false,
original$: true, original$: false,
baseURL: true, baseURL: false,
externalHost: true externalHost: false
} }
}, },
rules: { rules: {
...jqueryConfig.rules, ...jqueryConfig.rules,
strict: [ "error", "function" ],
// See https://github.com/eslint/eslint/issues/2342 "no-unused-vars": [
"no-unused-vars": "off", "error",
{ args: "after-used", argsIgnorePattern: "^_" }
],
// Too many errors // Too many errors
"max-len": "off", "max-len": "off",
camelcase: "off", camelcase: "off"
"one-var": "off" }
},
{
files: [
"test/unit/core.js"
],
rules: {
// Core has several cases where unused vars are expected
"no-unused-vars": "off"
} }
}, },
@ -220,10 +216,10 @@ export default [
"test/runner/**/*.js" "test/runner/**/*.js"
], ],
languageOptions: { languageOptions: {
ecmaVersion: "latest",
globals: { globals: {
...globals.node ...globals.node
}, }
sourceType: "module"
}, },
rules: { rules: {
...jqueryConfig.rules ...jqueryConfig.rules
@ -234,17 +230,40 @@ export default [
files: [ "test/runner/listeners.js" ], files: [ "test/runner/listeners.js" ],
languageOptions: { languageOptions: {
ecmaVersion: 5, ecmaVersion: 5,
sourceType: "script" sourceType: "script",
globals: {
...globals.browser,
QUnit: false,
Symbol: false
}
} }
}, },
{ {
files: [ files: [
"test/data/testinit.js",
"test/data/testrunner.js", "test/data/testrunner.js",
"test/data/core/jquery-iterability-transpiled-es6.js" "test/data/core/jquery-iterability-transpiled-es6.js"
], ],
languageOptions: { languageOptions: {
sourceType: "script" ecmaVersion: 2015,
sourceType: "script",
globals: {
...globals.browser
}
},
rules: {
...jqueryConfig.rules,
strict: [ "error", "function" ]
}
},
{
files: [
"test/data/testinit.js"
],
rules: {
strict: [ "error", "global" ]
} }
}, },
@ -261,43 +280,30 @@ export default [
{ {
files: [ files: [
"test/bundler_smoke_tests/**", "build/**",
"eslint.config.js",
"test/node_smoke_tests/**", "test/node_smoke_tests/**",
"test/bundler_smoke_tests/**/*",
"test/promises_aplus_adapters/**", "test/promises_aplus_adapters/**",
"test/middleware-mockserver.cjs" "test/middleware-mockserver.cjs"
], ],
languageOptions: { languageOptions: {
ecmaVersion: "latest",
globals: { globals: {
...globals.node, ...globals.browser,
...globals.es2021 ...globals.node
}
},
rules: {
strict: [ "error", "global" ]
}
},
{
files: [
"build/**",
"test/data/testinit.js"
],
languageOptions: {
globals: {
...globals.node,
...globals.es2021
} }
}, },
rules: { rules: {
...jqueryConfig.rules, ...jqueryConfig.rules,
"no-implicit-globals": "error",
strict: [ "error", "global" ] strict: [ "error", "global" ]
} }
}, },
{ {
files: [ files: [
"build/**/*.js", "build/**/*.js"
"test/data/testinit.js"
], ],
languageOptions: { languageOptions: {
sourceType: "commonjs" sourceType: "commonjs"
@ -313,40 +319,26 @@ export default [
"dist-module/jquery.module.js", "dist-module/jquery.module.js",
"dist-module/jquery.slim.module.js", "dist-module/jquery.slim.module.js",
"dist-module/jquery.factory.module.js", "dist-module/jquery.factory.module.js",
"dist-module/jquery.factory.slim.module.js" "dist-module/jquery.factory.slim.module.js",
],
languageOptions: {
globals: {
...globals.es2021,
define: false,
module: false,
Symbol: false
}
}
},
{
files: [
"dist/jquery.bundler-require-wrapper.js", "dist/jquery.bundler-require-wrapper.js",
"dist/jquery.bundler-require-wrapper.slim.js", "dist/jquery.bundler-require-wrapper.slim.js",
"dist-module/jquery.node-module-wrapper.js", "dist-module/jquery.node-module-wrapper.js",
"dist-module/jquery.node-module-wrapper.slim.js" "dist-module/jquery.node-module-wrapper.slim.js"
], ],
languageOptions: { languageOptions: {
ecmaVersion: 2015,
globals: { globals: {
...globals.node,
...globals.es2021,
define: false, define: false,
module: false, module: false,
Symbol: false Symbol: false,
window: false
} }
}, },
rules: { rules: {
...jqueryConfig.rules, ...jqueryConfig.rules,
"no-implicit-globals": "error",
// That is okay for the built version // That is okay for the built version
"no-multiple-empty-lines": "off", "no-multiple-empty-lines": "off",
@ -355,5 +347,49 @@ export default [
"max-len": "off", "max-len": "off",
"one-var": "off" "one-var": "off"
} }
},
{
files: [
"src/wrapper.js",
"src/wrapper-factory.js",
"dist/jquery.factory.js",
"dist/jquery.factory.slim.js",
"test/middleware-mockserver.cjs"
],
rules: {
"no-implicit-globals": "off"
}
},
{
files: [
"dist/**"
],
languageOptions: {
ecmaVersion: 5,
sourceType: "script"
}
},
{
files: [
"dist-module/**"
],
languageOptions: {
ecmaVersion: 2015,
sourceType: "module"
}
},
{
files: [
"dist/jquery.bundler-require-wrapper.js",
"dist/jquery.bundler-require-wrapper.slim.js"
],
languageOptions: {
ecmaVersion: 2015,
sourceType: "commonjs"
}
} }
]; ];

View File

@ -21,7 +21,7 @@ async function runJSDOMTest( { title, folder } ) {
const virtualConsole = new jsdom.VirtualConsole(); const virtualConsole = new jsdom.VirtualConsole();
virtualConsole.sendTo( console ); virtualConsole.sendTo( console );
virtualConsole.on( "assert", ( success, message ) => { virtualConsole.on( "assert", ( success ) => {
if ( !success ) { if ( !success ) {
process.exitCode = 1; process.exitCode = 1;
} }

View File

@ -1,5 +1,3 @@
/* global startIframeTest */
jQuery( function() { jQuery( function() {
$( "body" ).append( "<script nonce='jquery+hardcoded+nonce' src='csp-nonce.js'></script>" ); $( "body" ).append( "<script nonce='jquery+hardcoded+nonce' src='csp-nonce.js'></script>" );
} ); } );

View File

@ -1,5 +1,3 @@
/* global startIframeTest */
jQuery( function() { jQuery( function() {
$.globalEval( "startIframeTest()", { nonce: "jquery+hardcoded+nonce" } ); $.globalEval( "startIframeTest()", { nonce: "jquery+hardcoded+nonce" } );
} ); } );

View File

@ -1,5 +1,3 @@
/* global startIframeTest */
jQuery( function() { jQuery( function() {
var script = document.createElement( "script" ); var script = document.createElement( "script" );
script.setAttribute( "nonce", "jquery+hardcoded+nonce" ); script.setAttribute( "nonce", "jquery+hardcoded+nonce" );

2
test/jquery.js vendored
View File

@ -1,7 +1,5 @@
// Use the right jQuery source on the test page (and iframes) // Use the right jQuery source on the test page (and iframes)
( function() { ( function() {
/* global loadTests: false */
var dynamicImportSource, config, src, var dynamicImportSource, config, src,
parentUrl = window.location.protocol + "//" + window.location.host, parentUrl = window.location.protocol + "//" + window.location.host,
QUnit = window.QUnit; QUnit = window.QUnit;

View File

@ -261,7 +261,7 @@ QUnit.test( "attr(String, Object)", function( assert ) {
var $input, $text, $details, var $input, $text, $details,
attributeNode, commentNode, textNode, obj, attributeNode, commentNode, textNode, obj,
table, td, j, type, table, td, j,
check, thrown, button, $radio, $radios, $svg, check, thrown, button, $radio, $radios, $svg,
div = jQuery( "#qunit-fixture div" ).attr( "foo", "bar" ), div = jQuery( "#qunit-fixture div" ).attr( "foo", "bar" ),
i = 0, i = 0,
@ -418,7 +418,6 @@ QUnit.test( "attr(String, Object)", function( assert ) {
j.removeAttr( "name" ); j.removeAttr( "name" );
// Type // Type
type = jQuery( "#check2" ).attr( "type" );
try { try {
jQuery( "#check2" ).attr( "type", "hidden" ); jQuery( "#check2" ).attr( "type", "hidden" );
assert.ok( true, "No exception thrown on input type change" ); assert.ok( true, "No exception thrown on input type change" );

View File

@ -7,7 +7,7 @@ QUnit.test( "css(String|Hash)", function( assert ) {
assert.equal( jQuery( "#qunit-fixture" ).css( "display" ), "block", "Check for css property \"display\"" ); assert.equal( jQuery( "#qunit-fixture" ).css( "display" ), "block", "Check for css property \"display\"" );
var $child, div, div2, width, height, child, prctval, checkval, old; var $child, div, div2, child, prctval, checkval, old;
$child = jQuery( "#nothiddendivchild" ).css( { "width": "20%", "height": "20%" } ); $child = jQuery( "#nothiddendivchild" ).css( { "width": "20%", "height": "20%" } );
assert.notEqual( $child.css( "width" ), "20px", "Retrieving a width percentage on the child of a hidden div returns percentage" ); assert.notEqual( $child.css( "width" ), "20px", "Retrieving a width percentage on the child of a hidden div returns percentage" );
@ -36,8 +36,6 @@ QUnit.test( "css(String|Hash)", function( assert ) {
// handle negative numbers by setting to zero trac-11604 // handle negative numbers by setting to zero trac-11604
jQuery( "#nothiddendiv" ).css( { "width": 1, "height": 1 } ); jQuery( "#nothiddendiv" ).css( { "width": 1, "height": 1 } );
width = parseFloat( jQuery( "#nothiddendiv" ).css( "width" ) );
height = parseFloat( jQuery( "#nothiddendiv" ).css( "height" ) );
jQuery( "#nothiddendiv" ).css( { "overflow": "hidden", "width": -1, "height": -1 } ); jQuery( "#nothiddendiv" ).css( { "overflow": "hidden", "width": -1, "height": -1 } );
assert.equal( parseFloat( jQuery( "#nothiddendiv" ).css( "width" ) ), 0, "Test negative width set to 0" ); assert.equal( parseFloat( jQuery( "#nothiddendiv" ).css( "width" ) ), 0, "Test negative width set to 0" );
assert.equal( parseFloat( jQuery( "#nothiddendiv" ).css( "height" ) ), 0, "Test negative height set to 0" ); assert.equal( parseFloat( jQuery( "#nothiddendiv" ).css( "height" ) ), 0, "Test negative height set to 0" );
@ -274,8 +272,7 @@ QUnit.test( "css() non-px relative values (gh-1711)", function( assert ) {
QUnit.test( "css() mismatched relative values with bounded styles (gh-2144)", function( assert ) { QUnit.test( "css() mismatched relative values with bounded styles (gh-2144)", function( assert ) {
assert.expect( 1 ); assert.expect( 1 );
var right, var $container = jQuery( "<div></div>" )
$container = jQuery( "<div></div>" )
.css( { position: "absolute", width: "400px", fontSize: "4px" } ) .css( { position: "absolute", width: "400px", fontSize: "4px" } )
.appendTo( "#qunit-fixture" ), .appendTo( "#qunit-fixture" ),
$el = jQuery( "<div></div>" ) $el = jQuery( "<div></div>" )

View File

@ -317,6 +317,7 @@ QUnit.test( "data-* attributes", function( assert ) {
assert.equal( num, check.length, "Make sure that the right number of properties came through." ); assert.equal( num, check.length, "Make sure that the right number of properties came through." );
/* eslint-disable-next-line no-unused-vars */
for ( prop in obj2 ) { for ( prop in obj2 ) {
num2++; num2++;
} }

View File

@ -823,11 +823,11 @@ QUnit.test( "jQuery.when(nonThenable) - like Promise.resolve", function( assert
done = assert.async( 20 ); done = assert.async( 20 );
jQuery.when() jQuery.when()
.done( function( resolveValue ) { .done( function() {
assert.strictEqual( arguments.length, 0, "Resolved .done with no arguments" ); assert.strictEqual( arguments.length, 0, "Resolved .done with no arguments" );
assert.strictEqual( this, defaultContext, "Default .done context with no arguments" ); assert.strictEqual( this, defaultContext, "Default .done context with no arguments" );
} ) } )
.then( function( resolveValue ) { .then( function() {
assert.strictEqual( arguments.length, 0, "Resolved .then with no arguments" ); assert.strictEqual( arguments.length, 0, "Resolved .then with no arguments" );
assert.strictEqual( this, defaultContext, "Default .then context with no arguments" ); assert.strictEqual( this, defaultContext, "Default .then context with no arguments" );
} ); } );

View File

@ -1138,18 +1138,13 @@ QUnit.test( "interrupt toggle", function( assert ) {
var longDuration = fxInterval * 200, var longDuration = fxInterval * 200,
shortDuration = fxInterval * 50, shortDuration = fxInterval * 50,
remaining = 0,
$elems = jQuery( ".chain-test" ), $elems = jQuery( ".chain-test" ),
clock = this.clock, clock = this.clock,
finish = function() { finish = function() {};
};
jQuery.each( { slideToggle: "height", fadeToggle: "opacity", toggle: "width" }, function( method, prop ) { jQuery.each( { slideToggle: "height", fadeToggle: "opacity", toggle: "width" }, function( method, prop ) {
var $methodElems = $elems.filter( "[id^='" + method.toLowerCase() + "']" ).each( function() { var $methodElems = $elems.filter( "[id^='" + method.toLowerCase() + "']" ).each( function() {
// Don't end test until we're done with this element
remaining++;
// Save original property value for comparison // Save original property value for comparison
jQuery.data( this, "startVal", jQuery( this ).css( prop ) ); jQuery.data( this, "startVal", jQuery( this ).css( prop ) );
} ); } );

View File

@ -2698,7 +2698,6 @@ testIframe(
assert.expect( 1 ); assert.expect( 1 );
var done = assert.async(), var done = assert.async(),
focus = false,
input = jQuery( frameDoc ).find( "#frame-input" ); input = jQuery( frameDoc ).find( "#frame-input" );
// Create a focusin handler on the parent; shouldn't affect the iframe's fate // Create a focusin handler on the parent; shouldn't affect the iframe's fate
@ -3113,11 +3112,11 @@ QUnit.test(
spy.immediate = sinon.stub( event.originalEvent, "stopImmediatePropagation" ); spy.immediate = sinon.stub( event.originalEvent, "stopImmediatePropagation" );
event.stopImmediatePropagation(); event.stopImmediatePropagation();
} ) } )
.on( "simulated", function( event ) { .on( "simulated", function() {
assert.ok( false, "simulated event immediate propagation stopped" ); assert.ok( false, "simulated event immediate propagation stopped" );
} ); } );
outer outer
.on( "simulated", function( event ) { .on( "simulated", function() {
assert.ok( false, "simulated event propagation stopped" ); assert.ok( false, "simulated event propagation stopped" );
} ); } );
@ -3180,8 +3179,7 @@ QUnit.test( "trigger('click') on radio passes extra params", function( assert )
QUnit.test( "focusout/focusin support", function( assert ) { QUnit.test( "focusout/focusin support", function( assert ) {
assert.expect( 6 ); assert.expect( 6 );
var focus, var parent = jQuery( "<div>" ),
parent = jQuery( "<div>" ),
input = jQuery( "<input>" ), input = jQuery( "<input>" ),
inputExternal = jQuery( "<input>" ); inputExternal = jQuery( "<input>" );

View File

@ -1329,7 +1329,7 @@ QUnit.test( "Empty replaceWith (trac-13401; trac-13596; gh-2204)", function( ass
return input; return input;
} ); } );
assert.strictEqual( $el.html(), "", "replaceWith(function returning " + label + ")" ); assert.strictEqual( $el.html(), "", "replaceWith(function returning " + label + ")" );
$el.html( "<i></i>" ).children().replaceWith( function( i ) { $el.html( "<i></i>" ).children().replaceWith( function() {
return input; return input;
} ); } );
assert.strictEqual( $el.html(), "", "replaceWith(other function returning " + label + ")" ); assert.strictEqual( $el.html(), "", "replaceWith(other function returning " + label + ")" );
@ -2661,8 +2661,6 @@ QUnit.test( "insertAfter, insertBefore, etc do not work when destination is orig
assert.expect( 10 ); assert.expect( 10 );
var elems;
jQuery.each( [ jQuery.each( [
"appendTo", "appendTo",
"prependTo", "prependTo",
@ -2670,7 +2668,7 @@ QUnit.test( "insertAfter, insertBefore, etc do not work when destination is orig
"insertAfter", "insertAfter",
"replaceAll" "replaceAll"
], function( index, name ) { ], function( index, name ) {
elems = jQuery( [ jQuery( [
"<ul id='test4087-complex'><li class='test4087'><div>c1</div>h1</li><li><div>c2</div>h2</li></ul>", "<ul id='test4087-complex'><li class='test4087'><div>c1</div>h1</li><li><div>c2</div>h2</li></ul>",
"<div id='test4087-simple'><div class='test4087-1'>1<div class='test4087-2'>2</div><div class='test4087-3'>3</div></div></div>", "<div id='test4087-simple'><div class='test4087-1'>1<div class='test4087-2'>2</div><div class='test4087-3'>3</div></div></div>",
"<div id='test4087-multiple'><div class='test4087-multiple'>1</div><div class='test4087-multiple'>2</div></div>" "<div id='test4087-multiple'><div class='test4087-multiple'>1</div><div class='test4087-multiple'>2</div></div>"
@ -2955,7 +2953,7 @@ QUnit.test( "Ignore content from unsuccessful responses (gh-4126)", function( as
assert.expect( 1 ); assert.expect( 1 );
var globalEval = jQuery.globalEval; var globalEval = jQuery.globalEval;
jQuery.globalEval = function( code ) { jQuery.globalEval = function( _code ) {
assert.ok( false, "no attempt to evaluate code from an unsuccessful response" ); assert.ok( false, "no attempt to evaluate code from an unsuccessful response" );
}; };
@ -2973,7 +2971,7 @@ QUnit.test( "Ignore content from unsuccessful responses (gh-4126)", function( as
testIframe( testIframe(
"Check if CSP nonce is preserved", "Check if CSP nonce is preserved",
"mock.php?action=cspNonce", "mock.php?action=cspNonce",
function( assert, jQuery, window, document ) { function( assert ) {
var done = assert.async(); var done = assert.async();
assert.expect( 1 ); assert.expect( 1 );
@ -2988,7 +2986,7 @@ testIframe(
testIframe( testIframe(
"Check if CSP nonce is preserved for external scripts with src attribute", "Check if CSP nonce is preserved for external scripts with src attribute",
"mock.php?action=cspNonce&test=external", "mock.php?action=cspNonce&test=external",
function( assert, jQuery, window, document ) { function( assert ) {
var done = assert.async(); var done = assert.async();
assert.expect( 1 ); assert.expect( 1 );
@ -3006,7 +3004,7 @@ testIframe(
testIframe( testIframe(
"jQuery.globalEval supports nonce", "jQuery.globalEval supports nonce",
"mock.php?action=cspNonce&test=globaleval", "mock.php?action=cspNonce&test=globaleval",
function( assert, jQuery, window, document ) { function( assert ) {
var done = assert.async(); var done = assert.async();
assert.expect( 1 ); assert.expect( 1 );

View File

@ -4,7 +4,7 @@ if ( !includesModule( "offset" ) ) {
return; return;
} }
var supportsScroll, alwaysScrollable, var alwaysScrollable,
forceScroll = supportjQuery( "<div></div>" ).css( { width: 2000, height: 2000 } ), forceScroll = supportjQuery( "<div></div>" ).css( { width: 2000, height: 2000 } ),
checkSupport = function( assert ) { checkSupport = function( assert ) {
@ -14,7 +14,7 @@ var supportsScroll, alwaysScrollable,
// Append forceScroll to the body instead of #qunit-fixture because the latter is hidden // Append forceScroll to the body instead of #qunit-fixture because the latter is hidden
forceScroll.appendTo( "body" ); forceScroll.appendTo( "body" );
window.scrollTo( 200, 200 ); window.scrollTo( 200, 200 );
supportsScroll = document.documentElement.scrollTop || document.body.scrollTop; window.supportsScroll = document.documentElement.scrollTop || document.body.scrollTop;
forceScroll.detach(); forceScroll.detach();
// Support: iOS <=7 - 12+ // Support: iOS <=7 - 12+

View File

@ -857,7 +857,7 @@ QUnit.testUnlessIE( "contents() for <template /> remains inert", function( asser
"</template>" "</template>"
); );
var content = jQuery( "#template" ).contents(); jQuery( "#template" ).contents();
assert.strictEqual( window.testScript, true, "script in template isn't executed" ); assert.strictEqual( window.testScript, true, "script in template isn't executed" );
assert.strictEqual( window.testImgOnload, true, "onload of image in template isn't executed" ); assert.strictEqual( window.testImgOnload, true, "onload of image in template isn't executed" );