diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 8600a9e70..000000000 --- a/.eslintignore +++ /dev/null @@ -1,49 +0,0 @@ -# Logs -logs -*.log - -# Runtime data -pids -*.pid -*.seed - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (http://nodejs.org/api/addons.html) -build/Release - -# Dependency directory -# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git -node_modules - -# Jetbrains IDEs -.idea - -/build -_book - -# Only apps should have lockfiles -npm-shrinkwrap.json -package-lock.json -yarn.lock - -.DS_Store -._.DS_Store - -packages/*/build/ - -# Temporarily copied -packages/*/LICENSE.md -packages/enzyme/README.md -packages/enzyme-adapter-react-*/README.md -packages/enzyme-adapter-utils*/README.md diff --git a/.eslintrc b/.eslintrc index 7a9927f00..c174a39c3 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,7 +4,17 @@ "env": { "node": true, }, - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", + "ignorePatterns": [ + "/build", + "_book", + "packages/*/build/", + // Temporarily copied + "packages/*/LICENSE.md", + "packages/enzyme/README.md", + "packages/enzyme-adapter-react-*/README.md", + "packages/enzyme-adapter-utils*/README.md", + ], "rules": { "id-length": 0, "react/no-find-dom-node": 1, @@ -23,43 +33,45 @@ "devDependencies": true, }], "comma-dangle": [2, { - arrays: "always-multiline", - objects: "always-multiline", - imports: "always-multiline", - exports: "always-multiline", - functions: "ignore", + "arrays": "always-multiline", + "objects": "always-multiline", + "imports": "always-multiline", + "exports": "always-multiline", + "functions": "ignore", }], "strict": [2, "safe"], "prefer-destructuring": 0, "prefer-template": 0, }, "parserOptions": { - sourceType: "script", + "sourceType": "script", }, }, { "files": [ - "*.md", "**/*.md", + "**/*.md/**" ], - "plugins": [ - "markdown" - ], + "extends": ["plugin:markdown/recommended"], "rules": { "class-methods-use-this": 0, - "import/no-unresolved": 0, - "import/no-extraneous-dependencies": 0, "import/extensions": 0, + "import/no-extraneous-dependencies": 0, + "import/no-unresolved": 0, + "import/prefer-default-export": 0, "max-len": 0, - "no-unused-vars": 0, "no-console": 0, "no-undef": 0, - "react/react-in-jsx-scope": 0, + "no-unused-vars": 0, "react/jsx-filename-extension": 0, + "react/jsx-fragments": 0, "react/jsx-no-undef": 0, - "react/no-multi-comp": 0, + "react/jsx-no-useless-fragment": 0, "react/jsx-one-expression-per-line": 0, - "react/jsx-fragments": 0, + "react/no-multi-comp": 0, + "react/no-unknown-property": 0, + "react/no-unused-class-component-methods": 0, + "react/react-in-jsx-scope": 0, }, }, ], diff --git a/docs/api/ReactWrapper/props.md b/docs/api/ReactWrapper/props.md index 4614660c5..1c9f3c44b 100644 --- a/docs/api/ReactWrapper/props.md +++ b/docs/api/ReactWrapper/props.md @@ -7,7 +7,6 @@ This method is a reliable way of accessing the props of a node; `wrapper.instanc #### Example ```jsx - import PropTypes from 'prop-types'; function MyComponent(props) { diff --git a/docs/api/ReactWrapper/renderProp.md b/docs/api/ReactWrapper/renderProp.md index c58d5f886..b84edbbd0 100644 --- a/docs/api/ReactWrapper/renderProp.md +++ b/docs/api/ReactWrapper/renderProp.md @@ -50,17 +50,19 @@ Mouse.propTypes = { ``` ```jsx -const App = () => ( -
- ( -

- The mouse position is ({x}, {y}) -

- )} - /> -
-); +function App() { + return ( +
+ ( +

+ The mouse position is ({x}, {y}) +

+ )} + /> +
+ ); +} ``` ##### Testing with no arguments diff --git a/docs/api/ReactWrapper/simulate.md b/docs/api/ReactWrapper/simulate.md index 2f2c734e3..96330c3f5 100644 --- a/docs/api/ReactWrapper/simulate.md +++ b/docs/api/ReactWrapper/simulate.md @@ -48,12 +48,14 @@ expect(wrapper.find('.clicks-1').length).to.equal(1); #### Example `functional component` ```jsx -const Foo = ({ width, height, onChange }) => ( -
- - -
-); +function Foo({ width, height, onChange }) { + return ( +
+ + +
+ ); +} Foo.propTypes = { width: PropTypes.number.isRequired, height: PropTypes.number.isRequired, diff --git a/docs/api/ReactWrapper/simulateError.md b/docs/api/ReactWrapper/simulateError.md index 451618ab3..60f761e51 100644 --- a/docs/api/ReactWrapper/simulateError.md +++ b/docs/api/ReactWrapper/simulateError.md @@ -74,5 +74,3 @@ expect(spy.args).to.deep.equal([ }, ]); ``` - - diff --git a/docs/api/ShallowWrapper/props.md b/docs/api/ShallowWrapper/props.md index ce3718a35..29d6d062b 100644 --- a/docs/api/ShallowWrapper/props.md +++ b/docs/api/ShallowWrapper/props.md @@ -9,7 +9,6 @@ This method is a reliable way of accessing the props of a node; `wrapper.instanc #### Example ```jsx - import PropTypes from 'prop-types'; function MyComponent(props) { diff --git a/docs/api/ShallowWrapper/renderProp.md b/docs/api/ShallowWrapper/renderProp.md index 346bf7e7e..754251a7f 100644 --- a/docs/api/ShallowWrapper/renderProp.md +++ b/docs/api/ShallowWrapper/renderProp.md @@ -50,17 +50,19 @@ Mouse.propTypes = { ``` ```jsx -const App = () => ( -
- ( -

- The mouse position is ({x}, {y}) -

- )} - /> -
-); +function App() { + return ( +
+ ( +

+ The mouse position is ({x}, {y}) +

+ )} + /> +
+ ); +} ``` ##### Testing with no arguments diff --git a/docs/api/ShallowWrapper/simulate.md b/docs/api/ShallowWrapper/simulate.md index a285fc05b..52b12649d 100644 --- a/docs/api/ShallowWrapper/simulate.md +++ b/docs/api/ShallowWrapper/simulate.md @@ -48,12 +48,14 @@ expect(wrapper.find('.clicks-1').length).to.equal(1); #### Example `functional component` ```jsx -const Foo = ({ width, height, onChange }) => ( -
- - -
-); +function Foo({ width, height, onChange }) { + return ( +
+ + +
+ ); +} Foo.propTypes = { width: PropTypes.number.isRequired, height: PropTypes.number.isRequired, diff --git a/docs/api/ShallowWrapper/simulateError.md b/docs/api/ShallowWrapper/simulateError.md index e8f7b71dd..185dac212 100644 --- a/docs/api/ShallowWrapper/simulateError.md +++ b/docs/api/ShallowWrapper/simulateError.md @@ -73,6 +73,4 @@ expect(spy.args).to.deep.equal([ in WrapperComponent`, }, ]); -``` - - +``` \ No newline at end of file diff --git a/docs/api/shallow.md b/docs/api/shallow.md index 152386d03..b7d0ed439 100644 --- a/docs/api/shallow.md +++ b/docs/api/shallow.md @@ -37,7 +37,6 @@ describe('', () => { expect(onButtonClick).to.have.property('callCount', 1); }); }); - ``` ## `shallow(node[, options]) => ShallowWrapper` diff --git a/docs/guides/lab.md b/docs/guides/lab.md index f060c64cf..486c78838 100644 --- a/docs/guides/lab.md +++ b/docs/guides/lab.md @@ -13,7 +13,7 @@ const Code = require('code'); const Lab = require('lab'); const lab = Lab.script(); -exports.lab = lab; +export { lab }; lab.suite('A suite', () => { lab.test('calls componentDidMount', (done) => { diff --git a/docs/guides/migration-from-2-to-3.md b/docs/guides/migration-from-2-to-3.md index 700c20758..04071dfc6 100644 --- a/docs/guides/migration-from-2-to-3.md +++ b/docs/guides/migration-from-2-to-3.md @@ -78,7 +78,9 @@ const ICONS = { failure: , }; -const StatusLabel = ({ id, label }) =>
{ICONS[id]}{label}{ICONS[id]}
; +function StatusLabel({ id, label }) { + return
{ICONS[id]}{label}{ICONS[id]}
; +} ``` ```js @@ -504,11 +506,13 @@ Consider this example: ```js -const HelpLink = ({ text, ...rest }) => {text}; +function HelpLink({ text, ...rest }) { + return {text}; +} -const HelpLinkContainer = ({ text, ...rest }) => ( - -); +function HelpLinkContainer({ text, ...rest }) { + return ; +} const wrapper = mount(); ``` diff --git a/docs/guides/mocha.md b/docs/guides/mocha.md index 5f0877993..f7b8df040 100644 --- a/docs/guides/mocha.md +++ b/docs/guides/mocha.md @@ -22,5 +22,4 @@ describe('', () => { expect(Foo.prototype.componentDidMount).to.have.property('callCount', 1); }); }); - -``` +``` \ No newline at end of file diff --git a/package.json b/package.json index a81a837f4..dbbf53d9b 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "clean": "lerna run clean", "prelint": "npm run lint:root", "lint": "lerna exec --parallel 'npm run lint -- --quiet'", - "lint:root": "eslint . --ext=js,md,jsx --ignore-pattern=packages/ --ignore-path .eslintignore", + "lint:root": "eslint . --ext=js,md,jsx --ignore-pattern=packages/", "check": "lerna run lint && npm run test:all", "prebuild": "npm run clean", "build": "lerna run build", @@ -62,20 +62,20 @@ "devDependencies": { "@babel/cli": "^7.19.3", "@babel/core": "^7.19.3", + "@babel/eslint-parser": "^7.19.1", "@babel/node": "^7.19.1", "@babel/register": "^7.18.9", - "babel-eslint": "^10.1.0", "babel-loader": "^8.2.2", "babel-plugin-add-module-exports": "^1.0.4", "babel-plugin-transform-replace-object-assign": "^2.0.0", "babel-preset-airbnb": "^4.5.0", "chai": "^4.3.4", - "eslint": "^8.24.0", + "eslint": "^8.26.0", "eslint-config-airbnb": "^19.0.4", "eslint-plugin-import": "^2.26.0", "eslint-plugin-jsx-a11y": "^6.6.1", "eslint-plugin-markdown": "^3.0.0", - "eslint-plugin-react": "^7.31.8", + "eslint-plugin-react": "^7.31.10", "eslint-plugin-react-hooks": "^4.6.0", "gitbook-cli": "^1.0.1", "gitbook-plugin-anchors": "^0.7.1", diff --git a/packages/enzyme-adapter-react-13/.eslintrc b/packages/enzyme-adapter-react-13/.eslintrc index 7f08944fc..d6f202324 100644 --- a/packages/enzyme-adapter-react-13/.eslintrc +++ b/packages/enzyme-adapter-react-13/.eslintrc @@ -1,9 +1,10 @@ { "extends": "airbnb", - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", "root": true, + "ignorePatterns": ["build/"], "rules": { - "max-classes-per-file": 0, + "max-classes-per-file": 0, "max-len": 0, "react/no-find-dom-node": 0, "react/no-multi-comp": 0, diff --git a/packages/enzyme-adapter-react-13/package.json b/packages/enzyme-adapter-react-13/package.json index 3cc98ff1f..3f152e763 100644 --- a/packages/enzyme-adapter-react-13/package.json +++ b/packages/enzyme-adapter-react-13/package.json @@ -51,7 +51,7 @@ "devDependencies": { "@babel/cli": "^7.19.3", "@babel/core": "^7.19.3", - "babel-eslint": "^10.1.0", + "@babel/eslint-parser": "^7.19.1", "babel-plugin-add-module-exports": "^1.0.4", "babel-plugin-transform-replace-object-assign": "^2.0.0", "babel-preset-airbnb": "^4.5.0", diff --git a/packages/enzyme-adapter-react-14/.eslintrc b/packages/enzyme-adapter-react-14/.eslintrc index 102fa936c..f2a26f5a8 100644 --- a/packages/enzyme-adapter-react-14/.eslintrc +++ b/packages/enzyme-adapter-react-14/.eslintrc @@ -1,7 +1,8 @@ { "extends": "airbnb", - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", "root": true, + "ignorePatterns": ["build/"], "rules": { "max-len": 0, "react/no-find-dom-node": 0, diff --git a/packages/enzyme-adapter-react-14/package.json b/packages/enzyme-adapter-react-14/package.json index 5ccb48c4c..92730d0d0 100644 --- a/packages/enzyme-adapter-react-14/package.json +++ b/packages/enzyme-adapter-react-14/package.json @@ -55,7 +55,7 @@ "devDependencies": { "@babel/cli": "^7.19.3", "@babel/core": "^7.19.3", - "babel-eslint": "^10.1.0", + "@babel/eslint-parser": "^7.19.1", "babel-plugin-add-module-exports": "^1.0.4", "babel-plugin-transform-replace-object-assign": "^2.0.0", "babel-preset-airbnb": "^4.5.0", diff --git a/packages/enzyme-adapter-react-15.4/.eslintrc b/packages/enzyme-adapter-react-15.4/.eslintrc index a0b847354..12b72278d 100644 --- a/packages/enzyme-adapter-react-15.4/.eslintrc +++ b/packages/enzyme-adapter-react-15.4/.eslintrc @@ -1,6 +1,7 @@ { "extends": "airbnb", - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", + "ignorePatterns": ["build/"], "root": true, "rules": { "max-len": 0, diff --git a/packages/enzyme-adapter-react-15.4/package.json b/packages/enzyme-adapter-react-15.4/package.json index aaf09bc77..f05ab05c5 100644 --- a/packages/enzyme-adapter-react-15.4/package.json +++ b/packages/enzyme-adapter-react-15.4/package.json @@ -55,7 +55,7 @@ "devDependencies": { "@babel/cli": "^7.19.3", "@babel/core": "^7.19.3", - "babel-eslint": "^10.1.0", + "@babel/eslint-parser": "^7.19.1", "babel-plugin-add-module-exports": "^1.0.4", "babel-plugin-transform-replace-object-assign": "^2.0.0", "babel-preset-airbnb": "^4.5.0", diff --git a/packages/enzyme-adapter-react-15/.eslintrc b/packages/enzyme-adapter-react-15/.eslintrc index 585b379a9..6ef3eab97 100644 --- a/packages/enzyme-adapter-react-15/.eslintrc +++ b/packages/enzyme-adapter-react-15/.eslintrc @@ -1,7 +1,8 @@ { "extends": "airbnb", - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", "root": true, + "ignorePatterns": ["build/"], "rules": { "max-len": 0, "react/no-find-dom-node": 0, diff --git a/packages/enzyme-adapter-react-15/package.json b/packages/enzyme-adapter-react-15/package.json index 4cac12d24..a99783b5f 100644 --- a/packages/enzyme-adapter-react-15/package.json +++ b/packages/enzyme-adapter-react-15/package.json @@ -54,7 +54,7 @@ "devDependencies": { "@babel/cli": "^7.19.3", "@babel/core": "^7.19.3", - "babel-eslint": "^10.1.0", + "@babel/eslint-parser": "^7.19.1", "babel-plugin-add-module-exports": "^1.0.4", "babel-plugin-transform-replace-object-assign": "^2.0.0", "babel-preset-airbnb": "^4.5.0", diff --git a/packages/enzyme-adapter-react-16.1/.eslintrc b/packages/enzyme-adapter-react-16.1/.eslintrc index fe790d599..aca462bd8 100644 --- a/packages/enzyme-adapter-react-16.1/.eslintrc +++ b/packages/enzyme-adapter-react-16.1/.eslintrc @@ -1,9 +1,10 @@ { "extends": "airbnb", - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", "root": true, + "ignorePatterns": ["build/"], "rules": { - "max-classes-per-file": 0, + "max-classes-per-file": 0, "max-len": 0, "react/no-deprecated": 0, "react/no-find-dom-node": 0, diff --git a/packages/enzyme-adapter-react-16.1/package.json b/packages/enzyme-adapter-react-16.1/package.json index db584b5d9..cdd27ea43 100644 --- a/packages/enzyme-adapter-react-16.1/package.json +++ b/packages/enzyme-adapter-react-16.1/package.json @@ -55,7 +55,7 @@ "devDependencies": { "@babel/cli": "^7.19.3", "@babel/core": "^7.19.3", - "babel-eslint": "^10.1.0", + "@babel/eslint-parser": "^7.19.1", "babel-plugin-add-module-exports": "^1.0.4", "babel-plugin-transform-replace-object-assign": "^2.0.0", "babel-preset-airbnb": "^4.5.0", diff --git a/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js b/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js index 4524ae7ed..8215d38d6 100644 --- a/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js +++ b/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js @@ -416,7 +416,6 @@ class ReactSixteenOneAdapter extends EnzymeAdapter { writable: true, }); } - return true; }, }); } diff --git a/packages/enzyme-adapter-react-16.2/.eslintrc b/packages/enzyme-adapter-react-16.2/.eslintrc index 2000c148d..b2b317b2a 100644 --- a/packages/enzyme-adapter-react-16.2/.eslintrc +++ b/packages/enzyme-adapter-react-16.2/.eslintrc @@ -1,7 +1,8 @@ { "extends": "airbnb", - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", "root": true, + "ignorePatterns": ["build/"], "rules": { "max-classes-per-file": 0, "max-len": 0, diff --git a/packages/enzyme-adapter-react-16.2/package.json b/packages/enzyme-adapter-react-16.2/package.json index 9ac4f0e92..f5106f898 100644 --- a/packages/enzyme-adapter-react-16.2/package.json +++ b/packages/enzyme-adapter-react-16.2/package.json @@ -56,7 +56,7 @@ "devDependencies": { "@babel/cli": "^7.19.3", "@babel/core": "^7.19.3", - "babel-eslint": "^10.1.0", + "@babel/eslint-parser": "^7.19.1", "babel-plugin-add-module-exports": "^1.0.4", "babel-plugin-transform-replace-object-assign": "^2.0.0", "babel-preset-airbnb": "^4.5.0", diff --git a/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js b/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js index fa3ac9012..c71c24aa3 100644 --- a/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js +++ b/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js @@ -418,7 +418,6 @@ class ReactSixteenTwoAdapter extends EnzymeAdapter { writable: true, }); } - return true; }, }); } diff --git a/packages/enzyme-adapter-react-16.3/.eslintrc b/packages/enzyme-adapter-react-16.3/.eslintrc index 94f48a632..5c8fb3759 100644 --- a/packages/enzyme-adapter-react-16.3/.eslintrc +++ b/packages/enzyme-adapter-react-16.3/.eslintrc @@ -1,7 +1,8 @@ { "extends": "airbnb", - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", "root": true, + "ignorePatterns": ["build/"], "rules": { "max-len": 0, "react/no-deprecated": 0, diff --git a/packages/enzyme-adapter-react-16.3/package.json b/packages/enzyme-adapter-react-16.3/package.json index 81c337e80..42b1de60e 100644 --- a/packages/enzyme-adapter-react-16.3/package.json +++ b/packages/enzyme-adapter-react-16.3/package.json @@ -56,7 +56,7 @@ "devDependencies": { "@babel/cli": "^7.19.3", "@babel/core": "^7.19.3", - "babel-eslint": "^10.1.0", + "@babel/eslint-parser": "^7.19.1", "babel-plugin-add-module-exports": "^1.0.4", "babel-plugin-transform-replace-object-assign": "^2.0.0", "babel-preset-airbnb": "^4.5.0", diff --git a/packages/enzyme-adapter-react-16/.eslintrc b/packages/enzyme-adapter-react-16/.eslintrc index 89fd29ebe..a03d2f7c3 100644 --- a/packages/enzyme-adapter-react-16/.eslintrc +++ b/packages/enzyme-adapter-react-16/.eslintrc @@ -1,7 +1,8 @@ { "extends": "airbnb", - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", "root": true, + "ignorePatterns": ["build/"], "rules": { "max-classes-per-file": 0, "max-len": 0, diff --git a/packages/enzyme-adapter-react-16/package.json b/packages/enzyme-adapter-react-16/package.json index 5ce73eede..63f8fdab1 100644 --- a/packages/enzyme-adapter-react-16/package.json +++ b/packages/enzyme-adapter-react-16/package.json @@ -57,7 +57,7 @@ "devDependencies": { "@babel/cli": "^7.19.3", "@babel/core": "^7.19.3", - "babel-eslint": "^10.1.0", + "@babel/eslint-parser": "^7.19.1", "babel-plugin-add-module-exports": "^1.0.4", "babel-plugin-transform-replace-object-assign": "^2.0.0", "babel-preset-airbnb": "^4.5.0", diff --git a/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js b/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js index 238f02e82..b07a1f31b 100644 --- a/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js +++ b/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js @@ -752,7 +752,6 @@ class ReactSixteenAdapter extends EnzymeAdapter { writable: true, }); } - return true; }, }); } diff --git a/packages/enzyme-adapter-react-helper/.eslintrc b/packages/enzyme-adapter-react-helper/.eslintrc index 68a7af589..0e40a8621 100644 --- a/packages/enzyme-adapter-react-helper/.eslintrc +++ b/packages/enzyme-adapter-react-helper/.eslintrc @@ -1,7 +1,8 @@ { "extends": "airbnb", - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", "root": true, + "ignorePatterns": ["build/"], "rules": { "max-len": 0, }, diff --git a/packages/enzyme-adapter-react-helper/package.json b/packages/enzyme-adapter-react-helper/package.json index 1f1cacea8..3ea07c70f 100644 --- a/packages/enzyme-adapter-react-helper/package.json +++ b/packages/enzyme-adapter-react-helper/package.json @@ -44,7 +44,7 @@ "devDependencies": { "@babel/cli": "^7.19.3", "@babel/core": "^7.19.3", - "babel-eslint": "^10.1.0", + "@babel/eslint-parser": "^7.19.1", "babel-plugin-add-module-exports": "^1.0.4", "babel-plugin-transform-replace-object-assign": "^2.0.0", "babel-preset-airbnb": "^4.5.0", diff --git a/packages/enzyme-adapter-utils/.eslintrc b/packages/enzyme-adapter-utils/.eslintrc index 4ef5612a8..a3bc82df6 100644 --- a/packages/enzyme-adapter-utils/.eslintrc +++ b/packages/enzyme-adapter-utils/.eslintrc @@ -1,7 +1,8 @@ { "extends": "airbnb", - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", "root": true, + "ignorePatterns": ["build/"], "overrides": [ { "files": ["src/createMountWrapper.*"], diff --git a/packages/enzyme-adapter-utils/package.json b/packages/enzyme-adapter-utils/package.json index 8af1e5ffd..2771c1797 100644 --- a/packages/enzyme-adapter-utils/package.json +++ b/packages/enzyme-adapter-utils/package.json @@ -53,7 +53,7 @@ "devDependencies": { "@babel/cli": "^7.19.3", "@babel/core": "^7.19.3", - "babel-eslint": "^10.1.0", + "@babel/eslint-parser": "^7.19.1", "babel-plugin-add-module-exports": "^1.0.4", "babel-plugin-transform-replace-object-assign": "^2.0.0", "babel-preset-airbnb": "^4.5.0", diff --git a/packages/enzyme-adapter-utils/src/createMountWrapper.jsx b/packages/enzyme-adapter-utils/src/createMountWrapper.jsx index 8b6ff7930..a653fdab4 100644 --- a/packages/enzyme-adapter-utils/src/createMountWrapper.jsx +++ b/packages/enzyme-adapter-utils/src/createMountWrapper.jsx @@ -57,6 +57,7 @@ export default function createMountWrapper(node, options = {}) { }; } + // eslint-disable-next-line react/no-unused-class-component-methods setChildProps(newProps, newContext, callback = undefined) { const { props: oldProps, context: oldContext } = this.state; const props = { ...oldProps, ...newProps }; @@ -64,6 +65,7 @@ export default function createMountWrapper(node, options = {}) { this.setState({ props, context }, callback); } + // eslint-disable-next-line react/no-unused-class-component-methods setWrappingComponentProps(props, callback = undefined) { this.setState({ wrappingComponentProps: props }, callback); } diff --git a/packages/enzyme-example-mocha/.eslintrc b/packages/enzyme-example-mocha/.eslintrc index 4b71a2530..936643daa 100644 --- a/packages/enzyme-example-mocha/.eslintrc +++ b/packages/enzyme-example-mocha/.eslintrc @@ -1,7 +1,8 @@ { "extends": "airbnb", - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", "root": true, + "ignorePatterns": ["build/"], "env": { "node": true, "mocha": true, diff --git a/packages/enzyme-example-mocha/package.json b/packages/enzyme-example-mocha/package.json index a27a5e55e..b4c335756 100644 --- a/packages/enzyme-example-mocha/package.json +++ b/packages/enzyme-example-mocha/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@babel/cli": "^7.15.4", "@babel/core": "^7.15.5", - "babel-eslint": "^10.1.0", + "@babel/eslint-parser": "^7.19.1", "babel-plugin-add-module-exports": "^1.0.4", "babel-plugin-transform-replace-object-assign": "^2.0.0", "babel-preset-airbnb": "^4.5.0", diff --git a/packages/enzyme-shallow-equal/.eslintrc b/packages/enzyme-shallow-equal/.eslintrc index 1964ac2ea..ed8fb5c6e 100644 --- a/packages/enzyme-shallow-equal/.eslintrc +++ b/packages/enzyme-shallow-equal/.eslintrc @@ -1,5 +1,6 @@ { "root": true, "extends": "airbnb-base", - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", + "ignorePatterns": ["build/"], } diff --git a/packages/enzyme-shallow-equal/package.json b/packages/enzyme-shallow-equal/package.json index 2175e230b..b9eebfdbb 100644 --- a/packages/enzyme-shallow-equal/package.json +++ b/packages/enzyme-shallow-equal/package.json @@ -45,7 +45,7 @@ "devDependencies": { "@babel/cli": "^7.19.3", "@babel/core": "^7.19.3", - "babel-eslint": "^10.1.0", + "@babel/eslint-parser": "^7.19.1", "babel-plugin-add-module-exports": "^1.0.4", "babel-plugin-transform-replace-object-assign": "^2.0.0", "babel-preset-airbnb": "^4.5.0", diff --git a/packages/enzyme-test-suite/.eslintrc b/packages/enzyme-test-suite/.eslintrc index b3dc36c42..f83044b18 100644 --- a/packages/enzyme-test-suite/.eslintrc +++ b/packages/enzyme-test-suite/.eslintrc @@ -1,7 +1,8 @@ { "extends": "airbnb", - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", "root": true, + "ignorePatterns": ["build/"], "env": { "mocha": true, }, diff --git a/packages/enzyme/.eslintrc b/packages/enzyme/.eslintrc index 57451d1c1..d786ac5be 100644 --- a/packages/enzyme/.eslintrc +++ b/packages/enzyme/.eslintrc @@ -1,7 +1,8 @@ { "extends": "airbnb", - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", "root": true, + "ignorePatterns": ["build/"], "env": { "node": true, "mocha": true diff --git a/packages/enzyme/package.json b/packages/enzyme/package.json index b76a4da42..b7edf1848 100644 --- a/packages/enzyme/package.json +++ b/packages/enzyme/package.json @@ -66,7 +66,7 @@ "devDependencies": { "@babel/cli": "^7.19.3", "@babel/core": "^7.19.3", - "babel-eslint": "^10.1.0", + "@babel/eslint-parser": "^7.19.1", "babel-plugin-add-module-exports": "^1.0.4", "babel-plugin-transform-replace-object-assign": "^2.0.0", "babel-preset-airbnb": "^4.5.0", diff --git a/packages/enzyme/src/ReactWrapper.js b/packages/enzyme/src/ReactWrapper.js index 75a0cae0a..31330f85e 100644 --- a/packages/enzyme/src/ReactWrapper.js +++ b/packages/enzyme/src/ReactWrapper.js @@ -124,10 +124,12 @@ class ReactWrapper { throw new TypeError('your adapter does not support `wrappingComponent`. Try upgrading it!'); } - // eslint-disable-next-line no-use-before-define - privateSet(this, WRAPPING_COMPONENT, new WrappingComponentWrapper( - this, this[RENDERER].getWrappingComponentRenderer(), - )); + privateSet( + this, + WRAPPING_COMPONENT, + // eslint-disable-next-line no-use-before-define + new WrappingComponentWrapper(this, this[RENDERER].getWrappingComponentRenderer()), + ); this[LINKED_ROOTS].push(this[WRAPPING_COMPONENT]); } } else {