@modern-js/server 1.4.8 → 1.4.10

package/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  root: true,
+  extends: ['@modern-js'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: ['./tsconfig.json'],
+  },
+};

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @modern-js/server
 
+## 1.4.10
+
+### Patch Changes
+
+- 6cffe99d: chore:
+  remove react eslint rules for `modern-js` rule set.
+  add .eslintrc for each package to speed up linting
+- 04ae5262: chore: bump @modern-js/utils to v1.4.1 in dependencies
+- 60f7d8bf: feat: add tests dir to npmignore
+- 28ac120a: fix: remove unused webpack/hot/dev-server entry
+- Updated dependencies [b8599d09]
+- Updated dependencies [6cffe99d]
+- Updated dependencies [04ae5262]
+- Updated dependencies [60f7d8bf]
+- Updated dependencies [3bf4f8b0]
+  - @modern-js/utils@1.5.0
+  - @modern-js/bff-utils@1.2.3
+  - @modern-js/hmr-client@1.2.5
+  - @modern-js/prod-server@1.1.1
+  - @modern-js/server-utils@1.2.3
+
+## 1.4.9
+
+### Patch Changes
+
+- bebb39b6: chore: improve devDependencies and peerDependencies
+- Updated dependencies [bebb39b6]
+- Updated dependencies [afc836f4]
+- Updated dependencies [132f7b53]
+  - @modern-js/prod-server@1.0.6
+  - @modern-js/server-utils@1.2.2
+  - @modern-js/hmr-client@1.2.3
+  - @modern-js/utils@1.3.7
+
 ## 1.4.8
 
 ### Patch Changes

package/dist/js/modern/dev-tools/dev-server-plugin.js

