sync 127

Author: Jason Laster

.travis.yml

@@ -12,7 +12,7 @@ env:
   global:
     - DISPLAY=':99.0'
     - YARN_VERSION='1.9.4'
-    - MC_COMMIT='1a199fcf0ef6' # https://hg.mozilla.org/mozilla-central/shortlog
+    - MC_COMMIT='d97cc5b9eeae' # https://hg.mozilla.org/mozilla-central/shortlog
 
 notifications:
   slack:

src/actions/breakpoints/tests/__snapshots__/breakpoints.spec.js.snap

@@ -45,15 +45,8 @@ Array [
         },
       ],
       "contentType": "text/javascript",
-      "error": undefined,
       "id": "a",
-      "isBlackBoxed": false,
-      "isExtension": false,
-      "isPrettyPrinted": false,
-      "isWasm": false,
       "loadedState": "loaded",
-      "relativeUrl": "/examples/a",
-      "sourceMapURL": undefined,
       "text": "function a() {
   return a 
 }",
@@ -145,15 +138,8 @@ Array [
         },
       ],
       "contentType": "text/javascript",
-      "error": undefined,
       "id": "a",
-      "isBlackBoxed": false,
-      "isExtension": false,
-      "isPrettyPrinted": false,
-      "isWasm": false,
       "loadedState": "loaded",
-      "relativeUrl": "/examples/a",
-      "sourceMapURL": undefined,
       "text": "function a() {
   return a 
 }",

src/actions/pause/commands.js

@@ -22,7 +22,7 @@ import type { ThunkArgs } from "../types";
 import type { Command } from "../../reducers/types";
 
 export function selectThread(thread: string) {
-  return { type: "SELECT_THREAD", thread }
+  return { type: "SELECT_THREAD", thread };
 }
 
 /**

src/actions/sources/newSources.js

@@ -219,18 +219,17 @@ export function newSource(source: Source) {
 
 export function newSources(sources: Source[]) {
   return async ({ dispatch, getState }: ThunkArgs) => {
-
-    const newSources = sources.filter(
+    const _newSources = sources.filter(
       source => !getSource(getState(), source.id)
     );
 
     dispatch({ type: "ADD_SOURCES", sources });
 
-    for (const source of newSources) {
+    for (const source of _newSources) {
       dispatch(checkSelectedSource(source.id));
     }
 
-    dispatch(restoreBlackBoxedSources(newSources));
-    dispatch(loadSourceMaps(newSources));
+    dispatch(restoreBlackBoxedSources(_newSources));
+    dispatch(loadSourceMaps(_newSources));
   };
 }

src/actions/sources/select.js

@@ -87,8 +87,10 @@ export function selectSourceURL(
  * @memberof actions/sources
  * @static
  */
