@modern-js/server 1.4.9 → 1.4.12

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,61 @@
 # @modern-js/server
 
+## 1.4.12
+
+### Patch Changes
+
+- 6fa74d5f: add internal metrics and logger
+- Updated dependencies [0ee4bb4e]
+- Updated dependencies [a4c5fe78]
+- Updated dependencies [6fa74d5f]
+  - @modern-js/utils@1.7.0
+  - @modern-js/prod-server@1.1.3
+  - @modern-js/server-utils@1.2.4
+
+## 1.4.11
+
+### Patch Changes
+
+- a0475f1a: fix: missing @babel/core peer dependencies
+- 895fa0ff: chore: using "workspace:\*" in devDependencies
+- 247e2005: support devServer.devMiddleware, same as webpack-dev-server
+- Updated dependencies [2d155c4c]
+- Updated dependencies [a0499e4f]
+- Updated dependencies [123e432d]
+- Updated dependencies [e5a9b26d]
+- Updated dependencies [0b26b93b]
+- Updated dependencies [123e432d]
+- Updated dependencies [f9f66ef9]
+- Updated dependencies [592edabc]
+- Updated dependencies [895fa0ff]
+- Updated dependencies [3578913e]
+- Updated dependencies [1c3beab3]
+  - @modern-js/utils@1.6.0
+  - @modern-js/prod-server@1.1.2
+  - @modern-js/bff-utils@1.2.4
+  - @modern-js/server-utils@1.2.4
+
+## 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

package/dist/js/modern/constants.js

@@ -8,7 +8,7 @@ export const DEFAULT_DEV_OPTIONS = {
     host: 'localhost'
   },
   https: false,
-  dev: {
+  devMiddleware: {
     writeToDisk: true
   },
   watch: true,

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/modern/server/dev-server-split.js

@@ -9,9 +9,9 @@ export class ModernSSRDevServer extends ModernDevServer {
     return routes.filter(route => route.isSSR);
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     if (this.runMode === RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 
@@ -31,9 +31,9 @@ export class ModernAPIDevServer extends ModernDevServer {
     return routes.filter(route => route.isApi);
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     if (this.runMode === RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 

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

@@ -260,12 +260,11 @@ export class ModernDevServer extends ModernServer {
     const {
       conf
     } = this;
-    this.devMiddleware = webpackDevMiddleware(compiler, {
+    this.devMiddleware = webpackDevMiddleware(compiler, _objectSpread({
       headers: (_conf$tools2 = conf.tools) === null || _conf$tools2 === void 0 ? void 0 : (_conf$tools2$devServe = _conf$tools2.devServer) === null || _conf$tools2$devServe === void 0 ? void 0 : _conf$tools2$devServe.headers,
       publicPath: '/',
-      writeToDisk: this.dev.dev.writeToDisk,
       stats: false
-    });
+    }, this.dev.devMiddleware));
     return (ctx, next) => {
       const {
         req,

package/dist/js/node/constants.js

@@ -16,7 +16,7 @@ const DEFAULT_DEV_OPTIONS = {
     host: 'localhost'
   },
   https: false,
-  dev: {
+  devMiddleware: {
     writeToDisk: true
   },
   watch: true,

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/js/node/server/dev-server-split.js

@@ -18,9 +18,9 @@ class ModernSSRDevServer extends _devServer.ModernDevServer {
     return routes.filter(route => route.isSSR);
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     if (this.runMode === _prodServer.RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 
@@ -43,9 +43,9 @@ class ModernAPIDevServer extends _devServer.ModernDevServer {
     return routes.filter(route => route.isApi);
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     if (this.runMode === _prodServer.RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 

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

@@ -284,12 +284,11 @@ class ModernDevServer extends _prodServer.ModernServer {
     const {
       conf
     } = this;
-    this.devMiddleware = (0, _webpackDevMiddleware.default)(compiler, {
+    this.devMiddleware = (0, _webpackDevMiddleware.default)(compiler, _objectSpread({
       headers: (_conf$tools2 = conf.tools) === null || _conf$tools2 === void 0 ? void 0 : (_conf$tools2$devServe = _conf$tools2.devServer) === null || _conf$tools2$devServe === void 0 ? void 0 : _conf$tools2$devServe.headers,
       publicPath: '/',
-      writeToDisk: this.dev.dev.writeToDisk,
       stats: false
-    });
+    }, this.dev.devMiddleware));
     return (ctx, next) => {
       const {
         req,

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/dist/types/server/dev-server-split.d.ts

@@ -5,12 +5,12 @@ import { ModernDevServer } from './dev-server';
 export declare class ModernSSRDevServer extends ModernDevServer {
   protected prepareAPIHandler(_m: ApiServerMode, _: APIServerStartInput['config']): any;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
-  protected preServerInit(): Promise<void>;
+  protected setupBeforeProdMiddleware(): Promise<void>;
   protected emitRouteHook(_: HookNames, _input: any): Promise<void>;
 }
 export declare class ModernAPIDevServer extends ModernDevServer {
   protected prepareWebHandler(_: APIServerStartInput['config']): any;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
-  protected preServerInit(): Promise<void>;
+  protected setupBeforeProdMiddleware(): Promise<void>;
   protected emitRouteHook(_: HookNames, _input: any): Promise<void>;
 }

package/dist/types/types.d.ts

@@ -9,7 +9,7 @@ export declare type DevServerOptions = {
     host: string;
     progress?: boolean;
   };
-  dev: {
+  devMiddleware: {
     writeToDisk: boolean | ((filename: string) => boolean);
   };
   watch: boolean;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.9",
+  "version": "1.4.12",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,13 +28,13 @@
     }
   },
   "dependencies": {
+    "@babel/core": "7.16.7",
     "@babel/register": "^7.15.3",
-    "@modern-js/bff-utils": "^1.2.2",
-    "@modern-js/hmr-client": "^1.2.3",
-    "@modern-js/prod-server": "^1.0.6",
-    "@modern-js/server-utils": "^1.2.2",
-    "@modern-js/utils": "^1.3.7",
-    "chokidar": "^3.5.2",
+    "@modern-js/bff-utils": "^1.2.4",
+    "@modern-js/hmr-client": "^1.2.5",
+    "@modern-js/prod-server": "^1.1.3",
+    "@modern-js/server-utils": "^1.2.4",
+    "@modern-js/utils": "^1.7.0",
     "devcert": "^1.1.3",
     "launch-editor": "^2.2.1",
     "minimatch": "^3.0.4",
@@ -44,9 +44,9 @@
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.6.1",
-    "@modern-js/server-core": "1.2.5",
-    "@modern-js/types": "^1.3.6",
+    "@modern-js/core": "1.10.0",
+    "@modern-js/server-core": "1.3.3",
+    "@modern-js/types": "1.5.2",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/jest": "^26",

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;
-}