Skip to content

Commit eb590cf

Browse files
committed
chore(public-docsite-setup): adjust config to work with old eslint-plugin-es
1 parent 244871a commit eb590cf

File tree

4 files changed

+12
-17
lines changed

4 files changed

+12
-17
lines changed

Diff for: package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@
5959
"@dnd-kit/core": "^6.0.8",
6060
"@dnd-kit/sortable": "^7.0.2",
6161
"@dnd-kit/utilities": "^3.2.1",
62-
"@floating-ui/dom": "1.6.12",
62+
"@eslint/compat": "1.1.1",
6363
"@eslint/js": "9.17.0",
64+
"@floating-ui/dom": "1.6.12",
6465
"@fluentui/react-icons": "^2.0.245",
6566
"@griffel/babel-preset": "1.5.8",
6667
"@griffel/eslint-plugin": "^2.0.0",
@@ -227,9 +228,9 @@
227228
"esbuild-loader": "4.1.0",
228229
"eslint": "9.17.0",
229230
"eslint-config-airbnb": "18.2.1",
230-
"eslint-plugin-compat": "6.0.2",
231231
"eslint-config-prettier": "9.1.0",
232232
"eslint-import-resolver-typescript": "3.7.0",
233+
"eslint-plugin-compat": "6.0.2",
233234
"eslint-plugin-es": "4.1.0",
234235
"eslint-plugin-import": "2.31.0",
235236
"eslint-plugin-jest": "28.10.0",

Diff for: packages/public-docsite-setup/eslint.config.js

+7-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const es = require('eslint-plugin-es');
21
const js = require('@eslint/js');
2+
const { fixupConfigRules } = require('@eslint/compat');
33

44
const { FlatCompat } = require('@eslint/eslintrc');
55

@@ -12,22 +12,16 @@ const compat = new FlatCompat({
1212
module.exports = [
1313
...compat.extends('plugin:@fluentui/eslint-plugin/react--legacy'),
1414
{
15-
files: ['bin/*.js', 'src/loadSite.ts'],
16-
15+
files: ['bin/*.js', 'scripts/*.js'],
1716
rules: {
18-
'no-console': 'off',
19-
'no-restricted-globals': 'off',
17+
...fixupConfigRules(compat.extends('plugin:es/restrict-to-es2017')).rules,
2018
},
2119
},
22-
...compat.extends('plugin:es/restrict-to-es2017').map(config => ({
23-
...config,
24-
files: ['bin/*.js', 'scripts/*.js'],
25-
})),
2620
{
27-
files: ['bin/*.js', 'scripts/*.js'],
28-
29-
plugins: {
30-
es,
21+
files: ['bin/*.js', 'src/loadSite.ts'],
22+
rules: {
23+
'no-console': 'off',
24+
'no-restricted-globals': 'off',
3125
},
3226
},
3327
];

Diff for: packages/public-docsite-setup/scripts/getLoadSiteConfig.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function getLoadSiteConfig(options) {
2626
let copyPlugin;
2727
try {
2828
copyPlugin = new CopyWebpackPlugin({ patterns: copyPatterns });
29-
} catch (err) {
29+
} catch {
3030
// copy-webpack-plugin >= 6 requires Node 10+ and takes an object containing patterns.
3131
// Fabric 5 and 6 still support Node 8, so they need to use copy-webpack-plugin@5 which
3232
// takes the patterns themselves as the first parameter.

Diff for: yarn.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -1847,7 +1847,7 @@
18471847
resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
18481848
integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
18491849

1850-
"@eslint/compat@^1.1.1":
1850+
"@eslint/compat@1.1.1", "@eslint/compat@^1.1.1":
18511851
version "1.1.1"
18521852
resolved "https://registry.yarnpkg.com/@eslint/compat/-/compat-1.1.1.tgz#5736523f5105c94dfae5f35e31debc38443722cd"
18531853
integrity sha512-lpHyRyplhGPL5mGEh6M9O5nnKk0Gz4bFI+Zu6tKlPpDUN7XshWvH9C/px4UVm87IAANE0W81CEsNGbS1KlzXpA==

0 commit comments

Comments
 (0)