Skip to content

Commit c614a12

Browse files
B4nanB4nan
committed
chore: update eslint to v9
1 parent d5c19bc commit c614a12

File tree

42 files changed

+609
-756
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+609
-756
lines changed

‎.eslintignore

-2
This file was deleted.

‎apify-docs-theme/src/markdown.js

+22-22
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,6 @@ const remarkStringify = require('remark-stringify');
33
const { unified } = require('unified');
44
const { visitParents } = require('unist-util-visit-parents');
55

6-
/**
7-
* Updates the markdown content for better UX and compatibility with Docusaurus v3.
8-
* @param {string} changelog The markdown content.
9-
* @returns {string} The updated markdown content.
10-
*/
11-
function updateChangelog(changelog) {
12-
const pipeline = unified()
13-
.use(remarkParse)
14-
.use(removeGitCliffMarkers)
15-
.use(incrementHeadingLevels)
16-
.use(prettifyPRLinks)
17-
.use(linkifyUserTags)
18-
.use(remarkStringify);
19-
20-
changelog = pipeline.processSync(changelog).toString();
21-
changelog = addFrontmatter(changelog);
22-
changelog = escapeMDXCharacters(changelog);
23-
return changelog;
24-
}
25-
266
/**
277
* Bumps the headings levels in the markdown content. This function increases the depth
288
* of all headings in the content by 1. This is useful when the content is included in
@@ -60,7 +40,7 @@ const linkifyUserTags = () => (tree) => {
6040

6141
const directParent = parents[parents.length - 1];
6242

63-
if (!match || directParent.type === 'link') return;
43+
if (!match || directParent.type === 'link') return 0;
6444

6545
const nodeIndexInParent = directParent.children.findIndex((x) => x === node);
6646

@@ -95,7 +75,7 @@ const prettifyPRLinks = () => (tree) => {
9575
const prLinkRegex = /https:\/\/github.com\/[^\s]+\/pull\/(\d+)/g;
9676
const match = prLinkRegex.exec(node.value);
9777

98-
if (!match) return;
78+
if (!match) return 0;
9979

10080
const directParent = parents[parents.length - 1];
10181
const nodeIndexInParent = directParent.children.findIndex((x) => x === node);
@@ -148,6 +128,26 @@ function escapeMDXCharacters(changelog) {
148128
});
149129
}
150130

131+
/**
132+
* Updates the markdown content for better UX and compatibility with Docusaurus v3.
133+
* @param {string} changelog The markdown content.
134+
* @returns {string} The updated markdown content.
135+
*/
136+
function updateChangelog(changelog) {
137+
const pipeline = unified()
138+
.use(remarkParse)
139+
.use(removeGitCliffMarkers)
140+
.use(incrementHeadingLevels)
141+
.use(prettifyPRLinks)
142+
.use(linkifyUserTags)
143+
.use(remarkStringify);
144+
145+
changelog = pipeline.processSync(changelog).toString();
146+
changelog = addFrontmatter(changelog);
147+
changelog = escapeMDXCharacters(changelog);
148+
return changelog;
149+
}
150+
151151
module.exports = {
152152
updateChangelog,
153153
};

‎apify-docs-theme/src/roa-loader/index.js

-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ async function getHash(source) {
3838
})).json();
3939

4040
if (!res.data || !res.data.encoded) {
41-
// eslint-disable-next-line no-console
4241
console.error(`Signing failed:' ${inspect(res.error) || 'Unknown error'}`, res);
4342
return 'invalid-token';
4443
}
@@ -79,7 +78,6 @@ module.exports = async function (code) {
7978
return { code, hash: 'fast' };
8079
}
8180

82-
// eslint-disable-next-line no-console
8381
console.log(`Signing ${urlToRequest(this.resourcePath)}...`, { working, queue: queue.length });
8482
const codeHash = await encodeAndSign(code);
8583

‎apify-docs-theme/src/theme.js

-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ This either means that your Docusaurus setup is misconfigured, or that your GitH
108108
await generateChangelogFromGitHubReleases(pathsToCopyChangelog, `${context.siteConfig.organizationName}/${context.siteConfig.projectName}`);
109109
}
110110
} catch (e) {
111-
// eslint-disable-next-line no-console
112111
console.warn(`Changelog page could not be initialized: ${e.message}`);
113112
}
114113
},

