From 34a84d064807fb70130923e21846b5389d07a953 Mon Sep 17 00:00:00 2001 From: Thiago Matar Date: Fri, 14 Feb 2025 15:32:56 -0300 Subject: [PATCH 1/2] Fix: Express plugin compatibility for Express 4.x and 5.x --- src/plugins/ExpressPlugin.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/ExpressPlugin.ts b/src/plugins/ExpressPlugin.ts index d8e7651..8842357 100644 --- a/src/plugins/ExpressPlugin.ts +++ b/src/plugins/ExpressPlugin.ts @@ -38,7 +38,8 @@ class ExpressPlugin implements SwPlugin { } private interceptServerRequest(installer: PluginInstaller) { - const router = installer.require?.('express/lib/router') ?? require('express/lib/router'); + var express = require('express'); + var router = express.Router ? express.Router() : require('express/lib/router'); const _handle = router.handle; router.handle = function (req: Request, res: ServerResponse, next: any) { From e93563398046dd5df53bd0ad8a4a459117879e46 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Wed, 19 Feb 2025 13:34:38 +0000 Subject: [PATCH 2/2] fix --- src/plugins/ExpressPlugin.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/ExpressPlugin.ts b/src/plugins/ExpressPlugin.ts index 8842357..ce29524 100644 --- a/src/plugins/ExpressPlugin.ts +++ b/src/plugins/ExpressPlugin.ts @@ -38,8 +38,8 @@ class ExpressPlugin implements SwPlugin { } private interceptServerRequest(installer: PluginInstaller) { - var express = require('express'); - var router = express.Router ? express.Router() : require('express/lib/router'); + const express = installer.require?.('express') ?? require('express'); + const router = express.Router ?? installer.require?.('express/lib/router') ?? require('express/lib/router'); const _handle = router.handle; router.handle = function (req: Request, res: ServerResponse, next: any) {