@modern-js/server 1.17.0 → 1.18.1-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. package/CHANGELOG.md +55 -0
  2. package/dist/js/modern/dev-tools/{dev-server-plugin.js → dev-middleware/dev-server-plugin.js} +1 -1
  3. package/dist/js/modern/{hmr-client → dev-tools/dev-middleware/hmr-client}/createSocketUrl.js +0 -0
  4. package/dist/js/modern/{hmr-client → dev-tools/dev-middleware/hmr-client}/index.js +0 -0
  5. package/dist/js/modern/dev-tools/dev-middleware/index.js +138 -0
  6. package/dist/js/modern/dev-tools/{socket-server.js → dev-middleware/socket-server.js} +0 -0
  7. package/dist/js/modern/dev-tools/https/index.js +1 -1
  8. package/dist/js/modern/dev-tools/register/index.js +103 -0
  9. package/dist/js/modern/server/dev-server.js +45 -142
  10. package/dist/js/modern/server/index.js +1 -8
  11. package/dist/js/node/dev-tools/{dev-server-plugin.js → dev-middleware/dev-server-plugin.js} +1 -1
  12. package/dist/js/node/{hmr-client → dev-tools/dev-middleware/hmr-client}/createSocketUrl.js +0 -0
  13. package/dist/js/node/{hmr-client → dev-tools/dev-middleware/hmr-client}/index.js +0 -0
  14. package/dist/js/node/dev-tools/dev-middleware/index.js +152 -0
  15. package/dist/js/node/dev-tools/{socket-server.js → dev-middleware/socket-server.js} +0 -0
  16. package/dist/js/node/dev-tools/https/index.js +1 -1
  17. package/dist/js/node/dev-tools/register/index.js +120 -0
  18. package/dist/js/node/server/dev-server.js +46 -145
  19. package/dist/js/node/server/index.js +1 -9
  20. package/dist/types/dev-tools/{dev-server-plugin.d.ts → dev-middleware/dev-server-plugin.d.ts} +1 -1
  21. package/dist/types/{hmr-client → dev-tools/dev-middleware/hmr-client}/createSocketUrl.d.ts +0 -0
  22. package/dist/types/{hmr-client → dev-tools/dev-middleware/hmr-client}/index.d.ts +0 -0
  23. package/dist/types/dev-tools/dev-middleware/index.d.ts +31 -0
  24. package/dist/types/dev-tools/{socket-server.d.ts → dev-middleware/socket-server.d.ts} +1 -1
  25. package/dist/types/dev-tools/https/index.d.ts +6 -1
  26. package/dist/types/dev-tools/mock/getMockData.d.ts +1 -1
  27. package/dist/types/dev-tools/mock/index.d.ts +1 -1
  28. package/dist/types/dev-tools/{babel/register.d.ts → register/index.d.ts} +0 -0
  29. package/dist/types/index.d.ts +2 -2
  30. package/dist/types/server/dev-server.d.ts +6 -14
  31. package/dist/types/server/index.d.ts +1 -1
  32. package/dist/types/types.d.ts +7 -6
  33. package/package.json +17 -11
  34. package/dist/js/modern/dev-tools/babel/register.js +0 -33
  35. package/dist/js/modern/server/dev-server-split.js +0 -43
  36. package/dist/js/node/dev-tools/babel/register.js +0 -49
  37. package/dist/js/node/server/dev-server-split.js +0 -57
  38. package/dist/types/server/dev-server-split.d.ts +0 -16
