@hyext/builder-revues 1.0.50 → 1.0.52

package/dist/index.js

@@ -14,6 +14,7 @@ var os = require('os');
 var chalk = require('chalk');
 var util = require('util');
 var download = require('download');
+var chokidar = require('chokidar');
 var glob = require('glob');
 var handlebars = require('handlebars');
 var tapable = require('tapable');
@@ -29,6 +30,7 @@ var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 var os__default = /*#__PURE__*/_interopDefaultLegacy(os);
 var chalk__default = /*#__PURE__*/_interopDefaultLegacy(chalk);
 var download__default = /*#__PURE__*/_interopDefaultLegacy(download);
+var chokidar__default = /*#__PURE__*/_interopDefaultLegacy(chokidar);
 var handlebars__default = /*#__PURE__*/_interopDefaultLegacy(handlebars);
 var liveServer__default = /*#__PURE__*/_interopDefaultLegacy(liveServer);
 var archiver__default = /*#__PURE__*/_interopDefaultLegacy(archiver);
@@ -279,6 +281,116 @@ function resolvePluginConfig(pluginDir, key, props) {
     return resolvedConfig;
 }
 
+class CollectQueue {
+    constructor(handler, opts) {
+        this.timer = null;
+        this.debounceTime = 50;
+        this.actionQueue = [];
+        this.handler = handler;
+        Object.assign(this, opts);
+    }
+    collect(action) {
+        this.actionQueue.push(action);
+        this.timer && clearTimeout(this.timer);
+        this.timer = setTimeout(() => {
+            this.flush();
+        }, this.debounceTime);
+    }
+    flush() {
+        const queue = this.actionQueue;
+        this.actionQueue = [];
+        this.handler(queue);
+    }
+}
+
+function normalizePath(filePath = '') {
+    const format = path__default["default"].posix.normalize(filePath.replace(/\\/g, '/'));
+    const hasSlash = (!filePath.startsWith('//') && !filePath.startsWith('\\\\')) ||
+        format.startsWith('//');
+    return hasSlash ? format : '/' + format;
+}
+
+const defaultIgnoreRules = [/node_modules/, /(^|[\/\\])\../, 'dist/build-result/**', 'release/**'];
+function watchFiles(opts, cb) {
+    let isReady = false;
+    chokidar__default["default"]
+        .watch(opts.pattern, {
+        cwd: opts.projectPath,
+        ignored: opts.ignored
+            ? [...defaultIgnoreRules, ...opts.ignored]
+            : defaultIgnoreRules
+    })
+        .on('all', (type, filePath) => {
+        if (isReady) {
+            // filePath 需要遵循posix规范
+            cb && cb(type, normalizePath(filePath));
+        }
+    })
+        .on('error', (e) => {
+        console.error(e);
+    })
+        .on('ready', () => {
+        isReady = true;
+        logger.success('file watcher ready.');
+    });
+}
+
+const maxCompileFilesCount = 5;
+function watchProject(opts, done) {
+    const { compilerManager, compileFn, graphId } = opts;
+    function compileOne(type, filePath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (compilerManager.isFileChange({ type, filePath })) {
+                console.log('\n\n');
+                logger.log('正在编译：' + filePath);
+                try {
+                    yield compilerManager.compileSingleCode({ graphId, filePath, type });
+                    done && done();
+                }
+                catch (error) {
+                    const msg = `热编译文件 '${filePath}' 失败，原因：\n\n  ${error.message}`;
+                    error.message = msg;
+                    console.log(error);
+                }
+            }
+        });
+    }
+    function restart() {
+        return __awaiter(this, void 0, void 0, function* () {
+            console.log('\n\n');
+            logger.log('重启编译器');
+            compilerManager.destroy();
+            yield compileFn(true);
+            done && done();
+        });
+    }
+    function flush(queue) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (queue.length > maxCompileFilesCount) {
+                // 重启编译器
+                yield restart();
+            }
+            else {
+                {
+                    while (queue.length) {
+                        const item = queue.shift();
+                        if (item != null) {
+                            yield compileOne(item.type, item.filePath);
+                        }
+                    }
+                }
+            }
+        });
+    }
+    const collectFileQueue = new CollectQueue(flush);
+    watchFiles({
+        pattern: '**/**',
+        projectPath: compilerManager.projectPath
+    }, (type, filePath) => {
+        collectFileQueue.collect({ type, filePath });
+    });
+}
+
 function compile(mode, projectPath, outputPath) {
     return __awaiter(this, void 0, void 0, function* () {
         const isProd = mode === 'prod';
@@ -290,17 +402,21 @@ function compile(mode, projectPath, outputPath) {
         } : {};
         const { plugins, } = yield tryLoadPlugins(projectPath);
         initCacheDir();
-        yield codeCompiler.compilerManager.init({
-            projectPath,
-            outputPath,
-            cachePath: cacheDir,
-            compileSettings,
-            plugins,
-            mode
+        const run = (keep) => __awaiter(this, void 0, void 0, function* () {
+            yield codeCompiler.compilerManager.init({
+                projectPath,
+                outputPath,
+                cachePath: cacheDir,
+                compileSettings,
+                plugins,
+                mode
+            });
+            const action = isProd ? 'compile' : 'compileDev';
+            yield codeCompiler.compilerManager[action](isProd ? undefined : keep);
         });
-        const action = isProd ? 'compile' : 'compileDev';
-        yield codeCompiler.compilerManager[action]();
+        yield run(false);
         copyProjectConfigJSON(projectPath, outputPath);
+        return run;
     });
 }
 function compileDevPluginForProd(projectPath, outputPath) {
@@ -358,15 +474,12 @@ function watchGame(opts) {
 function watchMiniProgram(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const { projectPath, outputPath, cb } = opts;
-        yield compile('dev', projectPath, outputPath);
-        codeCompiler.compilerManager.watch({ graphId: 'miniprogram' }, (type, filePath) => __awaiter(this, void 0, void 0, function* () {
-            yield codeCompiler.compilerManager.compileSingleCode({
-                type,
-                filePath,
-                graphId: 'miniprogram'
-            });
-            cb && cb();
-        }));
+        const run = yield compile('dev', projectPath, outputPath);
+        watchProject({
+            compilerManager: codeCompiler.compilerManager,
+            graphId: 'miniprogram',
+            compileFn: run
+        }, cb);
     });
 }
 function watchDevPlugin(opts) {
@@ -525,10 +638,12 @@ function mergeSubPackagesToMainPackage(packagePath, main, subList, onMoveBefore)
     subList.forEach(conf => {
         const subRoot = path__default["default"].join(packagePath, conf.name);
         const subPath = path__default["default"].join(subRoot, conf.root);
-        const dest = path__default["default"].join(mainPath, conf.root);
-        onMoveBefore && onMoveBefore(subRoot, mainPath, conf);
-        fs__default["default"].moveSync(subPath, dest, { overwrite: true });
-        fs__default["default"].removeSync(path__default["default"].join(packagePath, conf.name));
+        if (fs__default["default"].existsSync(subPath)) {
+            const dest = path__default["default"].join(mainPath, conf.root);
+            onMoveBefore && onMoveBefore(subRoot, mainPath, conf);
+            fs__default["default"].moveSync(subPath, dest, { overwrite: true });
+            fs__default["default"].removeSync(subRoot);
+        }
     });
 }
 
@@ -855,9 +970,9 @@ function startLiveServer(opts) {
         open: false,
         ignore: opts.ignore,
         file: "index.html",
-        wait: 1000,
+        wait: 200,
         mount: opts.mount,
-        logLevel: 1,
+        logLevel: 0,
         https: httpsConf
     };
     // @ts-expect-error

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyext/builder-revues",
-  "version": "1.0.50",
+  "version": "1.0.52",
   "description": "> TODO: description",
   "author": "loler",
   "homepage": "",
@@ -24,14 +24,15 @@
     "minify": "node scripts/minify"
   },
   "dependencies": {
-    "@revues/cocos-web-adapter": "1.0.50",
-    "@revues/code-compiler": "1.0.50",
-    "@revues/hyext-adapter": "1.0.50",
-    "@revues/web-frame": "1.0.50",
-    "@revues/web-sdk-core": "1.0.50",
+    "@revues/cocos-web-adapter": "1.0.52",
+    "@revues/code-compiler": "1.0.52",
+    "@revues/hyext-adapter": "1.0.52",
+    "@revues/web-frame": "1.0.52",
+    "@revues/web-sdk-core": "1.0.52",
     "archiver": "^7.0.1",
     "axios": "^1.7.1",
     "chalk": "^2.4.2",
+    "chokidar": "^3.6.0",
     "download": "^8.0.0",
     "fs-extra": "8.1.0",
     "glob": "^10.3.10",
@@ -47,5 +48,5 @@
     "@types/ramda": "^0.29.11",
     "terser": "^5.31.0"
   },
-  "gitHead": "00eb6ee20c6508bd005ed4d1c21f7ad326743018"
+  "gitHead": "f95e88f22d1ccf77168d13a78f672faacd7ae084"
 }