Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

[WIP] Use devtools-reps-0.19.0 #4915

Merged
jasonLaster merged 7 commits into from
Jan 19, 2018
Merged

[WIP] Use devtools-reps-0.19.0 #4915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e60f009
Update devtools-reps to 0.19.0
nchevobbe Jan 17, 2018
a08f0b5
Adapt debugger to the new reps API design
nchevobbe Jan 17, 2018
cc7e209
Adapt tests to new ObjectInspector.
nchevobbe Jan 18, 2018
02d5dba
Add setPopupObjectProperties to dictionary.
nchevobbe Jan 19, 2018
0c06551
Update CI image to latest mozilla-central
nchevobbe Jan 19, 2018
617e40b
Move toggle function to head.js
nchevobbe Jan 19, 2018
cfe7be7
tweaks
jasonLaster Jan 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
global:
- DISPLAY=':99.0'
- YARN_VERSION='0.24.5'
- MC_COMMIT='22d2831cc1f4' # https://hg.mozilla.org/mozilla-central/shortlog
- MC_COMMIT='6ffbba9ce0ef' # https://hg.mozilla.org/mozilla-central/shortlog

notifications:
slack:
Expand Down
141 changes: 71 additions & 70 deletions assets/dictionary.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,85 +1,86 @@
sexualized
dispel
lifecycle
Yulia
intermittents
discoverable.
.mozconfig
.png
1x
7x
8x
addon
Aframe
airtable
amelzer
APIs
args
asm
Assaf
Asynchronicity
AUTOCLOBBER=1
benchmarking
blackboxed
fixup
scrollbars
li
blandy
Bomsy
CLRF
cmd
componentDidMount
componentWillUnmount
contextmenu
createClass
CRM
discoverable.
dispel
displayNames
errored
Yura
extns
travis
featureFlag
findSource
fixup
GH
href
intermittents
Jiel
Klabnik
li
lifecycle
linter
mapDispatchToProps
mc
mk_add_options
MobX
mochii
asm
monospace
nuxt
onKeyDown
param
prettyPrint
profiler
q4
featureFlag
displayNames
componentDidMount
.png
Klabnik
rebasing
unstaged
rebases
rebasing
retext
runtime
scrollbars
secondaryPanel
selectLocation
selectSource
setPopupObjectProperties
sexualized
sha
7x
8x
1x
un-hide
Jiel
Tohm
ship2gecko
Sneha
Bomsy
prettyPrint
Aframe
contextmenu
cmd
monospace
nuxt
stacktraces
secondaryPanel
onKeyDown
Unselects
CLRF
subdirectory
svgs
componentWillUnmount
createClass
retext
GH
ship2gecko
blandy
param
mk_add_options
AUTOCLOBBER=1
.mozconfig
href
linter
findSource
airtable
waitForPaused
Talos
talos
togglePaneCollapse
CRM
addon
Tohm
travis
UIs
Asynchronicity
args
APIs
Yury
runtime
Assaf
Varenya
MobX
un-hide
Unselects
unstaged
urls
mapDispatchToProps
amelzer
selectSource
selectLocation
talos
Talos
subdirectory
Varenya
waitForPaused
webpage
profiler
benchmarking
Yulia
Yura
Yury
11 changes: 4 additions & 7 deletions docs/debugger-html-react-redux-overview.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,13 +582,10 @@ file exports the following functions:
sources action. This loads up the editor with text for the
specific frame. The <code>SELECT\_FRAME</code> action is then dispatched.

- <code>loadObjectProperties()</code> – This function is called from the <code>Scopes</code>
component, which passes the data to the <code>ObjectInspector</code> component as
a property to display in the variable tree under the Scopes panel.
This function is also called directly from the <code>ObjectInspector</code> as
the variable tree is expanded. The function calls the connected
client to retrieve the values and dispatches the
<code>LOAD\_OBJECT\_PROPERTIES</code> action.
- <code>setPopupObjectProperties()</code> – This function is called from the
<code>Popup</code> component, which then use this data to pass all the properties from
the hovered variable as root nodes of the <code>ObjectInspector</code> component.
The function dispatches the <code>SET\_POPUP\_OBJECT\_PROPERTIES</code> action.


