Build: Update ESLint-related packages, fix linting errors

mgol · web-flow · commit f47c6a833706 · 2023-11-02T00:48:50.000+01:00
The main change is the new rule in `eslint-config-jquery`: `template-curly-spacing`. Closes gh-5347 Ref jquery/eslint-config-jquery#21 Ref gh-5348
diff --git a/build/tasks/build.js b/build/tasks/build.js
@@ -45,7 +45,7 @@ async function read( filename ) {
 // and ensure unix-style path separators
 function moduleName( filename ) {
 	return filename
-		.replace( `${srcFolder}${path.sep}`, "" )
+		.replace( `${ srcFolder }${ path.sep }`, "" )
 		.replace( /\.js$/, "" )
 		.split( path.sep )
 		.join( path.posix.sep );
@@ -112,7 +112,7 @@ async function checkExclude( exclude, include ) {
 
 	for ( const module of exclude ) {
 		if ( minimum.indexOf( module ) !== -1 ) {
-			throw new Error( `Module \"${module}\" is a minimum requirement.` );
+			throw new Error( `Module \"${ module }\" is a minimum requirement.` );
 		}
 
 		// Exclude all files in the dir of the same name
@@ -152,7 +152,7 @@ async function writeCompiled( { code, dir, filename, version } ) {
 		.replace( /@DATE/g, new Date().toISOString().replace( /:\d+\.\d+Z$/, "Z" ) );
 
 	await fs.promises.writeFile( path.join( dir, filename ), compiledContents );
-	console.log( `[${getTimestamp()}] ${filename} v${version} created.` );
+	console.log( `[${ getTimestamp() }] ${ filename } v${ version } created.` );
 }
 
 // Build jQuery ECMAScript modules
@@ -187,7 +187,9 @@ async function build( {
 
 		// "+[slim.]SHA" is semantically correct
 		// Add ".dirty" as well if the working dir is not clean
-		version = `${pkg.version}+${slim ? "slim." : ""}${stdout.trim()}${isClean ? "" : ".dirty"}`;
+		version = `${ pkg.version }+${ slim ? "slim." : "" }${ stdout.trim() }${
+			isClean ? "" : ".dirty"
+		}`;
 	} else if ( slim ) {
 		version += "+slim";
 	}
@@ -204,7 +206,7 @@ async function build( {
 	if ( excluded.includes( "exports/global" ) ) {
 		const index = excluded.indexOf( "exports/global" );
 		setOverride(
-			`${srcFolder}/exports/global.js`,
+			`${ srcFolder }/exports/global.js`,
 			"import { jQuery } from \"../core.js\";\n\n" +
 				"jQuery.noConflict = function() {};"
 		);
@@ -223,12 +225,12 @@ async function build( {
 		// No name means an anonymous define
 		const amdExportContents = await read( "exports/amd.js" );
 		setOverride(
-			`${srcFolder}/exports/amd.js`,
+			`${ srcFolder }/exports/amd.js`,
 			amdExportContents.replace(
 
 				// Remove the comma for anonymous defines
 				/(\s*)"jquery"(,\s*)/,
-				amd ? `$1\"${amd}\"$2` : " "
+				amd ? `$1\"${ amd }\"$2` : " "
 			)
 		);
 	}
@@ -246,11 +248,11 @@ async function build( {
 	}
 
 	const inputOptions = {
-		input: `${srcFolder}/jquery.js`
+		input: `${ srcFolder }/jquery.js`
 	};
 
 	const includedImports = included
-		.map( ( module ) => `import "./${module}.js";` )
+		.map( ( module ) => `import "./${ module }.js";` )
 		.join( "\n" );
 
 	const jQueryFileContents = await read( "jquery.js" );
@@ -272,7 +274,7 @@ async function build( {
 	// Replace excluded modules with empty sources.
 	for ( const module of excluded ) {
 		setOverride(
-			`${srcFolder}/${module}.js`,
+			`${ srcFolder }/${ module }.js`,
 
 			// The `selector` module is not removed, but replaced
 			// with `selector-native`.
@@ -288,7 +290,7 @@ async function build( {
 			output: [ outputOptions ],
 			plugins: [ rollupFileOverrides( fileOverrides ) ],
 			watch: {
-				include: `${srcFolder}/**`,
+				include: `${ srcFolder }/**`,
 				skipWrite: true
 			}
 		} );
diff --git a/build/tasks/compare_size.mjs b/build/tasks/compare_size.mjs
@@ -24,7 +24,7 @@ async function getCommitHash() {
 function getBranchHeader( branch, commit ) {
 	let branchHeader = branch.trim();
 	if ( commit ) {
-		branchHeader = chalk.bold( branchHeader ) + chalk.gray( ` @${commit}` );
+		branchHeader = chalk.bold( branchHeader ) + chalk.gray( ` @${ commit }` );
 	} else {
 		branchHeader = chalk.italic( branchHeader );
 	}
@@ -65,13 +65,13 @@ function saveCache( loc, cache ) {
 
 function compareSizes( existing, current, padLength ) {
 	if ( typeof current !== "number" ) {
-		return chalk.grey( `${existing}`.padStart( padLength ) );
+		return chalk.grey( `${ existing }`.padStart( padLength ) );
 	}
 	const delta = current - existing;
 	if ( delta > 0 ) {
-		return chalk.red( `+${delta}`.padStart( padLength ) );
+		return chalk.red( `+${ delta }`.padStart( padLength ) );
 	}
-	return chalk.green( `${delta}`.padStart( padLength ) );
+	return chalk.green( `${ delta }`.padStart( padLength ) );
 }
 
 function sortBranches( a, b ) {
@@ -130,7 +130,7 @@ export async function compareSize( { cache = ".sizecache.json", files } = {} ) {
 	const sizes = results.map( function( result ) {
 		const rawSize = result.raw.toString().padStart( rawPadLength );
 		const gzSize = result.gz.toString().padStart( gzPadLength );
-		return `${rawSize} ${gzSize} ${result.filename}`;
+		return `${ rawSize } ${ gzSize } ${ result.filename }`;
 	} );
 
 	const comparisons = Object.keys( sizeCache ).sort( sortBranches ).map( function( branch ) {
@@ -146,7 +146,7 @@ export async function compareSize( { cache = ".sizecache.json", files } = {} ) {
 
 			const compareRaw = compareSizes( branchResult.raw, compareResult.raw, rawPadLength );
 			const compareGz = compareSizes( branchResult.gz, compareResult.gz, gzPadLength );
-			return `${compareRaw} ${compareGz} ${filename}`;
+			return `${ compareRaw } ${ compareGz } ${ filename }`;
 		} );
 
 		return [
@@ -182,7 +182,7 @@ export async function compareSize( { cache = ".sizecache.json", files } = {} ) {
 			meta: { commit },
 			files: cacheResults( results )
 		};
-		console.log( `Saved cache for ${branch}.` );
+		console.log( `Saved cache for ${ branch }.` );
 	}
 
 	await saveCache( cache, sizeCache );
diff --git a/build/tasks/lib/getTimestamp.js b/build/tasks/lib/getTimestamp.js
@@ -5,5 +5,5 @@ module.exports = function getTimestamp() {
 	const hours = now.getHours().toString().padStart( 2, "0" );
 	const minutes = now.getMinutes().toString().padStart( 2, "0" );
 	const seconds = now.getSeconds().toString().padStart( 2, "0" );
-	return `${hours}:${minutes}:${seconds}`;
+	return `${ hours }:${ minutes }:${ seconds }`;
 };
diff --git a/build/tasks/minify.js b/build/tasks/minify.js
@@ -24,7 +24,7 @@ module.exports = async function minify( { filename, dir, esm } ) {
 				ecma: esm ? 2015 : 5,
 				asciiOnly: true,
 				comments: false,
-				preamble: `/*! jQuery ${version}` +
+				preamble: `/*! jQuery ${ version }` +
 					" | (c) OpenJS Foundation and other contributors" +
 					" | jquery.org/license */\n"
 			},
@@ -63,5 +63,7 @@ module.exports = async function minify( { filename, dir, esm } ) {
 	processForDist( code, minFilename );
 	processForDist( map, mapFilename );
 
-	console.log( `[${getTimestamp()}] ${minFilename} ${version} with ${mapFilename} created.` );
+	console.log( `[${ getTimestamp() }] ${ minFilename } ${ version } with ${
+		mapFilename
+	} created.` );
 };
diff --git a/build/tasks/npmcopy.js b/build/tasks/npmcopy.js
@@ -35,7 +35,7 @@ async function npmcopy() {
 		const toDir = path.dirname( to );
 		await fs.promises.mkdir( toDir, { recursive: true } );
 		await fs.promises.copyFile( from, to );
-		console.log( `${source} → ${dest}` );
+		console.log( `${ source } → ${ dest }` );
 	}
 }
 
diff --git a/build/tasks/promises_aplus_tests.js b/build/tasks/promises_aplus_tests.js
@@ -11,7 +11,7 @@ if ( !verifyNodeVersion() ) {
 
 const command = path.resolve(
 	__dirname,
-	`../../node_modules/.bin/promises-aplus-tests${os.platform() === "win32" ? ".cmd" : ""}`
+	`../../node_modules/.bin/promises-aplus-tests${ os.platform() === "win32" ? ".cmd" : "" }`
 );
 const args = [ "--reporter", "dot", "--timeout", "2000" ];
 const tests = [
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ async function npmcopy() {`
`35`	`35`	`const toDir = path.dirname( to );`
`36`	`36`	`await fs.promises.mkdir( toDir, { recursive: true } );`
`37`	`37`	`await fs.promises.copyFile( from, to );`
`38`		- console.log( `${source} → ${dest}` );
	`38`	+ console.log( `${ source } → ${ dest }` );
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`