@strapi/strapi 5.8.0 → 5.9.0

package/dist/node/vite/watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../src/node/vite/watch.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,UAAU,WAAW;IACnB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAqBD,QAAA,MAAM,KAAK,QAAe,YAAY,KAAG,QAAQ,WAAW,CA4E3D,CAAC;AAEF,OAAO,EAAE,KAAK,EAAE,CAAC;AACjB,YAAY,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../src/node/vite/watch.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,UAAU,WAAW;IACnB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAqBD,QAAA,MAAM,KAAK,QAAe,YAAY,KAAG,QAAQ,WAAW,CAuF3D,CAAC;AAEF,OAAO,EAAE,KAAK,EAAE,CAAC;AACjB,YAAY,EAAE,WAAW,EAAE,CAAC"}

package/dist/node/vite/watch.js

@@ -62,10 +62,18 @@ const watch = async (ctx) => {
   const vite = await createServer(finalConfig);
   const viteMiddlewares = (koaCtx, next) => {
     return new Promise((resolve, reject) => {
+      const prefix = ctx.basePath.replace(ctx.adminPath, "").replace(/\/+$/, "");
+      const originalPath = koaCtx.path;
+      if (!koaCtx.path.startsWith(prefix)) {
+        koaCtx.path = `${prefix}${koaCtx.path}`;
+      }
       vite.middlewares(koaCtx.req, koaCtx.res, (err) => {
         if (err) {
           reject(err);
         } else {
+          if (!koaCtx.res.headersSent) {
+            koaCtx.path = originalPath;
+          }
           resolve(next());
         }
       });

package/dist/node/vite/watch.js.map

@@ -1 +1 @@
-{"version":3,"file":"watch.js","sources":["../../../src/node/vite/watch.ts"],"sourcesContent":["import path from 'node:path';\nimport http from 'node:http';\nimport fs from 'node:fs/promises';\nimport type { Core } from '@strapi/types';\n\nimport { mergeConfigWithUserConfig, resolveDevelopmentConfig } from './config';\n\nimport type { BuildContext } from '../create-build-context';\n\ninterface ViteWatcher {\n  close(): Promise<void>;\n}\n\nconst HMR_DEFAULT_PORT = 5173;\n\nconst createHMRServer = () => {\n  return http.createServer(\n    // http server request handler. keeps the same with\n    // https://github.com/websockets/ws/blob/45e17acea791d865df6b255a55182e9c42e5877a/lib/websocket-server.js#L88-L96\n    (_, res) => {\n      const body = http.STATUS_CODES[426]; // Upgrade Required\n\n      res.writeHead(426, {\n        'Content-Length': body?.length ?? 0,\n        'Content-Type': 'text/plain',\n      });\n\n      res.end(body);\n    }\n  );\n};\n\nconst watch = async (ctx: BuildContext): Promise<ViteWatcher> => {\n  const hmrServer = createHMRServer();\n\n  ctx.options.hmrServer = hmrServer;\n  ctx.options.hmrClientPort = HMR_DEFAULT_PORT;\n\n  const config = await resolveDevelopmentConfig(ctx);\n  const finalConfig = await mergeConfigWithUserConfig(config, ctx);\n\n  const hmrConfig = config.server?.hmr;\n\n  // If the server used for Vite hmr is the one we've created (<> no user override)\n  if (typeof hmrConfig === 'object' && hmrConfig.server === hmrServer) {\n    // Only restart the hmr server when Strapi's server is listening\n    strapi.server.httpServer.on('listening', async () => {\n      hmrServer.listen(hmrConfig.clientPort ?? hmrConfig.port ?? HMR_DEFAULT_PORT);\n    });\n  }\n\n  ctx.logger.debug('Vite config', finalConfig);\n\n  const { createServer } = await import('vite');\n\n  const vite = await createServer(finalConfig);\n\n  const viteMiddlewares: Core.MiddlewareHandler = (koaCtx, next) => {\n    return new Promise((resolve, reject) => {\n      vite.middlewares(koaCtx.req, koaCtx.res, (err: unknown) => {\n        if (err) {\n          reject(err);\n        } else {\n          resolve(next());\n        }\n      });\n    });\n  };\n\n  const serveAdmin: Core.MiddlewareHandler = async (koaCtx, next) => {\n    await next();\n\n    if (koaCtx.method !== 'HEAD' && koaCtx.method !== 'GET') {\n      return;\n    }\n\n    if (koaCtx.body != null || koaCtx.status !== 404) {\n      return;\n    }\n\n    const url = koaCtx.originalUrl;\n\n    let template = await fs.readFile(path.relative(ctx.cwd, '.strapi/client/index.html'), 'utf-8');\n    template = await vite.transformIndexHtml(url, template);\n\n    koaCtx.type = 'html';\n    koaCtx.body = template;\n  };\n\n  const adminRoute = `${ctx.adminPath}/:path*`;\n\n  ctx.strapi.server.router.get(adminRoute, serveAdmin);\n  ctx.strapi.server.router.use(adminRoute, viteMiddlewares);\n\n  return {\n    async close() {\n      await vite.close();\n\n      if (hmrServer.listening) {\n        // Manually close the hmr server\n        // /!\\ This operation MUST be done after calling .close() on the vite\n        //      instance to avoid flaky behaviors with attached clients\n        await new Promise<void>((resolve, reject) => {\n          hmrServer.close((err) => (err ? reject(err) : resolve()));\n        });\n      }\n    },\n  };\n};\n\nexport { watch };\nexport type { ViteWatcher };\n"],"names":["http","config","resolveDevelopmentConfig","mergeConfigWithUserConfig","fs","path"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaA,MAAM,mBAAmB;AAEzB,MAAM,kBAAkB,MAAM;AAC5B,SAAOA,cAAK,QAAA;AAAA;AAAA;AAAA,IAGV,CAAC,GAAG,QAAQ;AACJ,YAAA,OAAOA,cAAAA,QAAK,aAAa,GAAG;AAElC,UAAI,UAAU,KAAK;AAAA,QACjB,kBAAkB,MAAM,UAAU;AAAA,QAClC,gBAAgB;AAAA,MAAA,CACjB;AAED,UAAI,IAAI,IAAI;AAAA,IAAA;AAAA,EAEhB;AACF;AAEM,MAAA,QAAQ,OAAO,QAA4C;AAC/D,QAAM,YAAY,gBAAgB;AAElC,MAAI,QAAQ,YAAY;AACxB,MAAI,QAAQ,gBAAgB;AAEtB,QAAAC,WAAS,MAAMC,OAAA,yBAAyB,GAAG;AACjD,QAAM,cAAc,MAAMC,iCAA0BF,UAAQ,GAAG;AAEzD,QAAA,YAAYA,SAAO,QAAQ;AAGjC,MAAI,OAAO,cAAc,YAAY,UAAU,WAAW,WAAW;AAEnE,WAAO,OAAO,WAAW,GAAG,aAAa,YAAY;AACnD,gBAAU,OAAO,UAAU,cAAc,UAAU,QAAQ,gBAAgB;AAAA,IAAA,CAC5E;AAAA,EAAA;AAGC,MAAA,OAAO,MAAM,eAAe,WAAW;AAE3C,QAAM,EAAE,aAAA,IAAiB,MAAM,OAAO,MAAM;AAEtC,QAAA,OAAO,MAAM,aAAa,WAAW;AAErC,QAAA,kBAA0C,CAAC,QAAQ,SAAS;AAChE,WAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,WAAK,YAAY,OAAO,KAAK,OAAO,KAAK,CAAC,QAAiB;AACzD,YAAI,KAAK;AACP,iBAAO,GAAG;AAAA,QAAA,OACL;AACL,kBAAQ,MAAM;AAAA,QAAA;AAAA,MAChB,CACD;AAAA,IAAA,CACF;AAAA,EACH;AAEM,QAAA,aAAqC,OAAO,QAAQ,SAAS;AACjE,UAAM,KAAK;AAEX,QAAI,OAAO,WAAW,UAAU,OAAO,WAAW,OAAO;AACvD;AAAA,IAAA;AAGF,QAAI,OAAO,QAAQ,QAAQ,OAAO,WAAW,KAAK;AAChD;AAAA,IAAA;AAGF,UAAM,MAAM,OAAO;AAEf,QAAA,WAAW,MAAMG,oBAAG,SAASC,cAAA,QAAK,SAAS,IAAI,KAAK,2BAA2B,GAAG,OAAO;AAC7F,eAAW,MAAM,KAAK,mBAAmB,KAAK,QAAQ;AAEtD,WAAO,OAAO;AACd,WAAO,OAAO;AAAA,EAChB;AAEM,QAAA,aAAa,GAAG,IAAI,SAAS;AAEnC,MAAI,OAAO,OAAO,OAAO,IAAI,YAAY,UAAU;AACnD,MAAI,OAAO,OAAO,OAAO,IAAI,YAAY,eAAe;AAEjD,SAAA;AAAA,IACL,MAAM,QAAQ;AACZ,YAAM,KAAK,MAAM;AAEjB,UAAI,UAAU,WAAW;AAIvB,cAAM,IAAI,QAAc,CAAC,SAAS,WAAW;AACjC,oBAAA,MAAM,CAAC,QAAS,MAAM,OAAO,GAAG,IAAI,SAAU;AAAA,QAAA,CACzD;AAAA,MAAA;AAAA,IACH;AAAA,EAEJ;AACF;;"}
+{"version":3,"file":"watch.js","sources":["../../../src/node/vite/watch.ts"],"sourcesContent":["import path from 'node:path';\nimport http from 'node:http';\nimport fs from 'node:fs/promises';\nimport type { Core } from '@strapi/types';\n\nimport { mergeConfigWithUserConfig, resolveDevelopmentConfig } from './config';\n\nimport type { BuildContext } from '../create-build-context';\n\ninterface ViteWatcher {\n  close(): Promise<void>;\n}\n\nconst HMR_DEFAULT_PORT = 5173;\n\nconst createHMRServer = () => {\n  return http.createServer(\n    // http server request handler. keeps the same with\n    // https://github.com/websockets/ws/blob/45e17acea791d865df6b255a55182e9c42e5877a/lib/websocket-server.js#L88-L96\n    (_, res) => {\n      const body = http.STATUS_CODES[426]; // Upgrade Required\n\n      res.writeHead(426, {\n        'Content-Length': body?.length ?? 0,\n        'Content-Type': 'text/plain',\n      });\n\n      res.end(body);\n    }\n  );\n};\n\nconst watch = async (ctx: BuildContext): Promise<ViteWatcher> => {\n  const hmrServer = createHMRServer();\n\n  ctx.options.hmrServer = hmrServer;\n  ctx.options.hmrClientPort = HMR_DEFAULT_PORT;\n\n  const config = await resolveDevelopmentConfig(ctx);\n  const finalConfig = await mergeConfigWithUserConfig(config, ctx);\n\n  const hmrConfig = config.server?.hmr;\n\n  // If the server used for Vite hmr is the one we've created (<> no user override)\n  if (typeof hmrConfig === 'object' && hmrConfig.server === hmrServer) {\n    // Only restart the hmr server when Strapi's server is listening\n    strapi.server.httpServer.on('listening', async () => {\n      hmrServer.listen(hmrConfig.clientPort ?? hmrConfig.port ?? HMR_DEFAULT_PORT);\n    });\n  }\n\n  ctx.logger.debug('Vite config', finalConfig);\n\n  const { createServer } = await import('vite');\n\n  const vite = await createServer(finalConfig);\n\n  const viteMiddlewares: Core.MiddlewareHandler = (koaCtx, next) => {\n    return new Promise((resolve, reject) => {\n      const prefix = ctx.basePath.replace(ctx.adminPath, '').replace(/\\/+$/, '');\n\n      const originalPath = koaCtx.path;\n      if (!koaCtx.path.startsWith(prefix)) {\n        koaCtx.path = `${prefix}${koaCtx.path}`;\n      }\n\n      vite.middlewares(koaCtx.req, koaCtx.res, (err: unknown) => {\n        if (err) {\n          reject(err);\n        } else {\n          if (!koaCtx.res.headersSent) {\n            koaCtx.path = originalPath;\n          }\n\n          resolve(next());\n        }\n      });\n    });\n  };\n\n  const serveAdmin: Core.MiddlewareHandler = async (koaCtx, next) => {\n    await next();\n\n    if (koaCtx.method !== 'HEAD' && koaCtx.method !== 'GET') {\n      return;\n    }\n\n    if (koaCtx.body != null || koaCtx.status !== 404) {\n      return;\n    }\n\n    const url = koaCtx.originalUrl;\n\n    let template = await fs.readFile(path.relative(ctx.cwd, '.strapi/client/index.html'), 'utf-8');\n    template = await vite.transformIndexHtml(url, template);\n\n    koaCtx.type = 'html';\n    koaCtx.body = template;\n  };\n\n  const adminRoute = `${ctx.adminPath}/:path*`;\n\n  ctx.strapi.server.router.get(adminRoute, serveAdmin);\n  ctx.strapi.server.router.use(adminRoute, viteMiddlewares);\n\n  return {\n    async close() {\n      await vite.close();\n\n      if (hmrServer.listening) {\n        // Manually close the hmr server\n        // /!\\ This operation MUST be done after calling .close() on the vite\n        //      instance to avoid flaky behaviors with attached clients\n        await new Promise<void>((resolve, reject) => {\n          hmrServer.close((err) => (err ? reject(err) : resolve()));\n        });\n      }\n    },\n  };\n};\n\nexport { watch };\nexport type { ViteWatcher };\n"],"names":["http","config","resolveDevelopmentConfig","mergeConfigWithUserConfig","fs","path"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaA,MAAM,mBAAmB;AAEzB,MAAM,kBAAkB,MAAM;AAC5B,SAAOA,cAAK,QAAA;AAAA;AAAA;AAAA,IAGV,CAAC,GAAG,QAAQ;AACJ,YAAA,OAAOA,cAAAA,QAAK,aAAa,GAAG;AAElC,UAAI,UAAU,KAAK;AAAA,QACjB,kBAAkB,MAAM,UAAU;AAAA,QAClC,gBAAgB;AAAA,MAAA,CACjB;AAED,UAAI,IAAI,IAAI;AAAA,IAAA;AAAA,EAEhB;AACF;AAEM,MAAA,QAAQ,OAAO,QAA4C;AAC/D,QAAM,YAAY,gBAAgB;AAElC,MAAI,QAAQ,YAAY;AACxB,MAAI,QAAQ,gBAAgB;AAEtB,QAAAC,WAAS,MAAMC,OAAA,yBAAyB,GAAG;AACjD,QAAM,cAAc,MAAMC,iCAA0BF,UAAQ,GAAG;AAEzD,QAAA,YAAYA,SAAO,QAAQ;AAGjC,MAAI,OAAO,cAAc,YAAY,UAAU,WAAW,WAAW;AAEnE,WAAO,OAAO,WAAW,GAAG,aAAa,YAAY;AACnD,gBAAU,OAAO,UAAU,cAAc,UAAU,QAAQ,gBAAgB;AAAA,IAAA,CAC5E;AAAA,EAAA;AAGC,MAAA,OAAO,MAAM,eAAe,WAAW;AAE3C,QAAM,EAAE,aAAA,IAAiB,MAAM,OAAO,MAAM;AAEtC,QAAA,OAAO,MAAM,aAAa,WAAW;AAErC,QAAA,kBAA0C,CAAC,QAAQ,SAAS;AAChE,WAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AAChC,YAAA,SAAS,IAAI,SAAS,QAAQ,IAAI,WAAW,EAAE,EAAE,QAAQ,QAAQ,EAAE;AAEzE,YAAM,eAAe,OAAO;AAC5B,UAAI,CAAC,OAAO,KAAK,WAAW,MAAM,GAAG;AACnC,eAAO,OAAO,GAAG,MAAM,GAAG,OAAO,IAAI;AAAA,MAAA;AAGvC,WAAK,YAAY,OAAO,KAAK,OAAO,KAAK,CAAC,QAAiB;AACzD,YAAI,KAAK;AACP,iBAAO,GAAG;AAAA,QAAA,OACL;AACD,cAAA,CAAC,OAAO,IAAI,aAAa;AAC3B,mBAAO,OAAO;AAAA,UAAA;AAGhB,kBAAQ,MAAM;AAAA,QAAA;AAAA,MAChB,CACD;AAAA,IAAA,CACF;AAAA,EACH;AAEM,QAAA,aAAqC,OAAO,QAAQ,SAAS;AACjE,UAAM,KAAK;AAEX,QAAI,OAAO,WAAW,UAAU,OAAO,WAAW,OAAO;AACvD;AAAA,IAAA;AAGF,QAAI,OAAO,QAAQ,QAAQ,OAAO,WAAW,KAAK;AAChD;AAAA,IAAA;AAGF,UAAM,MAAM,OAAO;AAEf,QAAA,WAAW,MAAMG,oBAAG,SAASC,cAAA,QAAK,SAAS,IAAI,KAAK,2BAA2B,GAAG,OAAO;AAC7F,eAAW,MAAM,KAAK,mBAAmB,KAAK,QAAQ;AAEtD,WAAO,OAAO;AACd,WAAO,OAAO;AAAA,EAChB;AAEM,QAAA,aAAa,GAAG,IAAI,SAAS;AAEnC,MAAI,OAAO,OAAO,OAAO,IAAI,YAAY,UAAU;AACnD,MAAI,OAAO,OAAO,OAAO,IAAI,YAAY,eAAe;AAEjD,SAAA;AAAA,IACL,MAAM,QAAQ;AACZ,YAAM,KAAK,MAAM;AAEjB,UAAI,UAAU,WAAW;AAIvB,cAAM,IAAI,QAAc,CAAC,SAAS,WAAW;AACjC,oBAAA,MAAM,CAAC,QAAS,MAAM,OAAO,GAAG,IAAI,SAAU;AAAA,QAAA,CACzD;AAAA,MAAA;AAAA,IACH;AAAA,EAEJ;AACF;;"}

package/dist/node/vite/watch.mjs

@@ -34,10 +34,18 @@ const watch = async (ctx) => {
   const vite = await createServer(finalConfig);
   const viteMiddlewares = (koaCtx, next) => {
     return new Promise((resolve, reject) => {
+      const prefix = ctx.basePath.replace(ctx.adminPath, "").replace(/\/+$/, "");
+      const originalPath = koaCtx.path;
+      if (!koaCtx.path.startsWith(prefix)) {
+        koaCtx.path = `${prefix}${koaCtx.path}`;
+      }
       vite.middlewares(koaCtx.req, koaCtx.res, (err) => {
         if (err) {
           reject(err);
         } else {
+          if (!koaCtx.res.headersSent) {
+            koaCtx.path = originalPath;
+          }
           resolve(next());
         }
       });

package/dist/node/vite/watch.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"watch.mjs","sources":["../../../src/node/vite/watch.ts"],"sourcesContent":["import path from 'node:path';\nimport http from 'node:http';\nimport fs from 'node:fs/promises';\nimport type { Core } from '@strapi/types';\n\nimport { mergeConfigWithUserConfig, resolveDevelopmentConfig } from './config';\n\nimport type { BuildContext } from '../create-build-context';\n\ninterface ViteWatcher {\n  close(): Promise<void>;\n}\n\nconst HMR_DEFAULT_PORT = 5173;\n\nconst createHMRServer = () => {\n  return http.createServer(\n    // http server request handler. keeps the same with\n    // https://github.com/websockets/ws/blob/45e17acea791d865df6b255a55182e9c42e5877a/lib/websocket-server.js#L88-L96\n    (_, res) => {\n      const body = http.STATUS_CODES[426]; // Upgrade Required\n\n      res.writeHead(426, {\n        'Content-Length': body?.length ?? 0,\n        'Content-Type': 'text/plain',\n      });\n\n      res.end(body);\n    }\n  );\n};\n\nconst watch = async (ctx: BuildContext): Promise<ViteWatcher> => {\n  const hmrServer = createHMRServer();\n\n  ctx.options.hmrServer = hmrServer;\n  ctx.options.hmrClientPort = HMR_DEFAULT_PORT;\n\n  const config = await resolveDevelopmentConfig(ctx);\n  const finalConfig = await mergeConfigWithUserConfig(config, ctx);\n\n  const hmrConfig = config.server?.hmr;\n\n  // If the server used for Vite hmr is the one we've created (<> no user override)\n  if (typeof hmrConfig === 'object' && hmrConfig.server === hmrServer) {\n    // Only restart the hmr server when Strapi's server is listening\n    strapi.server.httpServer.on('listening', async () => {\n      hmrServer.listen(hmrConfig.clientPort ?? hmrConfig.port ?? HMR_DEFAULT_PORT);\n    });\n  }\n\n  ctx.logger.debug('Vite config', finalConfig);\n\n  const { createServer } = await import('vite');\n\n  const vite = await createServer(finalConfig);\n\n  const viteMiddlewares: Core.MiddlewareHandler = (koaCtx, next) => {\n    return new Promise((resolve, reject) => {\n      vite.middlewares(koaCtx.req, koaCtx.res, (err: unknown) => {\n        if (err) {\n          reject(err);\n        } else {\n          resolve(next());\n        }\n      });\n    });\n  };\n\n  const serveAdmin: Core.MiddlewareHandler = async (koaCtx, next) => {\n    await next();\n\n    if (koaCtx.method !== 'HEAD' && koaCtx.method !== 'GET') {\n      return;\n    }\n\n    if (koaCtx.body != null || koaCtx.status !== 404) {\n      return;\n    }\n\n    const url = koaCtx.originalUrl;\n\n    let template = await fs.readFile(path.relative(ctx.cwd, '.strapi/client/index.html'), 'utf-8');\n    template = await vite.transformIndexHtml(url, template);\n\n    koaCtx.type = 'html';\n    koaCtx.body = template;\n  };\n\n  const adminRoute = `${ctx.adminPath}/:path*`;\n\n  ctx.strapi.server.router.get(adminRoute, serveAdmin);\n  ctx.strapi.server.router.use(adminRoute, viteMiddlewares);\n\n  return {\n    async close() {\n      await vite.close();\n\n      if (hmrServer.listening) {\n        // Manually close the hmr server\n        // /!\\ This operation MUST be done after calling .close() on the vite\n        //      instance to avoid flaky behaviors with attached clients\n        await new Promise<void>((resolve, reject) => {\n          hmrServer.close((err) => (err ? reject(err) : resolve()));\n        });\n      }\n    },\n  };\n};\n\nexport { watch };\nexport type { ViteWatcher };\n"],"names":[],"mappings":";;;;AAaA,MAAM,mBAAmB;AAEzB,MAAM,kBAAkB,MAAM;AAC5B,SAAO,KAAK;AAAA;AAAA;AAAA,IAGV,CAAC,GAAG,QAAQ;AACJ,YAAA,OAAO,KAAK,aAAa,GAAG;AAElC,UAAI,UAAU,KAAK;AAAA,QACjB,kBAAkB,MAAM,UAAU;AAAA,QAClC,gBAAgB;AAAA,MAAA,CACjB;AAED,UAAI,IAAI,IAAI;AAAA,IAAA;AAAA,EAEhB;AACF;AAEM,MAAA,QAAQ,OAAO,QAA4C;AAC/D,QAAM,YAAY,gBAAgB;AAElC,MAAI,QAAQ,YAAY;AACxB,MAAI,QAAQ,gBAAgB;AAEtB,QAAA,SAAS,MAAM,yBAAyB,GAAG;AACjD,QAAM,cAAc,MAAM,0BAA0B,QAAQ,GAAG;AAEzD,QAAA,YAAY,OAAO,QAAQ;AAGjC,MAAI,OAAO,cAAc,YAAY,UAAU,WAAW,WAAW;AAEnE,WAAO,OAAO,WAAW,GAAG,aAAa,YAAY;AACnD,gBAAU,OAAO,UAAU,cAAc,UAAU,QAAQ,gBAAgB;AAAA,IAAA,CAC5E;AAAA,EAAA;AAGC,MAAA,OAAO,MAAM,eAAe,WAAW;AAE3C,QAAM,EAAE,aAAA,IAAiB,MAAM,OAAO,MAAM;AAEtC,QAAA,OAAO,MAAM,aAAa,WAAW;AAErC,QAAA,kBAA0C,CAAC,QAAQ,SAAS;AAChE,WAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,WAAK,YAAY,OAAO,KAAK,OAAO,KAAK,CAAC,QAAiB;AACzD,YAAI,KAAK;AACP,iBAAO,GAAG;AAAA,QAAA,OACL;AACL,kBAAQ,MAAM;AAAA,QAAA;AAAA,MAChB,CACD;AAAA,IAAA,CACF;AAAA,EACH;AAEM,QAAA,aAAqC,OAAO,QAAQ,SAAS;AACjE,UAAM,KAAK;AAEX,QAAI,OAAO,WAAW,UAAU,OAAO,WAAW,OAAO;AACvD;AAAA,IAAA;AAGF,QAAI,OAAO,QAAQ,QAAQ,OAAO,WAAW,KAAK;AAChD;AAAA,IAAA;AAGF,UAAM,MAAM,OAAO;AAEf,QAAA,WAAW,MAAM,GAAG,SAAS,KAAK,SAAS,IAAI,KAAK,2BAA2B,GAAG,OAAO;AAC7F,eAAW,MAAM,KAAK,mBAAmB,KAAK,QAAQ;AAEtD,WAAO,OAAO;AACd,WAAO,OAAO;AAAA,EAChB;AAEM,QAAA,aAAa,GAAG,IAAI,SAAS;AAEnC,MAAI,OAAO,OAAO,OAAO,IAAI,YAAY,UAAU;AACnD,MAAI,OAAO,OAAO,OAAO,IAAI,YAAY,eAAe;AAEjD,SAAA;AAAA,IACL,MAAM,QAAQ;AACZ,YAAM,KAAK,MAAM;AAEjB,UAAI,UAAU,WAAW;AAIvB,cAAM,IAAI,QAAc,CAAC,SAAS,WAAW;AACjC,oBAAA,MAAM,CAAC,QAAS,MAAM,OAAO,GAAG,IAAI,SAAU;AAAA,QAAA,CACzD;AAAA,MAAA;AAAA,IACH;AAAA,EAEJ;AACF;"}
+{"version":3,"file":"watch.mjs","sources":["../../../src/node/vite/watch.ts"],"sourcesContent":["import path from 'node:path';\nimport http from 'node:http';\nimport fs from 'node:fs/promises';\nimport type { Core } from '@strapi/types';\n\nimport { mergeConfigWithUserConfig, resolveDevelopmentConfig } from './config';\n\nimport type { BuildContext } from '../create-build-context';\n\ninterface ViteWatcher {\n  close(): Promise<void>;\n}\n\nconst HMR_DEFAULT_PORT = 5173;\n\nconst createHMRServer = () => {\n  return http.createServer(\n    // http server request handler. keeps the same with\n    // https://github.com/websockets/ws/blob/45e17acea791d865df6b255a55182e9c42e5877a/lib/websocket-server.js#L88-L96\n    (_, res) => {\n      const body = http.STATUS_CODES[426]; // Upgrade Required\n\n      res.writeHead(426, {\n        'Content-Length': body?.length ?? 0,\n        'Content-Type': 'text/plain',\n      });\n\n      res.end(body);\n    }\n  );\n};\n\nconst watch = async (ctx: BuildContext): Promise<ViteWatcher> => {\n  const hmrServer = createHMRServer();\n\n  ctx.options.hmrServer = hmrServer;\n  ctx.options.hmrClientPort = HMR_DEFAULT_PORT;\n\n  const config = await resolveDevelopmentConfig(ctx);\n  const finalConfig = await mergeConfigWithUserConfig(config, ctx);\n\n  const hmrConfig = config.server?.hmr;\n\n  // If the server used for Vite hmr is the one we've created (<> no user override)\n  if (typeof hmrConfig === 'object' && hmrConfig.server === hmrServer) {\n    // Only restart the hmr server when Strapi's server is listening\n    strapi.server.httpServer.on('listening', async () => {\n      hmrServer.listen(hmrConfig.clientPort ?? hmrConfig.port ?? HMR_DEFAULT_PORT);\n    });\n  }\n\n  ctx.logger.debug('Vite config', finalConfig);\n\n  const { createServer } = await import('vite');\n\n  const vite = await createServer(finalConfig);\n\n  const viteMiddlewares: Core.MiddlewareHandler = (koaCtx, next) => {\n    return new Promise((resolve, reject) => {\n      const prefix = ctx.basePath.replace(ctx.adminPath, '').replace(/\\/+$/, '');\n\n      const originalPath = koaCtx.path;\n      if (!koaCtx.path.startsWith(prefix)) {\n        koaCtx.path = `${prefix}${koaCtx.path}`;\n      }\n\n      vite.middlewares(koaCtx.req, koaCtx.res, (err: unknown) => {\n        if (err) {\n          reject(err);\n        } else {\n          if (!koaCtx.res.headersSent) {\n            koaCtx.path = originalPath;\n          }\n\n          resolve(next());\n        }\n      });\n    });\n  };\n\n  const serveAdmin: Core.MiddlewareHandler = async (koaCtx, next) => {\n    await next();\n\n    if (koaCtx.method !== 'HEAD' && koaCtx.method !== 'GET') {\n      return;\n    }\n\n    if (koaCtx.body != null || koaCtx.status !== 404) {\n      return;\n    }\n\n    const url = koaCtx.originalUrl;\n\n    let template = await fs.readFile(path.relative(ctx.cwd, '.strapi/client/index.html'), 'utf-8');\n    template = await vite.transformIndexHtml(url, template);\n\n    koaCtx.type = 'html';\n    koaCtx.body = template;\n  };\n\n  const adminRoute = `${ctx.adminPath}/:path*`;\n\n  ctx.strapi.server.router.get(adminRoute, serveAdmin);\n  ctx.strapi.server.router.use(adminRoute, viteMiddlewares);\n\n  return {\n    async close() {\n      await vite.close();\n\n      if (hmrServer.listening) {\n        // Manually close the hmr server\n        // /!\\ This operation MUST be done after calling .close() on the vite\n        //      instance to avoid flaky behaviors with attached clients\n        await new Promise<void>((resolve, reject) => {\n          hmrServer.close((err) => (err ? reject(err) : resolve()));\n        });\n      }\n    },\n  };\n};\n\nexport { watch };\nexport type { ViteWatcher };\n"],"names":[],"mappings":";;;;AAaA,MAAM,mBAAmB;AAEzB,MAAM,kBAAkB,MAAM;AAC5B,SAAO,KAAK;AAAA;AAAA;AAAA,IAGV,CAAC,GAAG,QAAQ;AACJ,YAAA,OAAO,KAAK,aAAa,GAAG;AAElC,UAAI,UAAU,KAAK;AAAA,QACjB,kBAAkB,MAAM,UAAU;AAAA,QAClC,gBAAgB;AAAA,MAAA,CACjB;AAED,UAAI,IAAI,IAAI;AAAA,IAAA;AAAA,EAEhB;AACF;AAEM,MAAA,QAAQ,OAAO,QAA4C;AAC/D,QAAM,YAAY,gBAAgB;AAElC,MAAI,QAAQ,YAAY;AACxB,MAAI,QAAQ,gBAAgB;AAEtB,QAAA,SAAS,MAAM,yBAAyB,GAAG;AACjD,QAAM,cAAc,MAAM,0BAA0B,QAAQ,GAAG;AAEzD,QAAA,YAAY,OAAO,QAAQ;AAGjC,MAAI,OAAO,cAAc,YAAY,UAAU,WAAW,WAAW;AAEnE,WAAO,OAAO,WAAW,GAAG,aAAa,YAAY;AACnD,gBAAU,OAAO,UAAU,cAAc,UAAU,QAAQ,gBAAgB;AAAA,IAAA,CAC5E;AAAA,EAAA;AAGC,MAAA,OAAO,MAAM,eAAe,WAAW;AAE3C,QAAM,EAAE,aAAA,IAAiB,MAAM,OAAO,MAAM;AAEtC,QAAA,OAAO,MAAM,aAAa,WAAW;AAErC,QAAA,kBAA0C,CAAC,QAAQ,SAAS;AAChE,WAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AAChC,YAAA,SAAS,IAAI,SAAS,QAAQ,IAAI,WAAW,EAAE,EAAE,QAAQ,QAAQ,EAAE;AAEzE,YAAM,eAAe,OAAO;AAC5B,UAAI,CAAC,OAAO,KAAK,WAAW,MAAM,GAAG;AACnC,eAAO,OAAO,GAAG,MAAM,GAAG,OAAO,IAAI;AAAA,MAAA;AAGvC,WAAK,YAAY,OAAO,KAAK,OAAO,KAAK,CAAC,QAAiB;AACzD,YAAI,KAAK;AACP,iBAAO,GAAG;AAAA,QAAA,OACL;AACD,cAAA,CAAC,OAAO,IAAI,aAAa;AAC3B,mBAAO,OAAO;AAAA,UAAA;AAGhB,kBAAQ,MAAM;AAAA,QAAA;AAAA,MAChB,CACD;AAAA,IAAA,CACF;AAAA,EACH;AAEM,QAAA,aAAqC,OAAO,QAAQ,SAAS;AACjE,UAAM,KAAK;AAEX,QAAI,OAAO,WAAW,UAAU,OAAO,WAAW,OAAO;AACvD;AAAA,IAAA;AAGF,QAAI,OAAO,QAAQ,QAAQ,OAAO,WAAW,KAAK;AAChD;AAAA,IAAA;AAGF,UAAM,MAAM,OAAO;AAEf,QAAA,WAAW,MAAM,GAAG,SAAS,KAAK,SAAS,IAAI,KAAK,2BAA2B,GAAG,OAAO;AAC7F,eAAW,MAAM,KAAK,mBAAmB,KAAK,QAAQ;AAEtD,WAAO,OAAO;AACd,WAAO,OAAO;AAAA,EAChB;AAEM,QAAA,aAAa,GAAG,IAAI,SAAS;AAEnC,MAAI,OAAO,OAAO,OAAO,IAAI,YAAY,UAAU;AACnD,MAAI,OAAO,OAAO,OAAO,IAAI,YAAY,eAAe;AAEjD,SAAA;AAAA,IACL,MAAM,QAAQ;AACZ,YAAM,KAAK,MAAM;AAEjB,UAAI,UAAU,WAAW;AAIvB,cAAM,IAAI,QAAc,CAAC,SAAS,WAAW;AACjC,oBAAA,MAAM,CAAC,QAAS,MAAM,OAAO,GAAG,IAAI,SAAU;AAAA,QAAA,CACzD;AAAA,MAAA;AAAA,IACH;AAAA,EAEJ;AACF;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "5.8.0",
+  "version": "5.9.0",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -109,25 +109,25 @@
   },
   "dependencies": {
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
-    "@strapi/admin": "5.8.0",
-    "@strapi/cloud-cli": "5.8.0",
-    "@strapi/content-manager": "5.8.0",
-    "@strapi/content-releases": "5.8.0",
-    "@strapi/content-type-builder": "5.8.0",
-    "@strapi/core": "5.8.0",
-    "@strapi/data-transfer": "5.8.0",
-    "@strapi/database": "5.8.0",
-    "@strapi/email": "5.8.0",
-    "@strapi/generators": "5.8.0",
-    "@strapi/i18n": "5.8.0",
-    "@strapi/logger": "5.8.0",
+    "@strapi/admin": "5.9.0",
+    "@strapi/cloud-cli": "5.9.0",
+    "@strapi/content-manager": "5.9.0",
+    "@strapi/content-releases": "5.9.0",
+    "@strapi/content-type-builder": "5.9.0",
+    "@strapi/core": "5.9.0",
+    "@strapi/data-transfer": "5.9.0",
+    "@strapi/database": "5.9.0",
+    "@strapi/email": "5.9.0",
+    "@strapi/generators": "5.9.0",
+    "@strapi/i18n": "5.9.0",
+    "@strapi/logger": "5.9.0",
     "@strapi/pack-up": "5.0.2",
-    "@strapi/permissions": "5.8.0",
-    "@strapi/review-workflows": "5.8.0",
-    "@strapi/types": "5.8.0",
-    "@strapi/typescript-utils": "5.8.0",
-    "@strapi/upload": "5.8.0",
-    "@strapi/utils": "5.8.0",
+    "@strapi/permissions": "5.9.0",
+    "@strapi/review-workflows": "5.9.0",
+    "@strapi/types": "5.9.0",
+    "@strapi/typescript-utils": "5.9.0",
+    "@strapi/upload": "5.9.0",
+    "@strapi/utils": "5.9.0",
     "@types/nodemon": "1.19.6",
     "@vitejs/plugin-react-swc": "3.6.0",
     "boxen": "5.1.2",
@@ -182,11 +182,11 @@
     "@types/node": "18.19.24",
     "@types/webpack-bundle-analyzer": "4.7.0",
     "@types/webpack-hot-middleware": "2.25.9",
-    "eslint-config-custom": "5.8.0",
+    "eslint-config-custom": "5.9.0",
     "jest": "29.6.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "tsconfig": "5.8.0"
+    "tsconfig": "5.9.0"
   },
   "peerDependencies": {
     "react": "^17.0.0 || ^18.0.0",