## sources
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@
"babylon": "^6.18.0",
"codemirror": "^5.28.0",
"devtools-components": "^0.0.2",
"devtools-launchpad": "^0.0.112",
"devtools-launchpad": "^0.0.113",
"devtools-linters": "^0.0.4",
"devtools-map-bindings": "^0.3.2",
"devtools-reps": "^0.12.4",
"devtools-reps": "^0.19.0",
"devtools-source-map": "^0.14.7",
"devtools-splitter": "^0.0.6",
"devtools-utils": "^0.0.10",
Expand Down
2 changes: 1 addition & 1 deletion src/actions/pause/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ export { resumed } from "./resumed";
export { continueToHere } from "./continueToHere";
export { breakOnNext } from "./breakOnNext";
export { mapFrames } from "./mapFrames";
export { loadObjectProperties } from "./loadObjectProperties";
export { setPopupObjectProperties } from "./setPopupObjectProperties";
export { pauseOnExceptions } from "./pauseOnExceptions";
export { selectFrame } from "./selectFrame";
11 changes: 5 additions & 6 deletions src/actions/pause/loadObjectProperties.js → ...actions/pause/setPopupObjectProperties.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,25 @@

// @flow

import { PROMISE } from "../utils/middleware/promise";
import { getLoadedObject } from "../../selectors";
import { getPopupObjectProperties } from "../../selectors";
import type { ThunkArgs } from "../types";

/**
* @memberof actions/pause
* @static
*/
export function loadObjectProperties(object: any) {
export function setPopupObjectProperties(object: any, properties: Object) {
return ({ dispatch, client, getState }: ThunkArgs) => {
const objectId = object.actor || object.objectId;

if (getLoadedObject(getState(), objectId)) {
if (getPopupObjectProperties(getState(), object.actor)) {
return;
}

dispatch({
type: "LOAD_OBJECT_PROPERTIES",
type: "SET_POPUP_OBJECT_PROPERTIES",
objectId,
[PROMISE]: client.getProperties(object)
properties
});
};
}
6 changes: 2 additions & 4 deletions src/actions/types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,11 +241,9 @@ type PauseAction =
| { type: "COMMAND", value: { type: string }, command: string }
| { type: "SELECT_FRAME", frame: Frame, scopes: Scope[] }
| {
type: "LOAD_OBJECT_PROPERTIES",
type: "SET_POPUP_OBJECT_PROPERTIES",
objectId: string,
status: string,
value: Object,
"@@dispatch/promise": any
properties: Object
}
| {
type: "ADD_EXPRESSION",
Expand Down
2 changes: 1 addition & 1 deletion src/actions/utils/middleware/log.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { isTesting } from "devtools-config";

const blacklist = [
"LOAD_OBJECT_PROPERTIES",
"SET_POPUP_OBJECT_PROPERTIES",
"SET_SYMBOLS",
"OUT_OF_SCOPE_LOCATIONS"
];
Expand Down
10 changes: 9 additions & 1 deletion src/client/firefox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,20 @@
import { setupCommands, clientCommands } from "./firefox/commands";
import { setupEvents, clientEvents } from "./firefox/events";
import { features } from "../utils/prefs";
import type { Grip } from "debugger-html";
let DebuggerClient;

function createObjectClient(grip: Grip) {
return DebuggerClient.createObjectClient(grip);

@wldcordeiro wldcordeiro Jan 19, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mochitest is failing here because the assignment in the onConnect below hadn't happened yet. Should you put a guard in to check if the client isn't undefined?

@nchevobbe nchevobbe Jan 19, 2018

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it was failing because of https://bugzilla.mozilla.org/show_bug.cgi?id=1430799, which now landed in mozilla-central.
Locally, all the mochitest pass with --verify :)

@wldcordeiro wldcordeiro Jan 19, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah good to know. I saw the failure complaining about undefined and figured it was some async funkiness. Guess we just need to update the CI image?

@nchevobbe nchevobbe Jan 19, 2018

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm not familiar with this, but if this mean the CI image needs to be updated to pick up mozilla-central changes, then yes :)

@jasonLaster jasonLaster Jan 19, 2018 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nchevobbe you can update the .travis.yml w/ the new mc sha

}

export async function onConnect(connection: any, actions: Object): Object {
const {
tabConnection: { tabTarget, threadClient, debuggerClient }
} = connection;

DebuggerClient = debuggerClient;

if (!tabTarget || !threadClient || !debuggerClient) {
return { bpClients: {} };
}
Expand Down Expand Up @@ -59,4 +67,4 @@ export async function onConnect(connection: any, actions: Object): Object {
return { bpClients };
}

export { clientCommands, clientEvents };
export { createObjectClient, clientCommands, clientEvents };
Loading