From 23d41fd18dab73669f0789bfaecbf30da91b287f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20No=C3=ABl?= Date: Mon, 18 Jan 2021 09:54:41 +0100 Subject: [PATCH] change router matching "admin*" to "admin" & "admin/*" (#9128) --- packages/strapi/lib/middlewares/public/index.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/strapi/lib/middlewares/public/index.js b/packages/strapi/lib/middlewares/public/index.js index df3aca769e..215b4c0e30 100644 --- a/packages/strapi/lib/middlewares/public/index.js +++ b/packages/strapi/lib/middlewares/public/index.js @@ -81,16 +81,18 @@ module.exports = strapi => { if (!strapi.config.serveAdminPanel) return; const buildDir = path.resolve(strapi.dir, 'build'); + const serveAdmin = ctx => { + ctx.type = 'html'; + ctx.body = fs.createReadStream(path.join(buildDir + '/index.html')); + }; strapi.router.get( `${strapi.config.admin.path}/*`, serveStatic(buildDir, { maxage: maxAge, defer: false, index: 'index.html' }) ); - strapi.router.get(`${strapi.config.admin.path}*`, ctx => { - ctx.type = 'html'; - ctx.body = fs.createReadStream(path.join(buildDir + '/index.html')); - }); + strapi.router.get(`${strapi.config.admin.path}`, serveAdmin); + strapi.router.get(`${strapi.config.admin.path}/*`, serveAdmin); }, }; };