Skip to content

Commit

Permalink
fix incorrect ignore for nested eslint configs, phetsims/chipper#1483
Browse files Browse the repository at this point in the history
  • Loading branch information
zepumph committed Dec 3, 2024
1 parent 91545a1 commit 3807e64
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion js/config/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
*/

import nodeEslintConfig from '../../../perennial-alias/js/eslint/config/node.eslint.config.mjs';
import { mutateForNestedConfig } from '../../../perennial-alias/js/eslint/config/root.eslint.config.mjs';

export default [
...nodeEslintConfig
...mutateForNestedConfig( nodeEslintConfig )
];
3 changes: 2 additions & 1 deletion js/grunt/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
*/

import nodeEslintConfig from '../../../perennial-alias/js/eslint/config/node.eslint.config.mjs';
import { mutateForNestedConfig } from '../../../perennial-alias/js/eslint/config/root.eslint.config.mjs';

export default [
...nodeEslintConfig,
...mutateForNestedConfig( nodeEslintConfig ),
{
// TODO: remove once the path works in root config again, https://github.com/phetsims/chipper/issues/1483/
rules: {
Expand Down
3 changes: 2 additions & 1 deletion js/node-client/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
*/

import nodeEslintConfig from '../../../perennial-alias/js/eslint/config/node.eslint.config.mjs';
import { mutateForNestedConfig } from '../../../perennial-alias/js/eslint/config/root.eslint.config.mjs';

export default [
...nodeEslintConfig
...mutateForNestedConfig( nodeEslintConfig )
];
3 changes: 2 additions & 1 deletion js/server/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
*/

import nodeEslintConfig from '../../../perennial-alias/js/eslint/config/node.eslint.config.mjs';
import { mutateForNestedConfig } from '../../../perennial-alias/js/eslint/config/root.eslint.config.mjs';

export default [
...nodeEslintConfig
...mutateForNestedConfig( nodeEslintConfig )
];

0 comments on commit 3807e64

Please sign in to comment.