Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix eslint-plugin-react versions #5073

Closed
wants to merge 26 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion editor/.eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
src/third-party/*
../website-next/node_modules
../utopia-vscode-extension/src/vscode-types
**/node_modules
**/node_modules
dist
9 changes: 5 additions & 4 deletions editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,12 @@
"console-feed": "2.8.11",
"create-react-class": "15.6.3",
"css-tree": "2.3.1",
"eslint-config-utopia": "link:../eslint-config-utopia",
"utopia-runtime-eslint": "link:packages/runtime-eslint",
"eslint-plugin-import": "2.25.3",
"eslint-plugin-jsx-a11y": "6.5.1",
"eslint-plugin-react": "7.23.2",
"eslint-plugin-react-hooks": "4.2.0",
"eslint-config-utopia": "link:../eslint-config-utopia",
"eslint-plugin-react": "7.33.2",
"eslint-plugin-react-hooks": "4.6.0",
"eslint4b": "6.6.0",
"fast-deep-equal": "2.0.1",
"fontfaceobserver": "2.1.0",
Expand Down Expand Up @@ -365,7 +366,7 @@
"dependency-cruiser": "13.1.5",
"diff": "5.0.0",
"enzyme": "3.3.0",
"eslint": "7.32.0",
"eslint": "8.38.0",
"eslint-config-prettier": "6.9.0",
"eslint-plugin-jest": "^25.3.0",
"eslint-plugin-prettier": "3.1.2",
Expand Down
21 changes: 21 additions & 0 deletions editor/packages/runtime-eslint/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import type { Linter as ESLintLinter } from 'eslint'
import { rules as reactPluginRules } from 'eslint-plugin-react'
import { rules as reactHooksPluginRules } from 'eslint-plugin-react-hooks'
import { rules as jsxA11yPluginRules } from 'eslint-plugin-jsx-a11y'
import eslintImportRuleFirst from 'eslint-plugin-import/lib/rules/first'
import eslintImportRuleNoAmd from 'eslint-plugin-import/lib/rules/no-amd'
import eslintImportRuleNoWebpackSyntax from 'eslint-plugin-import/lib/rules/no-webpack-loader-syntax'
import Linter from 'eslint4b'
import BabelEslint from 'babel-eslint'

export type { ESLintLinter }
export {
reactPluginRules,
reactHooksPluginRules,
jsxA11yPluginRules,
eslintImportRuleFirst,
eslintImportRuleNoAmd,
eslintImportRuleNoWebpackSyntax,
Linter,
BabelEslint,
}
14 changes: 14 additions & 0 deletions editor/packages/runtime-eslint/missing-types.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
declare module 'eslint-plugin-react' {
export const rules: { [key: string]: any } = {}
}
declare module 'eslint-plugin-react-hooks' {
export const rules: { [key: string]: any } = {}
}
declare module 'eslint-plugin-jsx-a11y' {
export const rules: { [key: string]: any } = {}
}
declare module 'eslint-plugin-import/lib/rules/first'
declare module 'eslint-plugin-import/lib/rules/no-amd'
declare module 'eslint-plugin-import/lib/rules/no-webpack-loader-syntax'
declare module 'eslint4b'
declare module 'babel-eslint'
29 changes: 29 additions & 0 deletions editor/packages/runtime-eslint/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"name": "utopia-runtime-eslint",
"version": "1.0.0",
"description": "Utopia Runtime ESLint",
"types": "dist/index.d.ts",
"main": "dist/index.js",
"scripts": {
"build": "tsc"
},
"dependencies": {
"babel-eslint": "10.0.1",
"eslint": "7.32.0",
"eslint-plugin-import": "2.25.3",
"eslint-plugin-jsx-a11y": "6.5.1",
"eslint-plugin-react": "7.23.0",
"eslint-plugin-react-hooks": "4.2.0",
"eslint4b": "6.6.0"
},
"devDependencies": {
"@types/eslint": "^8.56.6",
"typescript": "5.4.2"
},
"pnpm": {
"patchedDependencies": {
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]"
}
}
}
16 changes: 16 additions & 0 deletions editor/packages/runtime-eslint/patches/[email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/lib/analyze-scope.js b/lib/analyze-scope.js
index 9b2a40d..05b470b 100644
--- a/lib/analyze-scope.js
+++ b/lib/analyze-scope.js
@@ -327,11 +327,6 @@ module.exports = function(ast, parserOptions) {
fallback,
};

- if (OriginalReferencer._babelEslintPatched) {
- require("./patch-eslint-scope")(parserOptions);
- return escope.analyze(ast, options);
- }
-
options.childVisitorKeys = childVisitorKeys;

const scopeManager = new escope.ScopeManager(options);
12 changes: 12 additions & 0 deletions editor/packages/runtime-eslint/patches/[email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/lib/index.js b/lib/index.js
index d809156..a4e3457 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -12,7 +12,6 @@ module.exports = {
'aria-proptypes': require('./rules/aria-proptypes'),
'aria-role': require('./rules/aria-role'),
'aria-unsupported-elements': require('./rules/aria-unsupported-elements'),
- 'autocomplete-valid': require('./rules/autocomplete-valid'),
'click-events-have-key-events': require('./rules/click-events-have-key-events'),
'control-has-associated-label': require('./rules/control-has-associated-label'),
'heading-has-content': require('./rules/heading-has-content'),
Loading
Loading