@modern-js/server 1.4.7-canary.2 → 1.4.9-beta.peer.1

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,46 @@
 # @modern-js/server
 
+## 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
+
+- a8df060e: support setup dev middleware first step
+- d2d0fa11: fix: missing devServer.proxy typing
+- 6a7acb81: modify devServer type and name
+- Updated dependencies [c2046f37]
+- Updated dependencies [d2d0fa11]
+  - @modern-js/utils@1.3.6
+  - @modern-js/prod-server@1.0.5
+
+## 1.4.7
+
+### Patch Changes
+
+- d95f28c3: remove server hook when api only
+- d5bf095a: fix: disable load webpack when apiOnly mode
+- 9229dfd1: support custom headers, fix hmr url concat
+- Updated dependencies [5bf5868d]
+- Updated dependencies [d95f28c3]
+- Updated dependencies [d95f28c3]
+- Updated dependencies [0923c182]
+- Updated dependencies [2008fdbd]
+- Updated dependencies [ca0bcf13]
+  - @modern-js/utils@1.3.5
+  - @modern-js/prod-server@1.0.4
+
 ## 1.4.6
 
 ### Patch Changes

package/dist/js/modern/dev-tools/babel/register.js

@@ -27,6 +27,7 @@ export const enableRegister = (projectRoot, config) => {
     }],
     extensions: ['.js', '.ts'],
     babelrc: false,
+    configFile: false,
     root: projectRoot
   }));
 };

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.js

@@ -39,12 +39,24 @@ export class ModernDevServer extends ModernServer {
   async onInit(runner) {
     var _conf$tools, _conf$tools$devServer;
 
+    this.runner = runner;
     const {
       conf,
       pwd,
       compiler,
       dev
-    } = this; // mock handler
+    } = this; // before dev handler
+
+    const beforeHandlers = await this.setupBeforeDevMiddleware();
+    beforeHandlers.forEach(handler => {
+      this.addHandler((ctx, next) => {
+        const {
+          req,
+          res
+        } = ctx;
+        return handler(req, res, next);
+      });
+    }); // mock handler
 
     this.mockHandler = createMockHandler({
       pwd
@@ -74,8 +86,19 @@ export class ModernDevServer extends ModernServer {
 
       const devMiddlewareHandler = this.setupCompiler(compiler);
       this.addHandler(devMiddlewareHandler);
-    }
+    } // after dev handler
+
 
+    const afterHandlers = await this.setupAfterDevMiddleware();
+    afterHandlers.forEach(handler => {
+      this.addHandler((ctx, next) => {
+        const {
+          req,
+          res
+        } = ctx;
+        return handler(req, res, next);
+      });
+    });
     await super.onInit(runner); // watch mock/ server/ api/ dir file change
 
     if (dev.watch) {
@@ -252,6 +275,30 @@ export class ModernDevServer extends ModernServer {
     };
   }
 
+  async setupBeforeDevMiddleware() {
+    var _conf$tools$devServer2;
+
+    const {
+      runner,
+      conf
+    } = this;
+    const setupMids = ((_conf$tools$devServer2 = conf.tools.devServer) === null || _conf$tools$devServer2 === void 0 ? void 0 : _conf$tools$devServer2.before) || [];
+    const pluginMids = await runner.beforeDevServer(conf);
+    return [...setupMids, ...pluginMids].flat();
+  }
+
+  async setupAfterDevMiddleware() {
+    var _conf$tools$devServer3;
+
+    const {
+      runner,
+      conf
+    } = this;
+    const setupMids = ((_conf$tools$devServer3 = conf.tools.devServer) === null || _conf$tools$devServer3 === void 0 ? void 0 : _conf$tools$devServer3.after) || [];
+    const pluginMids = await runner.afterDevServer(conf);
+    return [...pluginMids, ...setupMids].flat();
+  }
+
   cleanSSRCache() {
     const {
       distDir

package/dist/js/node/dev-tools/babel/register.js

@@ -41,6 +41,7 @@ const enableRegister = (projectRoot, config) => {
     }],
     extensions: ['.js', '.ts'],
     babelrc: false,
+    configFile: false,
     root: projectRoot
   }));
 };

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.js

