{"body":"","parents":["13a93e7b82119d60532e3d7c8273c90764ec4bae","4c1514495bf77acad2677b9944726e512691150e"],"commit":{"authorEmail":"bvaughn@fb.com","subject":"Merged changes from 4.0.5 -> 4.0.6 from DevTools fork","authoredAt":"2019-08-26T10:12:18-07:00","shortRevision":"9d4fd7a249","revision":"9d4fd7a24991598aa2fcaec203dbba5c04d253d1","authorName":"Brian Vaughn"},"files":[{"status":"M","path":"packages\/react-devtools-core\/package.json"},{"status":"M","path":"packages\/react-devtools-extensions\/chrome\/manifest.json"},{"status":"M","path":"packages\/react-devtools-extensions\/firefox\/manifest.json"},{"status":"M","path":"packages\/react-devtools-extensions\/popups\/deadcode.html"},{"status":"M","path":"packages\/react-devtools-extensions\/popups\/development.html"},{"status":"M","path":"packages\/react-devtools-extensions\/popups\/outdated.html"},{"status":"M","path":"packages\/react-devtools-extensions\/popups\/production.html"},{"status":"M","path":"packages\/react-devtools-extensions\/popups\/unminified.html"},{"status":"M","path":"packages\/react-devtools-extensions\/src\/main.js"},{"status":"M","path":"packages\/react-devtools-inline\/package.json"},{"status":"M","path":"packages\/react-devtools-shared\/src\/backend\/renderer.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/hydration.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/utils.js"},{"status":"M","path":"packages\/react-devtools\/package.json"},{"status":"M","path":"yarn.lock"}],"patch":"diff --git a\/packages\/react-devtools-core\/package.json b\/packages\/react-devtools-core\/package.json\nindex 49611b51a0..4970dcf263 100644\n--- a\/packages\/react-devtools-core\/package.json\n+++ b\/packages\/react-devtools-core\/package.json\n@@ -1,6 +1,6 @@\n {\n \"name\": \"react-devtools-core\",\n- \"version\": \"4.0.5\",\n+ \"version\": \"4.0.6\",\n \"description\": \"Use react-devtools outside of the browser\",\n \"license\": \"MIT\",\n \"main\": \".\/dist\/backend.js\",\n@@ -24,6 +24,7 @@\n \"start:standalone\": \"cross-env NODE_ENV=development webpack --config webpack.standalone.js --watch\"\n },\n \"dependencies\": {\n+ \"es6-symbol\": \"^3\",\n \"shell-quote\": \"^1.6.1\",\n \"ws\": \"^7\"\n },\ndiff --git a\/packages\/react-devtools-extensions\/chrome\/manifest.json b\/packages\/react-devtools-extensions\/chrome\/manifest.json\nindex a915ccc18c..13a79dfd73 100644\n--- a\/packages\/react-devtools-extensions\/chrome\/manifest.json\n+++ b\/packages\/react-devtools-extensions\/chrome\/manifest.json\n@@ -2,8 +2,8 @@\n \"manifest_version\": 2,\n \"name\": \"React Developer Tools\",\n \"description\": \"Adds React debugging tools to the Chrome Developer Tools.\",\n- \"version\": \"4.0.5\",\n- \"version_name\": \"4.0.5\",\n+ \"version\": \"4.0.6\",\n+ \"version_name\": \"4.0.6\",\n \n \"minimum_chrome_version\": \"49\",\n \ndiff --git a\/packages\/react-devtools-extensions\/firefox\/manifest.json b\/packages\/react-devtools-extensions\/firefox\/manifest.json\nindex 50da7c0c83..77ea161a7a 100644\n--- a\/packages\/react-devtools-extensions\/firefox\/manifest.json\n+++ b\/packages\/react-devtools-extensions\/firefox\/manifest.json\n@@ -2,7 +2,7 @@\n \"manifest_version\": 2,\n \"name\": \"React Developer Tools\",\n \"description\": \"Adds React debugging tools to the Firefox Developer Tools.\",\n- \"version\": \"4.0.5\",\n+ \"version\": \"4.0.6\",\n \n \"applications\": {\n \"gecko\": {\ndiff --git a\/packages\/react-devtools-extensions\/popups\/deadcode.html b\/packages\/react-devtools-extensions\/popups\/deadcode.html\nindex 5e74dc06c4..cdd4c278e8 100644\n--- a\/packages\/react-devtools-extensions\/popups\/deadcode.html\n+++ b\/packages\/react-devtools-extensions\/popups\/deadcode.html\n@@ -28,5 +28,5 @@\n <\/p>\n

\n- Open the developer tools, and the React tab will appear to the right.\n+ Open the developer tools, and \"Components\" and \"Profiler\" tabs will appear to the right.\n <\/p>\ndiff --git a\/packages\/react-devtools-extensions\/popups\/development.html b\/packages\/react-devtools-extensions\/popups\/development.html\nindex 9c2089cc2f..3d092a5eb6 100644\n--- a\/packages\/react-devtools-extensions\/popups\/development.html\n+++ b\/packages\/react-devtools-extensions\/popups\/development.html\n@@ -24,5 +24,5 @@\n <\/p>\n

\n- Open the developer tools, and the React tab will appear to the right.\n+ Open the developer tools, and \"Components\" and \"Profiler\" tabs will appear to the right.\n <\/p>\ndiff --git a\/packages\/react-devtools-extensions\/popups\/outdated.html b\/packages\/react-devtools-extensions\/popups\/outdated.html\nindex a6ec12bcaf..8f3f3f9508 100644\n--- a\/packages\/react-devtools-extensions\/popups\/outdated.html\n+++ b\/packages\/react-devtools-extensions\/popups\/outdated.html\n@@ -25,5 +25,5 @@\n <\/p>\n

\n- Open the developer tools, and the React tab will appear to the right.\n+ Open the developer tools, and \"Components\" and \"Profiler\" tabs will appear to the right.\n <\/p>\ndiff --git a\/packages\/react-devtools-extensions\/popups\/production.html b\/packages\/react-devtools-extensions\/popups\/production.html\nindex 1b65eb5b21..7b92841c6c 100644\n--- a\/packages\/react-devtools-extensions\/popups\/production.html\n+++ b\/packages\/react-devtools-extensions\/popups\/production.html\n@@ -17,5 +17,5 @@\n

\n This page is using the production build of React. ✅<\/b>\n
\n- Open the developer tools, and the React tab will appear to the right.\n+ Open the developer tools, and \"Components\" and \"Profiler\" tabs will appear to the right.\n <\/p>\ndiff --git a\/packages\/react-devtools-extensions\/popups\/unminified.html b\/packages\/react-devtools-extensions\/popups\/unminified.html\nindex 553c9ac6ac..c53885f509 100644\n--- a\/packages\/react-devtools-extensions\/popups\/unminified.html\n+++ b\/packages\/react-devtools-extensions\/popups\/unminified.html\n@@ -27,5 +27,5 @@\n <\/p>\n

\n
\n- Open the developer tools, and the React tab will appear to the right.\n+ Open the developer tools, and \"Components\" and \"Profiler\" tabs will appear to the right.\n <\/p>\ndiff --git a\/packages\/react-devtools-extensions\/src\/main.js b\/packages\/react-devtools-extensions\/src\/main.js\nindex 1e8e29df0a..7d786e0321 100644\n--- a\/packages\/react-devtools-extensions\/src\/main.js\n+++ b\/packages\/react-devtools-extensions\/src\/main.js\n@@ -24,6 +24,8 @@ import DevTools from 'react-devtools-shared\/src\/devtools\/views\/DevTools';\n const LOCAL_STORAGE_SUPPORTS_PROFILING_KEY =\n 'React::DevTools::supportsProfiling';\n \n+const isChrome = getBrowserName() === 'Chrome';\n+\n let panelCreated = false;\n \n \/\/ The renderer interface can't read saved component filters directly,\n@@ -126,7 +128,7 @@ function createPanelIfReactLoaded() {\n \n store = new Store(bridge, {\n isProfiling,\n- supportsReloadAndProfile: getBrowserName() === 'Chrome',\n+ supportsReloadAndProfile: isChrome,\n supportsProfiling,\n });\n store.profilerStore.profilingData = profilingData;\n@@ -232,7 +234,7 @@ function createPanelIfReactLoaded() {\n let needsToSyncElementSelection = false;\n \n chrome.devtools.panels.create(\n- '⚛ Components',\n+ isChrome ? '⚛ Components' : 'Components',\n '',\n 'panel.html',\n extensionPanel => {\n@@ -262,7 +264,7 @@ function createPanelIfReactLoaded() {\n );\n \n chrome.devtools.panels.create(\n- '⚛ Profiler',\n+ isChrome ? '⚛ Profiler' : 'Profiler',\n '',\n 'panel.html',\n extensionPanel => {\ndiff --git a\/packages\/react-devtools-inline\/package.json b\/packages\/react-devtools-inline\/package.json\nindex 26f30ccf91..d9554a09d1 100644\n--- a\/packages\/react-devtools-inline\/package.json\n+++ b\/packages\/react-devtools-inline\/package.json\n@@ -1,6 +1,6 @@\n {\n \"name\": \"react-devtools-inline\",\n- \"version\": \"4.0.5\",\n+ \"version\": \"4.0.6\",\n \"description\": \"Embed react-devtools within a website\",\n \"license\": \"MIT\",\n \"main\": \".\/dist\/backend.js\",\n@@ -20,7 +20,9 @@\n \"prepublish\": \"yarn run build\",\n \"start\": \"cross-env NODE_ENV=development webpack --config webpack.config.js --watch\"\n },\n- \"dependencies\": {},\n+ \"dependencies\": {\n+ \"es6-symbol\": \"^3\"\n+ },\n \"devDependencies\": {\n \"@babel\/core\": \"^7.1.6\",\n \"@babel\/plugin-proposal-class-properties\": \"^7.1.0\",\ndiff --git a\/packages\/react-devtools-shared\/src\/backend\/renderer.js b\/packages\/react-devtools-shared\/src\/backend\/renderer.js\nindex f150ae71be..9eafedaa95 100644\n--- a\/packages\/react-devtools-shared\/src\/backend\/renderer.js\n+++ b\/packages\/react-devtools-shared\/src\/backend\/renderer.js\n@@ -2074,7 +2074,10 @@ export function attach(\n let fiber = findCurrentFiberUsingSlowPathById(id);\n if (fiber !== null) {\n instance = fiber.stateNode;\n- style = fiber.memoizedProps.style;\n+\n+ if (fiber.memoizedProps !== null) {\n+ style = fiber.memoizedProps.style;\n+ }\n }\n \n return {instance, style};\ndiff --git a\/packages\/react-devtools-shared\/src\/hydration.js b\/packages\/react-devtools-shared\/src\/hydration.js\nindex 0823ec6e36..27a30a14f9 100644\n--- a\/packages\/react-devtools-shared\/src\/hydration.js\n+++ b\/packages\/react-devtools-shared\/src\/hydration.js\n@@ -1,5 +1,6 @@\n \/\/ @flow\n \n+import Symbol from 'es6-symbol';\n import {\n isElement,\n typeOf,\ndiff --git a\/packages\/react-devtools-shared\/src\/utils.js b\/packages\/react-devtools-shared\/src\/utils.js\nindex 0a19fb83e5..6cf811943a 100644\n--- a\/packages\/react-devtools-shared\/src\/utils.js\n+++ b\/packages\/react-devtools-shared\/src\/utils.js\n@@ -1,5 +1,6 @@\n \/\/ @flow\n \n+import Symbol from 'es6-symbol';\n import LRU from 'lru-cache';\n import {\n TREE_OPERATION_ADD,\ndiff --git a\/packages\/react-devtools\/package.json b\/packages\/react-devtools\/package.json\nindex 6386e3d57b..f4b4838883 100644\n--- a\/packages\/react-devtools\/package.json\n+++ b\/packages\/react-devtools\/package.json\n@@ -1,6 +1,6 @@\n {\n \"name\": \"react-devtools\",\n- \"version\": \"4.0.5\",\n+ \"version\": \"4.0.6\",\n \"description\": \"Use react-devtools outside of the browser\",\n \"license\": \"MIT\",\n \"repository\": {\n@@ -27,7 +27,7 @@\n \"electron\": \"^5.0.0\",\n \"ip\": \"^1.1.4\",\n \"minimist\": \"^1.2.0\",\n- \"react-devtools-core\": \"4.0.5\",\n+ \"react-devtools-core\": \"4.0.6\",\n \"update-notifier\": \"^2.1.0\"\n }\n }\ndiff --git a\/yarn.lock b\/yarn.lock\nindex 12b1a37f0b..eda5b7fa45 100644\n--- a\/yarn.lock\n+++ b\/yarn.lock\n@@ -4551,7 +4551,7 @@ es6-set@~0.1.5:\n es6-symbol \"3.1.1\"\n event-emitter \"~0.3.5\"\n \n-es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:\n+es6-symbol@3.1.1, es6-symbol@^3, es6-symbol@^3.1.1, es6-symbol@~3.1.1:\n version \"3.1.1\"\n resolved \"https:\/\/registry.yarnpkg.com\/es6-symbol\/-\/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77\"\n integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=\n"}

dillon1000/react

Files changed