Skip to content

Commit

Permalink
Upgrade to ESLint 9 and flat config, see phetsims/chipper#1474
Browse files Browse the repository at this point in the history
  • Loading branch information
samreid committed Sep 26, 2024
1 parent fa49031 commit be6a53d
Show file tree
Hide file tree
Showing 25 changed files with 33 additions and 39 deletions.
7 changes: 0 additions & 7 deletions .eslintrc.js

This file was deleted.

9 changes: 9 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Copyright 2024, University of Colorado Boulder
/**
* @author Sam Reid (PhET Interactive Simulations)
*/
import nodeEslintConfig from '../chipper/eslint/node.eslint.config.mjs';

export default [
...nodeEslintConfig
];
8 changes: 4 additions & 4 deletions js/build-server/build-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@


const constants = require( './constants' );
const childProcess = require( 'child_process' ); // eslint-disable-line require-statement-match
const winston = require( './log.js' ); // eslint-disable-line require-statement-match
const childProcess = require( 'child_process' ); // eslint-disable-line phet/require-statement-match
const winston = require( './log.js' ); // eslint-disable-line phet/require-statement-match
const logRequest = require( './logRequest' );
const sendEmail = require( './sendEmail' );
const taskWorker = require( './taskWorker' );
const async = require( 'async' );
const bodyParser = require( 'body-parser' ); // eslint-disable-line require-statement-match
const bodyParser = require( 'body-parser' ); // eslint-disable-line phet/require-statement-match
const express = require( 'express' );
const _ = require( 'lodash' );
const parseArgs = require( 'minimist' ); // eslint-disable-line require-statement-match
const parseArgs = require( 'minimist' ); // eslint-disable-line phet/require-statement-match
const persistentQueue = require( './persistentQueue' );
const getStatus = require( './getStatus' );

Expand Down
2 changes: 1 addition & 1 deletion js/build-server/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/


const fs = require( 'graceful-fs' ); // eslint-disable-line require-statement-match
const fs = require( 'graceful-fs' ); // eslint-disable-line phet/require-statement-match
const getBuildServerConfig = require( './getBuildServerConfig' );

const BUILD_SERVER_CONFIG = getBuildServerConfig( fs );
Expand Down
2 changes: 1 addition & 1 deletion js/build-server/copyFile.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2017-2018, University of Colorado Boulder
// @author Matt Pennington (PhET Interactive Simulations)

const fs = require( 'graceful-fs' ); // eslint-disable-line require-statement-match
const fs = require( 'graceful-fs' ); // eslint-disable-line phet/require-statement-match

