Skip to content

Commit

Permalink
Merge branch 'master' into fix/srv_subsrv_logs
Browse files Browse the repository at this point in the history
  • Loading branch information
AlvaroVega authored Sep 15, 2020
2 parents 81a1248 + 114a1a5 commit 7125578
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"plugins": ["prettier"],
"rules": {
"prettier/prettier": "error",
"no-shadow": 0,
"valid-jsdoc": 0
}
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/node_modules/
/.idea/
/coverage/
/.nyc_output/
/site
/report/
/.c9revisions/
Expand Down
1 change: 1 addition & 0 deletions CHANGES_NEXT_RELEASE
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- Fix: set service subservice in logs of redirector and configurations
- Fix: set new trans and corr or use it if provided
- Overall update of dev package dependencies
- Add extra fields to configuration (timestamp, languageExpression, explicitAttrs)
- Update codebase to use ES6
- Remove JSHint and jshint overrides
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
},
"scripts": {
"clean": "rm -rf package-lock.json && rm -rf node_modules && rm -rf coverage",
"test": "mocha --recursive 'test/**/*.js' --reporter spec --timeout 3000 --ui bdd --exit",
"test": "nyc --reporter=text mocha --recursive 'test/**/*.js' --reporter spec --timeout 3000 --ui bdd --exit",
"test:watch": "npm run test -- -w ./lib",
"lint": "eslint lib/ bin/iota-manager test/ --cache --fix",
"test:coverage": "istanbul cover _mocha -- --recursive 'test/**/*.js' --reporter spec --exit",
"test:coverage": "nyc --reporter=lcov mocha -- --recursive 'test/**/*.js' --reporter spec --exit",
"watch": "watch 'npm test && npm run lint' ./lib ./test"
},
"dependencies": {
Expand All @@ -38,18 +38,18 @@
"iotagent-node-lib": "git://github.com/telefonicaid/iotagent-node-lib.git#master"
},
"devDependencies": {
"eslint": "~5.16.0",
"eslint-config-tamia": "~6.2.1",
"eslint-plugin-prettier": "~3.1.0",
"prettier": "~1.14.2",
"mocha": "6.1.4",
"mongodb": "3.2.3",
"eslint": "~7.5.0",
"eslint-config-tamia": "~7.2.5",
"eslint-plugin-prettier": "~3.1.4",
"husky": "~4.2.5",
"lint-staged": "~10.2.11",
"mocha": "8.0.1",
"mongodb": "3.5.9",
"nock": "13.0.3",
"nyc": "~15.1.0",
"prettier": "~2.0.5",
"should": "13.2.3",
"husky": "~1.1.0",
"istanbul": "0.4.5",
"lint-staged": "~7.3.0",
"timekeeper": "2.2.0",
"nock": "10.0.6",
"watch": "~1.0.2"
},
"husky": {
Expand Down

0 comments on commit 7125578

Please sign in to comment.