@modern-js/server 1.2.1-rc.0 → 1.3.1-beta.0

package/tests/server.test.ts

@@ -2,6 +2,8 @@ import path from 'path';
 import { defaultsConfig, NormalizedConfig } from '@modern-js/core';
 import { ModernServerContext, NextFunction } from '@modern-js/types';
 import createServer, { Server } from '../src';
+import { ModernServer } from '../src/server/modern-server';
+import Watcher from '../src/dev-tools/watcher';
 
 describe('test server', () => {
   test('should throw error when ', resolve => {
@@ -58,7 +60,7 @@ describe('test server', () => {
         config: defaultsConfig as NormalizedConfig,
         pwd: appDirectory,
       });
-      const modernServer = server.server as any;
+      const modernServer = (server as any).server;
 
       const len = modernServer.handlers.length;
 
@@ -85,5 +87,34 @@ describe('test server', () => {
       expect(newLen + 1).toBe(nextLen);
       expect(modernServer.handlers[nextLen - 1]).toBe(asyncHandler);
     });
+
+    test('should get request handler correctly', async () => {
+      const server = await createServer({
+        config: defaultsConfig as NormalizedConfig,
+        pwd: appDirectory,
+      });
+
+      const modernServer: ModernServer = (server as any).server;
+      const handler = modernServer.getRequestHandler();
+      expect(typeof handler === 'function').toBeTruthy();
+    });
+  });
+});
+
+describe('dev server', () => {
+  const pwd = path.join(__dirname, './fixtures/pure');
+  let devServer: Server;
+
+  test('watch', async () => {
+    devServer = await createServer({
+      config: defaultsConfig as NormalizedConfig,
+      pwd,
+      dev: true,
+    });
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error
+    expect(devServer.server.watcher).toBeInstanceOf(Watcher);
+    await devServer.close();
   });
 });

package/tests/tsconfig.json

@@ -7,8 +7,6 @@
     "isolatedModules": true,
     "sourceMap": true
   },
-  "paths": {
-    "@/*": ["../src/*"]
-  },
+  "paths": {},
   "exclude": ["src/__test__/fixtures/**"]
 }

package/tests/utils.test.ts

@@ -3,6 +3,7 @@ import {
   mergeExtension,
   toMessage,
   createErrorDocument,
+  createMiddlewareCollecter,
 } from '../src/utils';
 
 describe('test server utils', () => {
@@ -37,4 +38,34 @@ describe('test server utils', () => {
     expect(doc).toMatch('redirect');
     expect(doc).toMatch('302: redirect');
   });
+
+  describe('test middleware collector', () => {
+    test('shoule return web middleware correctly', () => {
+      const { addWebMiddleware, getMiddlewares } = createMiddlewareCollecter();
+
+      const before = getMiddlewares();
+      expect(before.web).toEqual([]);
+
+      const middleware = async () => {
+        // empty
+      };
+      addWebMiddleware(middleware);
+      const after = getMiddlewares();
+      expect(after.web).toEqual([middleware]);
+    });
+
+    test('shoule return api middleware correctly', () => {
+      const { addAPIMiddleware, getMiddlewares } = createMiddlewareCollecter();
+
+      const before = getMiddlewares();
+      expect(before.web).toEqual([]);
+
+      const middleware = async () => {
+        // empty
+      };
+      addAPIMiddleware(middleware);
+      const after = getMiddlewares();
+      expect(after.api).toEqual([middleware]);
+    });
+  });
 });

package/tests/watcher.test.ts

@@ -0,0 +1,96 @@
+import * as path from 'path';
+import { fs } from '@modern-js/utils';
+import Watcher from '../src/dev-tools/watcher';
+
+jest.useRealTimers();
+
+describe('watcher', () => {
+  let watcher: Watcher;
+  jest.setTimeout(25000);
+  beforeAll(() => {
+    watcher = new Watcher();
+  });
+
+  test('should emit change', done => {
+    const pwd = path.join(__dirname, './fixtures/pure');
+    const serverDir = path.normalize(path.join(pwd, './tmp-server'));
+
+    const callback = jest.fn();
+    if (fs.pathExistsSync(serverDir)) {
+      fs.removeSync(serverDir);
+    }
+    const writeFiles = () => {
+      fs.mkdirSync(serverDir);
+      fs.writeFileSync(
+        path.normalize(path.join(serverDir, 'index.js')),
+        'test',
+        'utf8',
+      );
+    };
+
+    const clear = () => {
+      fs.removeSync(serverDir);
+    };
+
+    watcher.listen(
+      [`${serverDir}/**/*`],
+      {
+        ignoreInitial: true,
+        ignored: /api\/typings\/.*/,
+      },
+      async () => {
+        callback();
+        expect(callback).toHaveBeenCalledTimes(1);
+        await watcher.close();
+        clear();
+        done();
+      },
+    );
+
+    setTimeout(writeFiles, 100);
+  });
+
+  test('should not emit change when typings file changed', done => {
+    const pwd = path.join(__dirname, './fixtures/pure');
+    const apiDir = path.normalize(path.join(pwd, './api'));
+
+    const callback = jest.fn();
+
+    if (fs.pathExistsSync(apiDir)) {
+      fs.removeSync(apiDir);
+    }
+
+    const writeFiles = () => {
+      fs.mkdirSync(path.normalize(path.join(apiDir, 'typings')), {
+        recursive: true,
+      });
+      fs.writeFileSync(
+        path.normalize(path.join(apiDir, 'typings/index.js')),
+        'test',
+        'utf8',
+      );
+    };
+
+    const clear = () => {
+      fs.removeSync(apiDir);
+    };
+
+    watcher.listen(
+      [`${apiDir}/**/*`],
+      {
+        ignoreInitial: true,
+        ignored: /api\/typings\/.*/,
+      },
+      callback,
+    );
+
+    setTimeout(async () => {
+      expect(callback).toHaveBeenCalledTimes(0);
+      await watcher.close();
+      clear();
+      done();
+    }, 1000);
+
+    setTimeout(writeFiles);
+  });
+});

package/tsconfig.json

@@ -5,9 +5,7 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "esModuleInterop": true,
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "paths": {}
   },
   "include": ["src"]
 }