qmzreact 1.0.14 → 1.0.16

package/conf/config/webpack.base.conf.js

@@ -11,10 +11,11 @@ var fs = require('fs');
 var entry = [];
 var entryFile = ['index.js', 'index.jsx', 'index.ts', 'index.tsx'];
 for (var i = 0; i < entryFile.length; i++) {
+    var entryPath = utils.rootPath(processConfig.compileDir, entryFile[i]);
     try {
-        const stats = fs.statSync(utils.rootPath(processConfig.compileDir, entryFile[i]));
+        const stats = fs.statSync(entryPath);
         if (stats.isFile()) {
-            entry = [utils.rootPath(entryFile[i])];
+            entry = [entryPath];
         }
         break;
     } catch (err) {

package/conf/config/webpack.dll.conf.js

@@ -41,6 +41,7 @@ webpack(dllConf, function (err, stats) {
             children: false,
             chunks: false,
             chunkModules: false
-        }) + '\n')
+        }) + '\n');
+    process.exit(0); // 退出进程
 })
 }

package/conf/dev-server.js

@@ -25,14 +25,18 @@ var hotMiddleware = require('webpack-hot-middleware')(compiler)
 // // force page reload when html-webpack-plugin template changes
 compiler.hooks.make.tap('compilation', function (compilation) {
     compilation.hooks.finishModules.tap('html-webpack-plugin-after-emit', function (modules) {
+        process.env.NODE_STATUS = "running";
         hotMiddleware.publish({ action: 'reload' })
     })
 })
 // print compiler finished info
 compiler.hooks.done.tap('AfterCompiler', function(stats) {
   setTimeout(() => {
+    if (process.env.NODE_STATUS === 'rebuild') {
+        hotMiddleware.publish({ action: 'reload' })
+    }
     console.log('webpack \x1b[1mcompiled \x1B[32mfinished \x1B[37min',new Date().toLocaleString(),'\x1b[0m')
-  }, 1000)
+  }, 2000)
 })
 
 
@@ -79,7 +83,9 @@ if (processConfig.isHttps) {
         }
         var uri = 'https://localhost:' + port // 直接显示页面
         console.log('Listening at ' + uri + '\n')
-        opn(uri)
+        if (process.env.NODE_STATUS === 'build') {
+            opn(uri)
+        }
       })
 } else {
     service = app.listen(port, function (err) {
@@ -89,7 +95,9 @@ if (processConfig.isHttps) {
         }
         var uri = 'http://localhost:' + port // 直接显示页面
         console.log('Listening at ' + uri + '\n')
-        opn(uri)
+        if (process.env.NODE_STATUS === 'build') {
+            opn(uri)
+        }
 
     })
 }

package/conf/options.js

@@ -17,7 +17,7 @@ var {
 exports.utils = utils;
 
 exports.processConfig = {
-    compileDir: typeof compileDir === 'string' ? compileDir : 'src',
+    compileDir: (compileDir && typeof compileDir === 'string') ? compileDir : 'src',
     watch: Array.isArray(watch) ? watch : watch ? [watch] : [],
     port: argvPort || port || 8888,
     isHttps,

package/conf/utils.js

@@ -1,5 +1,6 @@
 var path = require('path')
 var fs = require('fs')
+var crypto = require('crypto')
 var { cosmiconfigSync } = require('cosmiconfig');
 
 var configFilePath = 'build.config.js';
@@ -58,8 +59,29 @@ function getWatchFileRestartService(pathname, restartService) {
       fs.watch(pathname, (eventType, filename) => {
         // 如果是文件，直接重启服务
         if (stats.isFile()) {
-          // 如果是文件直接重启服务
-          reStart();
+            // 只在文件内容实际修改（mtime 变化）时重启
+            fs.stat(pathname, (err2, newStats) => {
+              if (err2) return;
+              if (eventType == 'rename') {
+                reStart();
+              }
+              if (eventType == 'change') {
+                  fs.readFile(pathname, (err2, data) => {
+                    if (err2) return;
+                    // 计算内容哈希，首次读取时保存哈希，之后比较
+                    var hash = crypto.createHash('sha256').update(data).digest('hex');
+                    if (!stats._contentHash) {
+                      stats._contentHash = hash;
+                      return;
+                    }
+                    // 内容未变则不重启
+                    if (stats._contentHash === hash) return;
+                    // 更新保存的状态与哈希，避免重复触发
+                    stats._contentHash = hash;
+                    reStart();
+                  });
+              }
+            });
         } else if (stats.isDirectory()) {
           // 如果是文件夹，则判断是否删除或者新增
           if (eventType == 'rename') {

package/conf/webpack-server.js

@@ -19,7 +19,7 @@ watchFiles.forEach(dirname => {
       /**
        * 重启服务
        */
-      startServer();
+      startServer('rebuild');
     });
     // 杀掉进程
     childProcess.kill('SIGTERM');
@@ -31,7 +31,7 @@ watchFiles.forEach(dirname => {
 /**
  * 启动服务
  */
-module.exports = function startServer() {
+function startServer(status) {
   var spinner = ora('Starting dev server... \n');
   spinner.start();
   childProcess = spawn(
@@ -40,7 +40,7 @@ module.exports = function startServer() {
     {
       env: Object.assign({}, process.env, {
         NODE_ENV: 'development', // 根据需要修改或添加其它环境变量
-        // EXAMPLE_VAR: 'value'
+        NODE_STATUS: status || 'build'
       }),
       stdio: 'pipe'
     }
@@ -82,3 +82,6 @@ module.exports = function startServer() {
     console.log(`======= Service Closed (code: ${exitCode}) ======`);
   });
 }
+
+
+module.exports = startServer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qmzreact",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "前端react本地启动服务和打包工具",
   "author": {
     "name": "qmz",