@@ -0,0 +1,152 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+
8
+ var _events = require("events");
9
+
10
+ var _webpackDevMiddleware = _interopRequireDefault(require("@modern-js/utils/webpack-dev-middleware"));
11
+
12
+ var _devServerPlugin = _interopRequireDefault(require("./dev-server-plugin"));
13
+
14
+ var _socketServer = _interopRequireDefault(require("./socket-server"));
15
+
16
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
+
18
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
19
+
20
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
21
+
22
+ function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
23
+
24
+ const noop = () => {// noop
25
+ };
26
+
27
+ class DevMiddleware extends _events.EventEmitter {
28
+ constructor({
29
+ compiler,
30
+ dev,
31
+ config
32
+ }) {
33
+ super();
34
+
35
+ _defineProperty(this, "middleware", void 0);
36
+
37
+ _defineProperty(this, "compiler", void 0);
38
+
39
+ _defineProperty(this, "devOptions", void 0);
40
+
41
+ _defineProperty(this, "socketServer", void 0);
42
+
43
+ _defineProperty(this, "config", void 0);
44
+
45
+ this.compiler = compiler;
46
+ this.devOptions = dev;
47
+ this.config = config; // init socket server
48
+
49
+ this.socketServer = new _socketServer.default(dev); // Todo: should remove after abstract dev middleware
50
+
51
+ if (this.compiler) {
52
+ // setup compiler in server, also add dev-middleware to handler static file in memory
53
+ // set up plugin to each compiler
54
+ this.setupDevServerPlugin(); // register hooks for each compilation, update socket stats if recompiled
55
+
56
+ this.setupHooks(); // start dev middleware
57
+
58
+ this.middleware = this.setupDevMiddleware();
59
+ }
60
+ }
61
+
62
+ init(app) {
63
+ app.on('listening', () => {
64
+ this.socketServer.prepare(app);
65
+ });
66
+ app.on('close', async () => {
67
+ var _this$middleware;
68
+
69
+ (_this$middleware = this.middleware) === null || _this$middleware === void 0 ? void 0 : _this$middleware.close(noop);
70
+ this.socketServer.close();
71
+ });
72
+ }
73
+
74
+ setupDevServerPlugin() {
75
+ const {
76
+ devOptions
77
+ } = this; // apply dev server to client compiler, add hmr client to entry.
78
+
79
+ if (this.compiler.compilers) {
80
+ this.compiler.compilers.forEach(target => {
81
+ if (this.isClientCompiler(target)) {
82
+ new _devServerPlugin.default(devOptions).apply(target);
83
+ }
84
+ });
85
+ } else {
86
+ new _devServerPlugin.default(devOptions).apply(this.compiler);
87
+ }
88
+ }
89
+
90
+ setupHooks() {
91
+ const invalidPlugin = () => {
92
+ this.socketServer.sockWrite('invalid');
93
+ };
94
+
95
+ const addHooks = compiler => {
96
+ if (compiler.name === 'server') {
97
+ return;
98
+ }
99
+
100
+ const {
101
+ compile,
102
+ invalid,
103
+ done
104
+ } = compiler.hooks;
105
+ compile.tap('modern-dev-server', invalidPlugin);
106
+ invalid.tap('modern-dev-server', invalidPlugin);
107
+ done.tap('modern-dev-server', stats => {
108
+ this.socketServer.updateStats(stats);
109
+ this.emit('change', stats);
110
+ });
111
+ };
112
+
113
+ if (this.compiler.compilers) {
114
+ this.compiler.compilers.forEach(addHooks);
115
+ } else {
116
+ addHooks(this.compiler);
117
+ }
118
+ }
119
+
120
+ setupDevMiddleware() {
121
+ var _config$tools, _config$tools$devServ;
122
+
123
+ const {
124
+ config,
125
+ devOptions
126
+ } = this;
127
+ const middleware = (0, _webpackDevMiddleware.default)(this.compiler, _objectSpread({
128
+ headers: (_config$tools = config.tools) === null || _config$tools === void 0 ? void 0 : (_config$tools$devServ = _config$tools.devServer) === null || _config$tools$devServ === void 0 ? void 0 : _config$tools$devServ.headers,
129
+ stats: false
130
+ }, devOptions.devMiddleware));
131
+ return middleware;
132
+ }
133
+
134
+ isClientCompiler(compiler) {
135
+ const {
136
+ target
137
+ } = compiler.options; // if target not contains `node`, it's a client compiler
138
+
139
+ if (target) {
140
+ if (Array.isArray(target)) {
141
+ return !target.includes('node');
142
+ }
143
+
144
+ return target !== 'node';
145
+ }
146
+
147
+ return compiler.name === 'client';
148
+ }
149
+
150
+ }
151
+
152
+ exports.default = DevMiddleware;
@@ -12,7 +12,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
12
12
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
13
13
 
