fix(dev-server): apply dev configuration, avoid dev.setupMiddleware not apply.

.changeset/green-beans-provide.md

@@ -0,0 +1,6 @@
+---
+'@modern-js/app-tools': patch
+---
+
+fix(dev-server): apply dev configuration, then void dev.setupMiddlewares config lost
+fix(dev-server): 应用 dev 配置防止 dev.setupMiddlewares 丢失

packages/solutions/app-tools/src/commands/dev.ts

@@ -89,13 +89,24 @@ export const dev = async (
 
   const pluginInstances = await loadServerPlugins(api, appDirectory, metaName);
 
+  const toolsDevServerConfig = normalizedConfig.tools?.devServer;
+
   const serverOptions = {
     metaName,
     dev: {
+      // [`normalizedConfig.tools.devServer`](https://modernjs.dev/en/configure/app/tools/dev-server.html) already deprecated, we should using `normalizedConfig.dev` instead firstly.
+      // Oterwise, the `normalizedConfig.dev` can't be apply correctly.
+      ...toolsDevServerConfig,
+      devMiddleware: {
+        writeToDisk: normalizedConfig.dev.writeToDisk,
+      },
       port,
-      https: normalizedConfig.dev.https,
-      host: normalizedConfig.dev.host,
-      ...normalizedConfig.tools?.devServer,
+      host: normalizedConfig.dev.host ?? (toolsDevServerConfig as any)?.host,
+      https: normalizedConfig.dev.https ?? (toolsDevServerConfig as any)?.https,
+      hot: normalizedConfig.dev.hmr ?? (toolsDevServerConfig as any)?.hot,
+      setupMiddlewares:
+        normalizedConfig.dev.setupMiddlewares ??
+        (toolsDevServerConfig as any)?.setupMiddlewares,
     },
     appContext: {
       appDirectory,

tests/integration/dev-server/modern.config.ts

@@ -37,6 +37,21 @@ export default applyBaseConfig({
       ],
     },
   },
+  dev: {
+    setupMiddlewares: [
+      (middlewares, _) => {
+        middlewares.push((req, res, next) => {
+          res.setHeader('x-push-middleware', 'test-middleware');
+          return next();
+        });
+
+        middlewares.unshift((req, res, next) => {
+          res.setHeader('x-unshift-middleware', 'test-middleware');
+          return next();
+        });
+      },
+    ],
+  },
   runtime: {
     router: false,
     state: false,

tests/integration/dev-server/tests/index.test.ts

@@ -30,6 +30,8 @@ describe('dev', () => {
     const headers = response!.headers();
     expect(headers['x-config']).toBe('test-config');
     expect(headers['x-plugin']).toBe('test-plugin');
+    expect(headers['x-push-middleware']).toBe('test-middleware');
+    expect(headers['x-unshift-middleware']).toBe('test-middleware');
   });
 
   test('should provide history api fallback correctly', async () => {