@feathersjs/express
Advanced tools
Comparing version 5.0.0-pre.28 to 5.0.0-pre.29
@@ -6,2 +6,14 @@ # Change Log | ||
# [5.0.0-pre.29](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.28...v5.0.0-pre.29) (2022-09-16) | ||
### Features | ||
* Add CORS support to oAuth, Express, Koa and generated application ([#2744](https://github.com/feathersjs/feathers/issues/2744)) ([fd218f2](https://github.com/feathersjs/feathers/commit/fd218f289f8ca4c101e9938e8683e2efef6e8131)) | ||
* **authentication-oauth:** Koa and transport independent oAuth authentication ([#2737](https://github.com/feathersjs/feathers/issues/2737)) ([9231525](https://github.com/feathersjs/feathers/commit/9231525a24bb790ba9c5d940f2867a9c727691c9)) | ||
# [5.0.0-pre.28](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.27...v5.0.0-pre.28) (2022-08-03) | ||
@@ -8,0 +20,0 @@ |
@@ -17,3 +17,3 @@ /// <reference types="node" /> | ||
use: ExpressUseHandler<this, Services>; | ||
server: http.Server; | ||
server?: http.Server; | ||
} | ||
@@ -20,0 +20,0 @@ export declare type Application<Services = any, Settings = any> = Omit<Express, 'listen' | 'use' | 'get' | 'set'> & FeathersApplication<Services, Settings> & ExpressOverrides<Services>; |
import { Express } from 'express'; | ||
import { Application as FeathersApplication } from '@feathersjs/feathers'; | ||
import cors from 'cors'; | ||
import { rest, RestOptions, formatter } from './rest'; | ||
@@ -8,3 +9,3 @@ import { errorHandler, notFound, ErrorHandlerOptions } from './handlers'; | ||
import { default as original, static as serveStatic, json, raw, text, urlencoded, query } from 'express'; | ||
export { original, serveStatic, serveStatic as static, json, raw, text, urlencoded, query, rest, RestOptions, formatter, errorHandler, notFound, Application, ErrorHandlerOptions, ExpressOverrides, AuthenticationSettings, parseAuthentication, authenticate }; | ||
export { original, serveStatic, serveStatic as static, json, raw, text, urlencoded, query, rest, RestOptions, formatter, errorHandler, notFound, Application, ErrorHandlerOptions, ExpressOverrides, AuthenticationSettings, parseAuthentication, authenticate, cors }; | ||
export default function feathersExpress<S = any, C = any>(feathersApp?: FeathersApplication<S, C>, expressApp?: Express): Application<S, C>; |
@@ -29,3 +29,3 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.authenticate = exports.parseAuthentication = exports.notFound = exports.errorHandler = exports.formatter = exports.rest = exports.query = exports.urlencoded = exports.text = exports.raw = exports.json = exports.static = exports.serveStatic = exports.original = void 0; | ||
exports.cors = exports.authenticate = exports.parseAuthentication = exports.notFound = exports.errorHandler = exports.formatter = exports.rest = exports.query = exports.urlencoded = exports.text = exports.raw = exports.json = exports.static = exports.serveStatic = exports.original = void 0; | ||
const express_1 = __importDefault(require("express")); | ||
@@ -35,2 +35,4 @@ const feathers_1 = require("@feathersjs/feathers"); | ||
const commons_1 = require("@feathersjs/commons"); | ||
const cors_1 = __importDefault(require("cors")); | ||
exports.cors = cors_1.default; | ||
const rest_1 = require("./rest"); | ||
@@ -76,3 +78,3 @@ Object.defineProperty(exports, "rest", { enumerable: true, get: function () { return rest_1.rest; } }); | ||
} | ||
else if (arg.methods || arg.events) { | ||
else if (arg.methods || arg.events || arg.express || arg.koa) { | ||
options = arg; | ||
@@ -97,4 +99,4 @@ } | ||
feathersUse.call(this, location, service, { | ||
...options, | ||
express: middleware | ||
express: middleware, | ||
...options | ||
}); | ||
@@ -111,5 +113,10 @@ return this; | ||
async teardown(server) { | ||
return feathersTeardown | ||
.call(this, server) | ||
.then(() => new Promise((resolve, reject) => this.server.close((e) => (e ? reject(e) : resolve(this))))); | ||
return feathersTeardown.call(this, server).then(() => new Promise((resolve, reject) => { | ||
if (this.server) { | ||
this.server.close((e) => (e ? reject(e) : resolve(this))); | ||
} | ||
else { | ||
resolve(this); | ||
} | ||
})); | ||
} | ||
@@ -116,0 +123,0 @@ }); |
{ | ||
"name": "@feathersjs/express", | ||
"description": "Feathers Express framework bindings and REST provider", | ||
"version": "5.0.0-pre.28", | ||
"version": "5.0.0-pre.29", | ||
"homepage": "https://feathersjs.com", | ||
@@ -55,17 +55,18 @@ "main": "lib/", | ||
"dependencies": { | ||
"@feathersjs/authentication": "^5.0.0-pre.28", | ||
"@feathersjs/commons": "^5.0.0-pre.28", | ||
"@feathersjs/errors": "^5.0.0-pre.28", | ||
"@feathersjs/feathers": "^5.0.0-pre.28", | ||
"@feathersjs/transport-commons": "^5.0.0-pre.28", | ||
"@feathersjs/authentication": "^5.0.0-pre.29", | ||
"@feathersjs/commons": "^5.0.0-pre.29", | ||
"@feathersjs/errors": "^5.0.0-pre.29", | ||
"@feathersjs/feathers": "^5.0.0-pre.29", | ||
"@feathersjs/transport-commons": "^5.0.0-pre.29", | ||
"@types/express": "^4.17.13", | ||
"@types/express-serve-static-core": "^4.17.30", | ||
"cors": "^2.8.5", | ||
"express": "^4.18.1" | ||
}, | ||
"devDependencies": { | ||
"@feathersjs/authentication-local": "^5.0.0-pre.28", | ||
"@feathersjs/tests": "^5.0.0-pre.28", | ||
"@types/lodash": "^4.14.182", | ||
"@feathersjs/authentication-local": "^5.0.0-pre.29", | ||
"@feathersjs/tests": "^5.0.0-pre.29", | ||
"@types/lodash": "^4.14.185", | ||
"@types/mocha": "^9.1.1", | ||
"@types/node": "^18.6.3", | ||
"@types/node": "^18.7.17", | ||
"axios": "^0.27.2", | ||
@@ -76,5 +77,5 @@ "lodash": "^4.17.21", | ||
"ts-node": "^10.9.1", | ||
"typescript": "^4.7.4" | ||
"typescript": "^4.8.3" | ||
}, | ||
"gitHead": "bf8e54fddc14d688ba8f505e72c9630a71656ff1" | ||
"gitHead": "4314dc89a41a8bbaabf00b47697bf7887861d17d" | ||
} |
@@ -33,3 +33,3 @@ import http from 'http' | ||
use: ExpressUseHandler<this, Services> | ||
server: http.Server | ||
server?: http.Server | ||
} | ||
@@ -36,0 +36,0 @@ |
@@ -5,2 +5,3 @@ import express, { Express } from 'express' | ||
import { createDebug } from '@feathersjs/commons' | ||
import cors from 'cors' | ||
@@ -32,3 +33,4 @@ import { rest, RestOptions, formatter } from './rest' | ||
parseAuthentication, | ||
authenticate | ||
authenticate, | ||
cors | ||
} | ||
@@ -65,3 +67,3 @@ | ||
service = arg | ||
} else if (arg.methods || arg.events) { | ||
} else if (arg.methods || arg.events || arg.express || arg.koa) { | ||
options = arg | ||
@@ -91,4 +93,4 @@ } else { | ||
feathersUse.call(this, location, service, { | ||
...options, | ||
express: middleware | ||
express: middleware, | ||
...options | ||
}) | ||
@@ -110,7 +112,12 @@ | ||
async teardown(server?: any) { | ||
return feathersTeardown | ||
.call(this, server) | ||
.then( | ||
() => new Promise((resolve, reject) => this.server.close((e) => (e ? reject(e) : resolve(this)))) | ||
) | ||
return feathersTeardown.call(this, server).then( | ||
() => | ||
new Promise((resolve, reject) => { | ||
if (this.server) { | ||
this.server.close((e) => (e ? reject(e) : resolve(this))) | ||
} else { | ||
resolve(this) | ||
} | ||
}) | ||
) | ||
} | ||
@@ -117,0 +124,0 @@ } as Application<S, C>) |
Sorry, the diff of this file is not supported yet
120260
918
9
+ Addedcors@^2.8.5
+ Addedcors@2.8.5(transitive)
+ Addedobject-assign@4.1.1(transitive)