{"parents":["3ad50710a769838c9ae9c2d1669c5981e7639092","a39d9c3dff451c5280dded9418a627f37871b94b"],"files":[{"status":"M","path":"extension\/package.json"},{"status":"M","path":"extension\/shells\/browser\/chrome\/manifest.json"},{"status":"M","path":"extension\/shells\/browser\/firefox\/manifest.json"},{"status":"M","path":"extension\/shells\/browser\/shared\/popups\/deadcode.html"},{"status":"M","path":"extension\/shells\/browser\/shared\/popups\/development.html"},{"status":"M","path":"extension\/shells\/browser\/shared\/popups\/outdated.html"},{"status":"M","path":"extension\/shells\/browser\/shared\/popups\/production.html"},{"status":"M","path":"extension\/shells\/browser\/shared\/popups\/unminified.html"},{"status":"M","path":"extension\/shells\/browser\/shared\/src\/main.js"},{"status":"M","path":"extension\/src\/backend\/renderer.js"},{"status":"M","path":"extension\/src\/hydration.js"},{"status":"M","path":"extension\/src\/utils.js"},{"status":"M","path":"extension\/yarn.lock"},{"status":"M","path":"packages\/react-devtools-core\/package.json"},{"status":"M","path":"packages\/react-devtools-inline\/package.json"},{"status":"M","path":"packages\/react-devtools\/package.json"}],"patch":"diff --git a\/extension\/package.json b\/extension\/package.json\nindex 790363ec5d..dc7e4d52e5 100644\n--- a\/extension\/package.json\n+++ b\/extension\/package.json\n@@ -1,5 +1,5 @@\n {\n- \"version\": \"4.0.5\",\n+ \"version\": \"4.0.6\",\n \"repository\": \"bvaughn\/react-devtools-experimental\",\n \"license\": \"MIT\",\n \"private\": true,\n@@ -101,7 +101,7 @@\n \"crx\": \"^5.0.0\",\n \"css-loader\": \"^1.0.1\",\n \"error-stack-parser\": \"^2.0.2\",\n- \"es6-symbol\": \"3.0.2\",\n+ \"es6-symbol\": \"^3\",\n \"escape-string-regexp\": \"^1.0.5\",\n \"eslint\": \"^4.19.1\",\n \"eslint-config-prettier\": \"^2.9.0\",\ndiff --git a\/extension\/shells\/browser\/chrome\/manifest.json b\/extension\/shells\/browser\/chrome\/manifest.json\nindex a915ccc18c..13a79dfd73 100644\n--- a\/extension\/shells\/browser\/chrome\/manifest.json\n+++ b\/extension\/shells\/browser\/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\/extension\/shells\/browser\/firefox\/manifest.json b\/extension\/shells\/browser\/firefox\/manifest.json\nindex 50da7c0c83..77ea161a7a 100644\n--- a\/extension\/shells\/browser\/firefox\/manifest.json\n+++ b\/extension\/shells\/browser\/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\/extension\/shells\/browser\/shared\/popups\/deadcode.html b\/extension\/shells\/browser\/shared\/popups\/deadcode.html\nindex 5e74dc06c4..cdd4c278e8 100644\n--- a\/extension\/shells\/browser\/shared\/popups\/deadcode.html\n+++ b\/extension\/shells\/browser\/shared\/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\/extension\/shells\/browser\/shared\/popups\/development.html b\/extension\/shells\/browser\/shared\/popups\/development.html\nindex 9c2089cc2f..3d092a5eb6 100644\n--- a\/extension\/shells\/browser\/shared\/popups\/development.html\n+++ b\/extension\/shells\/browser\/shared\/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\/extension\/shells\/browser\/shared\/popups\/outdated.html b\/extension\/shells\/browser\/shared\/popups\/outdated.html\nindex a6ec12bcaf..8f3f3f9508 100644\n--- a\/extension\/shells\/browser\/shared\/popups\/outdated.html\n+++ b\/extension\/shells\/browser\/shared\/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\/extension\/shells\/browser\/shared\/popups\/production.html b\/extension\/shells\/browser\/shared\/popups\/production.html\nindex 1b65eb5b21..7b92841c6c 100644\n--- a\/extension\/shells\/browser\/shared\/popups\/production.html\n+++ b\/extension\/shells\/browser\/shared\/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\/extension\/shells\/browser\/shared\/popups\/unminified.html b\/extension\/shells\/browser\/shared\/popups\/unminified.html\nindex 553c9ac6ac..c53885f509 100644\n--- a\/extension\/shells\/browser\/shared\/popups\/unminified.html\n+++ b\/extension\/shells\/browser\/shared\/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\/extension\/shells\/browser\/shared\/src\/main.js b\/extension\/shells\/browser\/shared\/src\/main.js\nindex 98d09dab5c..8d0858873f 100644\n--- a\/extension\/shells\/browser\/shared\/src\/main.js\n+++ b\/extension\/shells\/browser\/shared\/src\/main.js\n@@ -21,6 +21,8 @@ import DevTools from '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@@ -123,7 +125,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@@ -226,47 +228,57 @@ function createPanelIfReactLoaded() {\n let currentPanel = null;\n let needsToSyncElementSelection = false;\n \n- chrome.devtools.panels.create('⚛ Components', '', 'panel.html', panel => {\n- panel.onShown.addListener(panel => {\n- if (needsToSyncElementSelection) {\n- needsToSyncElementSelection = false;\n- bridge.send('syncSelectionFromNativeElementsPanel');\n- }\n+ chrome.devtools.panels.create(\n+ isChrome ? '⚛ Components' : 'Components',\n+ '',\n+ 'panel.html',\n+ panel => {\n+ panel.onShown.addListener(panel => {\n+ if (needsToSyncElementSelection) {\n+ needsToSyncElementSelection = false;\n+ bridge.send('syncSelectionFromNativeElementsPanel');\n+ }\n \n- if (currentPanel === panel) {\n- return;\n- }\n+ if (currentPanel === panel) {\n+ return;\n+ }\n \n- currentPanel = panel;\n- componentsPortalContainer = panel.container;\n+ currentPanel = panel;\n+ componentsPortalContainer = panel.container;\n \n- if (componentsPortalContainer != null) {\n- ensureInitialHTMLIsCleared(componentsPortalContainer);\n- render('components');\n- panel.injectStyles(cloneStyleTags);\n- }\n- });\n- panel.onHidden.addListener(() => {\n- \/\/ TODO: Stop highlighting and stuff.\n- });\n- });\n-\n- chrome.devtools.panels.create('⚛ Profiler', '', 'panel.html', panel => {\n- panel.onShown.addListener(panel => {\n- if (currentPanel === panel) {\n- return;\n- }\n+ if (componentsPortalContainer != null) {\n+ ensureInitialHTMLIsCleared(componentsPortalContainer);\n+ render('components');\n+ panel.injectStyles(cloneStyleTags);\n+ }\n+ });\n+ panel.onHidden.addListener(() => {\n+ \/\/ TODO: Stop highlighting and stuff.\n+ });\n+ }\n+ );\n+\n+ chrome.devtools.panels.create(\n+ isChrome ? '⚛ Profiler' : 'Profiler',\n+ '',\n+ 'panel.html',\n+ panel => {\n+ panel.onShown.addListener(panel => {\n+ if (currentPanel === panel) {\n+ return;\n+ }\n \n- currentPanel = panel;\n- profilerPortalContainer = panel.container;\n+ currentPanel = panel;\n+ profilerPortalContainer = panel.container;\n \n- if (profilerPortalContainer != null) {\n- ensureInitialHTMLIsCleared(profilerPortalContainer);\n- render('profiler');\n- panel.injectStyles(cloneStyleTags);\n- }\n- });\n- });\n+ if (profilerPortalContainer != null) {\n+ ensureInitialHTMLIsCleared(profilerPortalContainer);\n+ render('profiler');\n+ panel.injectStyles(cloneStyleTags);\n+ }\n+ });\n+ }\n+ );\n \n chrome.devtools.network.onNavigated.removeListener(checkPageForReact);\n \ndiff --git a\/extension\/src\/backend\/renderer.js b\/extension\/src\/backend\/renderer.js\nindex 27bf7b03f4..e1b9c7205c 100644\n--- a\/extension\/src\/backend\/renderer.js\n+++ b\/extension\/src\/backend\/renderer.js\n@@ -2067,7 +2067,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\/extension\/src\/hydration.js b\/extension\/src\/hydration.js\nindex f660864e4a..a71ce51b40 100644\n--- a\/extension\/src\/hydration.js\n+++ b\/extension\/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\/extension\/src\/utils.js b\/extension\/src\/utils.js\nindex 1827495e98..e114dc8d4d 100644\n--- a\/extension\/src\/utils.js\n+++ b\/extension\/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\/extension\/yarn.lock b\/extension\/yarn.lock\nindex 24c7d3b366..43f2a9ca3d 100644\n--- a\/extension\/yarn.lock\n+++ b\/extension\/yarn.lock\n@@ -3859,12 +3859,6 @@ d@1:\n dependencies:\n es5-ext \"^0.10.9\"\n \n-d@^0.1.1, d@~0.1.1:\n- version \"0.1.1\"\n- resolved \"https:\/\/registry.yarnpkg.com\/d\/-\/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309\"\n- dependencies:\n- es5-ext \"~0.10.2\"\n-\n damerau-levenshtein@^1.0.0:\n version \"1.0.4\"\n resolved \"https:\/\/registry.yarnpkg.com\/damerau-levenshtein\/-\/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514\"\n@@ -4481,13 +4475,6 @@ es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:\n es6-symbol \"~3.1.1\"\n next-tick \"^1.0.0\"\n \n-es5-ext@^0.10.7, es5-ext@~0.10.10, es5-ext@~0.10.11, es5-ext@~0.10.2:\n- version \"0.10.12\"\n- resolved \"https:\/\/registry.yarnpkg.com\/es5-ext\/-\/es5-ext-0.10.12.tgz#aa84641d4db76b62abba5e45fd805ecbab140047\"\n- dependencies:\n- es6-iterator \"2\"\n- es6-symbol \"~3.1\"\n-\n es6-error@4.0.0:\n version \"4.0.0\"\n resolved \"https:\/\/registry.yarnpkg.com\/es6-error\/-\/es6-error-4.0.0.tgz#f094c7041f662599bb12720da059d6b9c7ff0f40\"\n@@ -4498,14 +4485,6 @@ es6-error@4.1.1:\n resolved \"https:\/\/registry.yarnpkg.com\/es6-error\/-\/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d\"\n integrity sha512-Um\/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==\n \n-es6-iterator@2:\n- version \"2.0.0\"\n- resolved \"https:\/\/registry.yarnpkg.com\/es6-iterator\/-\/es6-iterator-2.0.0.tgz#bd968567d61635e33c0b80727613c9cb4b096bac\"\n- dependencies:\n- d \"^0.1.1\"\n- es5-ext \"^0.10.7\"\n- es6-symbol \"3\"\n-\n es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:\n version \"2.0.3\"\n resolved \"https:\/\/registry.yarnpkg.com\/es6-iterator\/-\/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7\"\n@@ -4560,21 +4539,7 @@ es6-set@~0.1.5:\n es6-symbol \"3.1.1\"\n event-emitter \"~0.3.5\"\n \n-es6-symbol@3, es6-symbol@~3.1:\n- version \"3.1.0\"\n- resolved \"https:\/\/registry.yarnpkg.com\/es6-symbol\/-\/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa\"\n- dependencies:\n- d \"~0.1.1\"\n- es5-ext \"~0.10.11\"\n-\n-es6-symbol@3.0.2:\n- version \"3.0.2\"\n- resolved \"https:\/\/registry.yarnpkg.com\/es6-symbol\/-\/es6-symbol-3.0.2.tgz#1e928878c6f5e63541625b4bb4df4af07d154219\"\n- dependencies:\n- d \"~0.1.1\"\n- es5-ext \"~0.10.10\"\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=\ndiff --git a\/packages\/react-devtools-core\/package.json b\/packages\/react-devtools-core\/package.json\nindex d31a9bcad8..90258a731d 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@@ -23,6 +23,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-inline\/package.json b\/packages\/react-devtools-inline\/package.json\nindex 6ce31290e6..53be51aeeb 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@@ -19,7 +19,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 \"cross-env\": \"^3.1.4\"\n }\ndiff --git a\/packages\/react-devtools\/package.json b\/packages\/react-devtools\/package.json\nindex 0ff553694f..5af48118da 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@@ -26,7 +26,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 }\n","body":"","commit":{"subject":"Merge branch 'source' of github.com:bvaughn\/react-devtools-experimental","authorName":"Brian Vaughn","authoredAt":"2019-08-26T10:06:00-07:00","authorEmail":"bvaughn@fb.com","revision":"4c1514495bf77acad2677b9944726e512691150e","shortRevision":"4c1514495b"}}

dillon1000/react

Files changed