touchups

src/actions/sources.js

@@ -95,11 +95,11 @@ export function newSource(source: Source) {
     dispatch({ type: "ADD_SOURCE", source });
 
     if (prefs.clientSourceMapsEnabled) {
-      await dispatch(loadSourceMap(source));
+      dispatch(loadSourceMap(source));
     }
 
-    await checkSelectedSource(getState(), dispatch, source);
-    await checkPendingBreakpoints(getState(), dispatch, source.id);
+    checkSelectedSource(getState(), dispatch, source);
+    checkPendingBreakpoints(getState(), dispatch, source.id);
   };
 }
 
@@ -109,8 +109,15 @@ export function newSources(sources: Source[]) {
       source => !getSource(getState(), source.id)
     );
 
+    dispatch({
+      type: "ADD_SOURCES",
+      sources
+    });
+
     for (const source of filteredSources) {
-      await dispatch(newSource(source));
+      dispatch(loadSourceMap(source));
+      checkSelectedSource(getState(), dispatch, source);
+      checkPendingBreakpoints(getState(), dispatch, source.id);
     }
   };
 }

src/client/firefox/events.js

@@ -12,6 +12,7 @@ import type {
   Actions
 } from "./types";
 
+import { throttle } from "lodash";
 import { createPause, createSource } from "./create";
 import { isEnabled } from "devtools-config";
 
@@ -61,8 +62,17 @@ function resumed(_: "resumed", packet: ResumedPacket) {
   actions.resumed(packet);
 }
 
+let pendingSources = [];
+const newSources = throttle(() => {
+  actions.newSources(
+    pendingSources.map(source => createSource(source, { supportsWasm }))
+  );
+  pendingSources = [];
+}, 100);
+
 function newSource(_: "newSource", { source }: SourcePacket) {
-  actions.newSource(createSource(source, { supportsWasm }));
+  pendingSources.push(source);
+  newSources();
 
   if (isEnabled("eventListeners")) {
     actions.fetchEventListeners();

src/client/firefox/types.js

@@ -221,7 +221,7 @@ export type ListTabsResponse = {
 export type Actions = {
   paused: Pause => void,
   resumed: ResumedPacket => void,
-  newSource: Source => void,
+  newSources: (Source[]) => void,
   fetchEventListeners: () => void
 };
 

src/components/Editor/index.js

@@ -224,6 +224,7 @@ class Editor extends PureComponent<Props, State> {
   }
 
   componentWillUpdate(nextProps) {
+    console.warn("Editor.componentWillUpdate");
     this.setText(nextProps);
     this.setSize(nextProps);
   }

src/reducers/ast.js

@@ -183,8 +183,9 @@ export function getPreview(state: OuterState) {
   return state.ast.get("preview");
 }
 
+const emptySourceMetaData = {};
 export function getSourceMetaData(state: OuterState, sourceId: string) {
-  return state.ast.getIn(["sourceMetaData", sourceId]) || {};
+  return state.ast.getIn(["sourceMetaData", sourceId]) || emptySourceMetaData;
 }
 
 export default update;