Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Commit 4a8b4a8

Browse files
AnshulMalikjasonLaster
AnshulMalik
authored and
jasonLaster
committed
Upgrade to react 16.2.0 (#5465)
1 parent ad76422 commit 4a8b4a8

File tree

7 files changed

+50
-65
lines changed

7 files changed

+50
-65
lines changed

‎package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
"devtools-source-map": "^0.14.8",
7676
"devtools-splitter": "^0.0.6",
7777
"devtools-utils": "^0.0.11",
78+
"enzyme-adapter-react-16": "^1.1.1",
7879
"eslint-plugin-import": "^2.8.0",
7980
"fuzzaldrin-plus": "^0.6.0",
8081
"immutable": "^3.8.2",
@@ -84,8 +85,8 @@
8485
"parse-script-tags": "^0.1.6",
8586
"pretty-fast": "^0.2.3",
8687
"prop-types": "^15.6.0",
87-
"react": "^15.6.2",
88-
"react-dom": "^15.6.2",
88+
"react": "16.2.0",
89+
"react-dom": "16.2.0",
8990
"react-immutable-proptypes": "^2.1.0",
9091
"react-inlinesvg": "^0.7.4",
9192
"react-redux": "^5.0.6",
@@ -115,7 +116,6 @@
115116
"devtools-license-check": "^0.7.0",
116117
"documentation": "^5.2.1",
117118
"enzyme": "^3.3.0",
118-
"enzyme-adapter-react-15": "1.0.5",
119119
"enzyme-to-json": "3.3.1",
120120
"eslint": "^4.2.0",
121121
"eslint-config-prettier": "^2.3.0",
@@ -141,7 +141,6 @@
141141
"node-emoji": "^1.8.1",
142142
"npm-run-all": "^4.0.2",
143143
"prettier": "^1.10.2",
144-
"react-addons-perf": "^15.4.2",
145144
"react-test-renderer": "15.6.2",
146145
"remark-cli": "^5.0.0",
147146
"remark-lint": "^6.0.1",
@@ -188,7 +187,7 @@
188187
],
189188
"transformIgnorePatterns": ["node_modules/(?!devtools-)"],
190189
"setupTestFrameworkScriptFile": "<rootDir>/src/test/tests-setup.js",
191-
"setupFiles": ["jest-localstorage-mock"],
190+
"setupFiles": ["<rootDir>/src/test/shim.js", "jest-localstorage-mock"],
192191
"snapshotSerializers": [
193192
"jest-serializer-babel-ast",
194193
"enzyme-to-json/serializer"

‎src/components/Editor/tests/Editor.spec.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ describe("Editor", () => {
8080
selectedSource: I.fromJS({ loadedState: "loading" })
8181
});
8282

83-
expect(mockEditor.setText.mock.calls).toEqual([[""], ["Loading…"]]);
83+
expect(mockEditor.setText.mock.calls).toEqual([["Loading…"]]);
8484
expect(mockEditor.codeMirror.scrollTo.mock.calls).toEqual([]);
8585
});
8686
});
@@ -96,7 +96,7 @@ describe("Editor", () => {
9696
selectedLocation: { sourceId: "foo", line: 3, column: 1 }
9797
});
9898

99-
expect(mockEditor.setText.mock.calls).toEqual([[""], ["the text"]]);
99+
expect(mockEditor.setText.mock.calls).toEqual([["the text"]]);
100100
expect(mockEditor.codeMirror.scrollTo.mock.calls).toEqual([[1, 2]]);
101101
});
102102
});
@@ -117,7 +117,6 @@ describe("Editor", () => {
117117
});
118118

119119
expect(mockEditor.setText.mock.calls).toEqual([
120-
[""],
121120
["Error loading this URI: error text"]
122121
]);
123122
});
@@ -138,7 +137,6 @@ describe("Editor", () => {
138137
});
139138

140139
expect(mockEditor.setText.mock.calls).toEqual([
141-
[""],
142140
["Please refresh to debug this module"]
143141
]);
144142
});
@@ -166,7 +164,6 @@ describe("Editor", () => {
166164
});
167165

168166
expect(mockEditor.setText.mock.calls).toEqual([
169-
[""],
170167
["the text"],
171168
["Loading…"]
172169
]);
@@ -196,7 +193,6 @@ describe("Editor", () => {
196193
});
197194

198195
expect(mockEditor.setText.mock.calls).toEqual([
199-
[""],
200196
["Loading…"],
201197
["the text"]
202198
]);