@@ -61,12 +61,24 @@ class ModernDevServer extends _prodServer.ModernServer {
   async onInit(runner) {
     var _conf$tools, _conf$tools$devServer;
 
+    this.runner = runner;
     const {
       conf,
       pwd,
       compiler,
       dev
-    } = this; // mock handler
+    } = this; // before dev handler
+
+    const beforeHandlers = await this.setupBeforeDevMiddleware();
+    beforeHandlers.forEach(handler => {
+      this.addHandler((ctx, next) => {
+        const {
+          req,
+          res
+        } = ctx;
+        return handler(req, res, next);
+      });
+    }); // mock handler
 
     this.mockHandler = (0, _mock.createMockHandler)({
       pwd
@@ -96,8 +108,19 @@ class ModernDevServer extends _prodServer.ModernServer {
 
       const devMiddlewareHandler = this.setupCompiler(compiler);
       this.addHandler(devMiddlewareHandler);
-    }
+    } // after dev handler
+
 
+    const afterHandlers = await this.setupAfterDevMiddleware();
+    afterHandlers.forEach(handler => {
+      this.addHandler((ctx, next) => {
+        const {
+          req,
+          res
+        } = ctx;
+        return handler(req, res, next);
+      });
+    });
     await super.onInit(runner); // watch mock/ server/ api/ dir file change
 
     if (dev.watch) {
@@ -276,6 +299,30 @@ class ModernDevServer extends _prodServer.ModernServer {
     };
   }
 
+  async setupBeforeDevMiddleware() {
+    var _conf$tools$devServer2;
+
+    const {
+      runner,
+      conf
+    } = this;
+    const setupMids = ((_conf$tools$devServer2 = conf.tools.devServer) === null || _conf$tools$devServer2 === void 0 ? void 0 : _conf$tools$devServer2.before) || [];
+    const pluginMids = await runner.beforeDevServer(conf);
+    return [...setupMids, ...pluginMids].flat();
+  }
+
+  async setupAfterDevMiddleware() {
+    var _conf$tools$devServer3;
+
+    const {
+      runner,
+      conf
+    } = this;
+    const setupMids = ((_conf$tools$devServer3 = conf.tools.devServer) === null || _conf$tools$devServer3 === void 0 ? void 0 : _conf$tools$devServer3.after) || [];
+    const pluginMids = await runner.afterDevServer(conf);
+    return [...pluginMids, ...setupMids].flat();
+  }
+
   cleanSSRCache() {
     const {
       distDir

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.d.ts

@@ -25,6 +25,8 @@ export declare class ModernDevServer extends ModernServer {
   private setupDevServerPlugin;
   private setupHooks;
   private setupDevMiddleware;
+  private setupBeforeDevMiddleware;
+  private setupAfterDevMiddleware;
   private cleanSSRCache;
   private startWatcher;
 }

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,9 +11,9 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.7-canary.2",
+  "version": "1.4.9-beta.peer.1",
   "jsnext:source": "./src/index.ts",
-  "types": "./src/index.ts",
+  "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
   "module": "./dist/js/treeshaking/index.js",
   "jsnext:modern": "./dist/js/modern/index.js",
@@ -27,22 +27,14 @@
       "default": "./dist/js/treeshaking/index.js"
     }
   },
-  "scripts": {
-    "prepare": "pnpm build",
-    "prepublishOnly": "pnpm build --platform",
-    "new": "modern new",
-    "build": "modern build",
-    "dev": "modern build --watch",
-    "test": "jest"
-  },
   "dependencies": {
-    "@modern-js/prod-server": "^1.0.2",
+    "@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.4",
-    "chokidar": "^3.5.2",
+    "@modern-js/hmr-client": "^1.2.4",
+    "@modern-js/prod-server": "^1.1.0",
+    "@modern-js/server-utils": "^1.2.2",
+    "@modern-js/utils": "^1.4.1",
     "devcert": "^1.1.3",
     "launch-editor": "^2.2.1",
     "minimatch": "^3.0.4",
@@ -52,10 +44,11 @@
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/server-core": "^1.2.2",
-    "@modern-js/core": "^1.4.6",
-    "@scripts/build": "*",
-    "@modern-js/types": "^1.3.4",
+    "@modern-js/core": "1.7.1-beta.peer.1",
+    "@modern-js/server-core": "1.3.0",
+    "@modern-js/types": "^1.4.0",
+    "@scripts/build": "0.0.0",
+    "@scripts/jest-config": "0.0.0",
     "@types/jest": "^26",
     "@types/minimatch": "^3.0.5",
     "@types/node": "^14",
@@ -63,8 +56,7 @@
     "@types/ws": "^7.4.7",
     "jest": "^27",
     "typescript": "^4",
-    "webpack": "^5.54.0",
-    "@scripts/jest-config": "*",
+    "webpack": "^5.71.0",
     "websocket": "^1"
   },
   "peerDependencies": {
@@ -78,7 +70,13 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
-  }
-}
+    "access": "public"
+  },
+  "scripts": {
+    "new": "modern new",
+    "build": "modern build",
+    "dev": "modern build --watch",
+    "test": "jest"
+  },
+  "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
+}

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