Skip to content

Commit 9ad0e0f

Browse files
committed
Upgrade dependencies and build setup.
1 parent e380df8 commit 9ad0e0f

File tree

6 files changed

+39
-34
lines changed

6 files changed

+39
-34
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@ node_modules
3333
*.iml
3434

3535
data/
36-
doc/
36+
doc/
37+
.nyc_output/

circle.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ general:
44
- gh-pages
55
machine:
66
node:
7-
version: 4.1.0
7+
version: 5.7.0
88
dependencies:
99
pre:
1010
- npm install -g npm
11-
- npm install js-data@^3.0.0-beta.3 mongodb bson
11+
- npm install -g codecov nyc
12+
- npm install js-data@^3.0.0-rc.4 mongodb bson@^0.4.x
1213
test:
13-
override:
14-
- npm run ci
14+
post:
15+
- nyc report --reporter=lcov | codecov

mocha.start.js

+9-10
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,19 @@
22
'use strict'
33

44
// prepare environment for js-data-adapter-tests
5-
require('babel-polyfill')
5+
import 'babel-polyfill'
66

7-
var JSData = require('js-data')
8-
var JSDataAdapterTests = require('js-data-adapter-tests')
9-
var JSDataMongoDB = require('./')
10-
var version = JSDataMongoDB.version
11-
var MongoDBAdapter = JSDataMongoDB.MongoDBAdapter
7+
import * as JSData from 'js-data'
8+
import JSDataAdapterTests from './node_modules/js-data-adapter/dist/js-data-adapter-tests'
9+
import * as JSDataMongoDB from './src/index'
1210

13-
var assert = global.assert = JSDataAdapterTests.assert
11+
const assert = global.assert = JSDataAdapterTests.assert
1412
global.sinon = JSDataAdapterTests.sinon
1513

1614
JSDataAdapterTests.init({
1715
debug: false,
1816
JSData: JSData,
19-
Adapter: MongoDBAdapter,
17+
Adapter: JSDataMongoDB.MongoDBAdapter,
2018
adapterConfig: {
2119
uri: 'mongodb://localhost:27017'
2220
},
@@ -44,6 +42,7 @@ JSDataAdapterTests.init({
4442
require('./test/find.test')
4543

4644
describe('exports', function () {
47-
assert(version)
48-
assert(version.full)
45+
it('should have exports', function () {
46+
assert(JSDataMongoDB.version, 'Should have version')
47+
})
4948
})

package.json

+12-17
Original file line numberDiff line numberDiff line change
@@ -37,41 +37,36 @@
3737
"beforeEach",
3838
"afterEach"
3939
],
40-
"ignore": ["dist/"]
40+
"ignore": [
41+
"dist/"
42+
]
4143
},
4244
"babel": {
43-
"presets": ["es2015-rollup"]
45+
"presets": [
46+
"es2015"
47+
]
4448
},
4549
"scripts": {
4650
"lint": "repo-tools lint \"**/*.js\"",
4751
"bundle": "rollup -c rollup.config.js -f cjs -o dist/js-data-mongodb.js -m dist/js-data-mongodb.js.map src/index.js && repo-tools write-version dist/js-data-mongodb.js",
4852
"doc": "jsdoc -c conf.json src node_modules/js-data-adapter/src",
4953
"watch": "watch \"npm run bundle\" src/",
5054
"build": "npm run lint && npm run bundle",
51-
"mocha": "mocha -t 20000 -R dot -r source-map-support/register mocha.start.js",
52-
"cover": "istanbul cover --hook-run-in-context node_modules/mocha/bin/_mocha -- -t 20000 -R dot -r source-map-support/register mocha.start.js",
55+
"mocha": "mocha -t 20000 -R dot -r babel-core/register -r babel-polyfill mocha.start.js",
56+
"cover": "nyc --require babel-core/register --require babel-polyfill --cache mocha -t 20000 -R dot mocha.start.js && nyc report --reporter=html",
5357
"test": "npm run build && npm run cover",
54-
"release": "npm test && npm run doc && repo-tools updates && repo-tools changelog && repo-tools authors",
55-
"ci": "npm run test && cat coverage/lcov.info | codecov"
58+
"release": "npm test && npm run doc && repo-tools updates && repo-tools changelog && repo-tools authors"
5659
},
5760
"dependencies": {
58-
"js-data-adapter": "~0.6.1",
61+
"js-data-adapter": "~0.8.2",
5962
"mout": "1.0.0"
6063
},
6164
"peerDependencies": {
6265
"bson": "^0.4.x || ^0.3.x",
63-
"js-data": "^3.0.0-beta.3",
66+
"js-data": "^3.0.0-rc.4",
6467
"mongodb": ">=1.3.x"
6568
},
6669
"devDependencies": {
67-
"babel-polyfill": "6.8.0",
68-
"babel-preset-es2015-rollup": "1.1.1",
69-
"istanbul": "0.4.3",
70-
"js-data-adapter-tests": "^2.0.0-alpha.16",
71-
"js-data-repo-tools": "0.5.0",
72-
"rollup": "0.26.2",
73-
"rollup-plugin-babel": "2.4.0",
74-
"source-map-support": "0.4.0",
75-
"watch": "0.18.0"
70+
"js-data-repo-tools": "0.5.6"
7671
}
7772
}

rollup.config.js

+11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
var babel = require('rollup-plugin-babel')
22

33
module.exports = {
4+
external: [
5+
'mongodb',
6+
'bson',
7+
'js-data',
8+
'js-data-adapter',
9+
'mout/string/underscore'
10+
],
411
plugins: [
512
babel({
13+
babelrc: false,
14+
presets: [
15+
'es2015-rollup'
16+
],
617
exclude: 'node_modules/**'
718
})
819
]

src/index.js

-2
Original file line numberDiff line numberDiff line change
@@ -958,5 +958,3 @@ export const version = '<%= version %>'
958958
*
959959
* @module js-data-mongodb
960960
*/
961-
962-
export default MongoDBAdapter

0 commit comments

Comments
 (0)