fix: Update Grant usage and other dependencies (#2264)

feathersjs · Mar 22, 2021 · 7b0f8fa · 7b0f8fa
1 parent a3d75fa
commit 7b0f8fa
Show file tree

Hide file tree

Showing 19 changed files with 89 additions and 89 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/adapter-commons/package.json b/packages/adapter-commons/package.json
@@ -53,7 +53,7 @@
     "@feathersjs/feathers": "^5.0.0-pre.1"
   },
   "devDependencies": {
-    "@types/mocha": "^8.2.1",
+    "@types/mocha": "^8.2.2",
     "@types/mongodb": "^3.6.10",
     "@types/node": "^14.14.35",
     "mocha": "^8.3.2",

diff --git a/packages/adapter-memory/package.json b/packages/adapter-memory/package.json
@@ -54,7 +54,7 @@
   "devDependencies": {
     "@feathersjs/adapter-tests": "^5.0.0-pre.1",
     "@feathersjs/feathers": "^5.0.0-pre.1",
-    "@types/mocha": "^8.2.1",
+    "@types/mocha": "^8.2.2",
     "@types/node": "^14.14.35",
     "mocha": "^8.3.2",
     "shx": "^0.3.3",

diff --git a/packages/authentication-client/package.json b/packages/authentication-client/package.json
@@ -66,7 +66,7 @@
     "@feathersjs/socketio": "^5.0.0-pre.1",
     "@feathersjs/socketio-client": "^5.0.0-pre.1",
     "@types/debug": "^4.1.5",
-    "@types/mocha": "^8.2.1",
+    "@types/mocha": "^8.2.2",
     "@types/node": "^14.14.35",
     "axios": "^0.21.1",
     "mocha": "^8.3.2",

diff --git a/packages/authentication-local/package.json b/packages/authentication-local/package.json
@@ -64,7 +64,7 @@
     "@types/bcryptjs": "^2.4.2",
     "@types/debug": "^4.1.5",
     "@types/lodash": "^4.14.168",
-    "@types/mocha": "^8.2.1",
+    "@types/mocha": "^8.2.2",
     "@types/node": "^14.14.35",
     "mocha": "^8.3.2",
     "shx": "^0.3.3",

diff --git a/packages/authentication-oauth/package.json b/packages/authentication-oauth/package.json
@@ -58,7 +58,7 @@
     "@feathersjs/feathers": "^5.0.0-pre.1",
     "debug": "^4.3.1",
     "express-session": "^1.17.1",
-    "grant": "5.4.9",
+    "grant": "^5.4.12",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
@@ -67,7 +67,7 @@
     "@types/express": "^4.17.11",
     "@types/express-session": "^1.17.3",
     "@types/lodash": "^4.14.168",
-    "@types/mocha": "^8.2.1",
+    "@types/mocha": "^8.2.2",
     "@types/node": "^14.14.35",
     "axios": "^0.21.1",
     "mocha": "^8.3.2",

diff --git a/packages/authentication-oauth/src/express.ts b/packages/authentication-oauth/src/express.ts
@@ -1,17 +1,16 @@
-// @ts-ignore
-import { express as grantExpress } from 'grant';
+import grant from 'grant';
 import Debug from 'debug';
 import session from 'express-session';
 import { Application } from '@feathersjs/feathers';
 import { AuthenticationResult } from '@feathersjs/authentication';
 import {
   Application as ExpressApplication,
-  original as express
+  original as originalExpress
 } from '@feathersjs/express';
 import { OauthSetupSettings } from './utils';
 import { OAuthStrategy } from './strategy';
 
-const grant = grantExpress();
+const grantInstance = grant.express();
 const debug = Debug('@feathersjs/authentication-oauth/express');
 
 declare module 'express-session' {
@@ -40,8 +39,8 @@ export default (options: OauthSetupSettings) => {
       saveUninitialized: true,
       resave: true
     });
-    const grantApp = grant(config);
-    const authApp = express();
+    const grantApp = grantInstance(config);
+    const authApp = originalExpress();
 
     authApp.use(expressSession);
 

diff --git a/packages/authentication/package.json b/packages/authentication/package.json
@@ -66,7 +66,7 @@
     "@feathersjs/adapter-memory": "^5.0.0-pre.1",
     "@types/debug": "^4.1.5",
     "@types/lodash": "^4.14.168",
-    "@types/mocha": "^8.2.1",
+    "@types/mocha": "^8.2.2",
     "@types/node": "^14.14.35",
     "@types/uuid": "^8.3.0",
     "mocha": "^8.3.2",

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -71,7 +71,7 @@
     "superagent": "^6.1.0",
     "ts-loader": "^8.0.18",
     "typescript": "^4.2.3",
-    "webpack": "^5.27.0",
+    "webpack": "^5.27.2",
     "webpack-cli": "^4.5.0",
     "webpack-merge": "^5.7.3"
   },