file-lane 2.0.2-beta.1 → 2.0.2-beta.10

package/lib/FileLane.js

@@ -152,8 +152,10 @@ class FileLane {
                 });
             }
             catch (error) {
-                console.log('error', error);
+                console.log('FileLane error', error);
                 ColorConsole_1.default.throw(`ERROR: build error, ${error || 'unknown error'}`);
+                // 结束任务
+                process.exit();
             }
         });
     }
@@ -276,7 +278,15 @@ class FileLane {
             const { followWorks } = this.config;
             if (followWorks) {
                 for (let item of followWorks) {
-                    yield item(this.context, this.config, this.compilerOption);
+                    try {
+                        ColorConsole_1.default.info(`FollowWork: ${item.workerDescribe} start`);
+                        yield item.worker(this.context, this.config, this.compilerOption);
+                        ColorConsole_1.default.info(`FollowWork: ${item.workerDescribe} end`);
+                    }
+                    catch (error) {
+                        ColorConsole_1.default.throw(`FollowWork: ${item.workerDescribe} error, ${error}`);
+                        process.exit();
+                    }
                 }
             }
         });

package/lib/interface/IFileLaneConfig.d.ts

@@ -5,6 +5,18 @@ import IPlugin from './IPlugin';
 export type ILoaderClass = (new (...args: any[]) => ILoader) & {
     raw?: boolean;
 };
+export interface IRule {
+    /**
+     * 配置文件
+     */
+    test: MatchType;
+    /**
+     * 文件的 Loader，从前向后依次执行，前一个 loader 结果做为后一个 loader 的入参
+     */
+    loader: ILoaderClass[];
+    exclude?: MatchType;
+    include?: MatchType;
+}
 /**
  * IFileLaneConfig
  */
@@ -45,15 +57,7 @@ export default interface IFileLaneConfig<O = any> {
         /**
          * 转换规则
          */
-        rules: {
-            /**
-             * 配置文件
-             */
-            test: MatchType;
-            loader: ILoaderClass[];
-            exclude?: MatchType;
-            include?: MatchType;
-        }[];
+        rules: IRule[];
     };
     /**
      * 插件
@@ -78,11 +82,16 @@ export default interface IFileLaneConfig<O = any> {
      * ux--[webpack, zip]
      * uxInspect--[webpack, zipPhone, zipWatch, zipTv]
      */
-    followWorks?: FollowWork<O>[];
+    followWorks?: FollowWoker<O>[];
     /**
      * 配置watch时忽略的文件或者文件夹
      */
     watchIgnores?: MatchType;
 }
+type FollowWoker<O> = {
+    worker: FollowWork<O>;
+    workerDescribe?: string;
+};
 export type FollowWork<O = any> = (context: IFileLaneContext, config?: IFileLaneConfig, compilerOption?: O) => Promise<any>;
 export type PreWork<O = any> = (context: IFileLaneContext, fileList: string[], config: IFileLaneConfig, compilerOption?: O) => Promise<any>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "file-lane",
-  "version": "2.0.2-beta.1",
+  "version": "2.0.2-beta.10",
   "description": "File conversion tool, can be one-to-one, one to N, N to one",
   "keywords": [
     "file",
@@ -20,13 +20,15 @@
     "test": "node ./__tests__/file-lane.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.1",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.10",
     "archiver": "^6.0.1",
     "chokidar": "^3.5.3",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@types/archiver": "^5.3.2"
+    "@types/archiver": "^5.3.2",
+    "@types/fs-extra": "^11.0.4",
+    "fs-extra": "^11.2.0"
   },
-  "gitHead": "9244af36e617295ea4ff11a2f4f07f0e4f9f5f59"
+  "gitHead": "00d23c1ad1306a6c72bb007685de9fd4a6ee61af"
 }