module.exports = async function( src, dest ) {
return new Promise( ( resolve, reject ) => {
Expand Down
2 changes: 1 addition & 1 deletion js/build-server/createTranslationsXML.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@


const constants = require( './constants' );
const fs = require( 'graceful-fs' ); // eslint-disable-line require-statement-match
const fs = require( 'graceful-fs' ); // eslint-disable-line phet/require-statement-match
const winston = require( 'winston' );
const writeFile = require( '../common/writeFile' );
const parseScreenNames = require( './parseScreenNames' );
Expand Down
4 changes: 2 additions & 2 deletions js/build-server/getLocales.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@


const constants = require( './constants' );
const fs = require( 'graceful-fs' ); // eslint-disable-line require-statement-match
const fs = require( 'graceful-fs' ); // eslint-disable-line phet/require-statement-match
const getSortedVersionDirectories = require( './getSortedVersionDirectories' );
const parseString = require( 'xml2js' ).parseString; // eslint-disable-line no-property-in-require-statement
const parseString = require( 'xml2js' ).parseString; // eslint-disable-line phet/no-property-in-require-statement
const winston = require( 'winston' );

async function getJsonFromXML( xmlString ) {
Expand Down
2 changes: 1 addition & 1 deletion js/build-server/getSortedVersionDirectories.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// @author Matt Pennington (PhET Interactive Simulations)


const fs = require( 'graceful-fs' ); // eslint-disable-line require-statement-match
const fs = require( 'graceful-fs' ); // eslint-disable-line phet/require-statement-match

/**
* Define a helper function that will get a list of the PhET-style version directories at the given path. The
Expand Down
2 changes: 1 addition & 1 deletion js/build-server/log.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

const constants = require( './constants' );
const winston = require( 'winston' );
const Loggly = require( 'winston-loggly' ).Loggly; // eslint-disable-line no-property-in-require-statement
const Loggly = require( 'winston-loggly' ).Loggly; // eslint-disable-line phet/no-property-in-require-statement

const loggly_options = { subdomain: 'build-server', inputToken: 'none' };

Expand Down
2 changes: 1 addition & 1 deletion js/common/Maintenance.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const gitPull = require( './gitPull' );
const gitPush = require( './gitPush' );
const gitRevParse = require( './gitRevParse' );
const assert = require( 'assert' );
const asyncq = require( 'async-q' ); // eslint-disable-line require-statement-match
const asyncq = require( 'async-q' ); // eslint-disable-line phet/require-statement-match
const _ = require( 'lodash' );
const fs = require( 'fs' );
const repl = require( 'repl' );
Expand Down
2 changes: 0 additions & 2 deletions js/common/SimVersion.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
* @author Jonathan Olson <[email protected]>
*/

/* eslint-env browser, node */

( function( global ) {

// To support loading in Node.js and the browser
Expand Down
3 changes: 0 additions & 3 deletions js/common/SimVersionTests.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
* @author Michael Kauzmann (PhET Interactive Simulations)
*/

/* eslint-env node */


const SimVersion = require( './SimVersion' );
const qunit = require( 'qunit' );

Expand Down
2 changes: 1 addition & 1 deletion js/common/fixDivergedReleaseBranch.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const gitPush = require( './gitPush' );
const gitRevParse = require( './gitRevParse' );
const winston = require( 'winston' );
const buildLocal = require( './buildLocal' );
const Octokit = require( '@octokit/rest' ); // eslint-disable-line require-statement-match
const Octokit = require( '@octokit/rest' ); // eslint-disable-line phet/require-statement-match

/**
* Does some branch changes so that a releaseBranch's dependency SHA matches a named branch
Expand Down
2 changes: 1 addition & 1 deletion js/common/githubCreateIssue.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

const buildLocal = require( './buildLocal' );
const Octokit = require( '@octokit/rest' ); // eslint-disable-line require-statement-match
const Octokit = require( '@octokit/rest' ); // eslint-disable-line phet/require-statement-match
const _ = require( 'lodash' );
const winston = require( 'winston' );

Expand Down
2 changes: 1 addition & 1 deletion js/common/npmUpdateDirectory.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
const execute = require( './execute' );
const npmCommand = require( './npmCommand' );
const winston = require( 'winston' );
const asyncMutex = require( 'async-mutex' ); // eslint-disable-line require-statement-match
const asyncMutex = require( 'async-mutex' ); // eslint-disable-line phet/require-statement-match

const mutex = new asyncMutex.Mutex();

Expand Down
2 changes: 1 addition & 1 deletion js/common/writeFile.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2017-2018, University of Colorado Boulder
// @author Matt Pennington (PhET Interactive Simulations)

const fs = require( 'graceful-fs' ); // eslint-disable-line require-statement-match
const fs = require( 'graceful-fs' ); // eslint-disable-line phet/require-statement-match
const winston = require( 'winston' );

module.exports = async function( filepath, contents ) {
Expand Down
2 changes: 1 addition & 1 deletion js/common/writePhetioHtaccess.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const buildLocal = require( './buildLocal' );
const devScp = require( './devScp' );
const writeFile = require( './writeFile' );
const axios = require( 'axios' );
const fs = require( 'graceful-fs' ); // eslint-disable-line require-statement-match
const fs = require( 'graceful-fs' ); // eslint-disable-line phet/require-statement-match
const winston = require( 'winston' );

// A list of directories directly nested under the phet-io build output folder that should be password protected. Slashes
Expand Down
2 changes: 1 addition & 1 deletion js/grunt/reopenIssuesFromTODOs.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
const process = require( 'process' );
const fs = require( 'fs' );
const _ = require( 'lodash' );
const Octokit = require( '@octokit/rest' ); // eslint-disable-line require-statement-match
const Octokit = require( '@octokit/rest' ); // eslint-disable-line phet/require-statement-match

const execute = require( '../common/execute' );
const buildLocal = require( '../common/buildLocal' );
Expand Down
2 changes: 1 addition & 1 deletion js/scripts/addMissingTranslationCredits.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
**/

const buildLocal = require( '../common/buildLocal' );
const fetch = require( 'node-fetch' ); // eslint-disable-line require-statement-match
const fetch = require( 'node-fetch' ); // eslint-disable-line phet/require-statement-match
const fs = require( 'fs' );

const translatorAuthCode = buildLocal.translatorAuthCode;
Expand Down
3 changes: 0 additions & 3 deletions js/scripts/append-contrib.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
// Copyright 2023, University of Colorado Boulder

/* eslint-disable default-import-match-filename */


/**
* Append a note about contributing and a link to the contributing
* doc in this repo to core common repos then commit. This script
Expand Down
1 change: 0 additions & 1 deletion js/scripts/copy-pr-template.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import { execSync } from 'node:child_process';
import { copyFileSync, existsSync, mkdirSync } from 'node:fs';

// eslint-disable-next-line default-import-match-filename
import coreCommonRepos from './core-common-repos.js';
import { join, dirname } from 'node:path';
import { cwd, chdir } from 'node:process';
Expand Down
2 changes: 1 addition & 1 deletion js/scripts/initial-parse-locales-csv.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2021, University of Colorado Boulder

const fs = require( 'fs' );
// eslint-disable-next-line require-statement-match
// eslint-disable-next-line phet/require-statement-match
const csv = require( 'csv-parser' );

const filePath = process.argv[ 2 ];
Expand Down
2 changes: 1 addition & 1 deletion js/scripts/mv-string-files.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


const fs = require( 'fs' );
const childProcess = require( 'child_process' ); // eslint-disable-line require-statement-match
const childProcess = require( 'child_process' ); // eslint-disable-line phet/require-statement-match

// The repositories the script will iterate through to produce data
const repos = [
Expand Down
2 changes: 1 addition & 1 deletion js/scripts/repo-report.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* TODO https://github.com/phetsims/tasks/issues/942 This is a "quick" version which could benefit from documentation, better command line hygiene, more options, etc.
*/

const { exec } = require( 'child_process' ); // eslint-disable-line require-statement-match
const { exec } = require( 'child_process' ); // eslint-disable-line phet/require-statement-match

exec( 'git rev-list main', ( error, stdout, stderr ) => {
if ( error ) {
Expand Down
3 changes: 2 additions & 1 deletion js/scripts/studio-fuzz.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ const path = require( 'path' );

( async () => {

while ( true ) { // eslint-disable-line no-constant-condition
// TODO why don't we need the no-constant-condition disable? See https://github.com/phetsims/chipper/issues/1451
while ( true ) {
let studioFuzz = null;

console.log( 'starting new fuzz' );
Expand Down

0 comments on commit be6a53d

Please sign in to comment.