Skip to content

Commit

Permalink
Update deps (#38)
Browse files Browse the repository at this point in the history
* Update dependencies and replace isparta (deprecated) with nyc

* Add yarn.lock

* Fix coverage script

* Remove isparta from dependency
  • Loading branch information
davidebianchi committed Oct 26, 2017
1 parent ef24a95 commit 238b0c2
Show file tree
Hide file tree
Showing 13 changed files with 3,518 additions and 97 deletions.
7 changes: 6 additions & 1 deletion .babelrc
@@ -1,3 +1,8 @@
{
"presets": ["es2015", "stage-0"]
"presets": ["es2015", "stage-0"],
"env": {
"test": {
"plugins": ["istanbul"]
}
}
}
2 changes: 1 addition & 1 deletion .eslintrc
Expand Up @@ -21,7 +21,7 @@
"one-var": [2, "never"],
"quotes": [2, "double"],
"semi": [2, "always"],
"space-after-keywords": [2, "always"],
"keyword-spacing": [2],
"space-before-blocks": [2, "always"],
"space-before-function-paren": [2, "always"],
"space-in-parens": [2, "never"],
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
@@ -1,4 +1,6 @@
node_modules/
npm-debug.log
coverage/
.nyc_output
lib/
.DS_Store
1 change: 1 addition & 0 deletions .npmrc
@@ -0,0 +1 @@
package-lock=false
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,7 +1,7 @@
language: node_js

node_js:
- 5
- 8

# before_install:
# - curl https://install.meteor.com | /bin/sh
Expand Down
6 changes: 6 additions & 0 deletions README.md
Expand Up @@ -25,8 +25,14 @@ The purpose of this library is:

## Install

To install ddp.js using `npm`:

npm install ddp.js

or using `yarn`:

yarn add ddp.js

## Example usage

```js
Expand Down
36 changes: 18 additions & 18 deletions package.json
Expand Up @@ -6,14 +6,14 @@
"scripts": {
"build": "babel src --out-dir lib",
"clean": "rimraf lib coverage",
"coverage": "babel-node $(npm bin)/isparta cover $(npm bin)/_mocha -- --recursive test/unit",
"coverage": "nyc --require babel-register --reporter=lcov --include src --all npm test",
"coveralls": "cat ./coverage/lcov.info | coveralls",
"dev": "npm test -- --watch",
"lint": "eslint src test",
"prepublish": "npm run clean && npm run build",
"test": "mocha --compilers js:babel-core/register --recursive test/unit",
"test": "mocha --require babel-register --recursive test/unit",
"start-meteor": "cd test/server/ && meteor",
"e2e-test": "mocha --compilers js:babel-core/register --recursive test/e2e",
"e2e-test": "mocha --require babel-register --recursive test/e2e",
"e2e-dev": "npm run e2e-test -- --watch"
},
"repository": {
Expand All @@ -32,22 +32,22 @@
},
"homepage": "https://github.com/mondora/ddp.js",
"devDependencies": {
"babel-cli": "^6.5.1",
"babel-core": "^6.5.1",
"babel-eslint": "^4.1.8",
"babel-loader": "^6.2.2",
"babel-preset-es2015": "^6.5.0",
"babel-preset-stage-0": "^6.5.0",
"chai": "^3.5.0",
"coveralls": "^2.11.6",
"eslint": "^1.10.3",
"faye-websocket": "^0.10.0",
"isparta": "^4.0.0",
"mocha": "^2.4.5",
"sinon": "^1.17.3",
"sinon-chai": "^2.8.0"
"babel-cli": "^6.26.0",
"babel-eslint": "^8.0.1",
"babel-plugin-istanbul": "^4.1.5",
"babel-preset-es2015": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"babel-register": "^6.26.0",
"chai": "^4.1.2",
"coveralls": "^3.0.0",
"eslint": "^4.9.0",
"faye-websocket": "^0.11.1",
"mocha": "^4.0.1",
"nyc": "^11.2.1",
"sinon": "^4.0.2",
"sinon-chai": "^2.14.0"
},
"dependencies": {
"wolfy87-eventemitter": "^4.3.0"
"wolfy87-eventemitter": "^5.2.3"
}
}
5 changes: 5 additions & 0 deletions test/server/.meteor/.finished-upgraders
Expand Up @@ -10,3 +10,8 @@ notices-for-facebook-graph-api-2
1.2.0-meteor-platform-split
1.2.0-cordova-changes
1.2.0-breaking-changes
1.3.0-split-minifiers-package
1.4.0-remove-old-dev-bundle-link
1.4.1-add-shell-server-package
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package
19 changes: 11 additions & 8 deletions test/server/.meteor/packages
Expand Up @@ -4,14 +4,17 @@
# 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand.

meteor-base # Packages every Meteor app needs to have
mobile-experience # Packages for a great mobile UX
mongo # The database Meteor supports right now
meteor-base@1.1.0 # Packages every Meteor app needs to have
mobile-experience@1.0.5 # Packages for a great mobile UX
mongo@1.2.2 # The database Meteor supports right now
blaze-html-templates # Compile .html files into Meteor Blaze views
session # Client-side reactive dictionary for your app
jquery # Helpful client-side library
tracker # Meteor's client-side reactive programming library
session@1.1.7 # Client-side reactive dictionary for your app
jquery@1.11.10 # Helpful client-side library
tracker@1.1.3 # Meteor's client-side reactive programming library

standard-minifiers # JS/CSS minifiers run for production mode
es5-shim # ECMAScript 5 compatibility for older browsers.
es5-shim@4.6.15 # ECMAScript 5 compatibility for older browsers.

standard-minifier-css
standard-minifier-js
shell-server
dynamic-import
2 changes: 1 addition & 1 deletion test/server/.meteor/release
@@ -1 +1 @@
METEOR@1.2.1
METEOR@1.5.2.2
139 changes: 75 additions & 64 deletions test/server/.meteor/versions
@@ -1,64 +1,75 @@
autoupdate@1.2.4
babel-compiler@5.8.24_1
babel-runtime@0.1.4
base64@1.0.4
binary-heap@1.0.4
blaze@2.1.3
blaze-html-templates@1.0.1
blaze-tools@1.0.4
boilerplate-generator@1.0.4
caching-compiler@1.0.0
caching-html-compiler@1.0.2
callback-hook@1.0.4
check@1.1.0
ddp@1.2.2
ddp-client@1.2.1
ddp-common@1.2.2
ddp-server@1.2.2
deps@1.0.9
diff-sequence@1.0.1
ecmascript@0.1.6
ecmascript-runtime@0.2.6
ejson@1.0.7
es5-shim@4.1.14
fastclick@1.0.7
geojson-utils@1.0.4
hot-code-push@1.0.0
html-tools@1.0.5
htmljs@1.0.5
http@1.1.1
id-map@1.0.4
jquery@1.11.4
launch-screen@1.0.4
livedata@1.0.15
logging@1.0.8
meteor@1.1.10
meteor-base@1.0.1
minifiers@1.1.7
minimongo@1.0.10
mobile-experience@1.0.1
mobile-status-bar@1.0.6
mongo@1.1.3
mongo-id@1.0.1
npm-mongo@1.4.39_1
observe-sequence@1.0.7
ordered-dict@1.0.4
promise@0.5.1
random@1.0.5
reactive-dict@1.1.3
reactive-var@1.0.6
reload@1.1.4
retry@1.0.4
routepolicy@1.0.6
session@1.1.1
spacebars@1.0.7
spacebars-compiler@1.0.7
standard-minifiers@1.0.2
templating@1.1.5
templating-tools@1.0.0
tracker@1.0.9
ui@1.0.8
underscore@1.0.4
url@1.0.5
webapp@1.2.3
webapp-hashing@1.0.5
allow-deny@1.0.9
autoupdate@1.3.12
babel-compiler@6.20.0
babel-runtime@1.0.1
base64@1.0.10
binary-heap@1.0.10
blaze@2.3.2
blaze-html-templates@1.1.2
blaze-tools@1.0.10
boilerplate-generator@1.2.0
caching-compiler@1.1.9
caching-html-compiler@1.1.2
callback-hook@1.0.10
check@1.2.5
ddp@1.3.1
ddp-client@2.1.3
ddp-common@1.2.9
ddp-server@2.0.2
deps@1.0.12
diff-sequence@1.0.7
dynamic-import@0.1.3
ecmascript@0.8.3
ecmascript-runtime@0.4.1
ecmascript-runtime-client@0.4.3
ecmascript-runtime-server@0.4.1
ejson@1.0.14
es5-shim@4.6.15
geojson-utils@1.0.10
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
http@1.2.12
id-map@1.0.9
jquery@1.11.10
launch-screen@1.1.1
livedata@1.0.18
logging@1.1.19
meteor@1.7.2
meteor-base@1.1.0
minifier-css@1.2.16
minifier-js@2.1.4
minimongo@1.3.3
mobile-experience@1.0.5
mobile-status-bar@1.0.14
modules@0.10.0
modules-runtime@0.8.0
mongo@1.2.2
mongo-dev-server@1.0.1
mongo-id@1.0.6
npm-mongo@2.2.33
observe-sequence@1.0.16
ordered-dict@1.0.9
promise@0.9.0
random@1.0.10
reactive-dict@1.1.9
reactive-var@1.0.11
reload@1.1.11
retry@1.0.9
routepolicy@1.0.12
session@1.1.7
shell-server@0.2.4
spacebars@1.0.15
spacebars-compiler@1.1.3
standard-minifier-css@1.3.5
standard-minifier-js@2.1.2
templating@1.3.2
templating-compiler@1.3.3
templating-runtime@1.3.2
templating-tools@1.1.2
tracker@1.1.3
ui@1.0.13
underscore@1.0.10
url@1.1.0
webapp@1.3.19
webapp-hashing@1.0.9
6 changes: 3 additions & 3 deletions test/unit/ddp.js
Expand Up @@ -202,7 +202,7 @@ describe("`DDP` class", () => {
describe("`socket` `open` handler", () => {

beforeEach(() => {
sinon.stub(global, "setTimeout", fn => fn());
sinon.stub(global, "setTimeout").callsFake(fn => fn());
});
afterEach(() => {
global.setTimeout.restore();
Expand All @@ -224,7 +224,7 @@ describe("`DDP` class", () => {
describe("`socket` `close` handler", () => {

beforeEach(() => {
sinon.stub(global, "setTimeout", fn => fn());
sinon.stub(global, "setTimeout").callsFake(fn => fn());
});
afterEach(() => {
global.setTimeout.restore();
Expand Down Expand Up @@ -267,7 +267,7 @@ describe("`DDP` class", () => {
describe("`socket` `message:in` handler", () => {

beforeEach(() => {
sinon.stub(global, "setTimeout", fn => fn());
sinon.stub(global, "setTimeout").callsFake(fn => fn());
});
afterEach(() => {
global.setTimeout.restore();
Expand Down

0 comments on commit 238b0c2

Please sign in to comment.