‎apify-docs-theme/src/theme/ColorModeToggle/index.jsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import React from 'react';
2-
// eslint-disable-next-line import/no-extraneous-dependencies
3-
import clsx from 'clsx';
4-
import useIsBrowser from '@docusaurus/useIsBrowser';
51
import { translate } from '@docusaurus/Translate';
6-
import IconLightMode from '../Icon/LightMode';
7-
import IconDarkMode from '../Icon/DarkMode';
2+
import useIsBrowser from '@docusaurus/useIsBrowser';
3+
import clsx from 'clsx';
4+
import React from 'react';
5+
86
import styles from './styles.module.css';
7+
import IconDarkMode from '../Icon/DarkMode';
8+
import IconLightMode from '../Icon/LightMode';
99

1010
function ColorModeToggle({
1111
className,

‎apify-docs-theme/src/theme/DocSidebarItem/Link/index.jsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import React from 'react';
2-
// eslint-disable-next-line import/no-extraneous-dependencies
3-
import clsx from 'clsx';
1+
import isInternalUrl from '@docusaurus/isInternalUrl';
2+
import Link from '@docusaurus/Link';
3+
import { isActiveSidebarItem } from '@docusaurus/plugin-content-docs/client';
44
import { ThemeClassNames } from '@docusaurus/theme-common';
55
import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
6-
import { isActiveSidebarItem } from '@docusaurus/plugin-content-docs/client';
7-
import Link from '@docusaurus/Link';
8-
import isInternalUrl from '@docusaurus/isInternalUrl';
96
import IconExternalLink from '@theme/Icon/ExternalLink';
7+
import clsx from 'clsx';
8+
import React from 'react';
9+
1010
import styles from './styles.module.css';
1111

1212
export default function DocSidebarItemLink({

‎apify-docs-theme/src/theme/Footer/index.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import React from 'react';
2-
// eslint-disable-next-line import/no-extraneous-dependencies
3-
import clsx from 'clsx';
41
import { useThemeConfig } from '@docusaurus/theme-common';
52
import LinkItem from '@theme/Footer/LinkItem';
3+
import clsx from 'clsx';
4+
import React from 'react';
5+
66
import styles from './index.module.css';
77

88
function FooterLinksColumn({ column }) {

‎apify-docs-theme/src/theme/Layout/index.jsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import React from 'react';
2-
// cannot use any of the theme aliases here as it causes a circular dependency :( ideas welcome
1+
import { useLocation } from '@docusaurus/router';
32
import Layout from '@docusaurus/theme-classic/lib/theme/Layout/index';
4-
import { usePluginData } from '@docusaurus/useGlobalData';
53
import useBaseUrl from '@docusaurus/useBaseUrl';
6-
import { useLocation } from '@docusaurus/router';
4+
import { usePluginData } from '@docusaurus/useGlobalData';
5+
import React from 'react';
6+
// cannot use any of the theme aliases here as it causes a circular dependency :( ideas welcome
77

88
export default function LayoutWrapper(props) {
99
const { options: { subNavbar } } = usePluginData('@apify/docs-theme');

‎apify-docs-theme/src/theme/Navbar/MobileSidebar/PrimaryMenu/index.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import React from 'react';
21
import { useThemeConfig } from '@docusaurus/theme-common';
32
import useBaseUrl from '@docusaurus/useBaseUrl';
43
import { usePluginData } from '@docusaurus/useGlobalData';
54
import NavbarItem from '@theme/NavbarItem';
5+
import React from 'react';
66

77
function useNavbarItems() {
88
// TODO temporary casting until ThemeConfig type is improved

‎apify-docs-theme/src/theme/NavbarItem/ComponentTypes.jsx

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
import { useDocsVersion, useLayoutDoc } from '@docusaurus/plugin-content-docs/client';
2+
import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
13
import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
4+
import DocSidebarNavbarItem from '@theme/NavbarItem/DocSidebarNavbarItem';
5+
import DocsVersionDropdownNavbarItem from '@theme/NavbarItem/DocsVersionDropdownNavbarItem';
6+
import DocsVersionNavbarItem from '@theme/NavbarItem/DocsVersionNavbarItem';
27
import DropdownNavbarItem from '@theme/NavbarItem/DropdownNavbarItem';
8+
import HtmlNavbarItem from '@theme/NavbarItem/HtmlNavbarItem';
39
import LocaleDropdownNavbarItem from '@theme/NavbarItem/LocaleDropdownNavbarItem';
410
import SearchNavbarItem from '@theme/NavbarItem/SearchNavbarItem';
5-
import HtmlNavbarItem from '@theme/NavbarItem/HtmlNavbarItem';
6-
import DocSidebarNavbarItem from '@theme/NavbarItem/DocSidebarNavbarItem';
7-
import DocsVersionNavbarItem from '@theme/NavbarItem/DocsVersionNavbarItem';
8-
import DocsVersionDropdownNavbarItem from '@theme/NavbarItem/DocsVersionDropdownNavbarItem';
9-
import { useDocsVersion, useLayoutDoc } from '@docusaurus/plugin-content-docs/client';
10-
import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
1111
import React from 'react';
1212

1313
// const versions = require('../../../versions.json');
@@ -40,7 +40,6 @@ function ApiNavbarItem(ctx) {
4040
let version = {};
4141

4242
try {
43-
// eslint-disable-next-line react-hooks/rules-of-hooks
4443
version = useDocsVersion();
4544
} catch {
4645
version.version = stable;

‎apify-docs-theme/src/theme/RunnableCodeBlock/RunnableCodeBlock.jsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import React from 'react';
2-
// eslint-disable-next-line import/no-extraneous-dependencies
3-
import clsx from 'clsx';
4-
import CodeBlock from '@theme/CodeBlock';
51
import Link from '@docusaurus/Link';
2+
import CodeBlock from '@theme/CodeBlock';
3+
import clsx from 'clsx';
4+
import React from 'react';
5+
66
import styles from './RunnableCodeBlock.module.css';
77

88
const EXAMPLE_RUNNERS = {

‎apify-docs-theme/src/theme/SearchBar/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import { ApifySearch } from '@apify/docs-search-modal';
21
import BrowserOnly from '@docusaurus/BrowserOnly';
32
import RouterLink from '@docusaurus/Link';
43
import { useLocation, useHistory } from '@docusaurus/router';
54
import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
65
import React, { useCallback } from 'react';
76

7+
import { ApifySearch } from '@apify/docs-search-modal';
8+
89
/**
910
* Tests whether the given href is pointing to the current docusaurus instance (so we can use the router link).
1011
*/

‎eslint.config.mjs

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
import react from 'eslint-plugin-react';
2+
import globals from 'globals';
3+
4+
import apify from '@apify/eslint-config';
5+
6+
export default [
7+
{
8+
ignores: ['**/dist', 'node_modules', '.docusaurus', 'build', 'sources/api'],
9+
},
10+
...apify,
11+
{
12+
languageOptions: {
13+
parserOptions: {
14+
project: 'tsconfig.eslint.json',
15+
},
16+
},
17+
},
18+
{
19+
rules: {
20+
'@typescript-eslint/consistent-type-imports': 'off',
21+
'no-promise-executor-return': 'off',
22+
'@typescript-eslint/no-explicit-any': 'off',
23+
'no-param-reassign': 'off',
24+
'no-void': 'off',
25+
'no-console': 'off',
26+
'no-unused-vars': 'off',
27+
'import/no-extraneous-dependencies': 'off',
28+
'import/extensions': 'off',
29+
'import/no-default-export': 'off',
30+
'quote-props': ['error', 'consistent'],
31+
},
32+
},
33+
{
34+
files: ['**/*.{js,jsx,mjs,cjs,ts,tsx}'],
35+
plugins: {
36+
react,
37+
},
38+
languageOptions: {
39+
parserOptions: {
40+
ecmaFeatures: {
41+
jsx: true,
42+
},
43+
},
44+
globals: {
45+
...globals.browser,
46+
},
47+
},
48+
rules: {
49+
// ... any rules you want
50+
'react/jsx-uses-react': 'error',
51+
'react/jsx-uses-vars': 'error',
52+
},
53+
// ... others are omitted for brevity
54+
},
55+
];

‎examples/ts-parallel-scraping/orchestrator/src/main.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ interface State {
1515
await Actor.init();
1616

1717
const {
18-
parallelRunsCount= 1,
18+
parallelRunsCount = 1,
1919
targetActorId,
2020
targetActorInput = {},
2121
targetActorRunOptions = {},

0 commit comments

Comments
 (0)