Bug 1419370 - remove immutablejs from netmonitor. r=honza

Remove the use of `Immutable.is` in Toolbar, this method should
map directly to `Object.is`. The props being passed to `is` were
already plain JS objects from what I understand.

Yarn was used to remove the Immutable JS package and webpack was
configured to not include webpack from shared assets.
***

Removed Immutable reference in yarn.lock
***
Generated yarn.lock file

By running `yarn install`.
***
Remove debugging statements
This commit is contained in:
msecret 2018-01-05 10:30:03 -08:00
parent f5b1646f1e
commit 4f654df61b
4 changed files with 4 additions and 7 deletions

View File

@ -12,7 +12,6 @@
"devtools-launchpad": "=0.0.103",
"devtools-modules": "=0.0.32",
"devtools-source-editor": "=0.0.3",
"immutable": "^3.8.1",
"jszip": "^3.1.3",
"react": "=15.6.1",
"react-dom": "=15.6.1",

View File

@ -9,7 +9,6 @@ const { Component, createFactory } = require("devtools/client/shared/vendor/reac
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const { connect } = require("devtools/client/shared/vendor/react-redux");
const I = require("devtools/client/shared/vendor/immutable");
const Actions = require("../actions/index");
const { FILTER_SEARCH_DELAY, FILTER_TAGS } = require("../constants");
@ -98,7 +97,7 @@ class Toolbar extends Component {
|| this.props.persistentLogsEnabled !== nextProps.persistentLogsEnabled
|| this.props.browserCacheDisabled !== nextProps.browserCacheDisabled
|| this.props.recording !== nextProps.recording
|| !I.is(this.props.requestFilterTypes, nextProps.requestFilterTypes)
|| !Object.is(this.props.requestFilterTypes, nextProps.requestFilterTypes)
// Filtered requests are useful only when searchbox is focused
|| !!(this.refs.searchbox && this.refs.searchbox.focused);

View File

@ -75,7 +75,6 @@ let webpackConfig = {
"devtools/client/framework/menu": "devtools-modules/src/menu",
"devtools/client/netmonitor/src/utils/menu": "devtools-contextmenu",
"devtools/client/shared/vendor/immutable": "immutable",
"devtools/client/shared/vendor/react": "react",
"devtools/client/shared/vendor/react-dom": "react-dom",
"devtools/client/shared/vendor/react-redux": "react-redux",

View File

@ -2415,9 +2415,9 @@ immediate@~3.0.5:
version "3.0.6"
resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
immutable@^3.7.6, immutable@^3.8.1:
version "3.8.1"
resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.1.tgz#200807f11ab0f72710ea485542de088075f68cd2"
immutable@^3.7.6:
version "3.8.2"
resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
indexes-of@^1.0.1:
version "1.0.1"