diff --git a/.eslintrc.js b/.eslintrc.js index ff71e90c5..f655e5267 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -38,7 +38,6 @@ module.exports = { }, ], '@typescript-eslint/no-redeclare': 'off', - // We LOVE non-breaking spaces, and both straight and curly quotes here 'no-irregular-whitespace': [1, { skipJSXText: true, skipStrings: true }], 'react/no-unescaped-entities': [1, { forbid: ['>', '}'] }], @@ -52,12 +51,13 @@ module.exports = { (ruleSet) => !ruleSet.rules.hasOwnProperty('filenames/match-exported'), ), { - files: ['docs/pages/experiments/**/*{.tsx,.js}', 'docs/pages/playground/**/*{.tsx,.js}'], + files: ['docs/src/app/experiments/**/*{.tsx,.js}', 'docs/pages/playground/**/*{.tsx,.js}'], rules: { '@typescript-eslint/no-use-before-define': 'off', 'react/prop-types': 'off', 'no-alert': 'off', 'no-console': 'off', + 'import/no-relative-packages': 'off', }, }, { diff --git a/docs/src/components/AppBar.tsx b/docs/src/components/AppBar.tsx index 9eb2675bf..0d25f8559 100644 --- a/docs/src/components/AppBar.tsx +++ b/docs/src/components/AppBar.tsx @@ -4,8 +4,8 @@ import { GitHubIcon } from 'docs/src/icons/GitHub'; import { SettingsIcon } from 'docs/src/icons/Settings'; import { IconButton } from 'docs/src/design-system/IconButton'; import { IconLinkButton } from 'docs/src/design-system/IconLinkButton'; +import packageJson from 'docs/package.json'; import { DocsVersionSelector } from './DocsVersionSelector'; -import packageJson from '../../../package.json'; import classes from './AppBar.module.css'; const currentVersion = packageJson.version; diff --git a/docs/vitest.config.ts b/docs/vitest.config.ts index 272c2a82b..0d392b843 100644 --- a/docs/vitest.config.ts +++ b/docs/vitest.config.ts @@ -1,4 +1,5 @@ import { mergeConfig, defineProject } from 'vitest/config'; +// eslint-disable-next-line import/no-relative-packages import sharedConfig from '../vitest.shared'; export default mergeConfig( diff --git a/packages/mui-base/vitest.config.ts b/packages/mui-base/vitest.config.ts index b14b2143d..55b6a25c7 100644 --- a/packages/mui-base/vitest.config.ts +++ b/packages/mui-base/vitest.config.ts @@ -1,4 +1,5 @@ import { mergeConfig, defineProject } from 'vitest/config'; +// eslint-disable-next-line import/no-relative-packages import sharedConfig from '../../vitest.shared'; export default mergeConfig(