Skip to content

Commit ef53bb0

Browse files
committed
fix(server): 修复windows下重复设置header报错
1 parent 37ddf51 commit ef53bb0

File tree

2 files changed

+33
-15
lines changed

2 files changed

+33
-15
lines changed

lib/commands/server.js

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,12 @@ exports.run = function (options) {
168168

169169
compiler.watch({}, function (err, stats) {
170170
// compiler complete
171-
middleware = middlewareCache[cacheId] = webpackDevMiddleware(compiler, { quiet: true, clientLogLevel: 'error' });
172-
middleware(req, res, next);
171+
if (!middlewareCache[projectName]) {
172+
middleware = middlewareCache[cacheId] = webpackDevMiddleware(compiler, { quiet: true });
173+
middleware(req, res, next);
174+
} else {
175+
next();
176+
}
173177
});
174178
// 检测config文件变化
175179
watchConfig(project, middleware, cacheId);
@@ -226,13 +230,18 @@ exports.run = function (options) {
226230
});
227231

228232
compiler.watch({}, function (err, stats) {
233+
229234
// compiler complete
230-
middleware = middlewareCache[projectName] = webpackDevMiddleware(compiler, { quiet: true });
235+
if (!middlewareCache[projectName]) {
236+
middleware = middlewareCache[projectName] = webpackDevMiddleware(compiler, { quiet: true });
231237

232-
// 输出server运行中 error/warning 信息
233-
creatingCompiler = false;
234-
middleware(req, res, next);
235-
resolve(middleware);
238+
// 输出server运行中 error/warning 信息
239+
creatingCompiler = false;
240+
middleware(req, res, next);
241+
resolve(middleware);
242+
} else {
243+
next();
244+
}
236245
});
237246

238247
// 检测config文件变化

src/commands/server.js

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,12 @@ exports.run = (options) => {
167167

168168
compiler.watch({}, function(err, stats) {
169169
// compiler complete
170-
middleware = middlewareCache[cacheId] = webpackDevMiddleware(compiler, {quiet: true, clientLogLevel: 'error'});
171-
middleware(req, res, next);
170+
if(!middlewareCache[projectName]) {
171+
middleware = middlewareCache[cacheId] = webpackDevMiddleware(compiler, {quiet: true});
172+
middleware(req, res, next);
173+
} else {
174+
next()
175+
}
172176
});
173177
// 检测config文件变化
174178
watchConfig(project, middleware, cacheId)
@@ -216,13 +220,18 @@ exports.run = (options) => {
216220
});
217221

218222
compiler.watch({}, function(err, stats) {
219-
// compiler complete
220-
middleware = middlewareCache[projectName] = webpackDevMiddleware(compiler, {quiet: true});
221223

222-
// 输出server运行中 error/warning 信息
223-
creatingCompiler = false
224-
middleware(req, res, next);
225-
resolve(middleware);
224+
// compiler complete
225+
if(!middlewareCache[projectName]) {
226+
middleware = middlewareCache[projectName] = webpackDevMiddleware(compiler, {quiet: true});
227+
228+
// 输出server运行中 error/warning 信息
229+
creatingCompiler = false
230+
middleware(req, res, next);
231+
resolve(middleware);
232+
} else {
233+
next()
234+
}
226235
});
227236

228237
// 检测config文件变化

0 commit comments

Comments
 (0)