diff --git a/package-lock.json b/package-lock.json index e9de9528a12..646d648c21a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6168,12 +6168,6 @@ "node": ">= 0.6" } }, - "node_modules/accessibility-developer-tools": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/accessibility-developer-tools/-/accessibility-developer-tools-2.12.0.tgz", - "integrity": "sha1-PaDM6dbsY3OWS4TzXbfPw996tRQ=", - "dev": true - }, "node_modules/acorn": { "version": "8.4.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.0.tgz", @@ -13617,28 +13611,6 @@ "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", "devOptional": true }, - "node_modules/devtron": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/devtron/-/devtron-1.4.0.tgz", - "integrity": "sha1-tedIvW6Vu+cL/MaKrm/mlhGUQeE=", - "dev": true, - "dependencies": { - "accessibility-developer-tools": "^2.11.0", - "highlight.js": "^9.3.0", - "humanize-plus": "^1.8.1" - } - }, - "node_modules/devtron/node_modules/highlight.js": { - "version": "9.18.5", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz", - "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==", - "deprecated": "Support has ended for 9.x series. Upgrade to @latest", - "dev": true, - "hasInstallScript": true, - "engines": { - "node": "*" - } - }, "node_modules/dezalgo": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz", @@ -22960,15 +22932,6 @@ "ms": "^2.0.0" } }, - "node_modules/humanize-plus": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/humanize-plus/-/humanize-plus-1.8.2.tgz", - "integrity": "sha1-pls0RZrWNnrbs3B6gqPJ+RYWcDA=", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/hyperlinker": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/hyperlinker/-/hyperlinker-1.0.0.tgz", @@ -47182,9 +47145,9 @@ "cli-ux": "^5.5.1", "cross-env": "^7.0.3", "depcheck": "^1.4.0", - "devtron": "^1.4.0", "download": "^8.0.0", "electron": "^6.1.12", + "electron-devtools-installer": "^3.2.0", "electron-mocha": "^8.2.2", "electron-rebuild": "^2.3.5", "enzyme": "^3.11.0", @@ -66119,7 +66082,6 @@ "lodash.find": "^4.6.0", "lodash.get": "^4.4.2", "lodash.groupby": "^4.6.0", - "lodash.has": "^4.5.2", "lodash.includes": "^4.3.0", "lodash.isequal": "^4.5.0", "lodash.isstring": "^4.0.1", @@ -74805,7 +74767,7 @@ "debug": "^3.0.1", "depcheck": "^1.4.0", "electron": "^6.1.12", - "electron-devtools-installer": "^3.1.1", + "electron-devtools-installer": "^3.2.0", "electron-rebuild": "^2.3.5", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.6.0", @@ -116699,7 +116661,6 @@ "lodash.find": "^4.6.0", "lodash.get": "^4.4.2", "lodash.groupby": "^4.6.0", - "lodash.has": "^4.5.2", "lodash.includes": "^4.3.0", "lodash.isequal": "^4.5.0", "lodash.isstring": "^4.0.1", @@ -123203,7 +123164,7 @@ "debug": "^3.0.1", "depcheck": "^1.4.0", "electron": "^6.1.12", - "electron-devtools-installer": "^3.1.1", + "electron-devtools-installer": "^3.2.0", "electron-rebuild": "^2.3.5", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.6.0", @@ -136629,12 +136590,6 @@ "negotiator": "0.6.2" } }, - "accessibility-developer-tools": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/accessibility-developer-tools/-/accessibility-developer-tools-2.12.0.tgz", - "integrity": "sha1-PaDM6dbsY3OWS4TzXbfPw996tRQ=", - "dev": true - }, "acorn": { "version": "8.4.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.0.tgz", @@ -145448,25 +145403,6 @@ "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", "devOptional": true }, - "devtron": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/devtron/-/devtron-1.4.0.tgz", - "integrity": "sha1-tedIvW6Vu+cL/MaKrm/mlhGUQeE=", - "dev": true, - "requires": { - "accessibility-developer-tools": "^2.11.0", - "highlight.js": "^9.3.0", - "humanize-plus": "^1.8.1" - }, - "dependencies": { - "highlight.js": { - "version": "9.18.5", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz", - "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==", - "dev": true - } - } - }, "dezalgo": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz", @@ -155793,12 +155729,6 @@ "ms": "^2.0.0" } }, - "humanize-plus": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/humanize-plus/-/humanize-plus-1.8.2.tgz", - "integrity": "sha1-pls0RZrWNnrbs3B6gqPJ+RYWcDA=", - "dev": true - }, "hyperlinker": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/hyperlinker/-/hyperlinker-1.0.0.tgz", @@ -163215,9 +163145,9 @@ "debug": "^4.1.1", "debug-menu": "^0.3.0", "depcheck": "^1.4.0", - "devtron": "^1.4.0", "download": "^8.0.0", "electron": "^6.1.12", + "electron-devtools-installer": "^3.2.0", "electron-localshortcut": "^3.1.0", "electron-mocha": "^8.2.2", "electron-rebuild": "^2.3.5", diff --git a/packages/compass-schema/package.json b/packages/compass-schema/package.json index 2dd51d5605d..246c82337f2 100644 --- a/packages/compass-schema/package.json +++ b/packages/compass-schema/package.json @@ -149,7 +149,6 @@ "lodash.find": "^4.6.0", "lodash.get": "^4.4.2", "lodash.groupby": "^4.6.0", - "lodash.has": "^4.5.2", "lodash.includes": "^4.3.0", "lodash.isequal": "^4.5.0", "lodash.isstring": "^4.0.1", diff --git a/packages/compass-schema/src/components/value-bubble/value-bubble.jsx b/packages/compass-schema/src/components/value-bubble/value-bubble.jsx index 365ed16e042..d002c2e6733 100644 --- a/packages/compass-schema/src/components/value-bubble/value-bubble.jsx +++ b/packages/compass-schema/src/components/value-bubble/value-bubble.jsx @@ -1,6 +1,5 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import has from 'lodash.has'; import includes from 'lodash.includes'; import isString from 'lodash.isstring'; import { hasDistinctValue } from 'mongodb-query-util'; @@ -36,7 +35,7 @@ class ValueBubble extends Component { * @return {String} converted value */ _extractStringValue(value) { - if (has(value, '_bsontype')) { + if (value && value._bsontype) { if (includes([ DECIMAL_128, LONG ], value._bsontype)) { return value.toString(); } diff --git a/packages/compass-schema/src/modules/number.js b/packages/compass-schema/src/modules/number.js index 4e7485e1849..28d89bf46b5 100644 --- a/packages/compass-schema/src/modules/number.js +++ b/packages/compass-schema/src/modules/number.js @@ -1,7 +1,6 @@ /* eslint camelcase: 0 */ import d3 from 'd3'; import assign from 'lodash.assign'; -import has from 'lodash.has'; import includes from 'lodash.includes'; import groupBy from 'lodash.groupby'; import sortBy from 'lodash.sortby'; @@ -16,7 +15,7 @@ import shared from './shared'; * @return {Number} converted value */ function extractNumericValueFromBSON(value) { - if (has(value, '_bsontype')) { + if (value && value._bsontype) { if (includes([ 'Decimal128', 'Long' ], value._bsontype)) { return parseFloat(value.toString(), 10); } diff --git a/packages/compass-shell/package.json b/packages/compass-shell/package.json index a41e3e5e689..b612d434c2e 100644 --- a/packages/compass-shell/package.json +++ b/packages/compass-shell/package.json @@ -78,7 +78,7 @@ "debug": "^3.0.1", "depcheck": "^1.4.0", "electron": "^6.1.12", - "electron-devtools-installer": "^3.1.1", + "electron-devtools-installer": "^3.2.0", "electron-rebuild": "^2.3.5", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.6.0", diff --git a/packages/compass/package.json b/packages/compass/package.json index 8da7fa77b09..1cd4d4040fc 100644 --- a/packages/compass/package.json +++ b/packages/compass/package.json @@ -383,9 +383,9 @@ "cli-ux": "^5.5.1", "cross-env": "^7.0.3", "depcheck": "^1.4.0", - "devtron": "^1.4.0", "download": "^8.0.0", "electron": "^6.1.12", + "electron-devtools-installer": "^3.2.0", "electron-mocha": "^8.2.2", "electron-rebuild": "^2.3.5", "enzyme": "^3.11.0", diff --git a/packages/compass/src/main/window-manager.js b/packages/compass/src/main/window-manager.js index 9de8340963b..ca7b88771de 100644 --- a/packages/compass/src/main/window-manager.js +++ b/packages/compass/src/main/window-manager.js @@ -399,14 +399,21 @@ app.on('ready', function() { // install development tools (devtron, react tools) if in development mode if (process.env.NODE_ENV === 'development') { debug('Activating Compass specific devtools...'); - require('devtron').install(); - } + const { + default: installDevtools, + REACT_DEVELOPER_TOOLS, + } = require('electron-devtools-installer'); - /** - * When electron's main renderer has completed setup, - * we'll always show the [connect][./src/connect] dialog - * on start which is responsible for retaining it's own - * state between application launches. - */ - showConnectWindow(); + installDevtools(REACT_DEVELOPER_TOOLS).finally(() => { + showConnectWindow(); + }); + } else { + /** + * When electron's main renderer has completed setup, + * we'll always show the [connect][./src/connect] dialog + * on start which is responsible for retaining it's own + * state between application launches. + */ + showConnectWindow(); + } });