Skip to content
This repository has been archived by the owner on Jan 8, 2024. It is now read-only.

Fix npm audit issues #43

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ commands:
name: Setup build environment
command: |
cd platform-launcher/util && \
bash setup-ubuntu18.04.sh
bash setup-ubuntu20.04.sh
checkout-e2e:
description: "Checkout E2E test"
parameters:
Expand Down
23 changes: 1 addition & 22 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,26 +119,6 @@ module.exports = function(grunt) {
}
},
file: 'package.json'
},
mocha_istanbul: {
local: {
src: 'test/', // the folder, not the files
options: {
ui: 'bdd',
coverage: true,
recursive: true,
reporter: 'list',
timeout: 20000,
check: {
lines: 60,
statements: 60,
function: 60
},
root: '.', // define where the cover task should consider the root of libraries that are covered by tests
coverageFolder: 'dist/coverage',
reportFormats: ['lcov']
}
}
}
});

Expand All @@ -147,7 +127,6 @@ module.exports = function(grunt) {
done();
});

grunt.loadNpmTasks('grunt-mocha-istanbul');
// Load the plugin that provides the "uglify" task.
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-eslint');
Expand All @@ -156,7 +135,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-shell');

// Default task(s).
grunt.registerTask('default', ['eslint:local', 'jshint:local', 'mocha_istanbul:local']);
grunt.registerTask('default', ['eslint:local', 'jshint:local']);
grunt.registerTask('validate', ['eslint:local', 'jshint:local']);
grunt.registerTask('teamcity_codevalidation', ['jshint:teamcity']);

Expand Down
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
{
"name": "iotkit-websocket-server",
"version": "0.13.0",
"date": "2015-10-09T16:41:13.796Z",
"date": "2021-10-05T10:32:39.504Z",
"description": "Websocket server for iotkit agents",
"main": "server.js",
"dependencies": {
"request": "^2.34.0",
"async": "^2.6.1",
"log4js": "^3.0.5",
"hooker": "^0.2.3",
"websocket": "^1.0.18",
"winston": "^3.1.0",
"pg-hstore": "2.3.2",
"pg": "7.5.0",
"kafka-node": "^3.0.1",
"kafka-node": "^5.0.0",
"keycloak-connect": "^12.0.2",
"log4js": "^3.0.5",
"pg": "7.5.0",
"pg-hstore": "2.3.2",
"redis": "^3.1.2",
"request": "^2.34.0",
"uuid": "3.3.2",
"redis": "^2.8.0"
"websocket": "^1.0.18",
"winston": "^3.1.0"
},
"author": "Intel, CPG",
"devDependencies": {
"asserts": "^4.0.0",
"chai": "^4.2.0",
"grunt": "^1.0.3",
"mocha": "^5.2.0",
"istanbul": "^0.4.5",
"rewire": "^4.0.1",
"grunt-bumpup": "^0.6.3",
"grunt-cli": "^1.3.1",
"grunt-contrib-compress": "^1.4.3",
"grunt-contrib-jshint": "^2.0.0",
"grunt-eslint": "^21.0.0",
"mocha-teamcity-reporter": "2.5.1",
"jshint-teamcity": "^1.0.4",
"asserts": "^4.0.0",
"chai": "^4.2.0",
"grunt-contrib-compress": "^1.4.3",
"grunt-mocha-istanbul": "^5.0.2",
"grunt-istanbul": "^0.8.0",
"sinon": "^6.3.5",
"grunt-bumpup": "^0.6.3",
"grunt-shell": "^2.1.0"
"grunt-mocha-istanbul": "^5.0.2",
"grunt-shell": "^2.1.0",
"istanbul": "^0.4.5",
"jshint-teamcity": "^1.0.4",
"mocha": "^9.1.2",
"mocha-teamcity-reporter": "2.5.1",
"rewire": "^4.0.1",
"sinon": "^6.3.5"
}
}