fix browser globals (out of root), phetsims/chipper#1451

Signed-off-by: Michael Kauzmann <[email protected]>
phetsims · Oct 22, 2024 · 7fdbe44 · 7fdbe44
1 parent 47c4953
commit 7fdbe44
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/eslint/chipper.eslint.config.mjs b/eslint/chipper.eslint.config.mjs
@@ -1,7 +1,6 @@
 // Copyright 2018, University of Colorado Boulder
 // @author Michael Kauzmann
 
-import globals from 'globals';
 import nodeEslintConfig from './node.eslint.config.mjs';
 
 /**
@@ -10,15 +9,6 @@ import nodeEslintConfig from './node.eslint.config.mjs';
 export default [
   ...nodeEslintConfig,
   {
-
-    languageOptions: {
-      globals: {
-
-        // TODO: we would like to say exclude browser, but we will have to remove it from root.eslint.config.mjs to do so. See https://github.com/phetsims/chipper/issues/1451
-        // That is, we used to say browser: false. How to do that with flat?
-        ...globals.node
-      }
-    },
     rules: {
       'phet/bad-chipper-text': 'error'
     }

diff --git a/eslint/node.eslint.config.mjs b/eslint/node.eslint.config.mjs
@@ -12,9 +12,6 @@ export default [
   {
     languageOptions: {
       globals: {
-
-        // TODO: we would like to say exclude browser, but we will have to remove it from root.eslint.config.mjs to do so. See https://github.com/phetsims/chipper/issues/1451
-        // That is, we used to say browser: false. How to do that with flat?
         ...globals.node
       }
     },

diff --git a/eslint/root.eslint.config.mjs b/eslint/root.eslint.config.mjs
@@ -1750,9 +1750,6 @@ export default [
   }, {
     languageOptions: {
       globals: {
-
-        // ...globals.node,
-        ...globals.browser,
         ...globals.es2018,
 
         //=============================================================================================
@@ -1898,4 +1895,12 @@ export default [
       }
     }
   }
-];
+];
+
+export const browserGlobals = {
+  languageOptions: {
+    globals: {
+      ...globals.browser
+    }
+  }
+};
diff --git a/eslint/sim.eslint.config.mjs b/eslint/sim.eslint.config.mjs
@@ -1,13 +1,14 @@
 // Copyright 2018, University of Colorado Boulder
 // @author Michael Kauzmann
 
-import rootEslintConfig from './root.eslint.config.mjs';
+import rootEslintConfig, { browserGlobals } from './root.eslint.config.mjs';
 
 /**
  * Eslint config applied only to sims.
  */
 export default [
   ...rootEslintConfig,
+  browserGlobals,
   {
     rules: {
       'phet/bad-sim-text': 'error'