Merge branch 'lint-batches-chipper-1484'

phetsims · Nov 5, 2024 · ff70159 · ff70159
2 parents 4220f3c + 20b1e35
commit ff70159
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 67 deletions.
diff --git a/js/grunt/chipAway.js b/js/grunt/chipAway.js
diff --git a/js/grunt/tasks/lint-all.ts b/js/grunt/tasks/lint-all.ts
@@ -7,10 +7,11 @@
  */
 
 import * as grunt from 'grunt';
-import lint, { getLintOptions } from '../../../../perennial-alias/js/grunt/lint.js';
+import lint from '../../../../perennial-alias/js/eslint/lint.js';
 import getBrands from '../../../../perennial-alias/js/grunt/tasks/util/getBrands.js';
 import getRepo from '../../../../perennial-alias/js/grunt/tasks/util/getRepo.js';
 import getPhetLibs from '../getPhetLibs.js';
+import getLintOptions from '../../../../perennial-alias/js/eslint/getLintOptions.js';
 
 const repo = getRepo();
 
@@ -21,10 +22,10 @@ const brands = getBrands( repo );
  */
 export const lintAll = ( async () => {
 
-  const lintReturnValue = await lint( getLintOptions( { repos: getPhetLibs( repo, brands ) } ) );
+  const lintSuccess = await lint( getLintOptions( { repos: getPhetLibs( repo, brands ) } ) );
 
   // Output results on errors.
-  if ( !lintReturnValue.ok ) {
+  if ( !lintSuccess ) {
     grunt.fail.fatal( 'Lint failed' );
   }
   else {

diff --git a/js/scripts/hook-pre-commit-task.ts b/js/scripts/hook-pre-commit-task.ts
@@ -14,8 +14,8 @@ import Transpiler from '../../../chipper/js/common/Transpiler';
 import reportMedia from '../../../chipper/js/grunt/reportMedia.js';
 import getRepoList from '../../../perennial-alias/js/common/getRepoList';
 import withServer from '../../../perennial-alias/js/common/withServer';
+import lint from '../../../perennial-alias/js/eslint/lint';
 import check from '../../../perennial-alias/js/grunt/check';
-import lint from '../../../perennial-alias/js/grunt/lint';
 import puppeteerQUnit from '../../../perennial-alias/js/test/puppeteerQUnit.js';
 import getPhetLibs from '../grunt/getPhetLibs';
 import generatePhetioMacroAPI from '../phet-io/generatePhetioMacroAPI.js';
@@ -45,9 +45,9 @@ const repo = getArg( 'repo' );
 
     // Run lint tests if they exist in the checked-out SHAs.
     // lint() automatically filters out non-lintable repos
-    const lintReturnValue = await lint( { repos: [ repo ] } );
-    outputToConsole && console.log( `Linting had ${lintReturnValue.ok ? 'no ' : ''}errors.` );
-    process.exit( lintReturnValue.ok ? 0 : 1 );
+    const lintSuccess = await lint( { repos: [ repo ] } );
+    outputToConsole && console.log( `Linting had ${lintSuccess ? 'no ' : ''}errors.` );
+    process.exit( lintSuccess ? 0 : 1 );
   }
 
   else if ( command === 'report-media' ) {