mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-11 22:41:02 +00:00
Backed out changeset ed9cefa8d2db (bug 1352699) for failing talos damp test. r=backout
This commit is contained in:
Sebastian Hengst
parent
7370b3abcb
commit
222d5ebd0d
@ -13,36 +13,16 @@ const React = require("react");
|
||||
const ReactDOM = require("react-dom");
|
||||
const { bootstrap } = require("devtools-launchpad");
|
||||
const { EventEmitter } = require("devtools-modules");
|
||||
const { Services: { pref }} = require("devtools-modules");
|
||||
const { configureStore } = require("./src/utils/create-store");
|
||||
|
||||
require("./src/assets/styles/netmonitor.css");
|
||||
|
||||
EventEmitter.decorate(window);
|
||||
|
||||
pref("devtools.netmonitor.enabled", true);
|
||||
pref("devtools.netmonitor.filters", "[\"all\"]");
|
||||
pref("devtools.netmonitor.hiddenColumns", "[]");
|
||||
pref("devtools.netmonitor.panes-network-details-width", 550);
|
||||
pref("devtools.netmonitor.panes-network-details-height", 450);
|
||||
pref("devtools.netmonitor.har.defaultLogDir", "");
|
||||
pref("devtools.netmonitor.har.defaultFileName", "Archive %date");
|
||||
pref("devtools.netmonitor.har.jsonp", false);
|
||||
pref("devtools.netmonitor.har.jsonpCallback", "");
|
||||
pref("devtools.netmonitor.har.includeResponseBodies", true);
|
||||
pref("devtools.netmonitor.har.compress", false);
|
||||
pref("devtools.netmonitor.har.forceExport", false);
|
||||
pref("devtools.netmonitor.har.pageLoadedTimeout", 1500);
|
||||
pref("devtools.netmonitor.har.enableAutoExportToFile", false);
|
||||
pref("devtools.webconsole.persistlog", false);
|
||||
|
||||
const App = require("./src/components/app");
|
||||
const store = window.gStore = configureStore();
|
||||
const { NetMonitorController } = require("./src/netmonitor-controller");
|
||||
|
||||
// FIXME: Inject NetMonitorController to global window
|
||||
window.NetMonitorController = NetMonitorController;
|
||||
|
||||
bootstrap(React, ReactDOM, App, null, store).then(connection => {
|
||||
if (!connection || !connection.tab) {
|
||||
return;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
"devtools-launchpad": "^0.0.59",
|
||||
"devtools-modules": "^0.0.18",
|
||||
"devtools-reps": "^0.4.0",
|
||||
"devtools-splitter": "^0.0.2",
|
||||
"devtools-sham-modules": "^0.0.17",
|
||||
"express": "^4.15.2",
|
||||
"immutable": "^3.8.1",
|
||||
"jszip": "^3.1.3",
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
|
||||
"use strict";
|
||||
|
||||
const Services = require("Services");
|
||||
const {
|
||||
createClass,
|
||||
createFactory,
|
||||
@ -15,6 +14,7 @@ const { connect } = require("devtools/client/shared/vendor/react-redux");
|
||||
const { findDOMNode } = require("devtools/client/shared/vendor/react-dom");
|
||||
const Actions = require("../actions/index");
|
||||
const { getLongString } = require("../utils/client");
|
||||
const { Prefs } = require("../utils/prefs");
|
||||
const { getFormDataSections } = require("../utils/request-utils");
|
||||
const { getSelectedRequest } = require("../selectors/index");
|
||||
|
||||
@ -23,6 +23,7 @@ const SplitBox = createFactory(require("devtools/client/shared/components/splitt
|
||||
const NetworkDetailsPanel = createFactory(require("./network-details-panel"));
|
||||
const RequestList = createFactory(require("./request-list"));
|
||||
const Toolbar = createFactory(require("./toolbar"));
|
||||
|
||||
const { div } = DOM;
|
||||
const MediaQueryList = window.matchMedia("(min-width: 700px)");
|
||||
|
||||
@ -86,12 +87,10 @@ const MonitorPanel = createClass({
|
||||
let { clientWidth, clientHeight } = findDOMNode(this.refs.endPanel) || {};
|
||||
|
||||
if (this.state.isVerticalSpliter && clientWidth) {
|
||||
Services.prefs.setIntPref(
|
||||
"devtools.netmonitor.panes-network-details-width", clientWidth);
|
||||
Prefs.networkDetailsWidth = clientWidth;
|
||||
}
|
||||
if (!this.state.isVerticalSpliter && clientHeight) {
|
||||
Services.prefs.setIntPref(
|
||||
"devtools.netmonitor.panes-network-details-height", clientHeight);
|
||||
Prefs.networkDetailsHeight = clientHeight;
|
||||
}
|
||||
},
|
||||
|
||||
@ -103,23 +102,18 @@ const MonitorPanel = createClass({
|
||||
|
||||
render() {
|
||||
let { isEmpty, networkDetailsOpen } = this.props;
|
||||
let initialWidth = Services.prefs.getIntPref(
|
||||
"devtools.netmonitor.panes-network-details-width");
|
||||
let initialHeight = Services.prefs.getIntPref(
|
||||
"devtools.netmonitor.panes-network-details-height");
|
||||
return (
|
||||
div({ className: "monitor-panel" },
|
||||
Toolbar(),
|
||||
SplitBox({
|
||||
className: "devtools-responsive-container",
|
||||
initialWidth,
|
||||
initialHeight,
|
||||
initialWidth: `${Prefs.networkDetailsWidth}px`,
|
||||
initialHeight: `${Prefs.networkDetailsHeight}px`,
|
||||
minSize: "50px",
|
||||
maxSize: "80%",
|
||||
splitterSize: 1,
|
||||
splitterSize: "1px",
|
||||
startPanel: RequestList({ isEmpty }),
|
||||
endPanel: networkDetailsOpen && NetworkDetailsPanel({ ref: "endPanel" }),
|
||||
endPanelCollapsed: !networkDetailsOpen,
|
||||
endPanelControl: true,
|
||||
vert: this.state.isVerticalSpliter,
|
||||
}),
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
"use strict";
|
||||
|
||||
const Services = require("Services");
|
||||
const {
|
||||
ENABLE_REQUEST_FILTER_TYPE_ONLY,
|
||||
RESET_COLUMNS,
|
||||
TOGGLE_COLUMN,
|
||||
TOGGLE_REQUEST_FILTER_TYPE,
|
||||
} = require("../constants");
|
||||
const { Prefs } = require("../utils/prefs");
|
||||
const { getRequestFilterTypes } = require("../selectors/index");
|
||||
|
||||
/**
|
||||
@ -21,26 +21,22 @@ const { getRequestFilterTypes } = require("../selectors/index");
|
||||
function prefsMiddleware(store) {
|
||||
return next => action => {
|
||||
const res = next(action);
|
||||
|
||||
switch (action.type) {
|
||||
case ENABLE_REQUEST_FILTER_TYPE_ONLY:
|
||||
case TOGGLE_REQUEST_FILTER_TYPE:
|
||||
let filters = getRequestFilterTypes(store.getState())
|
||||
Prefs.filters = getRequestFilterTypes(store.getState())
|
||||
.filter(([type, check]) => check)
|
||||
.map(([type, check]) => type);
|
||||
Services.prefs.setCharPref(
|
||||
"devtools.netmonitor.filters", JSON.stringify(filters));
|
||||
break;
|
||||
|
||||
case TOGGLE_COLUMN:
|
||||
let hiddenColumns = [...store.getState().ui.columns]
|
||||
Prefs.hiddenColumns = [...store.getState().ui.columns]
|
||||
.filter(([column, shown]) => !shown)
|
||||
.map(([column, shown]) => column);
|
||||
Services.prefs.setCharPref(
|
||||
"devtools.netmonitor.hiddenColumns", JSON.stringify(hiddenColumns));
|
||||
break;
|
||||
|
||||
case RESET_COLUMNS:
|
||||
Services.prefs.setCharPref(
|
||||
"devtools.netmonitor.hiddenColumns", JSON.stringify([]));
|
||||
Prefs.hiddenColumns = [];
|
||||
break;
|
||||
}
|
||||
return res;
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
"use strict";
|
||||
|
||||
const Services = require("Services");
|
||||
const { createStore, applyMiddleware } = require("devtools/client/shared/vendor/redux");
|
||||
const { thunk } = require("devtools/client/shared/redux/middleware/thunk");
|
||||
const batching = require("../middleware/batching");
|
||||
const prefs = require("../middleware/prefs");
|
||||
const { Prefs } = require("./prefs");
|
||||
const rootReducer = require("../reducers/index");
|
||||
const { FilterTypes, Filters } = require("../reducers/filters");
|
||||
const { Requests } = require("../reducers/requests");
|
||||
@ -18,8 +18,7 @@ const { UI, Columns } = require("../reducers/ui");
|
||||
|
||||
function configureStore() {
|
||||
let activeFilters = {};
|
||||
let filters = JSON.parse(Services.prefs.getCharPref("devtools.netmonitor.filters"));
|
||||
filters.forEach((filter) => {
|
||||
Prefs.filters.forEach((filter) => {
|
||||
activeFilters[filter] = true;
|
||||
});
|
||||
|
||||
|
||||
@ -54,13 +54,13 @@ let webpackConfig = {
|
||||
"devtools/client/framework/menu-item": "devtools-modules",
|
||||
"devtools/client/locales": path.join(__dirname, "../locales/en-US"),
|
||||
"devtools/client/shared/components/reps/reps": "devtools-reps",
|
||||
"devtools/client/shared/components/search-box": "devtools-modules/client/shared/components/search-box",
|
||||
"devtools/client/shared/components/splitter/split-box": "devtools-modules/client/shared/components/splitter/SplitBox",
|
||||
"devtools/client/shared/components/stack-trace": "devtools-modules/client/shared/components/stack-trace",
|
||||
"devtools/client/shared/components/tabs/tabbar": "devtools-modules/client/shared/components/tabs/tabbar",
|
||||
"devtools/client/shared/components/tabs/tabs": "devtools-modules/client/shared/components/tabs/tabs",
|
||||
"devtools/client/shared/components/tree/tree-view": "devtools-modules/client/shared/components/tree/tree-view",
|
||||
"devtools/client/shared/components/tree/tree-row": "devtools-modules/client/shared/components/tree/tree-row",
|
||||
"devtools/client/shared/components/search-box": "devtools-modules",
|
||||
"devtools/client/shared/components/splitter/split-box": "devtools-modules",
|
||||
"devtools/client/shared/components/stack-trace": "devtools-modules",
|
||||
"devtools/client/shared/components/tabs/tabbar": "devtools-modules",
|
||||
"devtools/client/shared/components/tabs/tabs": "devtools-modules",
|
||||
"devtools/client/shared/components/tree/tree-view": "devtools-modules",
|
||||
"devtools/client/shared/components/tree/tree-row": "devtools-modules",
|
||||
"devtools/client/shared/curl": "devtools-modules",
|
||||
"devtools/client/shared/file-saver": "devtools-modules",
|
||||
"devtools/client/shared/prefs": "devtools-modules",
|
||||
@ -72,6 +72,7 @@ let webpackConfig = {
|
||||
"devtools/client/shared/vendor/redux": "redux",
|
||||
"devtools/client/shared/vendor/reselect": "reselect",
|
||||
"devtools/client/shared/vendor/jszip": "jszip",
|
||||
"devtools/client/shared/widgets/view-helpers": "devtools-modules",
|
||||
"devtools/client/shared/widgets/tooltip/HTMLTooltip": "devtools-modules",
|
||||
"devtools/client/shared/widgets/tooltip/ImageTooltipHelper": "devtools-modules",
|
||||
"devtools/client/shared/widgets/Chart": "devtools-modules",
|
||||
@ -82,7 +83,7 @@ let webpackConfig = {
|
||||
"devtools/shared/platform/clipboard": "devtools-modules",
|
||||
"devtools/shared/plural-form": "devtools-modules",
|
||||
"toolkit/locales": path.join(__dirname, "../../../toolkit/locales/en-US"),
|
||||
"Services": "devtools-modules/client/shared/shim/Services",
|
||||
"Services": "devtools-modules",
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@ -13,15 +13,6 @@ accepts@~1.3.3:
|
||||
mime-types "~2.1.11"
|
||||
negotiator "0.6.1"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
acorn-dynamic-import@^2.0.0:
|
||||
version "2.0.2"
|
||||
resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
|
||||
dependencies:
|
||||
acorn "^4.0.3"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
acorn-jsx@^3.0.0:
|
||||
version "3.0.1"
|
||||
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
|
||||
@ -184,15 +175,6 @@ async@^1.3.0, async@^1.5.0:
|
||||
version "1.5.2"
|
||||
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
async@^2.1.2:
|
||||
version "2.2.0"
|
||||
resolved "https://registry.yarnpkg.com/async/-/async-2.2.0.tgz#c324eba010a237e4fbd55a12dee86367d5c0ef32"
|
||||
dependencies:
|
||||
lodash "^4.14.0"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
async@~0.2.6:
|
||||
version "0.2.10"
|
||||
resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
|
||||
@ -793,13 +775,6 @@ braces@^1.8.2:
|
||||
preserve "^0.2.0"
|
||||
repeat-element "^1.1.2"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
brorand@^1.0.1:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
browserify-aes@0.4.0:
|
||||
version "0.4.0"
|
||||
resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-0.4.0.tgz#067149b668df31c4b58533e02d01e806d8608e2c"
|
||||
@ -921,15 +896,6 @@ chrome-remote-interface@0.17.0:
|
||||
commander "2.1.x"
|
||||
ws "1.1.x"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
cipher-base@^1.0.0, cipher-base@^1.0.1:
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07"
|
||||
dependencies:
|
||||
inherits "^2.0.1"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
circular-json@^0.3.1:
|
||||
version "0.3.1"
|
||||
resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
|
||||
@ -1407,23 +1373,9 @@ devtools-reps@^0.4.0:
|
||||
lodash "^4.17.2"
|
||||
svg-inline-react "^1.0.2"
|
||||
|
||||
<<<<<<< HEAD
|
||||
devtools-sham-modules@^0.0.17:
|
||||
version "0.0.17"
|
||||
resolved "https://registry.yarnpkg.com/devtools-sham-modules/-/devtools-sham-modules-0.0.17.tgz#26dd2741ac26a27b424e07690e16d7deaa5102fa"
|
||||
=======
|
||||
devtools-splitter@^0.0.2:
|
||||
version "0.0.2"
|
||||
resolved "https://registry.yarnpkg.com/devtools-splitter/-/devtools-splitter-0.0.2.tgz#2a18fa86f1e010a4664de655d61c3490f2844174"
|
||||
|
||||
diffie-hellman@^5.0.0:
|
||||
version "5.0.2"
|
||||
resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
|
||||
dependencies:
|
||||
bn.js "^4.1.0"
|
||||
miller-rabin "^4.0.0"
|
||||
randombytes "^2.0.0"
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
|
||||
doctrine@^1.2.2:
|
||||
version "1.5.0"
|
||||
@ -1711,15 +1663,6 @@ events@^1.0.0:
|
||||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
evp_bytestokey@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53"
|
||||
dependencies:
|
||||
create-hash "^1.1.1"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
exit-hook@^1.0.0:
|
||||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
|
||||
@ -2555,15 +2498,6 @@ lazy-cache@^1.0.3:
|
||||
version "1.0.4"
|
||||
resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
lcid@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
|
||||
dependencies:
|
||||
invert-kv "^1.0.0"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
levn@^0.3.0, levn@~0.3.0:
|
||||
version "0.3.0"
|
||||
resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
|
||||
@ -2726,17 +2660,6 @@ mime@1.3.4, mime@>=1.2.9, mime@^1.3.4:
|
||||
version "1.3.4"
|
||||
resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
minimalistic-assert@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
|
||||
|
||||
minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
minimatch@^3.0.0, minimatch@^3.0.2:
|
||||
version "3.0.3"
|
||||
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
|
||||
@ -2820,37 +2743,6 @@ node-libs-browser@^0.7.0:
|
||||
util "^0.10.3"
|
||||
vm-browserify "0.0.4"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
node-libs-browser@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646"
|
||||
dependencies:
|
||||
assert "^1.1.1"
|
||||
browserify-zlib "^0.1.4"
|
||||
buffer "^4.3.0"
|
||||
console-browserify "^1.1.0"
|
||||
constants-browserify "^1.0.0"
|
||||
crypto-browserify "^3.11.0"
|
||||
domain-browser "^1.1.1"
|
||||
events "^1.0.0"
|
||||
https-browserify "0.0.1"
|
||||
os-browserify "^0.2.0"
|
||||
path-browserify "0.0.0"
|
||||
process "^0.11.0"
|
||||
punycode "^1.2.4"
|
||||
querystring-es3 "^0.2.0"
|
||||
readable-stream "^2.0.5"
|
||||
stream-browserify "^2.0.1"
|
||||
stream-http "^2.3.1"
|
||||
string_decoder "^0.10.25"
|
||||
timers-browserify "^2.0.2"
|
||||
tty-browserify "0.0.0"
|
||||
url "^0.11.0"
|
||||
util "^0.10.3"
|
||||
vm-browserify "0.0.4"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
node-pre-gyp@^0.6.29:
|
||||
version "0.6.34"
|
||||
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7"
|
||||
@ -3766,11 +3658,7 @@ resolve-from@^1.0.0:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
|
||||
|
||||
<<<<<<< HEAD
|
||||
resolve@^1.1.6, resolve@^1.3.2:
|
||||
=======
|
||||
resolve@^1.1.6, resolve@^1.2.0:
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
version "1.3.2"
|
||||
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
|
||||
dependencies:
|
||||
@ -3941,23 +3829,6 @@ source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, sour
|
||||
version "0.5.6"
|
||||
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
spdx-correct@~1.0.0:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
|
||||
dependencies:
|
||||
spdx-license-ids "^1.0.2"
|
||||
|
||||
spdx-expression-parse@~1.0.0:
|
||||
version "1.0.4"
|
||||
resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
|
||||
|
||||
spdx-license-ids@^1.0.2:
|
||||
version "1.2.2"
|
||||
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
sprintf-js@~1.0.2:
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
|
||||
@ -4002,11 +3873,7 @@ strict-uri-encode@^1.0.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
|
||||
|
||||
<<<<<<< HEAD
|
||||
string-width@^1.0.1:
|
||||
=======
|
||||
string-width@^1.0.1, string-width@^1.0.2:
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
|
||||
dependencies:
|
||||
@ -4039,15 +3906,6 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
|
||||
dependencies:
|
||||
ansi-regex "^2.0.0"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
strip-bom@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
|
||||
dependencies:
|
||||
is-utf8 "^0.2.0"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
strip-bom@^3.0.0:
|
||||
version "3.0.0"
|
||||
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
|
||||
@ -4237,18 +4095,6 @@ ua-parser-js@^0.7.9:
|
||||
version "0.7.12"
|
||||
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
uglify-js@^2.8.5:
|
||||
version "2.8.20"
|
||||
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.20.tgz#be87100fbc18de3876ed606e9d24b4568311cecf"
|
||||
dependencies:
|
||||
source-map "~0.5.1"
|
||||
yargs "~3.10.0"
|
||||
optionalDependencies:
|
||||
uglify-to-browserify "~1.0.0"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
uglify-js@~2.7.3:
|
||||
version "2.7.5"
|
||||
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
|
||||
@ -4373,17 +4219,6 @@ watchpack@^0.2.1:
|
||||
chokidar "^1.0.0"
|
||||
graceful-fs "^4.1.2"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
watchpack@^1.3.1:
|
||||
version "1.3.1"
|
||||
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
|
||||
dependencies:
|
||||
async "^2.1.2"
|
||||
chokidar "^1.4.3"
|
||||
graceful-fs "^4.1.2"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
webpack-core@~0.6.9:
|
||||
version "0.6.9"
|
||||
resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
|
||||
@ -4446,34 +4281,6 @@ webpack@1.14.0, webpack@^1.12.14:
|
||||
watchpack "^0.2.1"
|
||||
webpack-core "~0.6.9"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
webpack@^2.3.2:
|
||||
version "2.3.2"
|
||||
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.2.tgz#7d521e6f0777a3a58985c69425263fdfe977b458"
|
||||
dependencies:
|
||||
acorn "^4.0.4"
|
||||
acorn-dynamic-import "^2.0.0"
|
||||
ajv "^4.7.0"
|
||||
ajv-keywords "^1.1.1"
|
||||
async "^2.1.2"
|
||||
enhanced-resolve "^3.0.0"
|
||||
interpret "^1.0.0"
|
||||
json-loader "^0.5.4"
|
||||
loader-runner "^2.3.0"
|
||||
loader-utils "^0.2.16"
|
||||
memory-fs "~0.4.1"
|
||||
mkdirp "~0.5.0"
|
||||
node-libs-browser "^2.0.0"
|
||||
source-map "^0.5.3"
|
||||
supports-color "^3.1.0"
|
||||
tapable "~0.2.5"
|
||||
uglify-js "^2.8.5"
|
||||
watchpack "^1.3.1"
|
||||
webpack-sources "^0.2.3"
|
||||
yargs "^6.0.0"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
whatwg-fetch@>=0.10.0:
|
||||
version "2.0.3"
|
||||
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
|
||||
@ -4482,13 +4289,6 @@ whet.extend@~0.9.9:
|
||||
version "0.9.9"
|
||||
resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
which-module@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
which@^1.2.12:
|
||||
version "1.2.14"
|
||||
resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
|
||||
@ -4517,16 +4317,6 @@ wordwrap@~1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
wrap-ansi@^2.0.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
|
||||
dependencies:
|
||||
string-width "^1.0.1"
|
||||
strip-ansi "^3.0.1"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
wrappy@1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
|
||||
@ -4580,33 +4370,6 @@ yamljs@^0.2.6:
|
||||
argparse "^1.0.7"
|
||||
glob "^7.0.5"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
yargs-parser@^4.2.0:
|
||||
version "4.2.1"
|
||||
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
|
||||
dependencies:
|
||||
camelcase "^3.0.0"
|
||||
|
||||
yargs@^6.0.0:
|
||||
version "6.6.0"
|
||||
resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
|
||||
dependencies:
|
||||
camelcase "^3.0.0"
|
||||
cliui "^3.2.0"
|
||||
decamelize "^1.1.1"
|
||||
get-caller-file "^1.0.1"
|
||||
os-locale "^1.4.0"
|
||||
read-pkg-up "^1.0.1"
|
||||
require-directory "^2.1.1"
|
||||
require-main-filename "^1.0.1"
|
||||
set-blocking "^2.0.0"
|
||||
string-width "^1.0.2"
|
||||
which-module "^1.0.0"
|
||||
y18n "^3.2.1"
|
||||
yargs-parser "^4.2.0"
|
||||
|
||||
>>>>>>> 2437f804c19a... fixup! Bug 1352699 - Access single Services.prefs instance r?honza
|
||||
yargs@~3.10.0:
|
||||
version "3.10.0"
|
||||
resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user