From 77a04f9cf12ed4239adf74810e169768bf9617d3 Mon Sep 17 00:00:00 2001 From: Thomas Rueckstiess Date: Sun, 21 Aug 2016 22:50:44 +0200 Subject: [PATCH] Bump some modules, add instance model, fix lint errors bump versions, add instance-model (was missing) - eslint-config-mongodb-js@2.2.0 - mongodb-js-precommit@0.2.9 - :shirt: fixing linter errors - run `npm run check` on precommit and ci. --- package.json | 12 ++++++++---- src/app/explain-plan/index.js | 2 -- src/app/home/index.js | 3 +-- src/app/index.js | 5 ----- src/app/metrics/features.js | 1 - src/app/minicharts/d3fns/many.js | 3 --- src/app/models/connection.js | 1 - src/app/refine-view/index.js | 2 -- src/app/style-manager.js | 2 ++ test/compass-functional.test.js | 15 ++++++--------- 10 files changed, 17 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 40bee772cb5..5ca2ebbfd1f 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "pretest": "mongodb-runner install", "test": "xvfb-maybe hadron-build test", "check": "mongodb-js-precommit ./src/app/*.js ./src/app/**/**/*.js ./src/{app/**/*.js,main/**/*.js} ./test/*.js", - "ci": "npm run test-unit", + "ci": "npm run check && npm run test-unit", "clean": "hadron-build clean", "compile-ui": "hadron-build ui", "fmt": "mongodb-js-fmt ./*.js src/{**/*.js,*.js} test/{**/*.js,*.js}", @@ -102,9 +102,9 @@ "font-awesome": "https://github.com/FortAwesome/Font-Awesome/archive/v4.4.0.tar.gz", "get-object-path": "azer/get-object-path#74eb42de0cfd02c14ffdd18552f295aba723d394", "hadron-action": "^0.1.0", + "hadron-app-registry": "^1.7.0", "hadron-auto-update-manager": "^0.0.12", "hadron-compile-cache": "^0.3.0", - "hadron-app-registry": "^1.7.0", "hadron-document": "^0.22.0", "hadron-ipc": "^0.0.7", "hadron-module-cache": "^0.0.3", @@ -126,6 +126,7 @@ "mongodb-database-model": "^0.1.2", "mongodb-explain-plan-model": "^0.2.0", "mongodb-extended-json": "^1.7.0", + "mongodb-instance-model": "^3.1.5", "mongodb-js-metrics": "^1.2.0", "mongodb-language-model": "^0.3.3", "mongodb-ns": "^1.0.3", @@ -156,15 +157,18 @@ "chai": "^3.4.1", "chai-as-promised": "^5.1.0", "electron-prebuilt": "1.2.8", - "eslint-config-mongodb-js": "^2.0.1", - "eslint-plugin-react": "^4.1.0", + "eslint-config-mongodb-js": "^2.2.0", "hadron-build": "^0.7.2", "mocha": "^2.3.4", + "mongodb-js-precommit": "^0.2.9", "mongodb-runner": "^3.1.15", "react-addons-test-utils": "^15.2.1", "spectron": "^3.2.6", "xvfb-maybe": "^0.1.3" }, + "precommit": [ + "check" + ], "engines": { "node": "^6.3.0", "npm": "^3.0.0" diff --git a/src/app/explain-plan/index.js b/src/app/explain-plan/index.js index d06f51bd339..8527a529a06 100644 --- a/src/app/explain-plan/index.js +++ b/src/app/explain-plan/index.js @@ -1,7 +1,6 @@ var View = require('ampersand-view'); var State = require('ampersand-state'); -var $ = require('jquery'); var _ = require('lodash'); var app = require('ampersand-app'); var ExplainPlanModel = require('mongodb-explain-plan-model'); @@ -9,7 +8,6 @@ var DocumentView = require('../documents/document-list-item'); var IndexDefinitionView = require('../indexes/index-definition'); var TreeView = require('./tree-view'); var StageModel = require('./stage-model'); -var metrics = require('mongodb-js-metrics')(); var electron = require('electron'); var shell = electron.shell; diff --git a/src/app/home/index.js b/src/app/home/index.js index 983688d00e6..68ea9a04908 100644 --- a/src/app/home/index.js +++ b/src/app/home/index.js @@ -1,7 +1,7 @@ var View = require('ampersand-view'); var format = require('util').format; var SidebarView = require('../sidebar'); -var IdentifyView = require('../identify'); +// var IdentifyView = require('../identify'); var CollectionView = require('./collection'); var InstancePropertyView = require('./instance-properties'); var CollectionListItemView = require('./collection-list-item'); @@ -14,7 +14,6 @@ var _ = require('lodash'); var debug = require('debug')('mongodb-compass:home'); var toNS = require('mongodb-ns'); var ipc = require('hadron-ipc'); -var pkg = require('../../../package.json'); var indexTemplate = require('./index.jade'); diff --git a/src/app/index.js b/src/app/index.js index 44e2e7e9bc9..9ca9ca4d54e 100644 --- a/src/app/index.js +++ b/src/app/index.js @@ -185,11 +185,6 @@ var Application = View.extend({ evt.preventDefault(); evt.stopPropagation(); var id = evt.target.dataset.hook; - var url = 'compass://help'; - if (id) { - url += '/' + id; - } - ipc.call('app:show-help-window', id); }, onClientReady: function() { diff --git a/src/app/metrics/features.js b/src/app/metrics/features.js index c39b787572f..e982f0805f0 100644 --- a/src/app/metrics/features.js +++ b/src/app/metrics/features.js @@ -1,6 +1,5 @@ var BaseResource = require('mongodb-js-metrics').resources.BaseResource; var FeatureResource = require('mongodb-js-metrics').resources.FeatureResource; -var app = require('ampersand-app'); var debug = require('debug')('mongodb-compass:metrics:features'); var _ = require('lodash'); diff --git a/src/app/minicharts/d3fns/many.js b/src/app/minicharts/d3fns/many.js index 08ff6ef7cf4..6c7ce6c8ee3 100644 --- a/src/app/minicharts/d3fns/many.js +++ b/src/app/minicharts/d3fns/many.js @@ -3,9 +3,6 @@ var d3 = require('d3'); var $ = require('jquery'); var _ = require('lodash'); var shared = require('./shared'); -var app = require('ampersand-app'); -var metrics = require('mongodb-js-metrics')(); -var ipc = require('hadron-ipc'); var tooltipTemplate = require('./tooltip.jade'); // var debug = require('debug')('mongodb-compass:minicharts:many'); diff --git a/src/app/models/connection.js b/src/app/models/connection.js index 9a4c8fa6381..92bb82b7480 100644 --- a/src/app/models/connection.js +++ b/src/app/models/connection.js @@ -4,7 +4,6 @@ var DataService = require('mongodb-data-service'); var debug = require('debug')('mongodb-compass:models:connection'); var uuid = require('uuid'); var metrics = require('mongodb-js-metrics')(); -var pkg = require('../../../package.json'); var electronApp = require('electron').remote.app; /** diff --git a/src/app/refine-view/index.js b/src/app/refine-view/index.js index e13b4924261..76de4fc4a69 100644 --- a/src/app/refine-view/index.js +++ b/src/app/refine-view/index.js @@ -6,8 +6,6 @@ var EJSON = require('mongodb-extended-json'); var QueryStore = require('../../internal-packages/schema/lib/store'); var Query = require('mongodb-language-model').Query; var QueryOptions = require('../models/query-options'); -var app = require('ampersand-app'); -var metrics = require('mongodb-js-metrics')(); // var metrics = require('mongodb-js-metrics')(); var debug = require('debug')('scout:refine-view:index'); diff --git a/src/app/style-manager.js b/src/app/style-manager.js index 2a1f15c66f5..476b8ccc3e5 100644 --- a/src/app/style-manager.js +++ b/src/app/style-manager.js @@ -1,3 +1,5 @@ +/* eslint no-sync: 0 */ + var path = require('path'); var LessCache = require('less-cache'); diff --git a/test/compass-functional.test.js b/test/compass-functional.test.js index 66f3737ff7d..c36d395edee 100644 --- a/test/compass-functional.test.js +++ b/test/compass-functional.test.js @@ -1,14 +1,12 @@ -'use strict'; - process.env.NODE_ENV = 'testing'; -const SpectronSupport = require('./support/spectron-support'); -const CrudSupport = require('./support/crud-support'); -const Connection = require('mongodb-connection-model'); +var SpectronSupport = require('./support/spectron-support'); +var CrudSupport = require('./support/crud-support'); +var Connection = require('mongodb-connection-model'); -const DATABASE = 'compass-test'; -const COLLECTION = 'bands'; -const CONNECTION = new Connection({ hostname: '127.0.0.1', port: 27018, ns: DATABASE }); +var DATABASE = 'compass-test'; +var COLLECTION = 'bands'; +var CONNECTION = new Connection({ hostname: '127.0.0.1', port: 27018, ns: DATABASE }); /** * Test documents to sample with a local server. @@ -103,7 +101,6 @@ describe('Compass #spectron', function() { }); context('when working in the documents tab', function() { - context('when viewing documents', function() { it('renders the documents in the list', function() { return client