14
14
  const genHttpsOptions = async userOptions => {
15
- const httpsOptions = userOptions === true ? {} : userOptions;
15
+ const httpsOptions = typeof userOptions === 'boolean' ? {} : userOptions;
16
16
 
17
17
  if (!httpsOptions.key || !httpsOptions.cert) {
18
18
  const selfsign = await devcert.certificateFor(['localhost']);
@@ -0,0 +1,120 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.enableRegister = void 0;
7
+
8
+ var _path = _interopRequireDefault(require("path"));
9
+
10
+ var _serverUtils = require("@modern-js/server-utils");
11
+
12
+ var _utils = require("@modern-js/utils");
13
+
14
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
+
16
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
17
+
18
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
19
+
20
+ function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
21
+
22
+ const debug = (0, _utils.createDebugger)('server');
23
+
24
+ const checkDep = (depName, paths) => {
25
+ let packagePath = '';
26
+
27
+ try {
28
+ packagePath = require.resolve(depName, {
29
+ paths
30
+ });
31
+ } catch (error) {}
32
+
33
+ return Boolean(packagePath);
34
+ };
35
+
36
+ const enableRegister = (projectRoot, config // eslint-disable-next-line consistent-return
37
+ ) => {
38
+ const registerDirs = ['./api', './server', './config/mock', './shared'];
39
+ const TS_CONFIG_FILENAME = `tsconfig.json`;
40
+
41
+ const tsconfigPath = _path.default.resolve(projectRoot, TS_CONFIG_FILENAME);
42
+
43
+ const isTsProject = _utils.fs.existsSync(tsconfigPath);
44
+
45
+ const existTsNode = checkDep('ts-node', [projectRoot]);
46
+ const existTsConfigPaths = checkDep('tsconfig-paths', [projectRoot]);
47
+
48
+ if (isTsProject && existTsNode && existTsConfigPaths) {
49
+ var _config$output;
50
+
51
+ debug('use ts-node');
52
+ const distPath = (config === null || config === void 0 ? void 0 : (_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist';
53
+
54
+ const tsNode = require('ts-node');
55
+
56
+ const tsConfigPaths = require('tsconfig-paths');
57
+
58
+ const {
59
+ alias
60
+ } = config.source;
61
+ const aliasOption = (0, _utils.getAlias)(alias || {}, {
62
+ appDirectory: projectRoot,
63
+ tsconfigPath
64
+ });
65
+ const {
66
+ paths = {},
67
+ absoluteBaseUrl = './'
68
+ } = aliasOption;
69
+ const tsPaths = Object.keys(paths).reduce((o, key) => {
70
+ let tsPath = paths[key];
71
+
72
+ if (typeof tsPath === 'string' && _path.default.isAbsolute(tsPath)) {
73
+ tsPath = _path.default.relative(absoluteBaseUrl, tsPath);
74
+ }
75
+
76
+ if (typeof tsPath === 'string') {
77
+ tsPath = [tsPath];
78
+ }
79
+
80
+ return _objectSpread(_objectSpread({}, o), {}, {
81
+ [`${key}`]: tsPath
82
+ });
83
+ }, {});
84
+ tsConfigPaths.register({
85
+ baseUrl: absoluteBaseUrl || './',
86
+ paths: tsPaths
87
+ });
88
+ tsNode.register({
89
+ project: tsconfigPath,
90
+ // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
91
+ files: true,
92
+ transpileOnly: true,
93
+ ignore: ['(?:^|/)node_modules/', `(?:^|/)${distPath}/bundles/`]
94
+ });
95
+ } else {
96
+ debug('use @babel/register');
97
+ const babelConfig = (0, _serverUtils.resolveBabelConfig)(projectRoot, config, {
98
+ tsconfigPath,
99
+ syntax: 'es6+',
100
+ type: 'commonjs'
101
+ });
102
+ return require('@babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
103
+ only: [function (filePath) {
104
+ // TODO: wait params
105
+ // FIXME: 删除hardcode,根据 AppContext 中的 metaName 设置路径
106
+ if (filePath.includes(`node_modules${_path.default.sep}.modern-js`)) {
107
+ return true;
108
+ }
109
+
110
+ return registerDirs.some(registerDir => filePath.startsWith(_path.default.join(projectRoot, registerDir)));
111
+ }],
112
+ extensions: ['.js', '.ts'],
113
+ babelrc: false,
114
+ configFile: false,
115
+ root: projectRoot
116
+ }));
117
+ }
118
+ };
119
+
120
+ exports.enableRegister = enableRegister;
@@ -13,22 +13,18 @@ var _https = require("https");
13
13
 
14
14
  var _utils = require("@modern-js/utils");
15
15
 
16
- var _webpackDevMiddleware = _interopRequireDefault(require("@modern-js/utils/webpack-dev-middleware"));
17
-
18
16
  var _prodServer = require("@modern-js/prod-server");
19
17
 
20
18
  var _constants = require("../constants");
21
19
 
22
20
  var _mock = require("../dev-tools/mock");
23
21
 
24
- var _socketServer = _interopRequireDefault(require("../dev-tools/socket-server"));
25
-
26
- var _devServerPlugin = _interopRequireDefault(require("../dev-tools/dev-server-plugin"));
27
-
28
- var _register = require("../dev-tools/babel/register");
22
+ var _register = require("../dev-tools/register");
29
23
 
30
24
  var _watcher = _interopRequireWildcard(require("../dev-tools/watcher"));
31
25
 
26
+ var _devMiddleware = _interopRequireDefault(require("../dev-tools/dev-middleware"));
27
+
32
28
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
33
29
 
34
30
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -49,19 +45,19 @@ class ModernDevServer extends _prodServer.ModernServer {
49
45
 
50
46
  _defineProperty(this, "dev", void 0);
51
47
 
52
- _defineProperty(this, "compiler", void 0);
53
-
54
- _defineProperty(this, "socketServer", void 0);
48
+ _defineProperty(this, "devMiddleware", void 0);
55
49
 
56
50
  _defineProperty(this, "watcher", void 0);
57
51
 
58
- _defineProperty(this, "devMiddleware", void 0);
59
-
60
- this.workDir = this.pwd; // set webpack compiler
52
+ this.workDir = this.pwd; // set dev server options, like webpack-dev-server
61
53
 
62
- this.compiler = options.compiler; // set dev server options, like webpack-dev-server
54
+ this.dev = this.getDevOptions(options); // create dev middleware instance
63
55
 
64
- this.dev = this.getDevOptions(options);
56
+ this.devMiddleware = new _devMiddleware.default({
57
+ dev: this.dev,
58
+ compiler: options.compiler,
59
+ config: this.conf
60
+ });
65
61
  (0, _register.enableRegister)(this.pwd, this.conf);
66
62
  }
67
63
 
@@ -74,15 +70,15 @@ class ModernDevServer extends _prodServer.ModernServer {
74
70
  } // Complete the preparation of services
75
71
 
76
72
 
77
- async onInit(runner) {
73
+ async onInit(runner, app) {
78
74
  var _conf$tools, _conf$tools$devServer;
79
75
 
80
76
  this.runner = runner;
81
77
  const {
82
78
  conf,
83
79
  pwd,
84
- compiler,
85
- dev
80
+ dev,
81
+ devMiddleware
86
82
  } = this; // before dev handler
87
83
 
88
84
  const beforeHandlers = await this.setupBeforeDevMiddleware();
@@ -136,14 +132,29 @@ class ModernDevServer extends _prodServer.ModernServer {
136
132
  } // do webpack build / plugin apply / socket server when pass compiler instance
137
133
 
138
134
 
139
- if (compiler) {
140
- // init socket server
141
- this.socketServer = new _socketServer.default(dev); // setup compiler in server, also add dev-middleware to handler static file in memory
142
-
143
- const devMiddlewareHandler = this.setupCompiler(compiler);
144
- this.addHandler(devMiddlewareHandler);
145
- } // after dev handler
135
+ devMiddleware.init(app);
136
+ devMiddleware.on('change', stats => {
137
+ // Reset only when client compile done
138
+ if (stats.toJson({
139
+ all: false
140
+ }).name === 'client') {
141
+ this.onRepack({
142
+ routes: this.getRoutes()
143
+ });
144
+ }
145
+ });
146
+ this.addHandler((ctx, next) => {
147
+ const {
148
+ req,
149
+ res
150
+ } = ctx;
146
151
 
152
+ if (devMiddleware.middleware) {
153
+ devMiddleware.middleware(req, res, next);
154
+ } else {
155
+ next();
156
+ }
157
+ }); // after dev handler
147
158
 
148
159
  const afterHandlers = await this.setupAfterDevMiddleware();
149
160
  afterHandlers.forEach(handler => {
@@ -155,28 +166,16 @@ class ModernDevServer extends _prodServer.ModernServer {
155
166
  return handler(req, res, next);
156
167
  });
157
168
  });
158
- await super.onInit(runner); // watch mock/ server/ api/ dir file change
169
+ await super.onInit(runner, app); // watch mock/ server/ api/ dir file change
159
170
 
160
171
  if (dev.watch) {
161
172
  this.startWatcher();
162
- }
163
- }
173
+ app.on('close', async () => {
174
+ var _this$watcher;
164
175
 
165
- async onClose() {
166
- var _this$watcher, _this$socketServer;
167
-
168
- await super.onClose();
169
- await ((_this$watcher = this.watcher) === null || _this$watcher === void 0 ? void 0 : _this$watcher.close());
170
- await new Promise(resolve => {
171
- if (this.devMiddleware) {
172
- this.devMiddleware.close(() => {
173
- resolve();
174
- });
175
- } else {
176
- resolve();
177
- }
178
- });
179
- (_this$socketServer = this.socketServer) === null || _this$socketServer === void 0 ? void 0 : _this$socketServer.close();
176
+ await ((_this$watcher = this.watcher) === null || _this$watcher === void 0 ? void 0 : _this$watcher.close());
177
+ });
178
+ }
180
179
  }
181
180
 
182
181
  onRepack(options = {}) {
@@ -192,12 +191,6 @@ class ModernDevServer extends _prodServer.ModernServer {
192
191
  super.onRepack(options);
193
192
  }
194
193
 
195
- onListening(app) {
196
- var _this$socketServer2;
197
-
198
- (_this$socketServer2 = this.socketServer) === null || _this$socketServer2 === void 0 ? void 0 : _this$socketServer2.prepare(app);
199
- }
200
-
201
194
  async createHTTPServer(handler) {
202
195
  const {
203
196
  dev
@@ -257,104 +250,12 @@ class ModernDevServer extends _prodServer.ModernServer {
257
250
  this.logger.error(e);
258
251
  }
259
252
  }
260
- } // set up plugin to each compiler
261
- // register hooks for each compilation, update socket stats if recompiled
262
- // start dev middleware
263
-
264
-
265
- setupCompiler(compiler) {
266
- this.setupDevServerPlugin(compiler);
267
- this.setupHooks();
268
- return this.setupDevMiddleware(compiler);
269
253
  }
270
254
 
271
- isClientCompiler(compiler) {
272
- const {
273
- target
274
- } = compiler.options; // if target not contains `node`, it's a client compiler
275
-
276
- if (target) {
277
- if (Array.isArray(target)) {
278
- return !target.includes('node');
279
- }
280
-
281
- return target !== 'node';
282
- }
283
-
284
- return compiler.name === 'client';
285
- }
286
-
287
- setupDevServerPlugin(compiler) {
288
- const {
289
- dev: devConf
290
- } = this; // apply dev server to client compiler, add hmr client to entry.
291
-
292
- if (compiler.compilers) {
293
- compiler.compilers.forEach(target => {
294
- if (this.isClientCompiler(target)) {
295
- new _devServerPlugin.default(devConf).apply(target);
296
- }
297
- });
298
- } else {
299
- new _devServerPlugin.default(devConf).apply(compiler);
300
- }
301
- }
302
-
303
- setupHooks() {
304
- const invalidPlugin = () => {
305
- this.socketServer.sockWrite('invalid');
306
- };
307
-
308
- const addHooks = compiler => {
309
- if (compiler.name === 'server') {
310
- return;
311
- }
312
-
313
- const {
314
- compile,
315
- invalid,
316
- done
317
- } = compiler.hooks;
318
- compile.tap('modern-dev-server', invalidPlugin);
319
- invalid.tap('modern-dev-server', invalidPlugin);
320
- done.tap('modern-dev-server', stats => {
321
- this.socketServer.updateStats(stats); // Reset only when client compile done
322
-
323
- if (stats.toJson({
324
- all: false
325
- }).name === 'client') {
326
- this.onRepack({
327
- routes: this.getRoutes()
328
- });
329
- }
330
- });
331
- };
332
-
333
- if (this.compiler.compilers) {
334
- this.compiler.compilers.forEach(addHooks);
335
- } else {
336
- addHooks(this.compiler);
337
- }
338
- }
339
-
340
- setupDevMiddleware(compiler) {
341
- var _conf$tools2, _conf$tools2$devServe;
342
-
343
- const {
344
- conf
345
- } = this;
346
- this.devMiddleware = (0, _webpackDevMiddleware.default)(compiler, _objectSpread({
347
- 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,
348
- publicPath: '/',
349
- stats: false
350
- }, this.dev.devMiddleware));
351
- return (ctx, next) => {
352
- const {
353
- req,
354
- res
355
- } = ctx;
356
- this.devMiddleware(req, res, next);
357
- };
255
+ createContext(req, res) {
256
+ return super.createContext(req, res, {
257
+ etag: true
258
+ });
358
259
  }
359
260
 
360
261
  async setupBeforeDevMiddleware() {
@@ -9,16 +9,8 @@ var _prodServer = require("@modern-js/prod-server");
9
9
 
10
10
  var _devServer = require("./dev-server");
11
11
 
12
- var _devServerSplit = require("./dev-server-split");
13
-
14
12
  const createDevServer = options => {
15
- if (options.apiOnly) {
16
- return new _devServerSplit.ModernAPIDevServer(options);
17
- } else if (options.ssrOnly) {
18
- return new _devServerSplit.ModernSSRDevServer(options);
19
- } else {
20
- return new _devServer.ModernDevServer(options);
21
- }
13
+ return new _devServer.ModernDevServer(options);
22
14
  };
23
15
 
24
16
  class DevServer extends _prodServer.Server {
@@ -1,5 +1,5 @@
1
1
  import type webpack from 'webpack';
2
- import type { DevServerOptions } from '../types';
2
+ import type { DevServerOptions } from '../../types';
3
3
  export default class DevServerPlugin {
4
4
  private readonly options;
5
5
  constructor(options: DevServerOptions);
@@ -0,0 +1,31 @@
1
+ /// <reference types="node" />
2
+ /// <reference types="node" />
3
+ import { Server, IncomingMessage, ServerResponse } from 'http';
4
+ import { EventEmitter } from 'events';
5
+ import { Compiler, MultiCompiler } from 'webpack';
6
+ import webpackDevMiddleware from '@modern-js/utils/webpack-dev-middleware';
7
+ import type { NormalizedConfig } from '@modern-js/core';
8
+ import { DevServerOptions } from '../../types';
9
+ declare type Options = {
10
+ compiler: MultiCompiler | Compiler | null;
11
+ dev: DevServerOptions;
12
+ config: NormalizedConfig;
13
+ };
14
+ export default class DevMiddleware extends EventEmitter {
15
+ middleware?: webpackDevMiddleware.API<IncomingMessage, ServerResponse>;
16
+ private compiler;
17
+ private devOptions;
18
+ private socketServer;
19
+ private config;
20
+ constructor({
21
+ compiler,
22
+ dev,
23
+ config
24
+ }: Options);
25
+ init(app: Server): void;
26
+ private setupDevServerPlugin;
27
+ private setupHooks;
28
+ private setupDevMiddleware;
29
+ private isClientCompiler;
30
+ }
31
+ export {};
@@ -2,7 +2,7 @@
2
2
  import { Server } from 'http';
3
3
  import ws from 'ws';
4
4
  import type webpack from 'webpack';
5
- import type { DevServerOptions } from '../types';
5
+ import type { DevServerOptions } from '../../types';
6
6
  export default class SocketServer {
7
7
  private wsServer;
8
8
  private readonly sockets;
@@ -1 +1,6 @@
1
- export declare const genHttpsOptions: (userOptions: any) => Promise<any>;
1
+ import type Buffer from 'buffer';
2
+ import type { DevServerHttpsOptions } from '../../types';
3
+ export declare const genHttpsOptions: (userOptions: DevServerHttpsOptions) => Promise<{
4
+ key?: Buffer | string;
5
+ cert?: Buffer | string;
6
+ }>;
@@ -1,6 +1,6 @@
1
1
  /// <reference types="node" />
2
2
  import { IncomingMessage, ServerResponse } from 'http';
3
- import { ModernServerContext, NextFunction } from '@modern-js/types';
3
+ import type { ModernServerContext, NextFunction } from '@modern-js/types';
4
4
  export declare type MockConfig = Record<string, {
5
5
  data: any;
6
6
  } | ((req: IncomingMessage, res: ServerResponse, next: NextFunction) => Promise<void>)>;
@@ -1,4 +1,4 @@
1
- import { ModernServerContext, NextFunction } from '@modern-js/types';
1
+ import type { ModernServerContext, NextFunction } from '@modern-js/types';
2
2
  export declare const createMockHandler: ({
3
3
  pwd
4
4
  }: {
@@ -1,7 +1,7 @@
1
1
  import { DevServer as Server } from './server';
2
- import { ModernDevServerOptions } from './types';
2
+ import type { DevServerOptions, DevServerHttpsOptions, ModernDevServerOptions } from './types';
3
3
  export { Server };
4
- export type { ModernDevServerOptions };
4
+ export type { DevServerOptions, DevServerHttpsOptions, ModernDevServerOptions };
5
5
 
6
6
  declare const _default: (options: ModernDevServerOptions) => Promise<Server>;
7
7