Skip to content

Commit 703d267

Browse files
committed
Upgrade react, react-dom, react-rest-renderer @16.0.0, enzyme @3.0.0
1 parent 2ecd38e commit 703d267

10 files changed

+46
-8
lines changed

package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
"supercluster": "3.0.0"
5959
},
6060
"peerDependencies": {
61+
"mapbox-gl": "^0.40.1",
6162
"prop-types": "^15.5.10",
6263
"react": "^15.6.1",
63-
"react-dom": "^15.6.1",
64-
"mapbox-gl": "^0.40.1"
64+
"react-dom": "^15.6.1"
6565
},
6666
"devDependencies": {
6767
"@types/core-js": "0.9.43",
@@ -78,14 +78,15 @@
7878
"@types/react-test-renderer": "^15.5.4",
7979
"@types/recompose": "0.24.1",
8080
"@types/supercluster": "^2.3.0",
81-
"enzyme": "2.9.1",
82-
"jest": "21.1.0",
81+
"enzyme": "^3.0.0",
82+
"enzyme-adapter-react-16": "^1.0.0",
83+
"jest": "^21.2.0",
8384
"mapbox-gl": "0.39.1",
8485
"prettier": "1.7.0",
8586
"prop-types": "15.5.10",
86-
"react": "15.6.1",
87-
"react-dom": "15.6.1",
88-
"react-test-renderer": "15.6.1",
87+
"react": "^16.0.0",
88+
"react-dom": "16.0.0",
89+
"react-test-renderer": "^16.0.0",
8990
"recompose": "0.25.0",
9091
"ts-jest": "21.0.1",
9192
"tslint": "5.7.0",

src/__tests__/cluster.test.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ import { withContext } from 'recompose';
1515
import { mount } from 'enzyme';
1616
const PropTypes = require('prop-types'); // tslint:disable-line
1717

18+
const Enzyme = require('enzyme');
19+
const Adapter = require('enzyme-adapter-react-16');
20+
Enzyme.configure({ adapter: new Adapter() });
21+
1822
const coordinates = [
1923
[-12.408741828510017, 58.16339752811908],
2024
[-5.668629523822517, 50.06970856327533],

src/__tests__/geojson-layer.test.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ import { withContext } from 'recompose';
44
import { mount } from 'enzyme';
55
const PropTypes = require('prop-types'); // tslint:disable-line
66

7+
const Enzyme = require('enzyme');
8+
const Adapter = require('enzyme-adapter-react-16');
9+
Enzyme.configure({ adapter: new Adapter() });
10+
711
describe('GeoJSONLayer', () => {
812
let GeoJSONLayerWithContext: any;
913
let addLayerMock = jest.fn();

src/__tests__/layer.test.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ import { withContext } from 'recompose';
44
import { mount } from 'enzyme';
55
const PropTypes = require('prop-types'); // tslint:disable-line
66

7+
const Enzyme = require('enzyme');
8+
const Adapter = require('enzyme-adapter-react-16');
9+
Enzyme.configure({ adapter: new Adapter() });
10+
711
describe('Layer', () => {
812
let LayerWithContext: any;
913
let addLayerMock = jest.fn();

src/__tests__/map.test.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,14 @@ import * as React from 'react';
1515
import ReactMapboxGl, { FitBounds } from '../map';
1616
import { mount } from 'enzyme';
1717

18+
const Enzyme = require('enzyme');
19+
const Adapter = require('enzyme-adapter-react-16');
20+
Enzyme.configure({ adapter: new Adapter() });
21+
1822
describe('Map', () => {
1923
let mapState;
20-
24+
console.log('Enzyme');
25+
console.log(Enzyme);
2126
beforeEach(() => {
2227
mockfitBounds = jest.fn();
2328
mockon = jest.fn();

src/__tests__/popup.test.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ import { withContext } from 'recompose';
1212
import { mount } from 'enzyme';
1313
const PropTypes = require('prop-types'); // tslint:disable-line
1414

15+
const Enzyme = require('enzyme');
16+
const Adapter = require('enzyme-adapter-react-16');
17+
Enzyme.configure({ adapter: new Adapter() });
18+
1519
describe('Popup', () => {
1620
let PopupWithContext: any;
1721

src/__tests__/rotation-control.test.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ import * as React from 'react';
22
import RotationControl from '../rotation-control';
33
import { shallow } from 'enzyme';
44

5+
const Enzyme = require('enzyme');
6+
const Adapter = require('enzyme-adapter-react-16');
7+
Enzyme.configure({ adapter: new Adapter() });
8+
59
describe('RotationControl', () => {
610
it('should render the component', () => {
711
const wrapper = shallow(<RotationControl />);

src/__tests__/scale-control.test.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ import { shallow } from 'enzyme';
44
import { withContext } from 'recompose';
55
const PropTypes = require('prop-types'); // tslint:disable-line
66

7+
const Enzyme = require('enzyme');
8+
const Adapter = require('enzyme-adapter-react-16');
9+
Enzyme.configure({ adapter: new Adapter() });
10+
711
describe('ScaleControl', () => {
812
let ScaleControlWithContext: any;
913

src/__tests__/source.test.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ import { withContext } from 'recompose';
44
import { mount } from 'enzyme';
55
const PropTypes = require('prop-types'); // tslint:disable-line
66

7+
const Enzyme = require('enzyme');
8+
const Adapter = require('enzyme-adapter-react-16');
9+
Enzyme.configure({ adapter: new Adapter() });
10+
711
describe('Source', () => {
812
let SourceWithContext: any;
913
let addSourceMock: any;

src/__tests__/zoom-control.test.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ import * as React from 'react';
22
import ZoomControl from '../zoom-control';
33
import { shallow } from 'enzyme';
44

5+
const Enzyme = require('enzyme');
6+
const Adapter = require('enzyme-adapter-react-16');
7+
Enzyme.configure({ adapter: new Adapter() });
8+
59
describe('ZoomControl', () => {
610
it('should render the component', () => {
711
const wrapper = shallow(<ZoomControl />);

0 commit comments

Comments
 (0)