Skip to content

Commit 313eb1c

Browse files
rueckstiesskangas
authored andcommitted
Bump some modules, add instance model, fix lint errors (#457)
bump versions, add instance-model (was missing) - [email protected] - [email protected] - 👕 fixing linter errors - run `npm run check` on precommit and ci.
1 parent 22d745d commit 313eb1c

File tree

10 files changed

+17
-29
lines changed

10 files changed

+17
-29
lines changed

package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"pretest": "mongodb-runner install",
5757
"test": "xvfb-maybe hadron-build test",
5858
"check": "mongodb-js-precommit ./src/app/*.js ./src/app/**/**/*.js ./src/{app/**/*.js,main/**/*.js} ./test/*.js",
59-
"ci": "npm run test-unit",
59+
"ci": "npm run check && npm run test-unit",
6060
"clean": "hadron-build clean",
6161
"compile-ui": "hadron-build ui",
6262
"fmt": "mongodb-js-fmt ./*.js src/{**/*.js,*.js} test/{**/*.js,*.js}",
@@ -102,9 +102,9 @@
102102
"font-awesome": "https://github.com/FortAwesome/Font-Awesome/archive/v4.4.0.tar.gz",
103103
"get-object-path": "azer/get-object-path#74eb42de0cfd02c14ffdd18552f295aba723d394",
104104
"hadron-action": "^0.1.0",
105+
"hadron-app-registry": "^1.7.0",
105106
"hadron-auto-update-manager": "^0.0.12",
106107
"hadron-compile-cache": "^0.3.0",
107-
"hadron-app-registry": "^1.7.0",
108108
"hadron-document": "^0.22.0",
109109
"hadron-ipc": "^0.0.7",
110110
"hadron-module-cache": "^0.0.3",
@@ -126,6 +126,7 @@
126126
"mongodb-database-model": "^0.1.2",
127127
"mongodb-explain-plan-model": "^0.2.0",
128128
"mongodb-extended-json": "^1.7.0",
129+
"mongodb-instance-model": "^3.1.5",
129130
"mongodb-js-metrics": "^1.2.0",
130131
"mongodb-language-model": "^0.3.3",
131132
"mongodb-ns": "^1.0.3",
@@ -156,15 +157,18 @@
156157
"chai": "^3.4.1",
157158
"chai-as-promised": "^5.1.0",
158159
"electron-prebuilt": "1.2.8",
159-
"eslint-config-mongodb-js": "^2.0.1",
160-
"eslint-plugin-react": "^4.1.0",
160+
"eslint-config-mongodb-js": "^2.2.0",
161161
"hadron-build": "^0.7.2",
162162
"mocha": "^2.3.4",
163+
"mongodb-js-precommit": "^0.2.9",
163164
"mongodb-runner": "^3.1.15",
164165
"react-addons-test-utils": "^15.2.1",
165166
"spectron": "^3.2.6",
166167
"xvfb-maybe": "^0.1.3"
167168
},
169+
"precommit": [
170+
"check"
171+
],
168172
"engines": {
169173
"node": "^6.3.0",
170174
"npm": "^3.0.0"

src/app/explain-plan/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
var View = require('ampersand-view');
22
var State = require('ampersand-state');
33

4-
var $ = require('jquery');
54
var _ = require('lodash');
65
var app = require('ampersand-app');
76
var ExplainPlanModel = require('mongodb-explain-plan-model');
87
var DocumentView = require('../documents/document-list-item');
98
var IndexDefinitionView = require('../indexes/index-definition');
109
var TreeView = require('./tree-view');
1110
var StageModel = require('./stage-model');
12-
var metrics = require('mongodb-js-metrics')();
1311

1412
var electron = require('electron');
1513
var shell = electron.shell;

src/app/home/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var View = require('ampersand-view');
22
var format = require('util').format;
33
var SidebarView = require('../sidebar');
4-
var IdentifyView = require('../identify');
4+
// var IdentifyView = require('../identify');
55
var CollectionView = require('./collection');
66
var InstancePropertyView = require('./instance-properties');
77
var CollectionListItemView = require('./collection-list-item');
@@ -14,7 +14,6 @@ var _ = require('lodash');
1414
var debug = require('debug')('mongodb-compass:home');
1515
var toNS = require('mongodb-ns');
1616
var ipc = require('hadron-ipc');
17-
var pkg = require('../../../package.json');
1817

1918
var indexTemplate = require('./index.jade');
2019

src/app/index.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,6 @@ var Application = View.extend({
185185
evt.preventDefault();
186186
evt.stopPropagation();
187187
var id = evt.target.dataset.hook;
188-
var url = 'compass://help';
189-
if (id) {
190-
url += '/' + id;
191-
}
192-
193188
ipc.call('app:show-help-window', id);
194189
},
195190
onClientReady: function() {

src/app/metrics/features.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
var BaseResource = require('mongodb-js-metrics').resources.BaseResource;
22
var FeatureResource = require('mongodb-js-metrics').resources.FeatureResource;
3-
var app = require('ampersand-app');
43
var debug = require('debug')('mongodb-compass:metrics:features');
54
var _ = require('lodash');
65

src/app/minicharts/d3fns/many.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ var d3 = require('d3');
33
var $ = require('jquery');
44
var _ = require('lodash');
55
var shared = require('./shared');
6-
var app = require('ampersand-app');
7-
var metrics = require('mongodb-js-metrics')();
8-
var ipc = require('hadron-ipc');
96

107
var tooltipTemplate = require('./tooltip.jade');
118
// var debug = require('debug')('mongodb-compass:minicharts:many');

src/app/models/connection.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ var DataService = require('mongodb-data-service');
44
var debug = require('debug')('mongodb-compass:models:connection');
55
var uuid = require('uuid');
66
var metrics = require('mongodb-js-metrics')();
7-
var pkg = require('../../../package.json');
87
var electronApp = require('electron').remote.app;
98

109
/**

src/app/refine-view/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ var EJSON = require('mongodb-extended-json');
66
var QueryStore = require('../../internal-packages/schema/lib/store');
77
var Query = require('mongodb-language-model').Query;
88
var QueryOptions = require('../models/query-options');
9-
var app = require('ampersand-app');
10-
var metrics = require('mongodb-js-metrics')();
119

1210
// var metrics = require('mongodb-js-metrics')();
1311
var debug = require('debug')('scout:refine-view:index');

src/app/style-manager.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* eslint no-sync: 0 */
2+
13
var path = require('path');
24
var LessCache = require('less-cache');
35

test/compass-functional.test.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
'use strict';
2-
31
process.env.NODE_ENV = 'testing';
42

5-
const SpectronSupport = require('./support/spectron-support');
6-
const CrudSupport = require('./support/crud-support');
7-
const Connection = require('mongodb-connection-model');
3+
var SpectronSupport = require('./support/spectron-support');
4+
var CrudSupport = require('./support/crud-support');
5+
var Connection = require('mongodb-connection-model');
86

9-
const DATABASE = 'compass-test';
10-
const COLLECTION = 'bands';
11-
const CONNECTION = new Connection({ hostname: '127.0.0.1', port: 27018, ns: DATABASE });
7+
var DATABASE = 'compass-test';
8+
var COLLECTION = 'bands';
9+
var CONNECTION = new Connection({ hostname: '127.0.0.1', port: 27018, ns: DATABASE });
1210

1311
/**
1412
* Test documents to sample with a local server.
@@ -103,7 +101,6 @@ describe('Compass #spectron', function() {
103101
});
104102

105103
context('when working in the documents tab', function() {
106-
107104
context('when viewing documents', function() {
108105
it('renders the documents in the list', function() {
109106
return client

0 commit comments

Comments
 (0)