@@ -26,10 +26,7 @@ export default class DevServerPlugin {
     const path = `&path=${client.path}`;
     const port = `&port=${client.port}`;
     const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`;
-
-    const hotEntry = require.resolve('webpack/hot/dev-server');
-
-    const additionalEntries = [clientEntry, hotEntry]; // use a hook to add entries if available
+    const additionalEntries = [clientEntry]; // use a hook to add entries if available
 
     for (const additionalEntry of additionalEntries) {
       new EntryPlugin(compiler.context, additionalEntry, {
@@ -41,7 +38,7 @@ export default class DevServerPlugin {
     const compilerOptions = compiler.options;
     compilerOptions.plugins = compilerOptions.plugins || [];
 
-    if (hotEntry && !compilerOptions.plugins.find(p => p.constructor === Webpack.HotModuleReplacementPlugin)) {
+    if (!compilerOptions.plugins.find(p => p.constructor === Webpack.HotModuleReplacementPlugin)) {
       // apply the HMR plugin, if it didn't exist before.
       const plugin = new Webpack.HotModuleReplacementPlugin();
       plugin.apply(compiler);

package/dist/js/modern/dev-tools/watcher/index.js

@@ -1,6 +1,5 @@
 import path from 'path';
-import { fs } from '@modern-js/utils';
-import chokidar from 'chokidar';
+import { fs, chokidar } from '@modern-js/utils';
 import { DependencyTree } from "./dependency-tree";
 import { StatsCache } from "./stats-cache";
 export const getWatchedFiles = watcher => {

package/dist/js/node/dev-tools/dev-server-plugin.js

@@ -38,10 +38,7 @@ class DevServerPlugin {
     const path = `&path=${client.path}`;
     const port = `&port=${client.port}`;
     const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`;
-
-    const hotEntry = require.resolve('webpack/hot/dev-server');
-
-    const additionalEntries = [clientEntry, hotEntry]; // use a hook to add entries if available
+    const additionalEntries = [clientEntry]; // use a hook to add entries if available
 
     for (const additionalEntry of additionalEntries) {
       new EntryPlugin(compiler.context, additionalEntry, {
@@ -53,7 +50,7 @@ class DevServerPlugin {
     const compilerOptions = compiler.options;
     compilerOptions.plugins = compilerOptions.plugins || [];
 
-    if (hotEntry && !compilerOptions.plugins.find(p => p.constructor === _webpack.default.HotModuleReplacementPlugin)) {
+    if (!compilerOptions.plugins.find(p => p.constructor === _webpack.default.HotModuleReplacementPlugin)) {
       // apply the HMR plugin, if it didn't exist before.
       const plugin = new _webpack.default.HotModuleReplacementPlugin();
       plugin.apply(compiler);

package/dist/js/node/dev-tools/watcher/index.js

@@ -9,8 +9,6 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _chokidar = _interopRequireDefault(require("chokidar"));
-
 var _dependencyTree = require("./dependency-tree");
 
 var _statsCache = require("./stats-cache");
@@ -41,7 +39,7 @@ class Watcher {
     const filenames = watched.map(filename => filename.replace(/\\/g, '/'));
     const cache = new _statsCache.StatsCache();
 
-    const watcher = _chokidar.default.watch(filenames, options);
+    const watcher = _utils.chokidar.watch(filenames, options);
 
     watcher.on('ready', () => {
       cache.add(getWatchedFiles(watcher));

package/dist/types/dev-tools/watcher/index.d.ts

@@ -1,5 +1,5 @@
-import chokidar, { FSWatcher, WatchOptions } from 'chokidar';
-export declare const getWatchedFiles: (watcher: chokidar.FSWatcher) => string[];
+import { FSWatcher, WatchOptions } from '@modern-js/utils';
+export declare const getWatchedFiles: (watcher: FSWatcher) => string[];
 export default class Watcher {
   private dependencyTree;
   private watcher;

package/jest.config.js

@@ -2,7 +2,6 @@ const sharedConfig = require('@scripts/jest-config');
 
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   ...sharedConfig,
   testEnvironment: 'node',
   rootDir: __dirname,

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.8",
+  "version": "1.4.10",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,13 +28,13 @@
     }
   },
   "dependencies": {
-    "@modern-js/prod-server": "^1.0.5",
+    "@babel/core": "7.16.7",
     "@babel/register": "^7.15.3",
-    "@modern-js/bff-utils": "^1.2.2",
-    "@modern-js/hmr-client": "^1.2.2",
-    "@modern-js/server-utils": "^1.2.1",
-    "@modern-js/utils": "^1.3.6",
-    "chokidar": "^3.5.2",
+    "@modern-js/bff-utils": "^1.2.3",
+    "@modern-js/hmr-client": "^1.2.5",
+    "@modern-js/prod-server": "^1.1.1",
+    "@modern-js/server-utils": "^1.2.3",
+    "@modern-js/utils": "^1.5.0",
     "devcert": "^1.1.3",
     "launch-editor": "^2.2.1",
     "minimatch": "^3.0.4",
@@ -44,10 +44,11 @@
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/server-core": "^1.2.4",
-    "@modern-js/core": "^1.6.0",
+    "@modern-js/core": "1.8.0",
+    "@modern-js/server-core": "1.3.1",
+    "@modern-js/types": "^1.5.0",
     "@scripts/build": "0.0.0",
-    "@modern-js/types": "^1.3.5",
+    "@scripts/jest-config": "0.0.0",
     "@types/jest": "^26",
     "@types/minimatch": "^3.0.5",
     "@types/node": "^14",
@@ -55,8 +56,7 @@
     "@types/ws": "^7.4.7",
     "jest": "^27",
     "typescript": "^4",
-    "webpack": "^5.54.0",
-    "@scripts/jest-config": "0.0.0",
+    "webpack": "^5.71.0",
     "websocket": "^1"
   },
   "peerDependencies": {

package/tests/.eslintrc.js

@@ -1,6 +0,0 @@
-module.exports = {
-  extends: ['@modern-js'],
-  parserOptions: {
-    project: require.resolve('./tsconfig.json'),
-  },
-};

package/tests/dev.test.ts

@@ -1,130 +0,0 @@
-import http from 'http';
-import { webpack, HotModuleReplacementPlugin } from 'webpack';
-import SocketServer from '../src/dev-tools/socket-server';
-import DevServerPlugin from '../src/dev-tools/dev-server-plugin';
-
-function getRandomPort() {
-  return Math.floor(Math.random() * (8000 - 1024)) + 1024;
-}
-
-describe('test dev tools', () => {
-  test('should socket server work correctly', () => {
-    const port = getRandomPort();
-    const socketServer: any = new SocketServer({
-      client: {
-        port: port.toString(),
-        overlay: false,
-        logging: 'error',
-        path: '/',
-        host: '127.0.0.1',
-      },
-      dev: {
-        writeToDisk: false,
-      },
-      watch: true,
-      hot: true,
-      liveReload: true,
-    });
-    const app = http.createServer((req, res) => {
-      res.end();
-    });
-
-    socketServer.prepare(app);
-    expect(socketServer.app).toBe(app);
-    expect(socketServer.stats).toBeUndefined();
-
-    const mockStats = {
-      toJson: () => ({}),
-    };
-    socketServer.updateStats(mockStats);
-    expect(socketServer.stats).toBe(mockStats);
-
-    const socket = {
-      state: 1,
-      readyState: 1,
-      data: '',
-      close() {
-        socket.state = 0;
-      },
-      send(data: string) {
-        socket.data = data;
-      },
-      on() {
-        // empty
-      },
-    };
-
-    socketServer.onConnect(socket);
-
-    socketServer.sockets = [socket];
-    socketServer.sockWrite('test');
-    expect(socket.data).toBe(JSON.stringify({ type: 'test' }));
-
-    socketServer.singleWrite(socket, 'single');
-    expect(socket.data).toBe(JSON.stringify({ type: 'single' }));
-
-    socketServer.close();
-    expect(socket.state).toBe(0);
-    app.close();
-  });
-
-  test('should dev server plugin work correctly with hot plugin', () => {
-    const compiler = webpack({
-      plugins: [new HotModuleReplacementPlugin()],
-    });
-    new DevServerPlugin({
-      client: {
-        port: '8080',
-        overlay: false,
-        logging: 'error',
-        path: '/',
-        host: '127.0.0.1',
-      },
-      dev: {
-        writeToDisk: false,
-      },
-      watch: true,
-      hot: true,
-      liveReload: true,
-    }).apply(compiler);
-
-    // expect(compiler.options.entry)
-    const entryPluginHook = compiler.hooks.compilation.taps.filter(
-      tap => tap.name === 'EntryPlugin',
-    );
-    const hotPluginHook = compiler.hooks.compilation.taps.filter(
-      tap => tap.name === 'HotModuleReplacementPlugin',
-    );
-    expect(entryPluginHook.length).toBe(3);
-    expect(hotPluginHook.length).toBe(1);
-  });
-
-  test('should dev server plugin work correctly', () => {
-    const compiler = webpack({});
-    new DevServerPlugin({
-      client: {
-        port: '8080',
-        overlay: false,
-        logging: 'error',
-        path: '/',
-        host: '127.0.0.1',
-      },
-      dev: {
-        writeToDisk: false,
-      },
-      watch: true,
-      hot: true,
-      liveReload: true,
-    }).apply(compiler);
-
-    // expect(compiler.options.entry)
-    const entryPluginHook = compiler.hooks.compilation.taps.filter(
-      tap => tap.name === 'EntryPlugin',
-    );
-    const hotPluginHook = compiler.hooks.compilation.taps.filter(
-      tap => tap.name === 'HotModuleReplacementPlugin',
-    );
-    expect(entryPluginHook.length).toBe(3);
-    expect(hotPluginHook.length).toBe(1);
-  });
-});

package/tests/fixtures/mock/exist/config/mock/index.ts

@@ -1,11 +0,0 @@
-export default {
-  'GET /api/getInfo': { data: [1, 2, 3, 4] },
-
-  '/api/getExample': { id: 1 },
-
-  'GET /api/addInfo': (req: any, res: any) => {
-    setTimeout(() => {
-      res.end('delay 2000ms');
-    }, 2000);
-  },
-};

package/tests/fixtures/mock/module-error/config/mock/index.ts

@@ -1 +0,0 @@
-export default null;

package/tests/fixtures/mock/type-error/config/mock/index.ts

@@ -1,3 +0,0 @@
-export default {
-  'GET /api/getInfo': 'foo',
-};

package/tests/fixtures/mock/zero/config/mock/index.ts

@@ -1 +0,0 @@
-export default {};

package/tests/fixtures/pure/config/mock/index.ts

@@ -1,11 +0,0 @@
-export default {
-  'GET /api/getInfo': { data: [1, 2, 3, 4] },
-
-  '/api/getExample': { id: 1 },
-
-  'GET /api/addInfo': (req: any, res: any) => {
-    setTimeout(() => {
-      res.end('delay 2000ms');
-    }, 2000);
-  },
-};

package/tests/fixtures/pure/modern.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  server: {
-    ssr: true,
-  },
-};

package/tests/fixtures/pure/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "deploy",
-  "version": "0.1.0",
-  "scripts": {
-    "reset": "del-cli node_modules",
-    "dev": "modern dev",
-    "build": "modern build",
-    "start": "modern start",
-    "new": "modern new",
-    "lint": "modern lint",
-    "deploy": "modern deploy"
-  },
-  "dependencies": {},
-  "devDependencies": {},
-  "modernConfig": {
-    "runtime": {
-      "router": true,
-      "state": true
-    }
-  }
-}

package/tests/fixtures/pure/src/App.css

@@ -1,119 +0,0 @@
-html,
-body {
-  padding: 0;
-  margin: 0;
-  font-family: nunito_for_arco, Helvetica Neue, Helvetica, PingFang SC,
-    Hiragino Sans GB, Microsoft YaHei, 微软雅黑, Arial, sans-serif;
-}
-
-* {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  box-sizing: border-box;
-}
-
-.container {
-  min-height: 100vh;
-  max-width: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-
-main {
-  padding: 5rem 0;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-
-.footer {
-  width: 100%;
-  height: 80px;
-  border-top: 1px solid #eaeaea;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background-color: #470000;
-}
-
-.footer a {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-grow: 1;
-  color: #f4f4f4;
-  text-decoration: none;
-  font-size: 1.1rem;
-}
-
-.logo {
-  margin-bottom: 2rem;
-}
-
-.logo svg {
-  width: 450px;
-  height: 132px;
-}
-
-.description {
-  text-align: center;
-  line-height: 1.5;
-  font-size: 1.5rem;
-}
-
-.code {
-  background: #fafafa;
-  border-radius: 5px;
-  padding: 0.75rem;
-  font-size: 1.1rem;
-  font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
-    Bitstream Vera Sans Mono, Courier New, monospace;
-}
-
-@media (max-width: 600px) {
-  .grid {
-    width: 100%;
-    flex-direction: column;
-  }
-}
-
-.grid {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-wrap: wrap;
-  width: 800px;
-  margin-top: 3rem;
-}
-
-.card {
-  margin: 1rem;
-  padding: 1.5rem;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100px;
-  color: inherit;
-  text-decoration: none;
-  border: 1px solid #470000;
-  color: #470000;
-  transition: color 0.15s ease, border-color 0.15s ease;
-  width: 45%;
-}
-
-.card:hover,
-.card:focus,
-.card:active {
-  transform: scale(1.05);
-  transition: 0.1s ease-in-out;
-}
-
-.card h2 {
-  font-size: 1.5rem;
-  margin: 0;
-  padding: 0;
-}

package/tests/fixtures/pure/src/App.tsx

@@ -1,43 +0,0 @@
-import './App.css';
-
-const App = () => (
-  <div className="container">
-    <main>
-      <div className="logo">
-        <img
-          src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png"
-          width="300"
-          alt="Modern.js Logo"
-        />
-      </div>
-      <p className="description">
-        Get started by editing <code className="code">src/home/App.tsx</code>
-      </p>
-      <div className="grid">
-        <a href="https://modernjs.dev/docs/start" className="card">
-          <h2>Quick Start Tencent</h2>
-        </a>
-        <a href="https://modernjs.dev/docs/guides" className="card">
-          <h2>Handbook</h2>
-        </a>
-        <a href="https://modernjs.dev/docs/apis" className="card">
-          <h2>API Reference </h2>
-        </a>
-        <a
-          href="https://modernjs.dev/coming-soon"
-          target="_blank"
-          rel="noopener noreferrer"
-          className="card">
-          <h2>Community </h2>
-        </a>
-      </div>
-    </main>
-    <footer className="footer">
-      <a href="https://modernjs.dev" target="_blank" rel="noopener noreferrer">
-        Powered by Modern.js
-      </a>
-    </footer>
-  </div>
-);
-
-export default App;

package/tests/fixtures/pure/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "declaration": false,
-    "jsx": "preserve",
-    "baseUrl": "./",
-    "paths": {
-      "@shared/*": ["./shared/*"]
-    }
-  },
-  "include": ["src", "shared", "config"]
-}

package/tests/fixtures/watch/a.ts

@@ -1,3 +0,0 @@
-export default {
-  name: 'a',
-};

package/tests/fixtures/watch/index.ts

@@ -1,5 +0,0 @@
-import a from './a';
-
-export default {
-  a,
-};

package/tests/fixtures/watch/stats.txt

@@ -1 +0,0 @@
-1

package/tests/helper.ts

@@ -1,3 +0,0 @@
-export const noop = () => {
-  // empty
-};

package/tests/https.test.ts

@@ -1,17 +0,0 @@
-import { genHttpsOptions } from '../src/dev-tools/https';
-
-describe('test dev tools', () => {
-  test('should get http cert correctly', async () => {
-    // Todo Interaction in CI
-    // const options = await genHttpsOptions(true);
-    // expect(options.key).toBeDefined();
-    // expect(options.cert).toBeDefined();
-
-    const useOpt = await genHttpsOptions({
-      key: 'foo',
-      cert: 'baz',
-    });
-    expect(useOpt.key).toBe('foo');
-    expect(useOpt.cert).toBe('baz');
-  });
-});

package/tests/launch-editor.test.ts

@@ -1,58 +0,0 @@
-import { LAUNCH_EDITOR_ENDPOINT } from '@modern-js/utils';
-import { createLaunchEditorHandler } from '../src/dev-tools/launch-editor';
-import { noop } from './helper';
-
-describe('should createLaunchEditorHandler work correctly', () => {
-  const middleware = createLaunchEditorHandler();
-
-  it('should return 200 if filename exist', () => {
-    let response: any;
-    const context: any = {
-      url: LAUNCH_EDITOR_ENDPOINT,
-      query: {
-        filename: 'test.ts',
-      },
-      res: {
-        end: (data: any) => {
-          response = data;
-        },
-      },
-    };
-    middleware(context, noop);
-    expect(context.status).toBe(200);
-    expect(response).toBeUndefined();
-  });
-
-  it('should return 500 if filename not exist', () => {
-    let response: any;
-    const context: any = {
-      url: LAUNCH_EDITOR_ENDPOINT,
-      query: {
-        filename: '',
-      },
-      res: {
-        end: (data: any) => {
-          response = data;
-        },
-      },
-    };
-    middleware(context, noop);
-    expect(context.status).toBe(500);
-    expect(typeof response === 'string').toBeTruthy();
-  });
-
-  it('should invoke next if not launch editor url', () => {
-    let response: any;
-    const context: any = {
-      url: '',
-      res: {
-        end: (data: any) => {
-          response = data;
-        },
-      },
-    };
-    middleware(context, noop);
-    expect(context.status).toBeUndefined();
-    expect(response).toBeUndefined();
-  });
-});

package/tests/mock.test.ts

@@ -1,150 +0,0 @@
-import path from 'path';
-import { createMockHandler } from '../src/dev-tools/mock';
-import getMockData, { getMatched } from '../src/dev-tools/mock/getMockData';
-import { noop } from './helper';
-
-describe('test dev tools', () => {
-  describe('should mock middleware work correctly', () => {
-    const pwd = path.join(__dirname, './fixtures/mock');
-
-    it('should return null if no config mock dir', () => {
-      expect(createMockHandler({ pwd: path.join(pwd, 'empty') })).toBeNull();
-    });
-
-    it('should return null if no api dir', () => {
-      expect(createMockHandler({ pwd: path.join(pwd, 'zero') })).toBeNull();
-    });
-
-    it('should return middleware if mock api exist', async () => {
-      const middleware = createMockHandler({ pwd: path.join(pwd, 'exist') });
-
-      expect(middleware).not.toBeNull();
-
-      let response: any;
-      const context: any = {
-        path: '/api/getInfo',
-        method: 'get',
-        res: {
-          setHeader: noop,
-          end: (data: any) => {
-            response = JSON.parse(data);
-          },
-        },
-      };
-      await middleware?.(context, noop);
-      expect(response).toEqual({
-        data: [1, 2, 3, 4],
-      });
-    });
-
-    it('should not return middleware if mock api exist', async () => {
-      const middleware = createMockHandler({ pwd: path.join(pwd, 'exist') });
-
-      expect(middleware).not.toBeNull();
-
-      let response: any;
-      const context: any = {
-        path: '/api/getInfp',
-        method: 'get',
-        res: {
-          setHeader: noop,
-          end: (data: any) => {
-            response = JSON.parse(data);
-          },
-        },
-      };
-      await middleware?.(context, noop);
-      expect(response).toBeUndefined();
-    });
-
-    it('should get api list correctly', resolve => {
-      const apiList = getMockData(path.join(pwd, 'exist/config/mock/index.ts'));
-      expect(apiList.length).toBe(3);
-
-      const pathList = apiList.map(api => api.path);
-      expect(pathList).toEqual([
-        '/api/getInfo',
-        '/api/getExample',
-        '/api/addInfo',
-      ]);
-
-      let response: any;
-      const context: any = {
-        res: {
-          setHeader: noop,
-          end: (data: any) => {
-            try {
-              response = JSON.parse(data);
-            } catch (e) {
-              response = data;
-            }
-          },
-        },
-      };
-
-      apiList[0].handler(context, noop as any);
-      expect(response).toEqual({
-        data: [1, 2, 3, 4],
-      });
-      apiList[1].handler(context, noop as any);
-      expect(response).toEqual({ id: 1 });
-
-      apiList[2].handler(context, noop as any);
-      setTimeout(() => {
-        expect(response).toBe('delay 2000ms');
-        resolve();
-      }, 3000);
-    });
-
-    it('should match api correctly', () => {
-      const apiList = [
-        {
-          method: 'get',
-          path: '/api/getInfo',
-          handler: noop,
-        },
-        {
-          method: 'get',
-          path: '/api/getExample',
-          handler: noop,
-        },
-        {
-          method: 'get',
-          path: '/api/addInfo',
-          handler: noop,
-        },
-      ];
-      const matched = getMatched(
-        { path: '/api/getInfo', method: 'get' } as any,
-        apiList,
-      );
-      expect(matched).toBe(apiList[0]);
-
-      const missMethod = getMatched(
-        { path: '/api/getModern', method: 'post' } as any,
-        apiList,
-      );
-      expect(missMethod).toBeUndefined();
-    });
-
-    it('should throw error if get mock file fail', resolve => {
-      try {
-        createMockHandler({ pwd: path.join(pwd, 'module-error') });
-      } catch (e: any) {
-        expect(e.message).toMatch('parsed failed!');
-        resolve();
-      }
-    });
-
-    it('should throw error if get mock api has wrong type', resolve => {
-      try {
-        createMockHandler({ pwd: path.join(pwd, 'type-error') });
-      } catch (e: any) {
-        expect(e.message).toMatch(
-          'should be object or function, but got string',
-        );
-        resolve();
-      }
-    });
-  });
-});

package/tests/server.test.ts

@@ -1,238 +0,0 @@
-import path from 'path';
-import { defaultsConfig, NormalizedConfig } from '@modern-js/core';
-import { ModernServerContext, NextFunction } from '@modern-js/types';
-import { webpack } from 'webpack';
-import { AGGRED_DIR, RUN_MODE } from '@modern-js/prod-server';
-import createServer, { Server } from '../src';
-import Watcher from '../src/dev-tools/watcher';
-import { ModernDevServer } from '../src/server/dev-server';
-
-jest.useFakeTimers();
-(global as any).setImmediate = () => false;
-const appDirectory = path.join(__dirname, './fixtures/pure');
-describe('test dev server', () => {
-  test('should throw error when ', resolve => {
-    try {
-      createServer(null as any);
-    } catch (e: any) {
-      expect((e as Error).message).toBe(
-        'can not start mserver without options',
-      );
-      resolve();
-    }
-  });
-
-  test('shoule get modern server instance', async () => {
-    const server = await createServer({
-      config: {
-        ...defaultsConfig,
-        tools: {
-          devServer: {
-            proxy: {
-              '/simple': `http://localhost:8080`,
-            },
-          },
-        },
-      } as any,
-      pwd: appDirectory,
-      dev: true,
-    });
-    expect(server instanceof Server).toBe(true);
-    await server.close();
-  });
-
-  describe('shoule get dev modern server instance', () => {
-    test('should init server correctly', async () => {
-      const server = await createServer({
-        config: defaultsConfig as NormalizedConfig,
-        pwd: appDirectory,
-        dev: true,
-      });
-      const modernServer = (server as any).server;
-
-      const {
-        pwd,
-        distDir,
-        workDir,
-        conf,
-        handlers,
-        isDev,
-        staticGenerate,
-        presetRoutes,
-      } = modernServer;
-      expect(pwd).toBe(appDirectory);
-      expect(distDir).toBe(path.join(appDirectory, 'dist'));
-      expect(workDir).toBe(appDirectory);
-      expect(conf).toBe(defaultsConfig);
-      expect(handlers).toBeDefined();
-      expect(isDev).toBeFalsy();
-      expect(staticGenerate).toBeFalsy();
-      expect(presetRoutes).toBeUndefined();
-      await server.close();
-    });
-
-    test('should add handler correctly', async () => {
-      const server = await createServer({
-        config: defaultsConfig as NormalizedConfig,
-        pwd: appDirectory,
-        dev: true,
-      });
-      const modernServer = (server as any).server;
-
-      const len = modernServer.handlers.length;
-
-      const syncHandler = (ctx: ModernServerContext, next: NextFunction) => {
-        console.info(ctx.url);
-        next();
-      };
-      modernServer.addHandler(syncHandler);
-
-      const newLen = modernServer.handlers.length;
-      expect(len + 1).toBe(newLen);
-      expect(modernServer.handlers[newLen - 1]).not.toBe(syncHandler);
-
-      const asyncHandler = async (
-        ctx: ModernServerContext,
-        next: NextFunction,
-      ) => {
-        console.info(ctx.url);
-        next();
-      };
-      modernServer.addHandler(asyncHandler);
-      const nextLen = modernServer.handlers.length;
-
-      expect(newLen + 1).toBe(nextLen);
-      expect(modernServer.handlers[nextLen - 1]).toBe(asyncHandler);
-      await server.close();
-    });
-
-    test('should get request handler correctly', async () => {
-      const server = await createServer({
-        config: defaultsConfig as NormalizedConfig,
-        pwd: appDirectory,
-        dev: true,
-      });
-
-      const modernServer: any = (server as any).server;
-      const handler = modernServer.getRequestHandler();
-      expect(typeof handler === 'function').toBeTruthy();
-      await server.close();
-    });
-
-    test('should get request handler correctly', async () => {
-      const server = await createServer({
-        config: defaultsConfig as NormalizedConfig,
-        pwd: appDirectory,
-        dev: true,
-      });
-
-      const modernServer: any = (server as any).server;
-      const handler = modernServer.getRequestHandler();
-      expect(typeof handler === 'function').toBeTruthy();
-      await server.close();
-    });
-
-    test('should invoke onrepack correctly', async () => {
-      const server = await createServer({
-        config: defaultsConfig as NormalizedConfig,
-        pwd: appDirectory,
-        dev: true,
-      });
-
-      const modernServer: ModernDevServer = (server as any).server;
-      modernServer.onRepack({ routes: [] });
-
-      expect((modernServer as any).router.matchers.length).toBe(0);
-      server.close();
-    });
-
-    test('should invoke onserver change correctly', async () => {
-      const server = await createServer({
-        config: defaultsConfig as NormalizedConfig,
-        pwd: appDirectory,
-        dev: true,
-      });
-
-      const modernServer = (server as any).server;
-      modernServer.onServerChange({
-        filepath: path.join(appDirectory, AGGRED_DIR.mock),
-      });
-      expect(modernServer.mockHandler).not.toBeNull();
-
-      modernServer.onServerChange({
-        filepath: path.join(appDirectory, 'index.js'),
-      });
-      expect(modernServer.mockHandler).not.toBeNull();
-      server.close();
-    });
-
-    test('should compiler work correctly', async () => {
-      const compiler = webpack({});
-      const server = await createServer({
-        config: defaultsConfig as NormalizedConfig,
-        pwd: appDirectory,
-        dev: true,
-        compiler,
-      });
-
-      expect(server).toBeDefined();
-      server.close();
-    });
-
-    test('should multi compiler work correctly', async () => {
-      const compiler = webpack([{}, { name: 'client' }]);
-      const server = await createServer({
-        config: defaultsConfig as NormalizedConfig,
-        pwd: appDirectory,
-        dev: true,
-        compiler,
-      });
-
-      expect(server).toBeDefined();
-      server.close();
-    });
-
-    test('should watcher work well', async () => {
-      const devServer = await createServer({
-        config: defaultsConfig as NormalizedConfig,
-        pwd: appDirectory,
-        dev: true,
-      });
-
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      expect(devServer.server.watcher).toBeInstanceOf(Watcher);
-      await devServer.close();
-    });
-  });
-
-  describe('should split server work correctly', () => {
-    test('should init api server correctly', async () => {
-      const server = await createServer({
-        config: defaultsConfig as NormalizedConfig,
-        pwd: appDirectory,
-        dev: true,
-        apiOnly: true,
-        runMode: RUN_MODE.FULL,
-      });
-      const modernServer = (server as any).server;
-      modernServer.emitRouteHook('reset', {});
-      expect(modernServer.prepareWebHandler()).toBe(null);
-      await server.close();
-    });
-
-    test('should init ssr server correctly', async () => {
-      const server = await createServer({
-        config: defaultsConfig as NormalizedConfig,
-        pwd: appDirectory,
-        dev: true,
-        ssrOnly: true,
-        runMode: RUN_MODE.FULL,
-      });
-      const modernServer = (server as any).server;
-      modernServer.emitRouteHook('reset', {});
-      expect(modernServer.prepareAPIHandler()).toBe(null);
-      await server.close();
-    });
-  });
-});

package/tests/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "declaration": false,
-    "jsx": "preserve",
-    "baseUrl": "./",
-    "isolatedModules": true,
-    "sourceMap": true
-  },
-  "paths": {},
-  "exclude": ["src/__test__/fixtures/**"]
-}

package/tests/watcher.test.ts

@@ -1,231 +0,0 @@
-import path from 'path';
-import { fs } from '@modern-js/utils';
-import Watcher, { getWatchedFiles } from '../src/dev-tools/watcher';
-import { StatsCache } from '../src/dev-tools/watcher/stats-cache';
-
-jest.useRealTimers();
-
-describe('watcher', () => {
-  jest.setTimeout(25000);
-  const pwd = path.join(__dirname, './fixtures/watch');
-  const serverDir = path.normalize(path.join(pwd, './tmp-server'));
-
-  beforeAll(() => {
-    if (fs.existsSync(serverDir)) {
-      fs.removeSync(serverDir);
-    }
-    fs.mkdirSync(serverDir);
-  });
-
-  afterAll(() => {
-    fs.removeSync(serverDir);
-  });
-
-  // const writeFiles = (content: string, filepath: string) => {
-  //   fs.writeFileSync(path.normalize(filepath), content, 'utf8');
-  // };
-
-  // TODO 容易导致 timeout，暂时注释掉
-  // test('should emit add', done => {
-  //   const watcher = new Watcher();
-  //   const callback = jest.fn();
-
-  //   const watchDir = path.join(serverDir, 'add');
-  //   fs.mkdirSync(watchDir);
-
-  //   watcher.listen(
-  //     [`${watchDir}/**/*`],
-  //     {
-  //       ignoreInitial: true,
-  //       ignored: /api\/typings\/.*/,
-  //     },
-  //     async () => {
-  //       try {
-  //         callback();
-  //         expect(callback).toHaveBeenCalledTimes(1);
-  //         await watcher.close();
-  //       } catch (e) {
-  //         console.error(e);
-  //       }
-  //       done();
-  //     },
-  //   );
-
-  //   setTimeout(() => writeFiles('test', path.join(watchDir, 'index.js')), 100);
-  // });
-
-  // TODO 容易导致 timeout，暂时注释掉
-  // test('should emit unlink', done => {
-  //   const watcher = new Watcher();
-
-  //   const callback = jest.fn();
-  //   const watchDir = path.join(serverDir, 'unlink');
-  //   fs.mkdirSync(watchDir);
-
-  //   const filepath = path.join(watchDir, 'index.js');
-  //   writeFiles('unlink', filepath);
-
-  //   watcher.listen(
-  //     [`${watchDir}/**/*`],
-  //     {
-  //       ignoreInitial: true,
-  //       ignored: /api\/typings\/.*/,
-  //     },
-  //     async () => {
-  //       callback();
-  //       expect(callback).toHaveBeenCalledTimes(1);
-  //       await watcher.close();
-  //       done();
-  //     },
-  //   );
-
-  //   setTimeout(() => {
-  //     fs.removeSync(filepath);
-  //   }, 100);
-  // });
-
-  // TODO 容易导致 timeout，暂时注释掉
-  // test('should emit change', done => {
-  //   const watcher = new Watcher();
-
-  //   const callback = jest.fn();
-  //   const watchDir = path.join(serverDir, 'change');
-  //   fs.mkdirSync(watchDir);
-
-  //   const filepath = path.join(watchDir, 'index.js');
-  //   writeFiles('start', filepath);
-
-  //   watcher.listen(
-  //     [`${watchDir}/**/*`],
-  //     {
-  //       ignoreInitial: true,
-  //       ignored: /api\/typings\/.*/,
-  //     },
-  //     async () => {
-  //       callback();
-  //       expect(callback).toHaveBeenCalledTimes(1);
-  //       await watcher.close();
-  //       done();
-  //     },
-  //   );
-
-  //   setTimeout(() => writeFiles('end', filepath), 100);
-  // });
-
-  test('should not emit change when typings file changed', done => {
-    const watcher = new Watcher();
-    const apiDir = path.normalize(path.join(pwd, './api'));
-
-    const callback = jest.fn();
-
-    if (fs.pathExistsSync(apiDir)) {
-      fs.removeSync(apiDir);
-    }
-
-    const clear = () => {
-      fs.removeSync(apiDir);
-    };
-
-    fs.mkdirSync(path.normalize(path.join(apiDir, 'typings')), {
-      recursive: true,
-    });
-
-    watcher.listen(
-      [`${apiDir}/**/*`],
-      {
-        ignoreInitial: true,
-        ignored: /api\/typings\/.*/,
-      },
-      callback,
-    );
-
-    setTimeout(async () => {
-      expect(callback).toHaveBeenCalledTimes(0);
-      await watcher.close();
-      clear();
-      done();
-    }, 1000);
-  });
-});
-
-describe('test watcher', () => {
-  let watcher: any;
-  const baseDir = path.join(__dirname, 'fixtures');
-  const watchDir = path.join(baseDir, 'watch/**');
-  const filepath = path.join(baseDir, 'watch', 'index.ts');
-  const filepatha = path.join(baseDir, 'watch', 'a.ts');
-  const txt = path.join(baseDir, 'watch', 'stats.txt');
-
-  afterEach(() => {
-    if (watcher) {
-      watcher.close();
-    }
-    fs.writeFileSync(txt, '1');
-  });
-
-  it('should create watcher instance correctly', resolve => {
-    watcher = new Watcher();
-    expect(watcher.dependencyTree).toBeNull();
-    watcher.createDepTree();
-    expect(watcher.dependencyTree).not.toBeNull();
-
-    expect(watcher.watcher).toBeUndefined();
-    watcher.listen([watchDir], {}, () => {
-      // empty
-    });
-
-    expect(watcher.watcher).toBeDefined();
-    require(filepath);
-    expect(watcher.dependencyTree.getNode(filepath)).toBeUndefined();
-    watcher.updateDepTree();
-    expect(watcher.dependencyTree.getNode(filepath)).toBeDefined();
-    watcher.cleanDepCache(filepath);
-    expect(watcher.dependencyTree.getNode(filepath)).toBeDefined();
-
-    jest.resetModules();
-    watcher.updateDepTree();
-    expect(watcher.dependencyTree.getNode(filepath)).toBeUndefined();
-
-    setTimeout(() => {
-      const fl = getWatchedFiles(watcher.watcher);
-      expect(fl.includes(filepatha)).toBeTruthy();
-      expect(fl.includes(filepath)).toBeTruthy();
-      expect(fl.includes(txt)).toBeTruthy();
-      resolve();
-    }, 1000);
-  });
-
-  it('should stats cache instance work correctly', () => {
-    const statsCache = new StatsCache();
-
-    // should not exist false before add
-    expect(statsCache.has(txt)).toBeFalsy();
-
-    // should exist true after add
-    statsCache.add([txt]);
-    expect(statsCache.has(txt)).toBeTruthy();
-
-    // should diff correctly
-    fs.writeFileSync(txt, 'foo');
-    expect(statsCache.isDiff(txt)).toBeTruthy();
-
-    // should not diff if not refresh
-    fs.writeFileSync(txt, '1');
-    expect(statsCache.isDiff(txt)).toBeFalsy();
-
-    // should diff after refresh
-    fs.writeFileSync(txt, 'foo');
-    statsCache.refresh(txt);
-    fs.writeFileSync(txt, '1');
-    expect(statsCache.isDiff(txt)).toBeTruthy();
-
-    // should diff when content change
-    statsCache.refresh(txt);
-    fs.writeFileSync(txt, '2');
-    expect(statsCache.isDiff(txt)).toBeTruthy();
-
-    // should not exist after del
-    statsCache.del(txt);
-    expect(statsCache.has(txt)).toBeFalsy();
-  });
-});