‎src/components/tests/__snapshots__/QuickOpenModal.spec.js.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,14 +1458,14 @@ exports[`QuickOpenModal updateResults on enable 2`] = `
14581458
>
14591459
<Modal
14601460
handleClose={[Function]}
1461-
status="entering"
1461+
status="exited"
14621462
>
14631463
<div
14641464
className="modal-wrapper"
14651465
onClick={[Function]}
14661466
>
14671467
<div
1468-
className="modal entering"
1468+
className="modal exited"
14691469
onClick={[Function]}
14701470
>
14711471
<SearchInput

‎src/main.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ import { onConnect } from "./client";
1414
import { teardownWorkers } from "./utils/bootstrap";
1515
import sourceQueue from "./utils/source-queue";
1616

17-
if (process.env.NODE_ENV !== "production") {
18-
window.Perf = require("react-addons-perf");
19-
}
20-
2117
if (isFirefoxPanel()) {
2218
module.exports = {
2319
bootstrap: ({

‎src/test/shim.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
global.requestAnimationFrame = callback => setTimeout(callback, 0);

‎src/test/tests-setup.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import getConfig from "../../bin/getConfig";
55
import { setConfig, getValue } from "devtools-config";
66
import { readFileSync } from "fs";
77
import Enzyme from "enzyme";
8-
import Adapter from "enzyme-adapter-react-15";
8+
import Adapter from "enzyme-adapter-react-16";
99

1010
import { startSourceMapWorker, stopSourceMapWorker } from "devtools-source-map";
1111

‎yarn.lock‎

Lines changed: 40 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2769,7 +2769,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
27692769
safe-buffer "^5.0.1"
27702770
sha.js "^2.4.8"
27712771

2772-
create-react-class@^15.6.0, create-react-class@^15.6.2:
2772+
create-react-class@^15.6.2:
27732773
version "15.6.3"
27742774
resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
27752775
dependencies:
@@ -3654,17 +3654,19 @@ envify@^3.0.0:
36543654
jstransform "^11.0.3"
36553655
through "~2.3.4"
36563656

3657-
enzyme-adapter-react-[email protected]:
3658-
version "1.0.5"
3659-
resolved "https://registry.yarnpkg.com/enzyme-adapter-react-15/-/enzyme-adapter-react-15-1.0.5.tgz#99f9a03ff2c2303e517342935798a6bdfbb75fac"
3657+
enzyme-adapter-react-16@^1.1.1:
3658+
version "1.1.1"
3659+
resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.1.tgz#a8f4278b47e082fbca14f5bfb1ee50ee650717b4"
36603660
dependencies:
3661-
enzyme-adapter-utils "^1.1.0"
3661+
enzyme-adapter-utils "^1.3.0"
36623662
lodash "^4.17.4"
36633663
object.assign "^4.0.4"
36643664
object.values "^1.0.4"
3665-
prop-types "^15.5.10"
3665+
prop-types "^15.6.0"
3666+
react-reconciler "^0.7.0"
3667+
react-test-renderer "^16.0.0-0"
36663668

3667-
enzyme-adapter-utils@^1.1.0:
3669+
enzyme-adapter-utils@^1.3.0:
36683670
version "1.3.0"
36693671
resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.3.0.tgz#d6c85756826c257a8544d362cc7a67e97ea698c7"
36703672
dependencies:
@@ -4300,7 +4302,7 @@ fbjs@^0.6.1:
43004302
ua-parser-js "^0.7.9"
43014303
whatwg-fetch "^0.9.0"
43024304

4303-
fbjs@^0.8.12, fbjs@^0.8.16, fbjs@^0.8.4, fbjs@^0.8.9:
4305+
fbjs@^0.8.12, fbjs@^0.8.16, fbjs@^0.8.9:
43044306
version "0.8.16"
43054307
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
43064308
dependencies:
@@ -9033,13 +9035,6 @@ rc@^1.1.0, rc@^1.1.7:
90339035
minimist "^1.2.0"
90349036
strip-json-comments "~2.0.1"
90359037

9036-
react-addons-perf@^15.4.2:
9037-
version "15.4.2"
9038-
resolved "https://registry.yarnpkg.com/react-addons-perf/-/react-addons-perf-15.4.2.tgz#110bdcf5c459c4f77cb85ed634bcd3397536383b"
9039-
dependencies:
9040-
fbjs "^0.8.4"
9041-
object-assign "^4.1.0"
9042-
90439038
react-docgen@^2.20.0:
90449039
version "2.20.1"
90459040
resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-2.20.1.tgz#29c3a1216066f513958abb1a43678860bbd51c7f"
@@ -9056,20 +9051,7 @@ react-dom-factories@^1.0.2:
90569051
version "1.0.2"
90579052
resolved "https://registry.yarnpkg.com/react-dom-factories/-/react-dom-factories-1.0.2.tgz#eb7705c4db36fb501b3aa38ff759616aa0ff96e0"
90589053

9059-
react-dom@^0.14.0:
9060-
version "0.14.9"
9061-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-0.14.9.tgz#05064a3dcf0fb1880a3b2bfc9d58c55d8d9f6293"
9062-
9063-
react-dom@^15.6.2:
9064-
version "15.6.2"
9065-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
9066-
dependencies:
9067-
fbjs "^0.8.9"
9068-
loose-envify "^1.1.0"
9069-
object-assign "^4.1.0"
9070-
prop-types "^15.5.10"
9071-
9072-
react-dom@^16.2.0:
9054+
[email protected], react-dom@^16.2.0:
90739055
version "16.2.0"
90749056
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
90759057
dependencies:
@@ -9078,6 +9060,10 @@ react-dom@^16.2.0:
90789060
object-assign "^4.1.1"
90799061
prop-types "^15.6.0"
90809062

9063+
react-dom@^0.14.0:
9064+
version "0.14.9"
9065+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-0.14.9.tgz#05064a3dcf0fb1880a3b2bfc9d58c55d8d9f6293"
9066+
90819067
react-fuzzy@^0.5.1:
90829068
version "0.5.2"
90839069
resolved "https://registry.yarnpkg.com/react-fuzzy/-/react-fuzzy-0.5.2.tgz#fc13bf6f0b785e5fefe908724efebec4935eaefe"
@@ -9129,6 +9115,15 @@ react-modal@^3.1.10:
91299115
prop-types "^15.5.10"
91309116
warning "^3.0.0"
91319117

9118+
react-reconciler@^0.7.0:
9119+
version "0.7.0"
9120+
resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.7.0.tgz#9614894103e5f138deeeb5eabaf3ee80eb1d026d"
9121+
dependencies:
9122+
fbjs "^0.8.16"
9123+
loose-envify "^1.1.0"
9124+
object-assign "^4.1.1"
9125+
prop-types "^15.6.0"
9126+
91329127
react-redux@^5.0.6:
91339128
version "5.0.7"
91349129
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8"
@@ -9161,6 +9156,14 @@ [email protected]:
91619156
fbjs "^0.8.9"
91629157
object-assign "^4.1.0"
91639158

9159+
react-test-renderer@^16.0.0-0:
9160+
version "16.2.0"
9161+
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.2.0.tgz#bddf259a6b8fcd8555f012afc8eacc238872a211"
9162+
dependencies:
9163+
fbjs "^0.8.16"
9164+
object-assign "^4.1.1"
9165+
prop-types "^15.6.0"
9166+
91649167
react-transition-group@^1.1.2:
91659168
version "1.2.1"
91669169
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6"
@@ -9193,24 +9196,7 @@ react-treebeard@^2.1.0:
91939196
shallowequal "^0.2.2"
91949197
velocity-react "^1.3.1"
91959198

9196-
react@^0.14.0:
9197-
version "0.14.9"
9198-
resolved "https://registry.yarnpkg.com/react/-/react-0.14.9.tgz#9110a6497c49d44ba1c0edd317aec29c2e0d91d1"
9199-
dependencies:
9200-
envify "^3.0.0"
9201-
fbjs "^0.6.1"
9202-
9203-
react@^15.6.2:
9204-
version "15.6.2"
9205-
resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
9206-
dependencies:
9207-
create-react-class "^15.6.0"
9208-
fbjs "^0.8.9"
9209-
loose-envify "^1.1.0"
9210-
object-assign "^4.1.0"
9211-
prop-types "^15.5.10"
9212-
9213-
react@^16.2.0:
9199+
[email protected], react@^16.2.0:
92149200
version "16.2.0"
92159201
resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
92169202
dependencies:
@@ -9219,6 +9205,13 @@ react@^16.2.0:
92199205
object-assign "^4.1.1"
92209206
prop-types "^15.6.0"
92219207

9208+
react@^0.14.0:
9209+
version "0.14.9"
9210+
resolved "https://registry.yarnpkg.com/react/-/react-0.14.9.tgz#9110a6497c49d44ba1c0edd317aec29c2e0d91d1"
9211+
dependencies:
9212+
envify "^3.0.0"
9213+
fbjs "^0.6.1"
9214+
92229215
read-all-stream@^3.0.0:
92239216
version "3.1.0"
92249217
resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa"

0 commit comments

Comments
 (0)