fix(server): 修复请求资源中带query引起的重复编译

Author: yuhaoju

lib/commands/server.js

@@ -133,11 +133,14 @@ exports.run = function (options) {
             if (!isCompilingAll) {
                 (function () {
                     // 去掉版本号和打头的"/"
-                    var urlNoVer = req.url.replace(/@[\d\w]+(?=\.\w+$)/, '');
-                    urlNoVer = urlNoVer[0] === '/' ? urlNoVer.slice(1) : urlNoVer;
+                    var pureSourcePath = req.url.replace(/@[\d\w]+(?=\.\w+$)/, '');
+                    pureSourcePath = pureSourcePath[0] === '/' ? pureSourcePath.slice(1) : pureSourcePath;
+
+                    // 去掉url query
+                    pureSourcePath = pureSourcePath.replace(/\?[\w=&]+$/, '');
 
                     // 从编译cache中取，map文件不必生成重复middleware
-                    var cacheId = sysPath.join(projectName, urlNoVer.replace('.map', ''));
+                    var cacheId = sysPath.join(projectName, pureSourcePath.replace('.map', ''));
                     var middleware = middlewareCache[cacheId];
 
                     if (!middleware) {
@@ -160,7 +163,7 @@ exports.run = function (options) {
 
                                     var cssReg = new RegExp(config.entryExtNames.css.join('|'));
                                     entryPath = entryPath.replace(cssReg, '.css'); // 将入口的.scss/.less后缀替换为.css
-                                    isRequestingEntry = entryPath.indexOf(urlNoVer) > -1;
+                                    isRequestingEntry = entryPath.indexOf(pureSourcePath) > -1;
 
                                     if (isRequestingEntry) {
                                         nextConfig.entry = _defineProperty({}, entryKey, entryItem);
@@ -171,7 +174,7 @@ exports.run = function (options) {
 
                             compiler.watch({}, function (err, stats) {
                                 // compiler complete
-                                middleware = middlewareCache[cacheId] = webpackDevMiddleware(compiler, { quiet: true });
+                                middleware = middlewareCache[cacheId] = webpackDevMiddleware(compiler, { quiet: true, clientLogLevel: 'error' });
                                 middleware(req, res, next);
                             });
                             // 检测config文件变化

src/commands/server.js

@@ -130,11 +130,14 @@ exports.run = (options) => {
             // 只编译所请求的资源
             if(!isCompilingAll) {
                 // 去掉版本号和打头的"/"
-                let urlNoVer = req.url.replace(/@[\d\w]+(?=\.\w+$)/, '')
-                urlNoVer = urlNoVer[0] === '/' ? urlNoVer.slice(1) : urlNoVer
+                let pureSourcePath = req.url.replace(/@[\d\w]+(?=\.\w+$)/, '')
+                pureSourcePath = pureSourcePath[0] === '/' ? pureSourcePath.slice(1) : pureSourcePath
+
+                // 去掉url query
+                pureSourcePath = pureSourcePath.replace(/\?[\w=&]+$/, '')
 
                 // 从编译cache中取，map文件不必生成重复middleware
-                const cacheId = sysPath.join(projectName, urlNoVer.replace('.map', ''))
+                const cacheId = sysPath.join(projectName, pureSourcePath.replace('.map', ''))
                 let middleware = middlewareCache[cacheId]
 
                 if (!middleware) {
@@ -157,7 +160,7 @@ exports.run = (options) => {
 
                                 const cssReg = new RegExp(config.entryExtNames.css.join('|'))
                                 entryPath = entryPath.replace(cssReg, '.css') // 将入口的.scss/.less后缀替换为.css
-                                isRequestingEntry = entryPath.indexOf(urlNoVer) > -1
+                                isRequestingEntry = entryPath.indexOf(pureSourcePath) > -1
 
                                 if(isRequestingEntry) {
                                     nextConfig.entry = {
@@ -170,7 +173,7 @@ exports.run = (options) => {
 
                         compiler.watch({}, function(err, stats) {
                             // compiler complete
-                            middleware = middlewareCache[cacheId] = webpackDevMiddleware(compiler, {quiet: true,});
+                            middleware = middlewareCache[cacheId] = webpackDevMiddleware(compiler, {quiet: true, clientLogLevel: 'error'});
                             middleware(req, res, next);
                         });
                         // 检测config文件变化