Skip to content

Commit 84264e7

Browse files
authored
(refactor) upgrade to react 16 (#60)
1 parent 9d05a2b commit 84264e7

File tree

3 files changed

+67
-46
lines changed

3 files changed

+67
-46
lines changed

package.json

+18-19
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,7 @@
2525
"bugs": {
2626
"url": "https://github.com/nfl/react-gpt/issues"
2727
},
28-
"files": [
29-
"*.md",
30-
"docs",
31-
"es",
32-
"src",
33-
"dist",
34-
"lib"
35-
],
28+
"files": ["*.md", "docs", "es", "src", "dist", "lib"],
3629
"dependencies": {
3730
"deep-equal": "^1.0.1",
3831
"eventemitter3": "^2.0.2",
@@ -61,11 +54,11 @@
6154
"core-js": "^2.2.2",
6255
"cz-conventional-changelog": "^1.1.6",
6356
"eslint": "4.7.0",
64-
"eslint-config-prettier": "^2.5.0",
65-
"eslint-plugin-prettier": "^2.2.0",
6657
"eslint-config-nfl": "12.0.0",
58+
"eslint-config-prettier": "^2.5.0",
6759
"eslint-plugin-import": "2.7.0",
6860
"eslint-plugin-mocha": "4.11.0",
61+
"eslint-plugin-prettier": "^2.2.0",
6962
"eslint-plugin-react": "7.3.0",
7063
"express": "^4.13.4",
7164
"history": "^4.3.0",
@@ -85,9 +78,10 @@
8578
"prop-types": "^15.5.10",
8679
"querystring": "^0.2.0",
8780
"radium": "^0.18.1",
88-
"react": "^15.0.1",
81+
"react": "^16.0.0",
8982
"react-addons-test-utils": "^15.0.1",
90-
"react-dom": "^15.0.1",
83+
"react-dom": "^16.0.0",
84+
"react-test-renderer": "^16.0.0",
9185
"rimraf": "^2.5.2",
9286
"serve-static": "^1.10.2",
9387
"sinon": "^1.17.2",
@@ -98,24 +92,29 @@
9892
},
9993
"peerDependencies": {
10094
"prop-types": "^15.5.10",
101-
"react": "^15.0.1",
102-
"react-dom": "^15.0.1"
95+
"react": "^15.0.1 || ^16.0.0",
96+
"react-dom": "^15.0.1 || ^16.0.0"
10397
},
10498
"scripts": {
10599
"commit": "git-cz",
106100
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
107101
"build": "npm run clean && npm run compile",
108102
"build:es": "BABEL_ENV=es babel --copy-files ./src -d es",
109-
"build:umd": "NODE_ENV=development webpack src/index.js dist/react-gpt.js",
110-
"build:umd:min": "NODE_ENV=production webpack -p src/index.js dist/react-gpt.min.js",
103+
"build:umd":
104+
"NODE_ENV=development webpack src/index.js dist/react-gpt.js",
105+
"build:umd:min":
106+
"NODE_ENV=production webpack -p src/index.js dist/react-gpt.min.js",
111107
"bundlesize": "npm run build:umd:min && bundlesize",
112108
"clean": "rimraf lib coverage dist lib es",
113109
"compile": "babel src --out-dir lib",
114-
"examples": "webpack-dev-server --config examples/webpack.config.js --content-base examples/apps --inline",
110+
"examples":
111+
"webpack-dev-server --config examples/webpack.config.js --content-base examples/apps --inline",
115112
"lint": "eslint --fix src test examples",
116-
"start": "npm run build && env BABEL_ENV=examples node examples/server/index.js",
113+
"start":
114+
"npm run build && env BABEL_ENV=examples node examples/server/index.js",
117115
"pretest": "npm run build",
118-
"prepublish": "npm run build && npm run build:es && npm run build:umd && npm run build:umd:min",
116+
"prepublish":
117+
"npm run build && npm run build:es && npm run build:umd && npm run build:umd:min",
119118
"test": "npm run lint && karma start",
120119
"update-apilist": "node ./scripts/updateAPIList.js"
121120
},

test/Bling.spec.js

+10-6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import React, {Component} from "react";
33
import PropTypes from "prop-types";
44
import ReactTestUtils from "react-dom/test-utils";
5+
import ShallowRenderer from "react-test-renderer/shallow";
56
import Bling from "../src/Bling";
67
import Events from "../src/Events";
78
import {pubadsAPI, APIToCallBeforeServiceEnabled} from "../src/createManager";
@@ -25,15 +26,18 @@ describe("Bling", () => {
2526
});
2627

2728
it("throws when either slotSize or sizeMapping is missing", () => {
28-
expect(() => {
29-
ReactTestUtils.renderIntoDocument(
30-
<Bling adUnitPath="/4595/nfl.test.open" />
31-
);
32-
}).to.throw("Either 'slotSize' or 'sizeMapping' prop needs to be set.");
29+
const renderBling = () => {
30+
const renderer = new ShallowRenderer();
31+
renderer.render(<Bling adUnitPath="/4595/nfl.test.open" />);
32+
};
33+
34+
expect(renderBling).to.throw(
35+
"Either 'slotSize' or 'sizeMapping' prop needs to be set."
36+
);
3337
});
3438

3539
it("initially renders empty div with style", () => {
36-
const renderer = ReactTestUtils.createRenderer();
40+
const renderer = new ShallowRenderer();
3741
renderer.render(
3842
<Bling adUnitPath="/4595/nfl.test.open" slotSize={[728, 90]} />
3943
);

yarn.lock

+39-21
Original file line numberDiff line numberDiff line change
@@ -1701,14 +1701,6 @@ core-util-is@~1.0.0:
17011701
version "1.0.2"
17021702
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
17031703

1704-
create-react-class@^15.6.0:
1705-
version "15.6.0"
1706-
resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.0.tgz#ab448497c26566e1e29413e883207d57cfe7bed4"
1707-
dependencies:
1708-
fbjs "^0.8.9"
1709-
loose-envify "^1.3.1"
1710-
object-assign "^4.1.1"
1711-
17121704
cross-spawn@^5.1.0:
17131705
version "5.1.0"
17141706
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -2409,6 +2401,18 @@ faye-websocket@~0.11.0:
24092401
dependencies:
24102402
websocket-driver ">=0.5.1"
24112403

2404+
fbjs@^0.8.16:
2405+
version "0.8.16"
2406+
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
2407+
dependencies:
2408+
core-js "^1.0.0"
2409+
isomorphic-fetch "^2.1.1"
2410+
loose-envify "^1.0.0"
2411+
object-assign "^4.1.0"
2412+
promise "^7.1.1"
2413+
setimmediate "^1.0.5"
2414+
ua-parser-js "^0.7.9"
2415+
24122416
fbjs@^0.8.9:
24132417
version "0.8.14"
24142418
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.14.tgz#d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c"
@@ -4414,6 +4418,14 @@ prop-types@^15.5.10:
44144418
fbjs "^0.8.9"
44154419
loose-envify "^1.3.1"
44164420

4421+
prop-types@^15.6.0:
4422+
version "15.6.0"
4423+
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
4424+
dependencies:
4425+
fbjs "^0.8.16"
4426+
loose-envify "^1.3.1"
4427+
object-assign "^4.1.1"
4428+
44174429
proxy-addr@~1.1.4:
44184430
version "1.1.5"
44194431
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.5.tgz#71c0ee3b102de3f202f3b64f608d173fcba1a918"
@@ -4518,24 +4530,30 @@ react-addons-test-utils@^15.0.1:
45184530
version "15.6.0"
45194531
resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.6.0.tgz#062d36117fe8d18f3ba5e06eb33383b0b85ea5b9"
45204532

4521-
react-dom@^15.0.1:
4522-
version "15.6.1"
4523-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.1.tgz#2cb0ed4191038e53c209eb3a79a23e2a4cf99470"
4533+
"react-dom@^15.0.1 || ^16.0.0":
4534+
version "16.0.0"
4535+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0.tgz#9cc3079c3dcd70d4c6e01b84aab2a7e34c303f58"
45244536
dependencies:
4525-
fbjs "^0.8.9"
4537+
fbjs "^0.8.16"
45264538
loose-envify "^1.1.0"
4527-
object-assign "^4.1.0"
4528-
prop-types "^15.5.10"
4539+
object-assign "^4.1.1"
4540+
prop-types "^15.6.0"
45294541

4530-
react@^15.0.1:
4531-
version "15.6.1"
4532-
resolved "https://registry.yarnpkg.com/react/-/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df"
4542+
react-test-renderer@^16.0.0:
4543+
version "16.0.0"
4544+
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.0.0.tgz#9fe7b8308f2f71f29fc356d4102086f131c9cb15"
45334545
dependencies:
4534-
create-react-class "^15.6.0"
4535-
fbjs "^0.8.9"
4546+
fbjs "^0.8.16"
4547+
object-assign "^4.1.1"
4548+
4549+
"react@^15.0.1 || ^16.0.0":
4550+
version "16.0.0"
4551+
resolved "https://registry.yarnpkg.com/react/-/react-16.0.0.tgz#ce7df8f1941b036f02b2cca9dbd0cb1f0e855e2d"
4552+
dependencies:
4553+
fbjs "^0.8.16"
45364554
loose-envify "^1.1.0"
4537-
object-assign "^4.1.0"
4538-
prop-types "^15.5.10"
4555+
object-assign "^4.1.1"
4556+
prop-types "^15.6.0"
45394557

45404558
read-pkg-up@^1.0.1:
45414559
version "1.0.1"

0 commit comments

Comments
 (0)