Skip to content

Commit 9d4fd7a

Browse files
author
Brian Vaughn
committed
Merged changes from 4.0.5 -> 4.0.6 from DevTools fork
2 parents 13a93e7 + 4c15144 commit 9d4fd7a

File tree

15 files changed

+28
-18
lines changed

15 files changed

+28
-18
lines changed

‎packages/react-devtools-core/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-devtools-core",
3-
"version": "4.0.5",
3+
"version": "4.0.6",
44
"description": "Use react-devtools outside of the browser",
55
"license": "MIT",
66
"main": "./dist/backend.js",
@@ -24,6 +24,7 @@
2424
"start:standalone": "cross-env NODE_ENV=development webpack --config webpack.standalone.js --watch"
2525
},
2626
"dependencies": {
27+
"es6-symbol": "^3",
2728
"shell-quote": "^1.6.1",
2829
"ws": "^7"
2930
},

‎packages/react-devtools-extensions/chrome/manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"manifest_version": 2,
33
"name": "React Developer Tools",
44
"description": "Adds React debugging tools to the Chrome Developer Tools.",
5-
"version": "4.0.5",
6-
"version_name": "4.0.5",
5+
"version": "4.0.6",
6+
"version_name": "4.0.6",
77

88
"minimum_chrome_version": "49",
99

‎packages/react-devtools-extensions/firefox/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"manifest_version": 2,
33
"name": "React Developer Tools",
44
"description": "Adds React debugging tools to the Firefox Developer Tools.",
5-
"version": "4.0.5",
5+
"version": "4.0.6",
66

77
"applications": {
88
"gecko": {

‎packages/react-devtools-extensions/popups/deadcode.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
</p>
2929
<hr />
3030
<p>
31-
Open the developer tools, and the React tab will appear to the right.
31+
Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
3232
</p>

‎packages/react-devtools-extensions/popups/development.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
</p>
2525
<hr />
2626
<p>
27-
Open the developer tools, and the React tab will appear to the right.
27+
Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
2828
</p>

‎packages/react-devtools-extensions/popups/outdated.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
</p>
2626
<hr />
2727
<p>
28-
Open the developer tools, and the React tab will appear to the right.
28+
Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
2929
</p>

‎packages/react-devtools-extensions/popups/production.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
<p>
1818
<b>This page is using the production build of React. &#x2705;</b>
1919
<br />
20-
Open the developer tools, and the React tab will appear to the right.
20+
Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
2121
</p>

‎packages/react-devtools-extensions/popups/unminified.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
</p>
2828
<hr />
2929
<p>
30-
Open the developer tools, and the React tab will appear to the right.
30+
Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
3131
</p>

‎packages/react-devtools-extensions/src/main.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import DevTools from 'react-devtools-shared/src/devtools/views/DevTools';
2424
const LOCAL_STORAGE_SUPPORTS_PROFILING_KEY =
2525
'React::DevTools::supportsProfiling';
2626

27+
const isChrome = getBrowserName() === 'Chrome';
28+
2729
let panelCreated = false;
2830

2931
// The renderer interface can't read saved component filters directly,
@@ -126,7 +128,7 @@ function createPanelIfReactLoaded() {
126128

127129
store = new Store(bridge, {
128130
isProfiling,
129-
supportsReloadAndProfile: getBrowserName() === 'Chrome',
131+
supportsReloadAndProfile: isChrome,
130132
supportsProfiling,
131133
});
132134
store.profilerStore.profilingData = profilingData;
@@ -232,7 +234,7 @@ function createPanelIfReactLoaded() {
232234
let needsToSyncElementSelection = false;
233235

234236
chrome.devtools.panels.create(
235-
'⚛ Components',
237+
isChrome ? '⚛ Components' : 'Components',
236238
'',
237239
'panel.html',
238240
extensionPanel => {
@@ -262,7 +264,7 @@ function createPanelIfReactLoaded() {
262264
);
263265

264266
chrome.devtools.panels.create(
265-
'⚛ Profiler',
267+
isChrome ? '⚛ Profiler' : 'Profiler',
266268
'',
267269
'panel.html',
268270
extensionPanel => {

‎packages/react-devtools-inline/package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-devtools-inline",
3-
"version": "4.0.5",
3+
"version": "4.0.6",
44
"description": "Embed react-devtools within a website",
55
"license": "MIT",
66
"main": "./dist/backend.js",
@@ -20,7 +20,9 @@
2020
"prepublish": "yarn run build",
2121
"start": "cross-env NODE_ENV=development webpack --config webpack.config.js --watch"
2222
},
23-
"dependencies": {},
23+
"dependencies": {
24+
"es6-symbol": "^3"
25+
},
2426
"devDependencies": {
2527
"@babel/core": "^7.1.6",
2628
"@babel/plugin-proposal-class-properties": "^7.1.0",

0 commit comments

Comments
 (0)