Skip to content

Commit

Permalink
Merge pull request #194 from awibox/react17
Browse files Browse the repository at this point in the history
#191: React 17 support
  • Loading branch information
awibox committed Mar 5, 2021
2 parents b9a35fe + ccddf79 commit 6aa126c
Show file tree
Hide file tree
Showing 4 changed files with 201 additions and 38 deletions.
2 changes: 1 addition & 1 deletion dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion jest-setup-tests.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import Enzyme, { shallow } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import { createSerializer } from 'enzyme-to-json';

// Set the default serializer for Jest to be the from enzyme-to-json
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-promise-loader",
"version": "1.0.5",
"version": "1.0.7",
"description": "This is NPM package with a component for React that will help you display the loader at use react-promise-tracker",
"main": "./dist/index.js",
"scripts": {
Expand Down Expand Up @@ -33,12 +33,12 @@
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/preset-env": "^7.8.3",
"@babel/preset-react": "^7.8.3",
"@wojtekmaj/enzyme-adapter-react-17": "^0.4.1",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.0.3",
"babel-loader": "8.1.0",
"coveralls": "^3.1.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"enzyme-to-json": "^3.4.3",
"eslint": "^7.5.0",
"eslint-config-airbnb-base": "^14.0.0",
Expand All @@ -56,8 +56,8 @@
"prop-types": "^15.7.2"
},
"peerDependencies": {
"react": "^16.14.0",
"react-dom": "^16.14.0"
"react": "^17.0.1",
"react-dom": "^17.0.1"
},
"jest": {
"collectCoverageFrom": [
Expand Down
Loading

0 comments on commit 6aa126c

Please sign in to comment.