-export function selectSource(sourceId: string,
-                             options: PartialPosition = { line: 1 }) {
+export function selectSource(
+  sourceId: string,
+  options: PartialPosition = { line: 1 }
+) {
   return async ({ dispatch }: ThunkArgs) => {
     const location = createLocation({ ...options, sourceId });
     return await dispatch(selectSpecificLocation(location));

src/actions/sources/tests/__snapshots__/prettyPrint.spec.js.snap

@@ -4,7 +4,6 @@ exports[`sources - pretty print returns a pretty source for a minified file 1`]
 Object {
   "actors": Array [],
   "contentType": "text/javascript",
-  "error": undefined,
   "id": "base.js/originalSource-36c718d4bde9a75edb388ff7733efe7f",
   "introductionUrl": null,
   "isBlackBoxed": false,
@@ -13,7 +12,6 @@ Object {
   "isWasm": false,
   "loadedState": "loaded",
   "relativeUrl": "http://localhost:8000/examples/base.js:formatted",
-  "sourceMapURL": undefined,
   "text": "undefined
 ",
   "url": "http://localhost:8000/examples/base.js:formatted",

src/components/PrimaryPanes/tests/__snapshots__/PrimaryPanes.spec.js.snap

@@ -32,7 +32,9 @@ exports[`PrimaryPanes with custom root renders custom root source list 1`] = `
     className="source-outline-panel has-root"
     hasFocusableContent={true}
   >
-    <div>
+    <div
+      className="threads-list"
+    >
       <div
         className="sources-clear-root-container"
         key="root"
@@ -96,7 +98,9 @@ exports[`PrimaryPanes with custom root renders empty custom root source list 1`]
     className="source-outline-panel has-root"
     hasFocusableContent={true}
   >
-    <div>
+    <div
+      className="threads-list"
+    >
       <div
         className="sources-clear-root-container"
         key="root"

src/components/PrimaryPanes/tests/__snapshots__/SourcesTree.spec.js.snap

@@ -2,9 +2,21 @@
 
 exports[`SourcesTree After changing expanded nodes Shows the tree with four.js, five.js and six.js expanded 1`] = `
 <div
-  className="sources-pane"
+  className="sources-pane thread"
   key="pane"
 >
+  <div
+    className="node thread-header"
+  >
+    <AccessibleImage
+      className="file"
+    />
+    <span
+      className="label"
+    >
+      Main Thread
+    </span>
+  </div>
   <div
     className="sources-list"
     key="tree"
@@ -38,9 +50,21 @@ exports[`SourcesTree After changing expanded nodes Shows the tree with four.js,
 
 exports[`SourcesTree Should show the tree with nothing expanded 1`] = `
 <div
-  className="sources-pane"
+  className="sources-pane thread"
   key="pane"
 >
+  <div
+    className="node thread-header"
+  >
+    <AccessibleImage
+      className="file"
+    />
+    <span
+      className="label"
+    >
+      Main Thread
+    </span>
+  </div>
   <div
     className="sources-list"
     key="tree"
@@ -67,9 +91,21 @@ exports[`SourcesTree Should show the tree with nothing expanded 1`] = `
 
 exports[`SourcesTree When loading initial source Shows the tree with one.js, two.js and three.js expanded 1`] = `
 <div
-  className="sources-pane"
+  className="sources-pane thread"
   key="pane"
 >
+  <div
+    className="node thread-header"
+  >
+    <AccessibleImage
+      className="file"
+    />
+    <span
+      className="label"
+    >
+      Main Thread
+    </span>
+  </div>
   <div
     className="sources-list"
     key="tree"
@@ -103,9 +139,21 @@ exports[`SourcesTree When loading initial source Shows the tree with one.js, two
 
 exports[`SourcesTree on receiving new props updates highlighted items updates highlightItems if selectedSource changes 1`] = `
 <div
-  className="sources-pane"
+  className="sources-pane thread"
   key="pane"
 >
+  <div
+    className="node thread-header"
+  >
+    <AccessibleImage
+      className="file"
+    />
+    <span
+      className="label"
+    >
+      Main Thread
+    </span>
+  </div>
   <div
     className="sources-list"
     key="tree"

src/main.development.js

@@ -7,16 +7,7 @@
 import React from "react";
 import ReactDOM from "react-dom";
 
-import { isFirefoxPanel } from "devtools-environment";
-
 import { onConnect } from "./client";
-import { teardownWorkers } from "./utils/bootstrap";
-import sourceQueue from "./utils/source-queue";
-
-function unmountRoot() {
-  const mount = document.querySelector("#mount .launchpad-root");
-  ReactDOM.unmountComponentAtNode(mount);
-}
 
 const { bootstrap, L10N } = require("devtools-launchpad");
 

src/main.js

@@ -4,7 +4,6 @@
 
 // @flow
 
-import React from "react";
 import ReactDOM from "react-dom";
 
 import { onConnect } from "./client";
@@ -23,19 +22,19 @@ module.exports = {
     debuggerClient,
     sourceMaps,
     panel
-  }: any) => 
-  onConnect(
-    {
-      tab: { clientType: "firefox" },
-      tabConnection: {
-        tabTarget,
-        threadClient,
-        debuggerClient
-      }
-    },
-    sourceMaps,
-    panel
-  ),
+  }: any) =>
+    onConnect(
+      {
+        tab: { clientType: "firefox" },
+        tabConnection: {
+          tabTarget,
+          threadClient,
+          debuggerClient
+        }
+      },
+      sourceMaps,
+      panel
+    ),
   destroy: () => {
     unmountRoot();
     sourceQueue.clear();

src/reducers/sources.js

@@ -22,13 +22,7 @@ import {
 import { originalToGeneratedId } from "devtools-source-map";
 import { prefs } from "../utils/prefs";
 
-import type {
-  Source,
-  SourceId,
-  SourceLocation,
-  ThreadId,
-  WorkerList
-} from "../types";
+import type { Source, SourceId, SourceLocation, ThreadId } from "../types";
 import type { PendingSelectedLocation, Selector } from "./types";
 import type { Action, DonePromiseAction, FocusItem } from "../actions/types";
 import type { LoadSourceAction } from "../actions/types/SourceAction";
@@ -186,9 +180,9 @@ function update(
 function updateSource(state: SourcesState, source: Object) {
   const existingSource = state.sources[source.id];
   return {
-    ...state, 
+    ...state,
     sources: {
-      ...state.sources, 
+      ...state.sources,
       [source.id]: { ...existingSource, ...source }
     }
   };
@@ -198,14 +192,11 @@ function updateSource(state: SourcesState, source: Object) {
  * Update all of the sources when an event occurs.
  * e.g. workers are updated, project directory root changes
  */
-function updateAllSources(
-  state: SourcesState,
-  callback: any
-) {
+function updateAllSources(state: SourcesState, callback: any) {
   const updatedSources = Object.values(state.sources).map(source => ({
     ...source,
     ...callback(source)
-  }))
+  }));
 
   return addSources({ ...state, ...emptySources }, updatedSources);
 }
@@ -249,11 +240,12 @@ function addSources(state: SourcesState, sources: Source[]) {
     // 3. Update the displayed actor map
     if (
       underRoot(source, state.projectDirectoryRoot) &&
-      (!source.isExtension || getChromeAndExtenstionsEnabled({ sources: state }))
+      (!source.isExtension ||
+        getChromeAndExtenstionsEnabled({ sources: state }))
     ) {
       for (const actor of getSourceActors(state, source)) {
         if (!state.displayed[actor.thread]) {
-          state.displayed[actor.thread] = {}
+          state.displayed[actor.thread] = {};
         }
         state.displayed[actor.thread][source.id] = true;
       }
@@ -285,10 +277,9 @@ function updateWorkers(state: SourcesState, action: Object) {
 function updateProjectDirectoryRoot(state: SourcesState, root: string) {
   prefs.projectDirectoryRoot = root;
 
-  return updateAllSources(
-    { ...state, projectDirectoryRoot: root },
-    source => ({ relativeUrl: getRelativeUrl(source, root) })
-  );
+  return updateAllSources({ ...state, projectDirectoryRoot: root }, source => ({
+    relativeUrl: getRelativeUrl(source, root)
+  }));
 }
 
 /*
@@ -301,12 +292,9 @@ function updateLoadedState(state, action: LoadSourceAction): SourcesState {
 
   if (action.status === "start") {
     source = { id: sourceId, loadedState: "loading" };
-
   } else if (action.status === "error") {
     source = { id: sourceId, error: action.error, loadedState: "loaded" };
-
   } else {
-
     if (!action.value) {
       return state;
     }
@@ -378,7 +366,10 @@ export function getSourceFromId(state: OuterState, id: string): Source {
   return source;
 }
 
-export function getSourceByActorId(state: OuterState, actorId: string): ?Source {
+export function getSourceByActorId(
+  state: OuterState,
+  actorId: string
+): ?Source {
   // We don't index the sources by actor IDs, so this method should be used
   // sparingly.
   for (const source of getSourceList(state)) {

src/reducers/tests/sources.spec.js

@@ -8,21 +8,16 @@ declare var it: (desc: string, func: () => void) => void;
 declare var expect: (value: any) => any;
 
 import update, { initialSourcesState, getDisplayedSources } from "../sources";
-import { foobar } from "../../test/fixtures";
 import type { Source } from "../../types";
 import { prefs } from "../../utils/prefs";
 import { makeMockSource } from "../../utils/test-mockup";
 
-
-
-const fakeSources = foobar.sources.sources;
-
 const extensionSource = {
   ...makeMockSource(),
   id: "extensionId",
   url: "http://example.com/script.js",
   actors: [{ actor: "extensionId-actor", source: "extensionId", thread: "foo" }]
-}
+};
 
 const firefoxExtensionSource = {
   ...makeMockSource(),