diff --git a/client/camera/package.json b/client/camera/package.json index 0f63ac1..a1ae79d 100644 --- a/client/camera/package.json +++ b/client/camera/package.json @@ -34,11 +34,9 @@ "branches": 80 }, "devDependencies": { - "@types/bluebird": "3.5.18", "@types/chai": "4.0.5", "@types/chai-as-promised": "7.1.0", "@types/cordova-plugin-camera": "0.0.3", - "@types/lodash": "4.14.85", "@types/mocha": "2.2.44", "@types/proxyquire": "1.3.28", "@types/sinon": "4.0.0", @@ -47,14 +45,14 @@ "del-cli": "1.1.0", "mocha": "4.0.1", "nyc": "11.3.0", - "proxyquire": "1.8.0", "sinon": "4.1.2", "source-map-support": "0.5.0", "ts-node": "3.3.0", "typescript": "2.6.1" }, "dependencies": { - "b64-to-blob": "1.2.19", + "@types/bluebird": "3.5.18", + "@types/lodash": "4.14.85", "bluebird": "3.5.1", "lodash": "4.17.4" } diff --git a/client/datasync-client/package.json b/client/datasync-client/package.json index fc28412..15d5731 100644 --- a/client/datasync-client/package.json +++ b/client/datasync-client/package.json @@ -35,15 +35,10 @@ "access": "public" }, "devDependencies": { - "@types/bluebird": "3.5.8", "@types/chai": "4.0.3", - "@types/lodash": "4.14.73", "@types/mocha": "2.2.41", "@types/proxyquire": "1.3.27", "@types/sinon": "4.0.0", - "assert": "1.4.1", - "browserify": "14.4.0", - "browserify-shim": "3.8.14", "chai": "4.1.1", "del-cli": "1.1.0", "mocha": "4.0.1", @@ -52,10 +47,11 @@ "sinon": "4.0.1", "source-map-support": "0.5.0", "ts-node": "3.3.0", - "tsify": "3.0.1", "typescript": "2.5.0" }, "dependencies": { + "@types/bluebird": "3.5.8", + "@types/lodash": "4.14.73", "@raincatcher/logger": "1.1.1", "bluebird": "3.5.0", "fh-sync-js": "1.0.3", diff --git a/client/filestore-client/package.json b/client/filestore-client/package.json index 166a1e3..f3bdbdf 100644 --- a/client/filestore-client/package.json +++ b/client/filestore-client/package.json @@ -34,18 +34,14 @@ "branches": 80 }, "devDependencies": { - "@types/bluebird": "3.5.18", "@types/chai": "4.0.5", - "@types/chai-as-promised": "7.1.0", "@types/cordova-plugin-file": "0.0.3", "@types/cordova-plugin-file-transfer": "0.0.3", - "@types/lodash": "4.14.85", "@types/mocha": "2.2.44", "@types/node": "8.0.53", "@types/proxyquire": "1.3.28", "@types/sinon": "4.0.0", "chai": "4.1.2", - "chai-as-promised": "7.1.1", "del-cli": "1.1.0", "mocha": "4.0.1", "nyc": "11.3.0", @@ -56,6 +52,8 @@ "typescript": "2.6.1" }, "dependencies": { + "@types/bluebird": "3.5.18", + "@types/lodash": "4.14.85", "b64-to-blob": "1.2.19", "bluebird": "3.5.1", "lodash": "4.17.4" diff --git a/client/filestore-client/test/FileManagerTest.ts b/client/filestore-client/test/FileManagerTest.ts index e283207..8e98b50 100644 --- a/client/filestore-client/test/FileManagerTest.ts +++ b/client/filestore-client/test/FileManagerTest.ts @@ -1,5 +1,4 @@ import * as chai from 'chai'; -import * as chaiAsPromise from 'chai-as-promised'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import { FileManager } from '../src/FileManager'; diff --git a/client/wfm/package.json b/client/wfm/package.json index 48a8c6b..00713f4 100644 --- a/client/wfm/package.json +++ b/client/wfm/package.json @@ -39,29 +39,23 @@ "access": "public" }, "devDependencies": { - "@types/bluebird": "3.5.18", "@types/chai": "4.0.5", "@types/chai-as-promised": "7.1.0", - "@types/lodash": "4.14.85", "@types/mocha": "2.2.44", "@types/node": "8.0.53", - "@types/shortid": "0.0.29", - "@types/valid-url": "1.0.2", "del-cli": "1.1.0", "mocha": "4.0.1", "nyc": "11.3.0", "source-map-support": "0.5.0", "ts-node": "3.3.0", - "typescript": "2.6.1" + "typescript": "2.6.1", + "chai": "4.1.2", + "chai-as-promised": "7.1.1" }, "dependencies": { - "ajv": "5.5.0", + "@types/bluebird": "3.5.18", + "@types/lodash": "4.14.85", "bluebird": "3.5.1", - "chai": "4.1.2", - "chai-as-promised": "7.1.1", - "eventemitter3": "2.0.3", - "lodash": "4.17.4", - "shortid": "2.2.8", - "valid-url": "1.0.9" + "lodash": "4.17.4" } } diff --git a/client/wfm/src/service/WfmService.ts b/client/wfm/src/service/WfmService.ts index 03cce97..be25bbf 100644 --- a/client/wfm/src/service/WfmService.ts +++ b/client/wfm/src/service/WfmService.ts @@ -4,7 +4,6 @@ import * as Promise from 'bluebird'; import * as _ from 'lodash'; -import * as shortid from 'shortid'; import { Step } from '../model/Step'; import { StepResult } from '../model/StepResult'; import { WorkFlow } from '../model/WorkFlow'; diff --git a/cloud/auth/package.json b/cloud/auth/package.json index 003e07c..85f81bb 100644 --- a/cloud/auth/package.json +++ b/cloud/auth/package.json @@ -36,18 +36,19 @@ "access": "public" }, "devDependencies": { - "@types/express": "4.0.39", "@types/mocha": "2.2.44", "del-cli": "1.1.0", "mocha": "4.0.1", "nyc": "11.3.0", - "sinon": "4.1.2", "source-map-support": "0.5.0", "ts-node": "3.3.0", "typescript": "2.6.1" }, "dependencies": { - "express": "4.16.2", + "@types/express": "4.0.39", + "express": "4.16.2" + }, + "peerDependencies": { "express-session": "1.15.6" } } diff --git a/cloud/auth/src/EndpointSecurity.ts b/cloud/auth/src/EndpointSecurity.ts index 3afe66b..604e784 100644 --- a/cloud/auth/src/EndpointSecurity.ts +++ b/cloud/auth/src/EndpointSecurity.ts @@ -3,7 +3,6 @@ */ import * as express from 'express'; -import { SessionOptions } from 'express-session'; /** * Security interface for Raincatcher authentication middleware diff --git a/cloud/auth/test/EndpointSecurity.ts b/cloud/auth/test/EndpointSecurity.ts index 1c46dc9..a07a797 100644 --- a/cloud/auth/test/EndpointSecurity.ts +++ b/cloud/auth/test/EndpointSecurity.ts @@ -1,11 +1,10 @@ 'use strict'; import * as assert from 'assert'; import * as express from 'express'; -import { SessionOptions } from 'express-session'; import { EndpointSecurity } from '../src/EndpointSecurity'; class Test implements EndpointSecurity { - public init(app: express.Express, sessionOpts: SessionOptions): void { + public init(app: express.Express): void { console.info('test'); } public protect(role?: string | undefined): express.Handler { diff --git a/cloud/datasync/package.json b/cloud/datasync/package.json index 53950f4..9021f50 100644 --- a/cloud/datasync/package.json +++ b/cloud/datasync/package.json @@ -36,12 +36,7 @@ }, "devDependencies": { "@raincatcher/logger": "1.1.1", - "@types/body-parser": "1.16.8", - "@types/cors": "2.8.3", - "@types/express": "4.0.39", "@types/mocha": "2.2.44", - "@types/mongodb": "2.2.16", - "@types/node": "8.0.53", "@types/proxyquire": "1.3.28", "del-cli": "1.1.0", "mocha": "4.0.1", @@ -52,9 +47,13 @@ "typescript": "2.6.1" }, "dependencies": { - "body-parser": "1.18.2", - "cors": "2.8.4", + "@types/express": "4.0.39", + "@types/mongodb": "2.2.16", + "@types/node": "8.0.53", "express": "4.16.2", "fh-sync": "1.0.13" + }, + "peerDependencies": { + "mongodb": "2.2.33" } } diff --git a/cloud/filestore/package.json b/cloud/filestore/package.json index 7ec969c..8a1c8ee 100644 --- a/cloud/filestore/package.json +++ b/cloud/filestore/package.json @@ -35,42 +35,35 @@ "branches": 50 }, "devDependencies": { - "@types/bluebird": "3.5.18", "@types/chai": "4.0.5", "@types/chai-as-promised": "7.1.0", "@types/del": "3.0.0", - "@types/gridfs-stream": "0.5.30", - "@types/mkdirp": "0.5.1", "@types/mocha": "2.2.44", - "@types/multer": "1.3.6", - "@types/node": "8.0.53", - "@types/proxyquire": "1.3.28", "chai": "4.1.2", "chai-as-promised": "7.1.1", "del": "3.0.0", "del-cli": "1.1.0", "mocha": "4.0.1", "nyc": "11.3.0", - "proxyquire": "1.8.0", "source-map-support": "0.5.0", "string-to-stream": "1.1.0", "ts-node": "3.3.0", "typescript": "2.6.1" }, "dependencies": { + "@types/bluebird": "3.5.18", + "@types/mongodb": "2.2.16", + "@types/multer": "1.3.6", + "@types/gridfs-stream": "0.5.30", + "@types/node": "8.0.53", + "@types/mkdirp": "0.5.1", "@raincatcher/logger": "1.1.1", - "base64-stream": "0.1.3", "bluebird": "3.5.1", "express": "4.16.2", "gridfs-stream": "1.1.1", - "lodash": "4.17.4", "mkdirp": "0.5.1", "mongodb": "2.2.33", "multer": "1.3.0", - "q": "1.5.1", - "s3": "4.4.0", - "shortid": "2.2.8", - "through2": "2.0.3", - "uuid-js": "0.7.5" + "s3": "4.4.0" } } diff --git a/cloud/filestore/src/FileRoutes.ts b/cloud/filestore/src/FileRoutes.ts index 41c1f12..5ed4fda 100644 --- a/cloud/filestore/src/FileRoutes.ts +++ b/cloud/filestore/src/FileRoutes.ts @@ -7,7 +7,6 @@ import { promisify } from 'bluebird'; import { Router } from 'express'; import { Request } from 'express'; import { rename } from 'fs'; -import * as uuid from 'uuid-js'; import { FileMetadata } from './file-api/FileMetadata'; import { FileStorage } from './file-api/FileStorage'; import * as fileService from './services/FileService'; diff --git a/cloud/filestore/src/services/FileService.ts b/cloud/filestore/src/services/FileService.ts index 753e86f..1c79fa9 100644 --- a/cloud/filestore/src/services/FileService.ts +++ b/cloud/filestore/src/services/FileService.ts @@ -3,7 +3,6 @@ */ import { getLogger } from '@raincatcher/logger'; -import * as base64 from 'base64-stream'; import * as Promise from 'bluebird'; import { Request } from 'express'; import * as fs from 'fs'; diff --git a/cloud/passportauth/package.json b/cloud/passportauth/package.json index fab8f76..c0faa08 100644 --- a/cloud/passportauth/package.json +++ b/cloud/passportauth/package.json @@ -37,16 +37,8 @@ }, "devDependencies": { "@raincatcher/logger": "1.1.1", - "@types/body-parser": "1.16.8", "@types/chai": "4.0.5", - "@types/cors": "2.8.3", - "@types/express": "4.0.39", - "@types/jsonwebtoken": "7.2.3", - "@types/lodash": "4.14.85", "@types/mocha": "2.2.44", - "@types/passport": "0.4.1", - "@types/passport-jwt": "3.0.0", - "@types/passport-local": "1.0.32", "@types/sinon": "4.0.0", "del-cli": "1.1.0", "mocha": "4.0.1", @@ -57,14 +49,16 @@ "typescript": "2.6.1" }, "dependencies": { + "@types/express": "4.0.39", + "@types/jsonwebtoken": "7.2.3", + "@types/passport": "0.4.1", + "@types/passport-jwt": "3.0.0", + "@types/passport-local": "1.0.32", "@raincatcher/express-auth": "1.1.1", - "body-parser": "1.18.2", "chai": "4.1.2", - "cors": "2.8.4", "express": "4.16.2", "express-session": "1.15.6", "jsonwebtoken": "8.1.0", - "lodash": "4.17.4", "passport": "0.4.0", "passport-jwt": "3.0.1", "passport-local": "1.0.0" diff --git a/cloud/wfm-demo-data/package.json b/cloud/wfm-demo-data/package.json index 61a6d08..2863136 100644 --- a/cloud/wfm-demo-data/package.json +++ b/cloud/wfm-demo-data/package.json @@ -36,19 +36,16 @@ "dependencies": { "@raincatcher/logger": "1.1.1", "@raincatcher/wfm": "1.1.1", - "@raincatcher/wfm-user": "1.1.1", - "bluebird": "3.5.1", - "mongodb": "2.2.33" - }, - "devDependencies": { "@types/bluebird": "3.5.18", - "@types/mocha": "2.2.44", "@types/mongodb": "2.2.16", + "bluebird": "3.5.1" + }, + "devDependencies": { "del-cli": "1.1.0", - "mocha": "4.0.1", - "nyc": "11.3.0", - "source-map-support": "0.5.0", "ts-node": "3.3.0", "typescript": "2.6.1" + }, + "peerDependencies": { + "mongodb": "2.2.33" } } diff --git a/cloud/wfm-rest-api/package.json b/cloud/wfm-rest-api/package.json index 954cc6d..a4816f9 100644 --- a/cloud/wfm-rest-api/package.json +++ b/cloud/wfm-rest-api/package.json @@ -37,34 +37,31 @@ "dependencies": { "@raincatcher/logger": "1.1.1", "@raincatcher/wfm": "1.1.1", + "@types/bluebird": "3.5.18", + "@types/express": "4.0.39", + "@types/lodash": "4.14.85", + "@types/mongodb": "2.2.16", "bluebird": "3.5.1", "express": "4.16.2", "lodash": "4.17.4", - "mongodb": "2.2.33", "shortid": "2.2.8" }, "devDependencies": { - "@types/bluebird": "3.5.18", "@types/chai": "4.0.5", "@types/chai-as-promised": "7.1.0", - "@types/express": "4.0.39", - "@types/lodash": "4.14.85", "@types/mocha": "2.2.44", - "@types/mongodb": "2.2.16", "@types/proxyquire": "1.3.28", "@types/shortid": "0.0.29", - "@types/sinon": "4.0.0", - "@types/sinon-express-mock": "1.3.2", "chai": "4.1.2", "chai-as-promised": "7.1.1", "del-cli": "1.1.0", "mocha": "4.0.1", "nyc": "11.3.0", - "proxyquire": "1.8.0", - "sinon": "4.1.2", - "sinon-express-mock": "1.3.1", "source-map-support": "0.5.0", "ts-node": "3.3.0", "typescript": "2.6.1" + }, + "peerDependencies": { + "mongodb": "2.2.33" } } diff --git a/cloud/wfm-rest-api/test/ApiControllerTest.ts b/cloud/wfm-rest-api/test/ApiControllerTest.ts index 2aa1144..a163d63 100644 --- a/cloud/wfm-rest-api/test/ApiControllerTest.ts +++ b/cloud/wfm-rest-api/test/ApiControllerTest.ts @@ -5,7 +5,6 @@ import * as chaiAsPromised from 'chai-as-promised'; import * as express from 'express'; import { Request } from 'express'; import * as proxyquire from 'proxyquire'; -import * as sinon from 'sinon'; import { MISSING_ID } from '../src/index'; chai.use(chaiAsPromised); diff --git a/cloud/wfm-rest-api/test/WfmRestApiTest.ts b/cloud/wfm-rest-api/test/WfmRestApiTest.ts index 3527315..aa60bb6 100644 --- a/cloud/wfm-rest-api/test/WfmRestApiTest.ts +++ b/cloud/wfm-rest-api/test/WfmRestApiTest.ts @@ -1,5 +1,4 @@ import * as assert from 'assert'; -import * as proxyquire from 'proxyquire'; import { WfmRestApi } from '../src/index'; describe('FeedHenry Wfm api Tests', function() { diff --git a/cloud/wfm-user/package.json b/cloud/wfm-user/package.json index 66010ca..bfe4d73 100644 --- a/cloud/wfm-user/package.json +++ b/cloud/wfm-user/package.json @@ -35,20 +35,14 @@ "access": "public" }, "devDependencies": { - "@types/bluebird": "3.5.18", "@types/chai": "4.0.5", "@types/chai-as-promised": "7.1.0", - "@types/express": "4.0.39", "@types/mocha": "2.2.44", - "@types/proxyquire": "1.3.28", - "@types/sinon": "4.0.0", "chai": "4.1.2", "chai-as-promised": "7.1.1", "del-cli": "1.1.0", "mocha": "4.0.1", "nyc": "11.3.0", - "proxyquire": "1.8.0", - "sinon": "4.1.2", "source-map-support": "0.5.0", "ts-node": "3.3.0", "typescript": "2.6.1" @@ -56,6 +50,8 @@ "dependencies": { "@raincatcher/logger": "1.1.1", "@raincatcher/wfm-rest-api": "1.1.1", + "@types/bluebird": "3.5.18", + "@types/express": "4.0.39", "bluebird": "3.5.1", "express": "4.16.2" } diff --git a/cloud/wfm-user/test/UserControllerTest.ts b/cloud/wfm-user/test/UserControllerTest.ts index 1947347..4cae5bc 100644 --- a/cloud/wfm-user/test/UserControllerTest.ts +++ b/cloud/wfm-user/test/UserControllerTest.ts @@ -4,8 +4,6 @@ import { expect } from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as express from 'express'; import { Request } from 'express'; -import * as proxyquire from 'proxyquire'; -import * as sinon from 'sinon'; chai.use(chaiAsPromised); diff --git a/common/logger/package.json b/common/logger/package.json index 6ad2baa..68cd6ae 100644 --- a/common/logger/package.json +++ b/common/logger/package.json @@ -36,21 +36,19 @@ "access": "public" }, "devDependencies": { - "@types/bunyan": "1.8.2", "@types/chai": "4.0.3", "@types/mocha": "2.2.41", - "@types/proxyquire": "1.3.27", "chai": "4.1.1", "del-cli": "1.1.0", "mocha": "4.0.1", "nyc": "11.1.0", - "proxyquire": "1.8.0", "source-map-support": "0.5.0", "ts-node": "3.3.0", - "tslint": "5.6.0", "typescript": "2.5.0" }, "dependencies": { + "@types/bunyan": "1.8.2", + "@types/loglevel": "1.5.3", "bunyan": "1.8.12", "loglevel": "1.4.1" } diff --git a/demo/server/package.json b/demo/server/package.json index 0ace034..73d714c 100644 --- a/demo/server/package.json +++ b/demo/server/package.json @@ -37,30 +37,27 @@ "branches": 70 }, "devDependencies": { + "@types/mocha": "2.2.44", + "del-cli": "1.1.0", + "mocha": "4.0.1", + "nodemon": "1.12.1", + "nyc": "11.3.0", + "source-map-support": "0.5.0", + "ts-node": "3.3.0", + "typescript": "2.6.1" + }, + "dependencies": { "@types/bluebird": "3.5.18", "@types/body-parser": "1.16.8", "@types/connect-redis": "0.0.7", "@types/cookie-parser": "1.4.1", "@types/cors": "2.8.3", "@types/express": "4.0.39", - "@types/express-handlebars": "0.0.30", - "@types/jsonwebtoken": "7.2.3", "@types/lodash": "4.14.85", - "@types/loglevel": "1.5.3", - "@types/mocha": "2.2.44", "@types/mongodb": "2.2.16", "@types/morgan": "1.7.35", "@types/node": "8.0.53", "@types/serve-favicon": "2.2.30", - "del-cli": "1.1.0", - "mocha": "4.0.1", - "nodemon": "1.12.1", - "nyc": "11.3.0", - "source-map-support": "0.5.0", - "ts-node": "3.3.0", - "typescript": "2.6.1" - }, - "dependencies": { "@raincatcher/auth-passport": "1.1.1", "@raincatcher/datasync-cloud": "1.1.1", "@raincatcher/express-auth": "1.1.1", @@ -75,12 +72,9 @@ "cookie-parser": "1.4.3", "cors": "2.8.4", "express": "4.16.2", - "express-handlebars": "3.0.0", "express-session": "1.15.6", - "jsonwebtoken": "8.1.0", "keycloak-connect": "3.4.0", "lodash": "4.17.4", - "loglevel": "1.4.1", "mongodb": "2.2.33", "morgan": "1.9.0", "serve-favicon": "2.4.5" diff --git a/demo/server/src/app.ts b/demo/server/src/app.ts index c964b86..41af7d1 100644 --- a/demo/server/src/app.ts +++ b/demo/server/src/app.ts @@ -9,7 +9,6 @@ import * as bodyParser from 'body-parser'; import * as cookieParser from 'cookie-parser'; import * as cors from 'cors'; import * as express from 'express'; -import * as expressHbs from 'express-handlebars'; import * as morgan from 'morgan'; import * as path from 'path'; import * as favicon from 'serve-favicon'; @@ -47,16 +46,13 @@ if (config.morganFormat) { app.use(bodyParser.json()); app.use(bodyParser.urlencoded({ extended: false })); app.use(cookieParser()); -app.use(express.static(path.join(__dirname, '../public'))); app.use(favicon(path.join(__dirname, '../public', 'favicon.ico'))); +app.use(express.static(path.join(__dirname, '../public'))); app.use(cors(getCorsConfig())); // Extra diagnostic endpoint for RHMAP app.get('/sys/info/ping', (req, res) => res.status(200).end('"OK"')); -app.engine('hbs', expressHbs()); -app.set('view engine', 'hbs'); - setupModules(app); app.use('/', index); diff --git a/demo/server/src/modules/passport-auth/index.ts b/demo/server/src/modules/passport-auth/index.ts index 5ae3b68..460a8cc 100644 --- a/demo/server/src/modules/passport-auth/index.ts +++ b/demo/server/src/modules/passport-auth/index.ts @@ -6,9 +6,7 @@ import { PassportAuth, UserRepository, UserService } from '@raincatcher/auth-pas import { getLogger } from '@raincatcher/logger'; import * as express from 'express'; import { SessionOptions } from 'express-session'; -import * as jwt from 'jsonwebtoken'; import * as _ from 'lodash'; -import * as logger from 'loglevel'; import appConfig from '../../util/Config'; // Implementation for fetching and mapping user data diff --git a/package.json b/package.json index 057e595..2ca15f4 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "publish:demo-server": "lerna clean --yes && lerna bootstrap && lerna run build --scope='@raincatcher/demo-server' && NODE_DEBUG=gh-pages node ./scripts/publish-app server --push true", "update:check": "lerna exec --concurrency 1 -- ncu", "update:run": "lerna exec -- ncu -a --removeRange -x 'fh-js-sdk'", + "depcheck": "lerna exec --parallel --stream -- depcheck --dev --specials='mocha,bin' --ignores='ts-node,@types/*' --ignore-dirs='example'", "quine": "lerna exec -- 'cat **/*'" }, "repository": { @@ -42,6 +43,7 @@ "devDependencies": { "coveralls": "3.0.0", "del-cli": "1.1.0", + "depcheck": "^0.6.8", "gh-pages": "1.1.0", "lcov-result-merger": "1.2.0", "lerna": "2.5.1",