Skip to content
This repository was archived by the owner on May 17, 2021. It is now read-only.

Commit 1b6021a

Browse files
authored
build: COMPASS-3933 electron upgrade (#33)
## Description - [x] COMPASS-4108 Add dependabot to compass dependencies in mongodb-js - [x] COMPASS-4084 Update plugin template for electron@6 - [x] COMPASS-4072 lodash ## Motivation and Context - [x] Dependency update ## Dependents - Depended on by mongodb-js/compass#1873 - mongodb-js/data-service#167 for bionic on travis for mongodb-runner - mongodb-js/compass-connect#82 for electron@6 updates ## Types of Changes - [x] Patch
2 parents 09aca81 + de9e037 commit 1b6021a

File tree

14 files changed

+118
-726
lines changed

14 files changed

+118
-726
lines changed

.jsfmtrc

Lines changed: 0 additions & 174 deletions
This file was deleted.

.travis.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
1-
sudo: required
2-
dist: trusty
1+
sudo: false
2+
dist: bionic
33
language: node_js
44
node_js:
5-
- 10.2.1
5+
- 12.4.0
66
env:
77
matrix:
88
- MONGODB_VERSION=stable MONGODB_TOPOLOGY=standalone
99
addons:
1010
apt:
1111
sources:
12-
- ubuntu-toolchain-r-test
12+
- sourceline: "ppa:ubuntu-toolchain-r/test"
1313
packages:
1414
- libkrb5-dev
1515
- libsecret-1-dev
16-
before_script:
17-
- export DISPLAY=:99.0
18-
- sh -e /etc/init.d/xvfb start
19-
before_install:
20-
- echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" >> .npmrc
2116
script: npm run ci
22-
cache:
23-
directories:
24-
- $HOME/.electron
25-
- node_modules
17+
cache: npm

.vscode/settings.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"editor.formatOnSave": true,
3+
"files.trimTrailingWhitespace": true,
4+
"files.insertFinalNewline": true,
5+
"files.exclude": {
6+
".nyc_output": true,
7+
"coverage": true
8+
},
9+
"search.exclude": {
10+
"coverage": true,
11+
".nyc_output": true
12+
},
13+
"prettier.arrowParens": "always"
14+
}

electron/renderer/stores/namespace-store.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const Reflux = require('reflux');
22
const app = require('hadron-app');
3-
const includes = require('lodash.includes');
3+
const { includes } = require('lodash');
44
const debug = require('debug')('mongodb-compass:namespace-store');
55

66
/**

karma.conf.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,21 @@ module.exports = function(config) {
2323
client: {
2424
useIframe: false
2525
},
26-
logLevel: config.LOG_ERROR
26+
logLevel: config.LOG_ERROR,
27+
/**
28+
* Define a custom launcher which inherits from `Electron`
29+
* @see https://github.com/mongodb-js/compass-connect/pull/82
30+
* @see https://github.com/twolfson/karma-electron#forcing-nodeintegration-support
31+
*/
32+
customLaunchers: {
33+
Compass: {
34+
base: 'Electron',
35+
browserWindowOptions: {
36+
webPreferences: {
37+
nodeIntegration: true
38+
}
39+
}
40+
}
41+
}
2742
});
2843
};

0 commit comments

Comments
 (0)