Skip to content

Commit

Permalink
[master] update npm dependencies (hyperledger-archives#4399)
Browse files Browse the repository at this point in the history
Signed-off-by: Dave Kelsey <[email protected]>
  • Loading branch information
Dave Kelsey authored Sep 19, 2018
1 parent af3b7f7 commit ac75a61
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 18 deletions.
9 changes: 6 additions & 3 deletions packages/composer-common/lib/factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@

'use strict';

const debug = require('debug')('hyperledger-composer');
const Logger = require('./log/logger');
const LOG = Logger.getLog('Factory');
const Globalize = require('./globalize');

const ModelUtil = require('./modelutil');
Expand Down Expand Up @@ -79,6 +80,7 @@ class Factory {
* @throws {TypeNotFoundException} if the type is not registered with the ModelManager
*/
newResource(ns, type, id, options) {
const method = 'newResource';
options = options || {};

if(typeof(id) !== 'string') {
Expand Down Expand Up @@ -127,7 +129,7 @@ class Factory {
// if we have an identifier, we set it now
let idField = classDecl.getIdentifierFieldName();
newObj[idField] = id;
debug('Factory.newResource created %s', id );
LOG.debug(method, 'Factory.newResource created', id );
return newObj;
}

Expand All @@ -147,6 +149,7 @@ class Factory {
* @throws {TypeNotFoundException} if the type is not registered with the ModelManager
*/
newConcept(ns, type, options) {
const method = 'newConcept';
const qualifiedName = ModelUtil.getFullyQualifiedName(ns, type);
const classDecl = this.modelManager.getType(qualifiedName);

Expand All @@ -173,7 +176,7 @@ class Factory {
newObj.assignFieldDefaults();
this.initializeNewObject(newObj, classDecl, options);

debug('Factory.newResource created concept %s', classDecl.getFullyQualifiedName() );
LOG.debug(method, 'created concept', classDecl.getFullyQualifiedName() );
return newObj;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/composer-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"axios": "0.17.1",
"comment-parser": "0.4.0",
"config": "1.24.0",
"debug": "2.6.2",
"debug": "2.6.9",
"doctrine": "2.0.0",
"fs-extra": "1.0.0",
"js-yaml": "3.10.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/composer-connector-hlfv1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"fabric-client": "1.2.1",
"fs-extra": "1.0.0",
"jsrsasign": "8.0.3",
"lodash": "4.17.4",
"lodash": "4.17.11",
"semver": "5.3.0",
"temp": "0.8.3",
"thenify-all": "1.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/composer-connector-proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"watchify": "3.7.0"
},
"dependencies": {
"socket.io-client": "1.7.3",
"socket.io-client": "1.7.4",
"uuid": "3.0.1"
},
"nyc": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const FunctionDeclaration = require('composer-common').FunctionDeclaration;
const EventDeclaration = require('composer-common').EventDeclaration;
const Query = require('composer-common').Query;
const QueryFile = require('composer-common').QueryFile;
const debug = require('debug')('concerto:infovisitor');
const debug = require('debug')('composer:infovisitor');

/**
* Convert the contents of a {@link ModelManager} instance to a set of JSON
Expand Down
2 changes: 1 addition & 1 deletion packages/composer-documentation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"debug-stream": "3.0.1",
"doctrine": "2.0.0",
"js-yaml": "3.10.0",
"lodash": "4.17.4",
"lodash": "4.17.11",
"lodash.clonedeep": "4.5.0",
"map-stream": "0.1.0",
"markdown-it": "8.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/composer-playground-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"nyc": "11.1.0",
"proxyquire": "1.7.11",
"sinon": "2.3.8",
"socket.io-client": "1.7.3"
"socket.io-client": "1.7.4"
},
"dependencies": {
"async": "2.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/composer-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
"karma-webpack": "2.0.2",
"left-pad": "1.1.3",
"license-check-and-add": "2.3.1",
"lodash": "4.17.4",
"lodash": "4.17.11",
"lz-string": "1.4.4",
"marked": "0.3.9",
"mocha": "3.4.2",
Expand Down
10 changes: 5 additions & 5 deletions packages/composer-rest-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,27 +39,27 @@
"composer-common": "0.20.1",
"composer-wallet-filesystem": "0.20.1",
"composer-wallet-inmemory": "0.20.1",
"compression": "1.0.3",
"compression": "1.7.3",
"connect-ensure-login": "0.1.1",
"cookie-parser": "1.4.3",
"cors": "2.5.2",
"express-flash": "0.0.2",
"express-session": "1.15.1",
"formidable": "1.1.1",
"helmet": "1.3.0",
"inquirer": "3.0.1",
"lodash": "4.17.4",
"inquirer": "3.3.0",
"lodash": "4.17.11",
"loopback": "3.4.0",
"loopback-boot": "2.25.0",
"loopback-component-explorer": "5.2.0",
"loopback-component-passport": "3.2.0",
"loopback-connector-composer": "0.20.1",
"passport-local": "1.0.0",
"pug": "2.0.0",
"serve-favicon": "2.0.1",
"serve-favicon": "2.5.0",
"strong-error-handler": "1.0.1",
"touch": "1.0.0",
"ws": "3.0.0",
"ws": "3.3.3",
"yargs": "10.0.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/composer-runtime-embedded/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"dependencies": {
"composer-runtime": "0.20.1",
"composer-runtime-pouchdb": "0.20.1",
"debug": "2.6.2",
"debug": "2.6.9",
"istanbul-lib-instrument": "1.7.2",
"pouchdb-adapter-memory": "6.2.0",
"request": "2.81.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/composer-runtime-pouchdb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"dependencies": {
"composer-common": "0.20.1",
"composer-runtime": "0.20.1",
"debug": "2.6.2",
"debug": "2.6.9",
"istanbul-lib-instrument": "1.7.2",
"pouchdb-collate": "6.2.0",
"pouchdb-core": "6.2.0",
Expand Down
1 change: 0 additions & 1 deletion packages/composer-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
}
},
"dependencies": {
"debug": "2.6.2",
"fast-json-patch": "1.1.8",
"request": "2.81.0",
"request-promise-any": "1.0.5",
Expand Down

0 comments on commit ac75a61

Please sign in to comment.