Address and move TODOs, phetsims/chipper#1451

phetsims · Oct 22, 2024 · 67cf6f3 · 67cf6f3
1 parent 2dbc19f
commit 67cf6f3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 21 deletions.
diff --git a/eslint/node.eslint.config.mjs b/eslint/node.eslint.config.mjs
@@ -7,17 +7,12 @@
  * @author Sam Reid (PhET Interactive Simulations)
  */
 
-import globals from 'globals';
-import rootEslintConfig from './root.eslint.config.mjs';
+import rootEslintConfig, { nodeLanguageOptions } from './root.eslint.config.mjs';
 
 export const getNodeConfiguration = ( pattern = {} ) => {
   return [
     {
-      languageOptions: {
-        globals: {
-          ...globals.node
-        }
-      },
+      languageOptions: nodeLanguageOptions,
       rules: {
         '@typescript-eslint/no-require-imports': 'off',
         '@typescript-eslint/no-var-requires': 'off'

diff --git a/eslint/root.eslint.config.mjs b/eslint/root.eslint.config.mjs
@@ -42,7 +42,12 @@ import todoShouldHaveIssue from './rules/todo-should-have-issue.js';
 import uppercaseStaticsShouldBeReadonly from './rules/uppercase-statics-should-be-readonly.js';
 import visibilityAnnotation from './rules/visibility-annotation.js';
 
-// TODO: Review this file, see https://github.com/phetsims/chipper/issues/1451
+export const nodeLanguageOptions = {
+  globals: {
+    ...globals.node
+  }
+};
+
 /**
  * The base eslint configuration for the PhET projects.
  *
@@ -76,14 +81,8 @@ export default [
   },
   {
     files: [ 'Gruntfile.js' ],
-    // TODO: reuse same thing as node.eslint.config? https://github.com/phetsims/chipper/issues/1451
-    languageOptions: {
-      globals: {
-        ...globals.node
-      }
-    }
+    languageOptions: nodeLanguageOptions
   },
-
   {
     plugins: {
       phet: {
@@ -176,12 +175,6 @@ export default [
 
     languageOptions: {
 
-      // TODO: upgrade version: Maybe 2022? https://github.com/phetsims/chipper/issues/1451
-      ecmaVersion: 2022,
-
-      // TODO: Does all code use sourceType module?, see https://github.com/phetsims/chipper/issues/1451
-      sourceType: 'module',
-
       // Without a parser, .js files are linted without es6 transpilation. Use the same parser that we use for TypeScript.
       parser: typescriptEslintParser
     },