{"commit":{"revision":"c7580fcd3f713f391c6f5f3ceab7cd305a01a20a","authorName":"Sunil Pai","shortRevision":"c7580fcd3f","authoredAt":"2019-05-28T20:21:38+01:00","authorEmail":"threepointone@gmail.com","subject":"Merge remote-tracking branch 'upstream\/master' into act-async"},"files":[{"status":"M","path":".eslintignore"},{"status":"M","path":".eslintrc"},{"status":"M","path":"OVERVIEW.md"},{"status":"M","path":"package.json"},{"status":"M","path":"shells\/browser\/chrome\/build.js"},{"status":"M","path":"shells\/browser\/chrome\/manifest.json"},{"status":"M","path":"shells\/browser\/chrome\/now.json"},{"status":"D","path":"shells\/browser\/chrome\/updates.xml"},{"status":"M","path":"shells\/browser\/firefox\/manifest.json"},{"status":"M","path":"shells\/browser\/firefox\/now.json"},{"status":"M","path":"shells\/browser\/shared\/build.js"},{"status":"M","path":"shells\/browser\/shared\/deploy.chrome.html"},{"status":"M","path":"shells\/browser\/shared\/deploy.firefox.html"},{"status":"M","path":"shells\/browser\/shared\/deploy.js"},{"status":"M","path":"shells\/browser\/shared\/src\/background.js"},{"status":"M","path":"shells\/browser\/shared\/src\/main.js"},{"status":"M","path":"shells\/dev\/app\/ElementTypes\/index.js"},{"status":"A","path":"shells\/dev\/app\/PriorityLevels\/index.js"},{"status":"M","path":"shells\/dev\/app\/index.js"},{"status":"M","path":"shells\/utils.js"},{"status":"A","path":"src\/__tests__\/__snapshots__\/inspectedElementContext-test.js.snap"},{"status":"A","path":"src\/__tests__\/__snapshots__\/ownersListContext-test.js.snap"},{"status":"A","path":"src\/__tests__\/__snapshots__\/profilerContext-test.js.snap"},{"status":"D","path":"src\/__tests__\/__snapshots__\/profiling-test.js.snap"},{"status":"A","path":"src\/__tests__\/__snapshots__\/profilingCache-test.js.snap"},{"status":"M","path":"src\/__tests__\/__snapshots__\/profilingCharts-test.js.snap"},{"status":"M","path":"src\/__tests__\/__snapshots__\/profilingCommitTreeBuilder-test.js.snap"},{"status":"A","path":"src\/__tests__\/__snapshots__\/treeContext-test.js.snap"},{"status":"A","path":"src\/__tests__\/bridge-test.js"},{"status":"A","path":"src\/__tests__\/inspectedElementContext-test.js"},{"status":"A","path":"src\/__tests__\/inspectedElementSerializer.js"},{"status":"A","path":"src\/__tests__\/ownersListContext-test.js"},{"status":"A","path":"src\/__tests__\/profilerContext-test.js"},{"status":"A","path":"src\/__tests__\/profilerStore-test.js"},{"status":"D","path":"src\/__tests__\/profiling-test.js"},{"status":"A","path":"src\/__tests__\/profilingCache-test.js"},{"status":"M","path":"src\/__tests__\/profilingCharts-test.js"},{"status":"M","path":"src\/__tests__\/profilingCommitTreeBuilder-test.js"},{"status":"A","path":"src\/__tests__\/profilingUtils-test.js"},{"status":"M","path":"src\/__tests__\/setupTests.js"},{"status":"M","path":"src\/__tests__\/store-test.js"},{"status":"M","path":"src\/__tests__\/storeComponentFilters-test.js"},{"status":"A","path":"src\/__tests__\/treeContext-test.js"},{"status":"M","path":"src\/__tests__\/utils.js"},{"status":"M","path":"src\/backend\/agent.js"},{"status":"M","path":"src\/backend\/index.js"},{"status":"M","path":"src\/backend\/renderer.js"},{"status":"M","path":"src\/backend\/types.js"},{"status":"M","path":"src\/bridge.js"},{"status":"M","path":"src\/constants.js"},{"status":"A","path":"src\/devtools\/ProfilerStore.js"},{"status":"M","path":"src\/devtools\/ProfilingCache.js"},{"status":"M","path":"src\/devtools\/store.js"},{"status":"M","path":"src\/devtools\/views\/Components\/ComponentFiltersModal.js"},{"status":"M","path":"src\/devtools\/views\/Components\/Components.js"},{"status":"M","path":"src\/devtools\/views\/Components\/Element.css"},{"status":"M","path":"src\/devtools\/views\/Components\/Element.js"},{"status":"A","path":"src\/devtools\/views\/Components\/EventsTree.css"},{"status":"A","path":"src\/devtools\/views\/Components\/EventsTree.js"},{"status":"M","path":"src\/devtools\/views\/Components\/InspectedElementContext.js"},{"status":"A","path":"src\/devtools\/views\/Components\/OwnersListContext.js"},{"status":"M","path":"src\/devtools\/views\/Components\/OwnersStack.css"},{"status":"M","path":"src\/devtools\/views\/Components\/OwnersStack.js"},{"status":"M","path":"src\/devtools\/views\/Components\/SelectedElement.js"},{"status":"M","path":"src\/devtools\/views\/Components\/ToggleComponentFiltersModalButton.js"},{"status":"M","path":"src\/devtools\/views\/Components\/Tree.css"},{"status":"M","path":"src\/devtools\/views\/Components\/Tree.js"},{"status":"M","path":"src\/devtools\/views\/Components\/TreeContext.js"},{"status":"M","path":"src\/devtools\/views\/Components\/types.js"},{"status":"M","path":"src\/devtools\/views\/DevTools.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/ChartNode.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/ClearProfilingDataButton.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/CommitFilterModal.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/CommitFlamegraph.css"},{"status":"M","path":"src\/devtools\/views\/Profiler\/CommitFlamegraph.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/CommitFlamegraphListItem.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/CommitRanked.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/CommitTreeBuilder.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/FlamegraphChartBuilder.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/InteractionListItem.css"},{"status":"M","path":"src\/devtools\/views\/Profiler\/InteractionListItem.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/Interactions.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/InteractionsChartBuilder.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/NoCommitData.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/Profiler.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/ProfilerContext.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/ProfilingImportExportButtons.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/RankedChartBuilder.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/RecordToggle.css"},{"status":"M","path":"src\/devtools\/views\/Profiler\/RecordToggle.js"},{"status":"A","path":"src\/devtools\/views\/Profiler\/RootSelector.css"},{"status":"A","path":"src\/devtools\/views\/Profiler\/RootSelector.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/SidebarCommitInfo.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/SidebarInteractions.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/SidebarSelectedFiberInfo.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/SnapshotCommitListItem.css"},{"status":"M","path":"src\/devtools\/views\/Profiler\/SnapshotSelector.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/types.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/utils.js"},{"status":"M","path":"src\/devtools\/views\/Settings\/SettingsContext.js"},{"status":"M","path":"src\/devtools\/views\/TabBar.js"},{"status":"M","path":"src\/devtools\/views\/root.css"},{"status":"M","path":"src\/devtools\/views\/utils.js"},{"status":"M","path":"src\/hook.js"},{"status":"M","path":"src\/hydration.js"},{"status":"M","path":"src\/utils.js"},{"status":"M","path":"yarn.lock"}],"parents":["7aaef6f41fa0dc0b13554a2e0800a34187a4ddfc","92c2d8366b77e94125010a626c1a56e4b4f94864"],"patch":"diff --git a\/.eslintignore b\/.eslintignore\nindex 60fbacc575..4b9cfb7dd7 100644\n--- a\/.eslintignore\n+++ b\/.eslintignore\n@@ -6,6 +6,7 @@ shells\/browser\/firefox\/build\n shells\/browser\/shared\/build\n shells\/dev\/dist\n vendor\n+*.js.snap\n \n package-lock.json\n-yarn.lock\n\\ No newline at end of file\n+yarn.lock\ndiff --git a\/.eslintrc b\/.eslintrc\nindex 5065c9aae8..5ee6406982 100644\n--- a\/.eslintrc\n+++ b\/.eslintrc\n@@ -12,6 +12,7 @@\n },\n \"globals\": {\n \"__DEV__\": \"readonly\",\n- \"jasmine\": \"readonly\"\n+ \"jasmine\": \"readonly\",\n+ \"spyOn\": \"readonly\"\n }\n }\ndiff --git a\/OVERVIEW.md b\/OVERVIEW.md\nindex a2d8a67fa9..eba370d98b 100644\n--- a\/OVERVIEW.md\n+++ b\/OVERVIEW.md\n@@ -14,9 +14,9 @@ The old DevTools also rendered the entire application tree in the form of a larg\n \n Every React commit that changes the tree in a way DevTools cares about results in an \"_operations_\" message being sent across the bridge. These messages are lightweight patches that describe the changes that were made. (We don't resend the full tree structure like in legacy DevTools.)\n \n-The payload for each message is a typed array. The first two entries are numbers that identify which renderer and root the update belongs to (for multi-root support). Then the strings are encoded in a string table. The rest of the array depends on the operations being made to the tree.\n+The payload for each message is a typed array. The first two entries are numbers that identify which renderer and root the update belongs to (for multi-root support). Then the strings are encoded in a [string table](#string-table). The rest of the array depends on the operations being made to the tree.\n \n-No updates are required for many commits because we only send the following bits of information: element type, id, parent id, owner id, name, and key. Additional information (e.g. props, state) requires a separate \"_inspectElement_\" message.\n+No updates are required for most commits because we only send the following bits of information: element type, id, parent id, owner id, name, and key. Additional information (e.g. props, state) requires a separate [\"_inspectElement_\" message](#inspecting-an-element).\n \n #### String table\n \n@@ -211,176 +211,57 @@ while (index !== currentWeight) {\n }\n ```\n \n-## Profiler\n-\n-The Profiler UI is a powerful tool for identifying and fixing performance problems. The primary goal of the new profiler is to minimize its impact (CPU usage) while profiling is active. This can be accomplished by:\n-* Minimizing bridge traffic.\n-* Making expensive computations lazy.\n+## Inspecting an element\n \n-Profiling information is stored on the backend. The backend push-notifies the frontend of when profiling starts or stops by sending a \"_profilingStatus_\" message. (The frontend also asks for the current status after mounting by sending a \"_getProfilingStatus_\" message.)\n+When an element is mounted in the tree, DevTools sends a minimal amount of information about it across the bridge. This information includes its display name, type, and key- but does _not_ include things like props or state. (These values are often expensive to serialize and change frequently, which would add a significant amount of load to the bridge.)\n \n-When profiling begins, the frontend takes a snapshot\/copy of each root. This snapshot includes the id, name, key, and child IDs for each node in the tree. (This information is already present on the frontend, so it does not require any additional bridge traffic.) While profiling is active, each time React commits– the frontend also stores a copy of the \"_operations_\" message (described above). Once profiling has finished, the frontend can use the original snapshot along with each of the stored \"_operations_\" messages to reconstruct the tree for each of the profiled commits.\n+Instead DevTools lazily requests additional information about an element only when it is selected in the \"Components\" tab. At that point, the frontend requests this information by sending a special \"_inspectElement_\" message containing the id of the element being inspected. The backend then responds with an \"_inspectedElement_\" message containing the additional details.\n \n-When profiling begins, the backend records the base durations of each fiber currently in the tree. While profiling is in progress, the backend also stores some information ^{1<\/sup> about each commit:\n-* Commit time and duration\n-* Which elements were rendered during that commit.\n-* Which interactions (if any) were part of the commit.\n+### Polling strategy\n \n-This information is kept on the backend until requested by the frontend (as described below).\n+Elements can update frequently, especially in response to things like scrolling events. Since props and state can be large, we avoid sending this information across the bridge every time the selected element is updated. Instead, the frontend polls the backend for updates about once a second. The backend tracks when the element was last \"inspected\" and sends a special no-op response if it has not re-rendered since then.\n \n-^{1<\/sup> In the future, the backend may also store additional metadata (e.g. which props\/states changed between rendered for a given component).\n+### Inspecting hooks\n \n-### Profiling summary\n+Hooks present a unique challenge for the DevTools because of the concept of _custom_ hooks. (A custom hook is essentially any function that calls at least one of the built-in hooks. By convention custom hooks also have names that begin with \"use\".)\n \n-The profiling tab shows information for the currently-selected React root. When profiling completes (or when a new root is selected) the frontend first checks to see if there is any profiling data for the selected root. (Has it cached any \"_operations_\"?)\n+So how does DevTools identify custom functions called from within third party components? It does this by temporarily overriding React's built-in hooks and shallow rendering the component in question. Whenever one of the (overridden) built-in hooks are called, it parses the call stack to spot potential custom hooks (functions between the component itself and the built-in hook). This approach enables it to build a tree structure describing all of the calls to both the built-in _and_ custom hooks, along with the values passed to those hooks. (If you're interested in learning more about this, [here is the source code](https:\/\/github.com\/bvaughn\/react-devtools-experimental\/blob\/master\/src\/backend\/ReactDebugHooks.js).)\n \n-If so, then it sends a \"_getProfilingSummary_\" message with an id that identifies the root. The backend then returns a \"_profilingSummary_\" message with the following information:\n+> **Note**: DevTools obtains hooks info by re-rendering a component. Breakpoints and console logs will be invoked during this additional (shallow) render.\n \n-* root id (to match request and response)\n-* number of interactions that were traced for this root\n-* the commits (each consisting of a timestamp and duration) that were profiled for the root\n-* tree base durations as of when profiling started\n+### Performance implications\n \n-This is the minimal information required to render the main [\"commit selector\"](https:\/\/reactjs.org\/blog\/2018\/09\/10\/introducing-the-react-profiler.html#browsing-commits). \n+To mitigate the performance impact of re-rendering a component, DevTools does the following:\n+* Only function components that use _at least one hook_ are rendered. (Props and state can be analyzed without rendering.)\n+* Rendering is always shallow.\n+* Rendering is throttled to occur, at most, once per second.\n+* Rendering is skipped if the component has not updated since the last time its properties were inspected.\n \n-Here is an example profile summary:\n-```js\n-{\n- rootID: 1,\n- interactionCount: 2,\n-\n- \/\/ Commit durations\n- commitDurations: [\n- 10, \/\/ first commit took 10ms\n- 13, \/\/ second commit took 13ms\n- 5, \/\/ third commit took 5ms\n- ]\n-\n- \/\/ Commit times (relative to when profiling started)\n- commitTimes: [\n- 210, \/\/ first commit started 210ms after profiling began\n- 284, \/\/ second commit started 284ms after profiling began\n- 303, \/\/ third commit started 303ms after profiling began\n- ],\n-\n- \/\/ Tuples of fiber id and initial tree base duration\n- initialTreeBaseDurations: [\n- 1, \/\/ fiber id\n- 11, \/\/ tree base duration when profiling started\n-\n- 2, \/\/ fiber id\n- 12, \/\/ tree base duration when profiling started\n-\n- 3, \/\/ fiber id\n- 8, \/\/ tree base duration when profiling started\n- ]\n-]\n-```\n-\n-Additional information (e.g. which components were part of a specific commit, which interactions were logged) are lazily requested by the frontend as a user interacts with the Profiler UI.\n-\n-### Commit details\n-\n-When a commit is selected in the profiling view, the frontend needs to reconstruct the tree at that point in time using the snapshot and the \"_operations_\" it has cached.\n-\n-In addition to this, it also needs to ask the backend for some additional information needed to display the [\"flame chart\"](https:\/\/reactjs.org\/blog\/2018\/09\/10\/introducing-the-react-profiler.html#flame-chart) and [\"ranked chart\"](https:\/\/reactjs.org\/blog\/2018\/09\/10\/introducing-the-react-profiler.html#ranked-chart) views. The frontend sends a \"_profileCommitDetails_\" message specifying which root and commit (index) it is interested in. The backend sends a response to fill in missing details about the commit:\n-\n-* root id and commit index (to match request and response)\n-* which elements were rendered during the commit ^{1<\/sup> and how long did they take\n-* which interactions were part of the commit\n-\n-Here is an example commit in which two elements were rendered and one interaction was traced:\n-\n-```js\n-{\n- rootID: 1,\n- commitIndex: 0,\n- interactions: [\n- {\n- id: 8,\n- timestamp: 4,\n- name: \"Foo\"\n- },\n- {\n- id: 11,\n- timestamp: 4,\n- name: \"Bar\"\n- }\n- ],\n- nodes: [\n- {\n- id: 1,\n- baseDuration: 15,\n- actualDuration: 15\n- },\n- {\n- id: 2,\n- baseDuration: 11,\n- actualDuration: 11\n- }\n- }\n-}\n-```\n-\n-^{1<\/sup> Elements in the tree that are not explicitly included in the above response were not rendered during the current commit.\n+## Profiler\n \n-### Component commits\n+The Profiler UI is a powerful tool for identifying and fixing performance problems. The primary goal of the new profiler is to minimize its impact (CPU usage) while profiling is active. This can be accomplished by:\n+* Minimizing bridge traffic.\n+* Making expensive computations lazy.\n \n-When a particular component (fiber) is selected, the frontend polls the backend for the aggregate data required to render the [\"component chart\"](https:\/\/reactjs.org\/blog\/2018\/09\/10\/introducing-the-react-profiler.html#component-chart) view. The frontend sends a \"_profileComponentDetails_\" message specifying which root and component (id) it is interested in. The backend sends a response that includes:\n+The majority of profiling information is stored on the backend. The backend push-notifies the frontend of when profiling starts or stops by sending a \"_profilingStatus_\" message. (The frontend also asks for the current status after mounting by sending a \"_getProfilingStatus_\" message.)\n \n-* root and component ids (to match request and response)\n-* which commits was the component rendered in and how long did each take\n+When profiling begins, the frontend takes a snapshot\/copy of each root. This snapshot includes the id, name, key, and child IDs for each node in the tree. (This information is already present on the frontend, so it does not require any additional bridge traffic.) While profiling is active, each time React commits– the frontend also stores a copy of the \"_operations_\" message (described above). Once profiling has finished, the frontend can use the original snapshot along with each of the stored \"_operations_\" messages to reconstruct the tree for each of the profiled commits.\n \n-Here is an example of a component that committed twice during a profiling session:\n+When profiling begins, the backend records the base durations of each fiber currently in the tree. While profiling is in progress, the backend also stores some information ^{1<\/sup> about each commit:\n+* Commit time and duration\n+* Which elements were rendered during that commit.\n+* Which interactions (if any) were part of the commit.\n \n-```js\n-{\n- rootID: 1,\n- id: 2,\n-\n- \/\/ Tuples of commit index and render duration (ms)\n- commits: [\n- 0, \/\/ index of first\n- 11 \/\/ duration (ms)\n-\n- 2, \/\/ index of second commit\n- 7 \/\/ duration (ms)\n- ]\n-}\n-```\n+This information will eventually be required by the frontend in order to render its profiling graphs, but it will not be sent across the bridge until profiling has completed (to minimize the performance impact of profiling).\n \n-### Interactions\n+^{1<\/sup> In the future, the backend may also store additional metadata (e.g. which props\/states changed between rendered for a given component).\n \n-The [Interactions chart](https:\/\/reactjs.org\/blog\/2018\/09\/10\/introducing-the-react-profiler.html#interactions) shows a time series for every interaction that was traced in the recent profiler session. The frontend sends a \"_profileInteractions_\" message specifying which root it would like interaction data for. The backend sends the following response:\n+### Combining profiling data\n \n-* root id (to match request and response)\n-* interaction metadata\n+Once profiling is finished, the frontend requests profiling data from the backend one renderer at a time by sending a \"_getProfilingData_\" message. The backend responds with a \"_profilingData_\" message that contains per-root commit timing and duration information. The frontend then combines this information with its own snapshots to form a complete picture of the profiling session. Using this data, charts and graphs are lazily computed (and incrementally cached) on demand, based on which commits and views are selected in the Profiler UI.\n \n-Here is an example of a profiling session consisting of two interactions:\n+### Importing\/exporting data\n \n-```js\n-{\n- rootID: 1,\n- interactions: [\n- {\n- id: 8,\n- name: \"Foo\",\n- timestamp: 4,\n- commits: [\n- 0, \/\/ index of first commit\n- 2 \/\/ index of second commit\n- ]\n- },\n- {\n- id: 11,\n- name: \"Bar\",\n- timestamp: 4,\n- commits: [\n- 0 \/\/ index of first commit\n- ]\n- }\n- ]\n-}\n-```\n+Because all of the data is merged in the frontend after a profiling session is completed, it can be exported and imported (as JSON), enabling profiling sessions to be shared between users.\n \n-The backend does not need to resend the timestamp for each of the commits because that was already sent as part of the \"_profilingSummary_\" message.\n+At the moment, screenshots are not included in the exported data (to keep the export filesize small) but this could be changed in the future.\n\\ No newline at end of file\ndiff --git a\/package.json b\/package.json\nindex 3958ceb4bd..8dcd8bd6fe 100644\n--- a\/package.json\n+++ b\/package.json\n@@ -24,6 +24,7 @@\n \"\/src\/__tests__\/setupTests\"\n ],\n \"snapshotSerializers\": [\n+ \"\/src\/__tests__\/inspectedElementSerializer\",\n \"\/src\/__tests__\/storeSerializer\"\n ],\n \"testMatch\": [\n@@ -78,7 +79,7 @@\n \"@babel\/preset-react\": \"^7.0.0\",\n \"@reach\/menu-button\": \"^0.1.17\",\n \"@reach\/tooltip\": \"^0.2.0\",\n- \"adm-zip\": \"^0.4.7\",\n+ \"archiver\": \"^3.0.0\",\n \"babel-core\": \"^7.0.0-bridge\",\n \"babel-eslint\": \"^9.0.0\",\n \"babel-jest\": \"^24.7.1\",\n@@ -89,7 +90,6 @@\n \"cli-spinners\": \"^1.0.0\",\n \"clipboard-js\": \"^0.3.6\",\n \"cross-env\": \"^5.2.0\",\n- \"crx\": \"git+https:\/\/github.com\/oncletom\/crx#ef150e8\",\n \"css-loader\": \"^1.0.1\",\n \"error-stack-parser\": \"^2.0.2\",\n \"es6-symbol\": \"3.0.2\",\n@@ -131,21 +131,21 @@\n \"opener\": \"^1.5.1\",\n \"prettier\": \"^1.16.4\",\n \"prop-types\": \"^15.6.2\",\n- \"react\": \"^0.0.0-6da04b5d8\",\n+ \"react\": \"^0.0.0-50b50c26f\",\n \"react-color\": \"^2.11.7\",\n- \"react-dom\": \"^0.0.0-6da04b5d8\",\n- \"react-is\": \"^0.0.0-6da04b5d8\",\n- \"react-test-renderer\": \"^0.0.0-6da04b5d8\",\n+ \"react-dom\": \"^0.0.0-50b50c26f\",\n+ \"react-is\": \"^0.0.0-50b50c26f\",\n+ \"react-test-renderer\": \"^0.0.0-50b50c26f\",\n \"react-virtualized-auto-sizer\": \"^1.0.2\",\n \"react-window\": \"^1.8.0\",\n \"request-promise\": \"^4.2.4\",\n- \"scheduler\": \"^0.0.0-6da04b5d8\",\n+ \"rimraf\": \"^2.6.3\",\n+ \"scheduler\": \"^0.0.0-50b50c26f\",\n \"semver\": \"^5.5.1\",\n \"style-loader\": \"^0.23.1\",\n \"web-ext\": \"^3.0.0\",\n \"webpack\": \"^4.26.0\",\n \"webpack-cli\": \"^3.1.2\",\n- \"webpack-dev-server\": \"^3.3.1\",\n- \"xml-js\": \"^1.6.11\"\n+ \"webpack-dev-server\": \"^3.3.1\"\n }\n }\ndiff --git a\/shells\/browser\/chrome\/build.js b\/shells\/browser\/chrome\/build.js\nindex 0f5905e2de..57b2dbb1f9 100644\n--- a\/shells\/browser\/chrome\/build.js\n+++ b\/shells\/browser\/chrome\/build.js\n@@ -1,35 +1,10 @@\n #!\/usr\/bin\/env node\n \n const chalk = require('chalk');\n-const { execSync } = require('child_process');\n-const { join } = require('path');\n-const rp = require('request-promise');\n-const convert = require('xml-js');\n const build = require('..\/shared\/build');\n \n const main = async () => {\n- const manifestVersion = await rp(\n- 'https:\/\/react-devtools-experimental-chrome.now.sh\/updates.xml'\n- )\n- .then(xmlString => {\n- const parsedXML = convert.xml2js(xmlString);\n- const version =\n- parsedXML.elements[0].elements[0].elements[0].attributes.version;\n- const match = \/(\\d)\\.(\\d)\\.(\\d)\\.*(\\d)*\/.exec(version);\n- if (match !== null) {\n- const prerelease = parseInt(match[4], 10) || 0;\n- return `${match[1]}.${match[2]}.${match[3]}.${prerelease + 1}`;\n- }\n- })\n- .catch(error => null);\n-\n- await build('chrome', manifestVersion);\n-\n- const cwd = join(__dirname, 'build');\n- execSync('crx pack .\/unpacked -o ReactDevTools.crx -p ..\/..\/..\/..\/key.pem', {\n- cwd,\n- });\n- execSync('rm packed.zip', { cwd });\n+ await build('chrome');\n \n console.log(chalk.green('\\nThe Chrome extension has been built!'));\n console.log(chalk.green('You can test this build by running:'));\ndiff --git a\/shells\/browser\/chrome\/manifest.json b\/shells\/browser\/chrome\/manifest.json\nindex d6ee523d48..c24fe09e86 100644\n--- a\/shells\/browser\/chrome\/manifest.json\n+++ b\/shells\/browser\/chrome\/manifest.json\n@@ -4,8 +4,6 @@\n \"description\": \"Adds React debugging tools to the Chrome Developer Tools.\",\n \"version\": \"4.0.0\",\n \n- \"update_url\": \"https:\/\/react-devtools-experimental-chrome.now.sh\/updates.xml\",\n-\n \"minimum_chrome_version\": \"49\",\n \n \"icons\": {\n@@ -44,8 +42,8 @@\n \"permissions\": [\n \"\",\n \"background\",\n- \"downloads\",\n \"tabs\",\n+ \"webNavigation\",\n \"file:\/\/\/*\",\n \"http:\/\/*\/*\",\n \"https:\/\/*\/*\"\ndiff --git a\/shells\/browser\/chrome\/now.json b\/shells\/browser\/chrome\/now.json\nindex fa36a08c68..e541ec866d 100644\n--- a\/shells\/browser\/chrome\/now.json\n+++ b\/shells\/browser\/chrome\/now.json\n@@ -1,5 +1,5 @@\n {\n \"name\": \"react-devtools-experimental-chrome\",\n \"alias\": [\"react-devtools-experimental-chrome\"],\n- \"files\": [\"index.html\", \"updates.xml\", \"ReactDevTools.crx\"]\n+ \"files\": [\"index.html\", \"ReactDevTools.zip\"]\n }\ndiff --git a\/shells\/browser\/chrome\/updates.xml b\/shells\/browser\/chrome\/updates.xml\ndeleted file mode 100644\nindex 460aa13403..0000000000\n--- a\/shells\/browser\/chrome\/updates.xml\n+++ \/dev\/null\n@@ -1,6 +0,0 @@\n-\n-\n- \n- \n- <\/app>\n-<\/gupdate>\n\\ No newline at end of file\ndiff --git a\/shells\/browser\/firefox\/manifest.json b\/shells\/browser\/firefox\/manifest.json\nindex 3ef00fba01..02f24a0fef 100644\n--- a\/shells\/browser\/firefox\/manifest.json\n+++ b\/shells\/browser\/firefox\/manifest.json\n@@ -46,9 +46,9 @@\n \n \"permissions\": [\n \"\",\n- \"downloads\",\n \"activeTab\",\n \"tabs\",\n+ \"webNavigation\",\n \"file:\/\/\/*\",\n \"http:\/\/*\/*\",\n \"https:\/\/*\/*\"\ndiff --git a\/shells\/browser\/firefox\/now.json b\/shells\/browser\/firefox\/now.json\nindex 324d62388e..5e61bb442f 100644\n--- a\/shells\/browser\/firefox\/now.json\n+++ b\/shells\/browser\/firefox\/now.json\n@@ -1,5 +1,5 @@\n {\n \"name\": \"react-devtools-experimental-firefox\",\n \"alias\": [\"react-devtools-experimental-firefox\"],\n- \"files\": [\"index.html\", \"packed.zip\"]\n+ \"files\": [\"index.html\", \"ReactDevTools.zip\"]\n }\ndiff --git a\/shells\/browser\/shared\/build.js b\/shells\/browser\/shared\/build.js\nindex fb1037f7a8..8cc9de1c3a 100644\n--- a\/shells\/browser\/shared\/build.js\n+++ b\/shells\/browser\/shared\/build.js\n@@ -1,8 +1,8 @@\n #!\/usr\/bin\/env node\n \n-const AdmZip = require('adm-zip');\n+const archiver = require('archiver');\n const { execSync } = require('child_process');\n-const { readFileSync, writeFileSync } = require('fs');\n+const { readFileSync, writeFileSync, createWriteStream } = require('fs');\n const { copy, ensureDir, move, remove } = require('fs-extra');\n const { join } = require('path');\n const { getGitCommit } = require('..\/..\/utils');\n@@ -17,7 +17,7 @@ const preProcess = async (destinationPath, tempPath) => {\n await ensureDir(tempPath); \/\/ Create temp dir for this new build\n };\n \n-const build = async (tempPath, manifestPath, manifestVersion) => {\n+const build = async (tempPath, manifestPath) => {\n const binPath = join(tempPath, 'bin');\n const zipPath = join(tempPath, 'zip');\n \n@@ -62,23 +62,27 @@ const build = async (tempPath, manifestPath, manifestVersion) => {\n const commit = getGitCommit();\n \n const manifest = JSON.parse(readFileSync(copiedManifestPath).toString());\n- manifest.description += `\\n\\nCreated from revision ${commit}`;\n- if (manifestVersion) {\n- manifest.version = manifestVersion;\n- manifest.version_name = `${manifestVersion} ${commit}`;\n- }\n+ manifest.description += `\\n\\nCreated from revision ${commit} (${new Date().toLocaleDateString()})`;\n+ manifest.version_name = `${commit} (${new Date().toLocaleDateString()})`;\n writeFileSync(copiedManifestPath, JSON.stringify(manifest, null, 2));\n \n \/\/ Pack the extension\n- const zip = new AdmZip();\n- zip.addLocalFolder(zipPath);\n- zip.writeZip(join(tempPath, 'packed.zip'));\n+ const archive = archiver('zip', { zlib: { level: 9 } });\n+ const zipStream = createWriteStream(join(tempPath, 'ReactDevTools.zip'));\n+ await new Promise((resolve, reject) => {\n+ archive\n+ .directory(zipPath, false)\n+ .on('error', err => reject(err))\n+ .pipe(zipStream);\n+ archive.finalize();\n+ zipStream.on('close', () => resolve());\n+ });\n };\n \n const postProcess = async (tempPath, destinationPath) => {\n const unpackedSourcePath = join(tempPath, 'zip');\n- const packedSourcePath = join(tempPath, 'packed.zip');\n- const packedDestPath = join(destinationPath, 'packed.zip');\n+ const packedSourcePath = join(tempPath, 'ReactDevTools.zip');\n+ const packedDestPath = join(destinationPath, 'ReactDevTools.zip');\n const unpackedDestPath = join(destinationPath, 'unpacked');\n \n await move(unpackedSourcePath, unpackedDestPath); \/\/ Copy built files to destination\n@@ -86,7 +90,7 @@ const postProcess = async (tempPath, destinationPath) => {\n await remove(tempPath); \/\/ Clean up temp directory and files\n };\n \n-const main = async (buildId, manifestVersion) => {\n+const main = async buildId => {\n const root = join(__dirname, '..', buildId);\n const manifestPath = join(root, 'manifest.json');\n const destinationPath = join(root, 'build');\n@@ -94,7 +98,7 @@ const main = async (buildId, manifestVersion) => {\n try {\n const tempPath = join(__dirname, 'build', buildId);\n await preProcess(destinationPath, tempPath);\n- await build(tempPath, manifestPath, manifestVersion);\n+ await build(tempPath, manifestPath);\n \n const builtUnpackedPath = join(destinationPath, 'unpacked');\n await postProcess(tempPath, destinationPath);\ndiff --git a\/shells\/browser\/shared\/deploy.chrome.html b\/shells\/browser\/shared\/deploy.chrome.html\nindex ccef0c2724..eb70be0024 100644\n--- a\/shells\/browser\/shared\/deploy.chrome.html\n+++ b\/shells\/browser\/shared\/deploy.chrome.html\n@@ -1,7 +1,8 @@\n \n- download extension<\/a><\/li>\n-
Navigate to chrome:\/\/extensions\/<\/a><\/li>\n+
download extension<\/a><\/li>\n+
Double-click to extract<\/li>\n+
Navigate to chrome:\/\/extensions\/<\/code><\/li>\n
Enable \"Developer mode\"<\/li>\n-
Drag ReactDevTools.crx<\/code> into Chrome<\/li>\n-
Choose \"Add Extension\" when prompted<\/li>\n+
Click \"LOAD UNPACKED\"<\/li>\n+
Select extracted extension folder (ReactDevTools<\/code>)<\/li>\n <\/ol>\n\\ No newline at end of file\ndiff --git a\/shells\/browser\/shared\/deploy.firefox.html b\/shells\/browser\/shared\/deploy.firefox.html\nindex 57051bf586..d2879a17c4 100644\n--- a\/shells\/browser\/shared\/deploy.firefox.html\n+++ b\/shells\/browser\/shared\/deploy.firefox.html\n@@ -1,7 +1,7 @@\n \n- download extension<\/a><\/li>\n+
download extension<\/a><\/li>\n
Extract\/unzip<\/li>\n
Visit about:debugging<\/code><\/li>\n
Click \"Load Temporary Add-on\"<\/li>\n-
Select the manifest.json<\/code><\/li>\n+
Select the manifest.json<\/code> file inside of the extracted extension folder (ReactDevTools<\/code>)<\/li>\n <\/ol>\n\\ No newline at end of file\ndiff --git a\/shells\/browser\/shared\/deploy.js b\/shells\/browser\/shared\/deploy.js\nindex 349c6c8106..6cc33e1cbf 100644\n--- a\/shells\/browser\/shared\/deploy.js\n+++ b\/shells\/browser\/shared\/deploy.js\n@@ -3,7 +3,6 @@\n const { exec, execSync } = require('child_process');\n const { readFileSync, writeFileSync } = require('fs');\n const { join } = require('path');\n-const convert = require('xml-js');\n \n const main = async buildId => {\n const root = join(__dirname, '..', buildId);\n@@ -22,18 +21,6 @@ const main = async buildId => {\n cwd: root,\n });\n \n- if (buildId === 'chrome') {\n- const file = readFileSync(join(buildPath, 'unpacked', 'manifest.json'));\n- const json = JSON.parse(file);\n- const { version } = json;\n-\n- const xmlString = readFileSync(join(root, 'updates.xml'), 'utf8');\n- const parsedXML = convert.xml2js(xmlString);\n- parsedXML.elements[0].elements[0].elements[0].attributes.version = version;\n-\n- writeFileSync(join(buildPath, 'updates.xml'), convert.js2xml(parsedXML));\n- }\n-\n const file = readFileSync(join(root, 'now.json'));\n const json = JSON.parse(file);\n const alias = json.alias[0];\ndiff --git a\/shells\/browser\/shared\/src\/background.js b\/shells\/browser\/shared\/src\/background.js\nindex 64e0bfead8..1090ef76d8 100644\n--- a\/shells\/browser\/shared\/src\/background.js\n+++ b\/shells\/browser\/shared\/src\/background.js\n@@ -110,17 +110,6 @@ chrome.runtime.onMessage.addListener((request, sender) => {\n setIconAndPopup(reactBuildType, sender.tab.id);\n }\n \n- if (request.exportFile) {\n- let { contents, filename } = request;\n- if (!Array.isArray(contents)) {\n- contents = [contents];\n- }\n-\n- const blob = new Blob(contents, { type: 'text\/plain' });\n- const url = URL.createObjectURL(blob);\n- chrome.downloads.download({ filename, saveAs: true, url });\n- }\n-\n if (request.captureScreenshot) {\n const { commitIndex, rootID } = request;\n try {\ndiff --git a\/shells\/browser\/shared\/src\/main.js b\/shells\/browser\/shared\/src\/main.js\nindex d2da26ba2b..bf194d3c5e 100644\n--- a\/shells\/browser\/shared\/src\/main.js\n+++ b\/shells\/browser\/shared\/src\/main.js\n@@ -51,6 +51,8 @@ function createPanelIfReactLoaded() {\n let bridge = null;\n let store = null;\n \n+ let profilingData = null;\n+\n let componentsPortalContainer = null;\n let profilerPortalContainer = null;\n let settingsPortalContainer = null;\n@@ -85,13 +87,6 @@ function createPanelIfReactLoaded() {\n localStorage.setItem(LOCAL_STORAGE_SUPPORTS_PROFILING_KEY, 'true');\n chrome.devtools.inspectedWindow.eval('window.location.reload();');\n });\n- bridge.addListener('exportFile', ({ contents, filename }) => {\n- chrome.runtime.sendMessage({\n- exportFile: true,\n- contents,\n- filename,\n- });\n- });\n bridge.addListener('captureScreenshot', ({ commitIndex, rootID }) => {\n chrome.runtime.sendMessage(\n {\n@@ -124,10 +119,10 @@ function createPanelIfReactLoaded() {\n store = new Store(bridge, {\n isProfiling,\n supportsCaptureScreenshots: true,\n- supportsFileDownloads: browserName === 'Chrome',\n supportsReloadAndProfile: true,\n supportsProfiling,\n });\n+ store.profilerStore.profilingData = profilingData;\n \n \/\/ Initialize the backend only once the Store has been initialized.\n \/\/ Otherwise the Store may miss important initial tree op codes.\n@@ -286,18 +281,29 @@ function createPanelIfReactLoaded() {\n \n chrome.devtools.network.onNavigated.removeListener(checkPageForReact);\n \n- \/\/ Shutdown bridge and re-initialize DevTools panel when a new page is loaded.\n+ \/\/ Shutdown bridge before a new page is loaded.\n+ chrome.webNavigation.onBeforeNavigate.addListener(\n+ function onBeforeNavigate(details) {\n+ \/\/ `bridge.shutdown()` will remove all listeners we added, so we don't have to.\n+ bridge.shutdown();\n+\n+ profilingData = store.profilerStore.profilingData;\n+ }\n+ );\n+\n+ \/\/ Re-initialize DevTools panel when a new page is loaded.\n chrome.devtools.network.onNavigated.addListener(function onNavigated() {\n \/\/ Re-initialize saved filters on navigation,\n \/\/ since global values stored on window get reset in this case.\n initializeSavedComponentFilters();\n \n- \/\/ `bridge.shutdown()` will remove all listeners we added, so we don't have to.\n- bridge.shutdown();\n-\n \/\/ It's easiest to recreate the DevTools panel (to clean up potential stale state).\n \/\/ We can revisit this in the future as a small optimization.\n- flushSync(() => root.unmount(initBridgeAndStore));\n+ flushSync(() => {\n+ root.unmount(() => {\n+ initBridgeAndStore();\n+ });\n+ });\n });\n }\n );\ndiff --git a\/shells\/dev\/app\/ElementTypes\/index.js b\/shells\/dev\/app\/ElementTypes\/index.js\nindex fa027f5926..6ef562596c 100644\n--- a\/shells\/dev\/app\/ElementTypes\/index.js\n+++ b\/shells\/dev\/app\/ElementTypes\/index.js\n@@ -6,8 +6,6 @@ import React, {\n lazy,\n memo,\n Component,\n- \/\/ $FlowFixMe Flow thinks ConcurrentMode is stable\n- unstable_ConcurrentMode as ConcurrentMode,\n Fragment,\n \/\/ $FlowFixMe Flow doesn't know about the Profiler import yet\n Profiler,\n@@ -48,15 +46,13 @@ export default function ElementTypes() {\n {value => null}<\/Context.Consumer>\n <\/Context.Provider>\n \n- \n- Loading...<\/div>}>\n- \n- \n- \n- \n- \n- <\/Suspense>\n- <\/ConcurrentMode>\n+ Loading...<\/div>}>\n+ \n+ \n+ \n+ \n+ \n+ <\/Suspense>\n <\/StrictMode>\n <\/Fragment>\n <\/Profiler>\ndiff --git a\/shells\/dev\/app\/PriorityLevels\/index.js b\/shells\/dev\/app\/PriorityLevels\/index.js\nnew file mode 100644\nindex 0000000000..2888451980\n--- \/dev\/null\n+++ b\/shells\/dev\/app\/PriorityLevels\/index.js\n@@ -0,0 +1,46 @@\n+\/\/ @flow\n+\n+import React, { Fragment, useCallback, useState } from 'react';\n+import {\n+ unstable_IdlePriority as IdlePriority,\n+ unstable_LowPriority as LowPriority,\n+ unstable_runWithPriority as runWithPriority,\n+} from 'scheduler';\n+\n+export default function PriorityLevels() {\n+ const [defaultPriority, setDefaultPriority] = useState(false);\n+ const [idlePriority, setIdlePriority] = useState(false);\n+ const [normalPriority, setLowPriority] = useState(false);\n+\n+ const resetSequence = useCallback(() => {\n+ setDefaultPriority(false);\n+ setLowPriority(false);\n+ setIdlePriority(false);\n+ }, []);\n+\n+ const startSequence = useCallback(() => {\n+ setDefaultPriority(true);\n+ runWithPriority(LowPriority, () => setLowPriority(true));\n+ runWithPriority(IdlePriority, () => setIdlePriority(true));\n+ }, []);\n+\n+ const labels = [];\n+ if (defaultPriority) {\n+ labels.push('(default priority)');\n+ }\n+ if (normalPriority) {\n+ labels.push('Low Priority');\n+ }\n+ if (idlePriority) {\n+ labels.push('Idle Priority');\n+ }\n+\n+ return (\n+ \n+ Priority Levels<\/h1>\n+}}}}}}

dillon1000/react

Files changed