xhs-mp-compiler-cli 2.0.20 → 2.0.22

package/dist/compiler.js

@@ -320,7 +320,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 catch (error) {
                     this.watching = false;
                     (_d = this.pendingTask.reject) === null || _d === void 0 ? void 0 : _d.forEach(fn => fn(error));
-                    throw error;
                 }
                 finally {
                     this.pendingTask = undefined;

package/dist/compilerImpl.js

@@ -52,12 +52,17 @@ function formatOutputError(err, stats) {
         var _a, _b, _c, _d;
         let match;
         try {
-            if (typeof i.moduleIdentifier === 'string' && babelLoaderReg.test(i.moduleIdentifier) && (match = (_a = i.moduleName) === null || _a === void 0 ? void 0 : _a.match(jsScriptReg))) {
+            if (typeof i.moduleIdentifier === 'string' &&
+                babelLoaderReg.test(i.moduleIdentifier) &&
+                (match = (_a = i.moduleName) === null || _a === void 0 ? void 0 : _a.match(jsScriptReg))) {
                 // babel-loader 错误
                 const [_, filePath] = match;
                 const file = path.resolve(CWD, filePath);
                 let errorType, message, line, column;
-                const errorLines = i.message.split('\n').filter(Boolean).map(text => {
+                const errorLines = i.message
+                    .split('\n')
+                    .filter(Boolean)
+                    .map(text => {
                     if (text.match(startLine) || text.match(at))
                         return;
                     const match1 = text.match(babelSyntaxError);
@@ -70,7 +75,8 @@ function formatOutputError(err, stats) {
                         return;
                     }
                     return text;
-                }).filter(Boolean);
+                })
+                    .filter(Boolean);
                 return {
                     file,
                     line: Number(line),
@@ -83,15 +89,20 @@ function formatOutputError(err, stats) {
                         file,
                         line: Number(line),
                         column: Number(column)
-                    }),
+                    })
                 };
             }
-            else if (typeof i.moduleIdentifier === 'string' && swcLoaderReg.test(i.moduleIdentifier) && (match = (_b = i.moduleName) === null || _b === void 0 ? void 0 : _b.match(jsScriptReg))) {
+            else if (typeof i.moduleIdentifier === 'string' &&
+                swcLoaderReg.test(i.moduleIdentifier) &&
+                (match = (_b = i.moduleName) === null || _b === void 0 ? void 0 : _b.match(jsScriptReg))) {
                 // swc-loader 错误
                 const [_, filePath] = match;
                 const file = path.resolve(CWD, filePath);
                 let line, column;
-                const errorLines = i.message.split('\n').filter(Boolean).map(text => {
+                const errorLines = i.message
+                    .split('\n')
+                    .filter(Boolean)
+                    .map(text => {
                     if (text.match(startLine) || text.match(at))
                         return;
                     const match1 = text.match(swcSyntaxError);
@@ -102,7 +113,8 @@ function formatOutputError(err, stats) {
                         return text.replace(swcSyntaxError, '───');
                     }
                     return text;
-                }).filter(Boolean);
+                })
+                    .filter(Boolean);
                 return {
                     file,
                     line: Number(line),
@@ -114,8 +126,8 @@ function formatOutputError(err, stats) {
                         errorLines: [],
                         file,
                         line: Number(line),
-                        column: Number(column),
-                    }),
+                        column: Number(column)
+                    })
                 };
             }
             else if (i.file && (match = (_d = (_c = i.file) === null || _c === void 0 ? void 0 : _c.match) === null || _d === void 0 ? void 0 : _d.call(_c, scriptRegWithLineCol))) {
@@ -215,26 +227,25 @@ function createProjectPacker(data) {
 }
 const handlers = {
     runWatch: (data) => __awaiter(void 0, void 0, void 0, function* () {
-        console.log('[compiler] create compiler');
+        console.log('[compiler] runWatch');
         createProjectPacker(data);
         sendBuildInfoMessage('run-watch', '执行编译');
-        const { err, stats } = (yield projectPacker.watch({}, (err, stats) => {
+        const { err, stats } = yield projectPacker.watch({}, (err, stats) => {
             var _a;
             console.log('[compiler] file change...', err, stats);
             // 修改文件时构建
             const hasError = err || ((_a = stats === null || stats === void 0 ? void 0 : stats.hasErrors) === null || _a === void 0 ? void 0 : _a.call(stats));
             if (hasError) {
-                throw formatOutputError(err, stats);
-                // sendMessage({
-                //   event: 'compileErrorWhenFileChange',
-                //   data: formatOutputError(err, stats)
-                // })
-                // return
+                sendMessage({
+                    event: 'compileErrorWhenFileChange',
+                    data: formatOutputError(err, stats)
+                });
+                return;
             }
             sendMessage({
                 event: 'compileFinishWhenFileChange'
             });
-        }));
+        });
         console.log('[compiler] it is watching...', err, stats);
         const hasError = err || stats.hasErrors();
         if (hasError) {
@@ -289,4 +300,12 @@ const handlers = {
         globalConfig = null;
     }
 };
+// try {
 workerPool.worker(handlers);
+// } catch (error) {
+//   console.error('workerPool error:', error)
+// }
+// @ts-ignore
+globalThis.addEventListener('unhandledrejection', (err) => {
+    console.log(111, 'err', err);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "2.0.20",
+  "version": "2.0.22",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
@@ -88,18 +88,18 @@
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.2",
     "xhs-mp-workerpool": "^9.2.0",
-    "xhs-mp-ml-loader": "2.0.20",
-    "xhs-mp-compiler-utils": "2.0.20",
-    "xhs-mp-pack": "2.0.20",
-    "xhs-mp-project": "2.0.20",
-    "xhs-mp-shared": "2.0.20",
-    "xhs-mp-shared-fs": "2.0.20",
-    "xhs-mp-sjs-loader": "2.0.20",
-    "xhs-mp-sketch-loader": "2.0.20",
+    "xhs-mp-ml-loader": "2.0.22",
+    "xhs-mp-compiler-utils": "2.0.22",
+    "xhs-mp-pack": "2.0.22",
+    "xhs-mp-project": "2.0.22",
+    "xhs-mp-shared": "2.0.22",
+    "xhs-mp-shared-fs": "2.0.22",
+    "xhs-mp-sjs-loader": "2.0.22",
+    "xhs-mp-sketch-loader": "2.0.22",
     "yauzl": "^2.10.0"
   },
   "peerDependencies": {
-    "xhs-mp-ml-parser": "2.0.20"
+    "xhs-mp-ml-parser": "2.0.22"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.3",
@@ -122,7 +122,7 @@
     "@types/node": "14",
     "typescript": "5.1.6",
     "webpack-dev-server": "4.0.0-beta.3",
-    "xhs-mp-ml-parser": "2.0.20"
+    "xhs-mp-ml-parser": "2.0.22"
   },
   "scripts": {
     "version": "formula changelog && git add .",