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

Release8.0.0 #357

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
8.0.0
=====
* Added support for react 17. (@alandeivson, @iagocaldeira)


7.1.2
=====
* Fix a typescript conflict with a recent Jest update. (@tobilen)
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
"@babel/preset-env": "^7.6.2",
"@babel/preset-flow": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
"babel-eslint": "^10.0.3",
"babel-jest": "^25.2.0",
"babel-plugin-add-module-exports": "^1.0.2",
"babel-preset-airbnb": "^4.1.0",
"enzyme": "^3.4.0",
"enzyme-adapter-react-16": "^1.5.0",
"eslint": "^4.9.0",
"eslint-config-airbnb": "^16.1.0",
"eslint-config-prettier": "^2.9.0",
Expand All @@ -66,16 +66,16 @@
"lint-staged": "^4.0.2",
"prettier": "^1.5.3",
"prop-types": "^15.6.0",
"react": "^16.5.1",
"react-dom": "^16.5.1",
"react-test-renderer": "^16.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-test-renderer": "^17.0.2",
"readline-sync": "^1.4.1",
"rimraf": "^2.5.0"
},
"jest": {
"testEnvironment": "<rootDir>/packages/jest-environment-enzyme/lib/index.js",
"testEnvironmentOptions": {
"enzymeAdapter": "react16"
"enzymeAdapter": "react17"
},
"setupFilesAfterEnv": [
"<rootDir>/packages/jest-enzyme/src/index.js"
Expand Down
2 changes: 1 addition & 1 deletion packages/enzyme-matchers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
],
"testEnvironment": "../jest-environment-enzyme/lib/index.js",
"testEnvironmentOptions": {
"adapter": "react16"
"adapter": "react17"
},
"verbose": true
}
Expand Down
2 changes: 1 addition & 1 deletion packages/jasmine-enzyme/spec/helpers/setup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');
const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');

configure({ adapter: new Adapter() });
2 changes: 1 addition & 1 deletion packages/jest-environment-enzyme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"peerDependencies": {
"enzyme": "3.x",
"jest": ">=22.0.0",
"react": "^0.13.0 || ^0.14.0 || ^15.0.0 || >=16.x"
"react": "^0.13.0 || ^0.14.0 || ^15.0.0 || ^16.0.0 || >=17.x"
},
"devDependencies": {
"cpy-cli": "^2.0.0"
Expand Down
8 changes: 6 additions & 2 deletions packages/jest-environment-enzyme/src/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ export const exposeGlobals = () => {
dep = 'enzyme-adapter-react-15.4';
break;
case 'react16':
default:
dep = 'enzyme-adapter-react-16';
break;
case 'react17':
default:
dep = '@wojtekmaj/enzyme-adapter-react-17';
}

let Adapter;
Expand All @@ -38,7 +41,8 @@ export const exposeGlobals = () => {
or with npm

> npm i --save-dev ${dep}
`, e,
`,
e
);
return;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/jest-enzyme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"devDependencies": {
"@types/enzyme": "^3.1.11",
"@types/react": "^16.0.10",
"@types/react": "^17.0.5",
"cpy-cli": "^2.0.0"
},
"jest": {
Expand All @@ -68,7 +68,7 @@
],
"testEnvironment": "enzyme",
"testEnvironmentOptions": {
"enzymeAdapter": "react16"
"enzymeAdapter": "react17"
},
"setupFilesAfterEnv": [
"<rootDir>/src/index.js"
Expand Down
Loading