jgb-shared - npm Package Compare versions

Comparing version 1.4.3 to 1.4.4-alpha.0

lib/Asset.d.ts

@@ -31,2 +31,5 @@ import { IInitOptions } from '../typings/jgb-shared';
     constructor(name: string, options: IInitOptions);
+    /**
+     * 获取cli的Compiler
+     */
     readonly compiler: ICompiler;
@@ -45,3 +48,3 @@ invalidate(): void;
         realName: string;
-        distPath: string;
+        distPath: any;
         absolutePath: string;
@@ -48,0 +51,0 @@ relativeRequirePath: string;

lib/Asset.js

@@ -14,2 +14,5 @@ "use strict";
 var objectHash_1 = require("./utils/objectHash");
+var WorkerFarm_1 = require("./workerfarm/WorkerFarm");
+var DEFAULT_NPM_DIR = 'npm';
+var REG_NODE_MODULES = /(\/node_modules\/|\/npm\/)/g;
 var NODE_MODULES = 'node_modules';
@@ -28,5 +31,9 @@ var cache = new Map();
         this.relativeName = path.relative(options.sourceDir, name);
-        this.resolver = new Resolver_1.default(options);
+        var resolver = WorkerFarm_1.default.getSharedResolver();
+        this.resolver = resolver || new Resolver_1.default(options);
     }
     Object.defineProperty(Asset.prototype, "compiler", {
+        /**
+         * 获取cli的Compiler
+         */
         get: function () {
@@ -63,39 +70,8 @@ if (this.parentCompiler) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e_1, _a, distPath, alias, _b, _c, key, aliasValue, sourceFile, dependenceFile, absolutePath, relativeRequirePath, parentDistPath;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        distPath = '';
-                        alias = this.options.alias;
-                        /**
-                         * resolve alias get relativepath
-                         * @example
-                         *  @/utils/index => ../utils/index
-                         */
-                        if (alias) {
-                            try {
-                                for (_b = tslib_1.__values(Object.keys(alias)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                                    key = _c.value;
-                                    if (name.includes(key)) {
-                                        aliasValue = utils_1.normalizeAlias(alias[key]);
-                                        name = path.normalize(name.replace(key, aliasValue.path));
-                                        sourceFile = this.name;
-                                        dependenceFile = name;
-                                        // relative path: ..\\utils\\index => ../utils/index
-                                        name = utils_1.promoteRelativePath(path.relative(sourceFile, dependenceFile));
-                                        break;
-                                    }
-                                }
-                            }
-                            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                            finally {
-                                try {
-                                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                                }
-                                finally { if (e_1) throw e_1.error; }
-                            }
-                        }
-                        return [4 /*yield*/, this.resolver.resolve(name, this.name)];
+            var absolutePath, relativeRequirePath, distPath, parentDistPath;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.resolver.resolve(name, this.name)];
                     case 1:
-                        absolutePath = (_d.sent()).path;
+                        absolutePath = (_a.sent()).path;
                         relativeRequirePath = '';
@@ -109,3 +85,3 @@ distPath = this.generateDistPath(absolutePath, ext);
                                 /* 文件真实路径 */
-                                realName: name,
+                                realName: absolutePath,
                                 distPath: distPath,
@@ -182,3 +158,3 @@ absolutePath: absolutePath,
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e_2, _a, startTime, _b, generated, generated_1, generated_1_1, _c, code, ext, map, _d, _e, distPath, ignore, endTime, e_2_1;
+            var e_1, _a, startTime, _b, generated, generated_1, generated_1_1, _c, code, ext, map, _d, _e, distPath, ignore, endTime, e_1_1;
             return tslib_1.__generator(this, function (_f) {
@@ -233,4 +209,4 @@ switch (_f.label) {
                     case 12:
-                        e_2_1 = _f.sent();
-                        e_2 = { error: e_2_1 };
+                        e_1_1 = _f.sent();
+                        e_1 = { error: e_1_1 };
                         return [3 /*break*/, 14];
@@ -241,3 +217,3 @@ case 13:
                         }
-                        finally { if (e_2) throw e_2.error; }
+                        finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
@@ -342,8 +318,9 @@ case 14: return [2 /*return*/];
         if (ext === void 0) { ext = ''; }
-        if (cache.has(sourcePath)) {
-            return cache.get(sourcePath);
+        var cacheKey = "" + sourcePath + ext;
+        if (cache.has(cacheKey)) {
+            return cache.get(cacheKey);
         }
         var alias = this.options.alias;
-        var sourceDir = path.resolve(this.options.sourceDir);
-        var name = sourcePath;
+        var sourceDir = utils_1.pathToUnixType(path.resolve(this.options.sourceDir));
+        var name = utils_1.pathToUnixType(sourcePath);
         var distPath = '';
@@ -354,4 +331,6 @@ var aliasDirs = tslib_1.__spread(Object.entries(alias));
             var normalizedAlias = utils_1.normalizeAlias(aliasValue);
-            var dir = normalizedAlias.path;
-            var distDir = normalizedAlias.dist ? normalizedAlias.dist : 'npm';
+            var dir = utils_1.pathToUnixType(normalizedAlias.path);
+            var distDir = normalizedAlias.dist
+                ? normalizedAlias.dist
+                : DEFAULT_NPM_DIR;
             // in alias source dir but not in build source file
@@ -370,2 +349,7 @@ if (name.includes(sourceDir)) {
         }
+        // fix style
+        distPath = utils_1.pathToUnixType(distPath);
+        /**
+         * node_modules/npm => npm
+         */
         if ((!distPath && name.includes(NODE_MODULES)) ||
@@ -375,3 +359,3 @@ distPath.includes(NODE_MODULES)) {
             var relativeAlias = spNM.pop();
-            distPath = path.join(this.options.outDir, 'npm', relativeAlias);
+            distPath = path.join(this.options.outDir, DEFAULT_NPM_DIR, relativeAlias);
         }
@@ -391,3 +375,3 @@ if (!distPath) {
         }
-        cache.set(sourcePath, distPath);
+        cache.set(cacheKey, distPath);
         return distPath;
@@ -560,2 +544,2 @@ };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Asset.js","sourceRoot":"","sources":["../src/Asset.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Asset.js","sourceRoot":"","sources":["../src/Asset.ts"],"names":[],"mappings":";;;AAAA,6BAA+B;AAC/B,0BAA4B;AAC5B,2BAA6B;AAC7B,yBAA2B;AAE3B,iCAAmC;AACnC,mCAAkC;AAElC,uCAAkC;AAElC,iCAA8E;AAC9E,uCAAkC;AAClC,iDAA4C;AAC5C,sDAAiD;AAEjD,IAAM,eAAe,GAAG,KAAK,CAAC;AAC9B,IAAM,gBAAgB,GAAG,6BAA6B,CAAC;AAEvD,IAAM,YAAY,GAAG,cAAc,CAAC;AAEpC,IAAM,KAAK,GAAG,IAAI,GAAG,EAAE,CAAC;AAQxB;IAsBE,eAAmB,IAAY,EAAS,OAAqB;QAA1C,SAAI,GAAJ,IAAI,CAAQ;QAAS,YAAO,GAAP,OAAO,CAAc;QApB7D,iBAAY,GAAG,IAAI,GAAG,EAAe,CAAC;QACtC,aAAQ,GAAG,EAAE,CAAC;QAKd,cAAS,GAAG,KAAK,CAAC;QAClB,cAAS,GAAsC,IAAI,CAAC;QAOpD,cAAS,GAAQ,EAAE,CAAC;QAOlB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC3D,IAAM,QAAQ,GAAG,oBAAU,CAAC,iBAAiB,EAAE,CAAC;QAChD,IAAI,CAAC,QAAQ,GAAG,QAAQ,IAAI,IAAI,kBAAQ,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAKD,sBAAI,2BAAQ;QAHZ;;WAEG;aACH;YACE,IAAI,IAAI,CAAC,cAAc,EAAE;gBACvB,OAAO,IAAI,CAAC,cAAc,CAAC;aAC5B;QACH,CAAC;;;OAAA;IAED,0BAAU,GAAV;QACE,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;QAChB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,0BAA0B;IAC5B,CAAC;IAED;;OAEG;IACH,gCAAgB,GAAhB,UAAiB,SAAe;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;OAIG;IACG,gCAAgB,GAAtB,UAAuB,IAAY,EAAE,GAAgB;QAAhB,oBAAA,EAAA,QAAgB;;;;;4BAEnB,qBAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CACzD,IAAI,EACJ,IAAI,CAAC,IAAI,CACV,EAAA;;wBAHa,YAAY,GAAK,CAAC,SAG/B,CAGA,KANyB;wBAStB,mBAAmB,GAAG,EAAE,CAAC;wBAEvB,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;wBACpD,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;wBAE7D,IAAI,QAAQ,IAAI,cAAc,EAAE;4BAC9B,mBAAmB,GAAG,2BAAmB,CACvC,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,QAAQ,CAAC,CACxC,CAAC;yBACH;wBAED,sBAAO;gCACL,YAAY;gCACZ,QAAQ,EAAE,YAAY;gCACtB,QAAQ,UAAA;gCACR,YAAY,cAAA;gCACZ,iBAAiB;gCACjB,mBAAmB,qBAAA;6BACpB,EAAC;;;;KACH;IAED,6BAAa,GAAb,UAAc,IAAY,EAAE,IAAc;QAAd,qBAAA,EAAA,SAAc;QACxC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,MAAA,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,gCAAgB,GAAhB,UAAiB,GAAW,EAAE,IAAgB,EAAE,IAAU;QAA5B,qBAAA,EAAA,OAAO,IAAI,CAAC,IAAI;QAC5C,IAAI,CAAC,GAAG,IAAI,eAAK,CAAC,GAAG,CAAC,EAAE;YACtB,OAAO,GAAG,CAAC;SACZ;QAED,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC5B,IAAI,GAAG,IAAI,CAAC;YACZ,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;SAClB;QAED,IAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,OAAO,CAAC;QACZ,IAAI,QAAQ,CAAC;QACb,IAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,QAAQ,GAAG,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEnD,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YAC9C,IAAI,GAAG,KAAK,GAAG,EAAE;gBACf,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;aAC5B;YACD,yBAAyB;YACzB,kBAAkB;YAClB,6DAA6D;YAC7D,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;gBACtE,IAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;gBAC/C,IAAI,GAAG,EAAE;oBACP,IAAI,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC;oBACtB,8BAA8B;oBAC9B,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;wBACtC,IAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC5C,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;qBACjC;oBAED,QAAQ,GAAG,2BAAmB,CAC5B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CACpD,CAAC;iBACH;aACF;YACD,OAAO,GAAG,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SACnE;aAAM;YACL,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACvC,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;SACnE;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;YAC5B,OAAO,GAAG,2BAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;SAClE;QAED,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;QAEpE,0EAA0E;QAE1E,MAAM,CAAC,QAAQ,GAAG,OAAO,CAAC;QAE1B,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED;;;;;;;;OAQG;IACG,uBAAO,GAAb;;;;;;wBACE,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;4BACZ,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;yBAC7B;wBAEK,SAAS,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;wBAE9B,qBAAM,IAAI,CAAC,YAAY,EAAE,EAAA;;wBAAzB,SAAyB,CAAC;wBAC1B,qBAAM,IAAI,CAAC,YAAY,EAAE,EAAA;;wBAAzB,SAAyB,CAAC;wBAC1B,qBAAM,IAAI,CAAC,eAAe,EAAE,EAAA;;wBAA5B,SAA4B,CAAC;wBAC7B,qBAAM,IAAI,CAAC,SAAS,EAAE,EAAA;;wBAAtB,SAAsB,CAAC;wBACvB,KAAA,IAAI,CAAA;wBAAa,qBAAM,IAAI,CAAC,QAAQ,EAAE,EAAA;;wBAAtC,GAAK,SAAS,GAAG,SAAqB,CAAC;wBACjC,SAAS,GAAqB,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;;;;wBAC7B,cAAA,iBAAA,SAAS,CAAA;;;;wBAA/B,wBAAkB,EAAhB,IAAI,UAAA,EAAE,GAAG,SAAA,EAAE,GAAG,SAAA;wBACzB,KAAA,IAAI,CAAA;wBAAQ,qBAAM,IAAI,CAAC,YAAY,EAAE,EAAA;;wBAArC,GAAK,IAAI,GAAG,SAAyB,CAAC;wBACT,qBAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAAxD,KAAuB,SAAiC,EAAtD,QAAQ,cAAA,EAAE,MAAM,YAAA;wBAClB,OAAO,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;wBAE5B,IAAI,CAAC,MAAM,EAAE;4BACX,eAAM,CAAC,GAAG,CAAC,KAAG,QAAU,EAAE,IAAI,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;yBACtD;;;;;;;;;;;;;;;;;;;;KAEJ;IAEK,4BAAY,GAAlB;;;;;;6BACM,CAAC,IAAI,CAAC,QAAQ,EAAd,wBAAc;wBAChB,KAAA,IAAI,CAAA;wBAAa,qBAAM,IAAI,CAAC,IAAI,EAAE,EAAA;;wBAAlC,GAAK,QAAQ,GAAG,CAAC,SAAiB,CAAC,IAAI,EAAE,CAAC;;;;;;KAE7C;IAED,oCAAoC;IAC9B,4BAAY,GAAlB;;;;KAAuB;IAEvB,oCAAoC;IAC9B,yBAAS,GAAf;;;;KAAoB;IAEpB,oCAAoC;IAC9B,2BAAW,GAAjB,UAAkB,SAAc;;;;KAAkB;IAElD;;OAEG;IACG,+BAAe,GAArB;;;;4BACE,qBAAM,IAAI,CAAC,YAAY,EAAE,EAAA;;wBAAzB,SAAyB,CAAC;6BAEtB,CAAA,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAA,EAA7C,wBAA6C;wBAC/C,qBAAM,IAAI,CAAC,aAAa,EAAE,EAAA;;wBAA1B,SAA0B,CAAC;wBAC3B,qBAAM,IAAI,CAAC,mBAAmB,EAAE,EAAA;;wBAAhC,SAAgC,CAAC;;;;;;KAEpC;IAEK,6BAAa,GAAnB;;;;;4BACE,qBAAM,IAAI,CAAC,YAAY,EAAE,EAAA;;wBAAzB,SAAyB,CAAC;6BACtB,CAAC,IAAI,CAAC,GAAG,EAAT,wBAAS;wBACX,KAAA,IAAI,CAAA;wBAAO,qBAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAA;;wBAA1C,GAAK,GAAG,GAAG,SAA+B,CAAC;;;;;;KAE9C;IAEK,mCAAmB,GAAzB;;;gBACE,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAC;;;;KAC3D;IAED,qCAAqB,GAArB;QACE,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,gCAAgB,GAAhB,UAAiB,UAAkB,EAAE,GAAgB;QAAhB,oBAAA,EAAA,QAAgB;QACnD,IAAM,QAAQ,GAAG,KAAG,UAAU,GAAG,GAAK,CAAC;QACvC,IAAI,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACvB,OAAO,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SAC5B;QAED,IAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QACjC,IAAM,SAAS,GAAG,sBAAc,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QACvE,IAAM,IAAI,GAAG,sBAAc,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,QAAQ,GAAG,EAAE,CAAC;QAElB,IAAM,SAAS,oBAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAE7C,OAAO,SAAS,CAAC,MAAM,EAAE;YACjB,IAAA,yCAA2C,EAA1C,iBAAS,EAAE,kBAAU,CAAsB;YAClD,IAAM,eAAe,GAAG,sBAAc,CAAC,UAAU,CAAC,CAAC;YACnD,IAAM,GAAG,GAAG,sBAAc,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YACjD,IAAM,OAAO,GAAG,eAAe,CAAC,IAAI;gBAClC,CAAC,CAAC,eAAe,CAAC,IAAI;gBACtB,CAAC,CAAC,eAAe,CAAC;YACpB,mDAAmD;YACnD,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBAC5B,IAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBAClD,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;gBACtD,MAAM;aACP;YACD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtB,kBAAkB;gBAClB,IAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBAE/C,QAAQ,GAAG,IAAI,CAAC,IAAI,CAClB,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,OAAO,EACP,SAAmB,EACnB,aAAa,CACd,CAAC;gBACF,MAAM;aACP;SACF;QAED,YAAY;QACZ,QAAQ,GAAG,sBAAc,CAAC,QAAQ,CAAC,CAAC;QAEpC;;WAEG;QACH,IACE,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAC1C,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,EAC/B;YACA,IAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtC,IAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACjC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC;SAC3E;QAED,IAAI,CAAC,QAAQ,EAAE;YACb,IAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAClD,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;SACvD;QAED,IAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAEvC,IAAI,CAAC,OAAO,EAAE;YACZ,oBAAoB;YACpB,QAAQ,IAAI,GAAG,CAAC;SACjB;aAAM,IAAI,GAAG,IAAI,OAAO,IAAI,OAAO,KAAK,GAAG,EAAE;YAC5C,wBAAwB;YACxB,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;SAC3C;QAED,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC9B,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACG,sBAAM,GAAZ,UACE,IAAY,EACZ,GAAgB,EAChB,GAAc;QADd,oBAAA,EAAA,QAAgB;;;;;;wBAOZ,MAAM,GAAG,IAAI,CAAC;wBAEd,QAAQ,GACV,IAAI,CAAC,QAAQ;4BACb,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC;4BACrC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;wBAEnD,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC;wBAC7B,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;wBAE5C,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;4BACnC,oBAAoB;4BACpB,QAAQ,IAAI,GAAG,CAAC;yBACjB;6BAAM,IAAI,OAAO,KAAK,GAAG,EAAE;4BAC1B,wBAAwB;4BACxB,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;yBAC3C;wBAED,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;wBAEzB,cAAc,GAAG,2BAAmB,CAClC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAC7C,CAAC;6BAGE,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,EAAhC,wBAAgC;wBAClC,MAAM,GAAG,KAAK,CAAC;wBACT,eAAe,GAAG,GAAG;4BACzB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC;4BACnD,CAAC,CAAC,EAAE,CAAC;6BACH,eAAe,EAAf,wBAAe;wBACjB,qBAAM,SAAS,CACb,QAAQ,EACR,IAAI;iCACF,yEAAuE,MAAM,CAAC,IAAI,CAChF,eAAe,EACf,OAAO,CACR,CAAC,QAAQ,CAAC,QAAQ,CAAG,CAAA,CACzB,EAAA;;wBAPD,SAOC,CAAC;;4BAEF,qBAAM,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAA;;wBAA/B,SAA+B,CAAC;;4BAIpC,sBAAO;4BACL,MAAM,QAAA;4BACN,QAAQ,EAAE,cAAc;yBACzB,EAAC;;;;KACH;IAEK,4BAAY,GAAlB;;;gBACE,sBAAO,oBAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAC;;;KACnC;IAED;;OAEG;IACG,oBAAI,GAAV;;;;4BACS,qBAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAA;4BAA5C,sBAAO,SAAqC,EAAC;;;;KAC9C;IAED;;;OAGG;IACG,qBAAK,GAAX,UAAY,QAAgB;;;gBAC1B,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;;;;KAC7C;IAEK,wBAAQ,GAAd;;;gBACE,kDAAkD;gBAClD,sBAAO;wBACL,IAAI,EAAE,EAAE;wBACR,GAAG,EAAE,EAAE;qBACR,EAAC;;;KACH;IAEK,0BAAU,GAAhB;;;;;;6BACM,CAAC,IAAI,CAAC,QAAQ,EAAd,wBAAc;wBAChB,KAAA,IAAI,CAAA;wBAAY,qBAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAA;;wBAAxE,GAAK,QAAQ,GAAG,SAAwD,CAAC;;4BAG3E,sBAAO,IAAI,CAAC,QAAQ,EAAC;;;;KACtB;IAEK,yBAAS,GAAf,UAAgB,SAAmB,EAAE,IAAc;QAAd,qBAAA,EAAA,SAAc;;;;;;6BAC7C,IAAI,CAAC,UAAU,EAAf,wBAAe;wBACL,qBAAM,IAAI,CAAC,UAAU,EAAE,EAAA;;wBAA7B,GAAG,GAAG,SAAuB;wBACnC,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;4BAC/B,sBAAO,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAC;yBAC1C;;4BAIU,qBAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAA;;wBAA9D,IAAI,GAAG,SAAuD;6BAChE,IAAI,EAAJ,wBAAI;wBACN,oEAAoE;wBACpE,sCAAsC;wBACtC,qBAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,EAAA;;wBAF1D,oEAAoE;wBACpE,sCAAsC;wBACtC,SAA0D,CAAC;wBAC3D,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE;4BACvB,sBAAO,IAAI,EAAC;yBACb;wBAEM,qBAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAA;4BAA3D,sBAAO,SAAoD,EAAC;4BAG9D,sBAAO,IAAI,EAAC;;;;KACb;IACH,YAAC;AAAD,CAAC,AA3aD,IA2aC;;AAED,SAAe,SAAS,CAAC,QAAgB,EAAE,IAAY;;;;wBACrD,qBAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAA;;oBAA1C,SAA0C,CAAC;oBAC3C,qBAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAA;;oBAAlC,SAAkC,CAAC;;;;;CACpC"}

lib/Logger.js

@@ -119,2 +119,2 @@ "use strict";
 exports.error = error;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsK0JBQXFDO0FBRXJDLHNEQUFpRDtBQUlqRCxJQUFZLE9BS1g7QUFMRCxXQUFZLE9BQU87SUFDakIsMkNBQU8sQ0FBQTtJQUNQLHVDQUFLLENBQUE7SUFDTCxxQ0FBSSxDQUFBO0lBQ0osbUNBQUcsQ0FBQTtBQUNMLENBQUMsRUFMVyxPQUFPLEdBQVAsZUFBTyxLQUFQLGVBQU8sUUFLbEI7QUFFRDtJQUlFO1FBRkEsVUFBSyxHQUFHLElBQUksR0FBRyxFQUFFLENBQUM7UUFHaEIsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLGVBQUssQ0FBQyxXQUFXLENBQUMsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsb0JBQUcsR0FBSCxVQUNFLE9BQVksRUFDWixJQUEwQyxFQUMxQyxRQUFpQjtRQURqQixxQkFBQSxFQUFBLE9BQStCLE9BQU8sQ0FBQyxHQUFHO1FBRzFDLElBQUksT0FBTyxPQUFPLEtBQUssUUFBUSxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUU7WUFDekQsT0FBTyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUM7U0FDbkM7UUFFRCxJQUFJLElBQUksS0FBSyxPQUFPLENBQUMsS0FBSyxFQUFFO1lBQzFCLE9BQU8sT0FBTyxDQUFDLEtBQUssQ0FBQyxlQUFLLENBQUMsR0FBRyxDQUFDLFVBQVUsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDO1NBQ3ZEO1FBRUQsSUFBSSxJQUFJLEtBQUssT0FBTyxDQUFDLE9BQU8sRUFBRTtZQUM1QixPQUFPLE9BQU8sQ0FBQyxJQUFJLENBQUMsZUFBSyxDQUFDLE1BQU0sQ0FBQyxZQUFZLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQztTQUMzRDtRQUVELElBQUksSUFBSSxL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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsK0JBQXFDO0FBQ3JDLHNEQUFpRDtBQUlqRCxJQUFZLE9BS1g7QUFMRCxXQUFZLE9BQU87SUFDakIsMkNBQU8sQ0FBQTtJQUNQLHVDQUFLLENBQUE7SUFDTCxxQ0FBSSxDQUFBO0lBQ0osbUNBQUcsQ0FBQTtBQUNMLENBQUMsRUFMVyxPQUFPLEdBQVAsZUFBTyxLQUFQLGVBQU8sUUFLbEI7QUFFRDtJQUlFO1FBRkEsVUFBSyxHQUFHLElBQUksR0FBRyxFQUFFLENBQUM7UUFHaEIsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLGVBQUssQ0FBQyxXQUFXLENBQUMsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsb0JBQUcsR0FBSCxVQUNFLE9BQVksRUFDWixJQUEwQyxFQUMxQyxRQUFpQjtRQURqQixxQkFBQSxFQUFBLE9BQStCLE9BQU8sQ0FBQyxHQUFHO1FBRzFDLElBQUksT0FBTyxPQUFPLEtBQUssUUFBUSxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUU7WUFDekQsT0FBTyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUM7U0FDbkM7UUFFRCxJQUFJLElBQUksS0FBSyxPQUFPLENBQUMsS0FBSyxFQUFFO1lBQzFCLE9BQU8sT0FBTyxDQUFDLEtBQUssQ0FBQyxlQUFLLENBQUMsR0FBRyxDQUFDLFVBQVUsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDO1NBQ3ZEO1FBRUQsSUFBSSxJQUFJLEtBQUssT0FBTyxDQUFDLE9BQU8sRUFBRTtZQUM1QixPQUFPLE9BQU8sQ0FBQyxJQUFJLENBQUMsZUFBSyxDQUFDLE1BQU0sQ0FBQyxZQUFZLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQztTQUMzRDtRQUVELElBQUksSUFBSSxL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

lib/pluginDeclare.d.ts

 import Asset from './Asset';
 import AwaitEventEmitter from './awaitEventEmitter';
 export declare type TypeAsset = typeof Asset;
+/**
+ * cli的Compiler实例
+ */
 export interface ICompiler extends AwaitEventEmitter {
     addAssetsType(exts: string | string[], asset: TypeAsset): void;
 }
-export declare type IPluginRegister = (compiler: ICompiler, config: any) => any;
-export default function declare(pluginRegister: IPluginRegister): IPluginRegister;
+/** 返回pluginName  */
+export declare type IPluginRegister = (compiler: ICompiler, config: any) => string | void;
+export default function declare(pluginRegister: IPluginRegister): any;

lib/pluginDeclare.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var chalk_1 = require("chalk");
+var Logger_1 = require("./Logger");
+var loadedPlugins = new Set();
 function declare(pluginRegister) {
     return function (compiler, config) {
-        return pluginRegister(compiler, config);
+        var pluginName = pluginRegister(compiler, config);
+        if (!pluginName || loadedPlugins.has(pluginName)) {
+            return;
+        }
+        loadedPlugins.add(pluginName);
+        Logger_1.logger.log(chalk_1.default.gray("[\u52A0\u8F7D]: " + pluginName));
     };
 }
 exports.default = declare;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luRGVjbGFyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wbHVnaW5EZWNsYXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBVUEsU0FBd0IsT0FBTyxDQUM3QixjQUErQjtJQUUvQixPQUFPLFVBQUMsUUFBbUIsRUFBRSxNQUFXO1FBQ3RDLE9BQU8sY0FBYyxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUMxQyxDQUFDLENBQUM7QUFDSixDQUFDO0FBTkQsMEJBTUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luRGVjbGFyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wbHVnaW5EZWNsYXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0JBQXFDO0FBR3JDLG1DQUFrQztBQWFsQyxJQUFNLGFBQWEsR0FBRyxJQUFJLEdBQUcsRUFBRSxDQUFDO0FBRWhDLFNBQXdCLE9BQU8sQ0FBQyxjQUErQjtJQUM3RCxPQUFPLFVBQUMsUUFBbUIsRUFBRSxNQUFXO1FBQ3RDLElBQU0sVUFBVSxHQUFHLGNBQWMsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDcEQsSUFBSSxDQUFDLFVBQVUsSUFBSSxhQUFhLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxFQUFFO1lBQ2hELE9BQU87U0FDUjtRQUNELGFBQWEsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDOUIsZUFBTSxDQUFDLEdBQUcsQ0FBQyxlQUFLLENBQUMsSUFBSSxDQUFDLHFCQUFTLFVBQVksQ0FBQyxDQUFDLENBQUM7SUFDaEQsQ0FBQyxDQUFDO0FBQ0osQ0FBQztBQVRELDBCQVNDIn0=

lib/Resolver.d.ts

@@ -1,2 +0,2 @@
-import { IAliasValue, IInitOptions } from "../typings/jgb-shared";
+import { IAliasValue, IInitOptions } from '../typings/jgb-shared';
 export default class Resolver {
@@ -44,3 +44,10 @@ private options;
     loadAlias(fileName: string, dir: string): Promise<string>;
-    loadResolveAlias(fileName: string, dir: string): Promise<string>;
+    /**
+     * resolve alias get relativepath
+     * @param fileName
+     * @param dir 如果有dir则返回相对路径，否则返回绝对路径
+     * @example
+     *  @/utils/index => ../utils/index
+     */
+    loadResolveAlias(fileName: string, dir?: string): string;
     resolveAliases(fileName: string, pkg: any): string;
@@ -47,0 +54,0 @@ resolvePackageAliases(fileName: string, pkg: any): string;

lib/Resolver.js

@@ -43,3 +43,3 @@ "use strict";
                         }
-                        exts.unshift("");
+                        exts.unshift('');
                         return [4 /*yield*/, this.resolveModule(fileName, parent)];
@@ -49,3 +49,3 @@ case 1:
                         dir = parent ? path.dirname(parent) : process.cwd();
-                        if (!("moduleDir" in module && module.moduleDir)) return [3 /*break*/, 3];
+                        if (!('moduleDir' in module && module.moduleDir)) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.loadNodeModules(module, exts)];
@@ -81,3 +81,3 @@ case 2:
     Resolver.prototype.getCacheKey = function (fileName, parent) {
-        return (parent ? path.dirname(parent) : "") + ":" + fileName;
+        return (parent ? path.dirname(parent) : '') + ':' + fileName;
     };
@@ -144,3 +144,3 @@ Resolver.prototype.resolveModule = function (fileName, parent) {
                         // Skip node_modules directories
-                        if (path.basename(dir) === "node_modules") {
+                        if (path.basename(dir) === 'node_modules') {
                             dir = path.dirname(dir);
@@ -151,3 +151,3 @@ }
                         _a.trys.push([2, 4, , 5]);
-                        moduleDir = path.join(dir, "node_modules", parts[0]);
+                        moduleDir = path.join(dir, 'node_modules', parts[0]);
                         return [4 /*yield*/, util_1.promisify(fs.stat)(moduleDir)];
@@ -161,3 +161,3 @@ case 3:
                                     moduleDir: moduleDir,
-                                    filePath: path.join(dir, "node_modules", filename)
+                                    filePath: path.join(dir, 'node_modules', filename)
                                 }];
@@ -316,3 +316,3 @@ }
         var browser = this.getBrowserField(pkg);
-        if (browser && typeof browser === "object" && browser[pkg.name]) {
+        if (browser && typeof browser === 'object' && browser[pkg.name]) {
             browser = browser[pkg.name];
@@ -324,7 +324,7 @@ }
         return [pkg.source, browser, pkg.main, pkg.module]
-            .filter(function (entry) { return typeof entry === "string"; })
+            .filter(function (entry) { return typeof entry === 'string'; })
             .map(function (main) {
             // Default to index file if no main field find
-            if (!main || main === "." || main === "./") {
-                main = "index";
+            if (!main || main === '.' || main === './') {
+                main = 'index';
             }
@@ -385,3 +385,3 @@ return path.resolve(pkg.pkgdir, main);
                         return [3 /*break*/, 13];
-                    case 13: return [4 /*yield*/, this.loadAsFile(path.join(dir, "index"), extensions, pkg)];
+                    case 13: return [4 /*yield*/, this.loadAsFile(path.join(dir, 'index'), extensions, pkg)];
                     case 14: 
@@ -397,3 +397,3 @@ // Fall back to an index file inside the directory.
             switch (fileName[0]) {
-                case "/":
+                case '/':
                     if (fsExtra.existsSync(fileName)) {
@@ -404,11 +404,11 @@ return fileName;
                     return path.resolve(this.options.sourceDir, fileName.slice(1));
-                case "~":
+                case '~':
                     // Tilde path. Resolve relative to nearest node_modules directory,
                     // or the project root - whichever comes first.
                     while (dir !== this.options.rootDir &&
-                        path.basename(path.dirname(dir)) !== "node_modules") {
+                        path.basename(path.dirname(dir)) !== 'node_modules') {
                         dir = path.dirname(dir);
                     }
                     return path.join(dir, fileName.slice(1));
-                case ".":
+                case '.':
                     // Relative path.
@@ -452,31 +452,35 @@ return path.resolve(dir, fileName);
     };
+    /**
+     * resolve alias get relativepath
+     * @param fileName
+     * @param dir 如果有dir则返回相对路径，否则返回绝对路径
+     * @example
+     *  @/utils/index => ../utils/index
+     */
     Resolver.prototype.loadResolveAlias = function (fileName, dir) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e_5, _a, _b, _c, key, target;
-            return tslib_1.__generator(this, function (_d) {
-                try {
-                    for (_b = tslib_1.__values(this.alias.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        key = _c.value;
-                        if (fileName.startsWith(key)) {
-                            target = this.alias.get(key);
-                            /**
-                             * @src: path.resolve('src')
-                             *
-                             * @src/abc => /src/abc
-                             */
-                            fileName = fileName.replace(key, utils_1.normalizeAlias(target).path);
-                            return [2 /*return*/, this.resolveFilename(fileName, dir)];
-                        }
-                    }
+        var e_5, _a;
+        fileName = utils_1.pathToUnixType(fileName);
+        try {
+            for (var _b = tslib_1.__values(this.alias.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var key = _c.value;
+                if (fileName.includes(key)) {
+                    var target = this.alias.get(key);
+                    var normalizedAlias = utils_1.normalizeAlias(target);
+                    fileName = fileName.replace(key, normalizedAlias.path);
+                    // if (dir) {
+                    //   const relativePath = path.relative(dir, fileName);
+                    //   return pathToUnixType(relativePath);
+                    // }
+                    return utils_1.pathToUnixType(fileName);
                 }
-                catch (e_5_1) { e_5 = { error: e_5_1 }; }
-                finally {
-                    try {
-                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                    }
-                    finally { if (e_5) throw e_5.error; }
-                }
-                return [2 /*return*/];
-            });
-        });
+            }
+        }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_5) throw e_5.error; }
+        }
+        return;
     };
@@ -498,7 +502,7 @@ Resolver.prototype.resolveAliases = function (fileName, pkg) {
     Resolver.prototype.getBrowserField = function (pkg) {
-        var target = this.options.target || "browser";
-        return target === "browser" ? pkg.browser : null;
+        var target = this.options.target || 'browser';
+        return target === 'browser' ? pkg.browser : null;
     };
     Resolver.prototype.getAlias = function (fileName, dir, aliases) {
-        if (!fileName || !aliases || typeof aliases !== "object") {
+        if (!fileName || !aliases || typeof aliases !== 'object') {
             return null;
@@ -510,4 +514,4 @@ }
             fileName = path.relative(dir, fileName);
-            if (fileName[0] !== ".") {
-                fileName = "./" + fileName;
+            if (fileName[0] !== '.') {
+                fileName = './' + fileName;
             }
@@ -523,3 +527,3 @@ alias = this.lookupAlias(aliases, fileName, dir);
                 alias = this.lookupAlias(aliases, parts[0], dir);
-                if (typeof alias === "string") {
+                if (typeof alias === 'string') {
                     // Append the fileName back onto the aliased module.
@@ -532,3 +536,3 @@ alias = path.join.apply(path, tslib_1.__spread([alias], parts.slice(1)));
         if (alias === false) {
-            return "";
+            return '';
         }
@@ -540,3 +544,3 @@ return alias;
         var alias = aliases[fileName];
-        if (typeof alias === "string") {
+        if (typeof alias === 'string') {
             return this.resolveFilename(alias, dir);
@@ -555,3 +559,3 @@ }
                     case 1:
-                        if (!(dir !== root && path.basename(dir) !== "node_modules")) return [3 /*break*/, 6];
+                        if (!(dir !== root && path.basename(dir) !== 'node_modules')) return [3 /*break*/, 6];
                         _a.label = 2;
@@ -576,3 +580,3 @@ case 2:
         var root = path.parse(dir).root;
-        while (dir !== root && path.basename(dir) !== "node_modules") {
+        while (dir !== root && path.basename(dir) !== 'node_modules') {
             try {
@@ -593,7 +597,7 @@ return this.readPackageSync(dir);
                     case 0:
-                        file = path.join(dir, "package.json");
+                        file = path.join(dir, 'package.json');
                         if (this.packageCache.has(file)) {
                             return [2 /*return*/, this.packageCache.get(file)];
                         }
-                        return [4 /*yield*/, util_1.promisify(fs.readFile)(file, { encoding: "utf8" })];
+                        return [4 /*yield*/, util_1.promisify(fs.readFile)(file, { encoding: 'utf8' })];
                     case 1:
@@ -620,7 +624,7 @@ json = _a.sent();
     Resolver.prototype.readPackageSync = function (dir) {
-        var file = path.join(dir, "package.json");
+        var file = path.join(dir, 'package.json');
         if (this.packageCache.has(file)) {
             return this.packageCache.get(file);
         }
-        var json = fs.readFileSync(file, { encoding: "utf8" });
+        var json = fs.readFileSync(file, { encoding: 'utf8' });
         var pkg = JSON.parse(json);
@@ -632,3 +636,3 @@ pkg.pkgfile = file;
         if (pkg.source) {
-            var realpath = fs.readFileSync(file, { encoding: "utf8" });
+            var realpath = fs.readFileSync(file, { encoding: 'utf8' });
             if (realpath === file) {
@@ -643,3 +647,3 @@ delete pkg.source;
         var parts = path.normalize(name).split(path.sep);
-        if (parts[0].charAt(0) === "@") {
+        if (parts[0].charAt(0) === '@') {
             // Scoped module (e.g. @scope/module). Merge the first two parts back together.
@@ -653,2 +657,2 @@ parts.splice(0, 2, parts[0] + "/" + parts[1]);
 exports.default = Resolver;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Resolver.js","sourceRoot":"","sources":["../src/Resolver.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Resolver.js","sourceRoot":"","sources":["../src/Resolver.ts"],"names":[],"mappings":"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"}

lib/workerfarm/WorkerFarm.d.ts

@@ -15,2 +15,3 @@ /// <reference types="node" />
     bundlerOptions: any;
+    startPrefTime: any;
     constructor(options: any, farmOptions?: any);
@@ -35,4 +36,2 @@ /**
     processQueue(): Promise<void>;
-    prefStartChild(): void;
-    prefCpuUsage(): void;
     /**
@@ -47,2 +46,11 @@ * 处理请求
     init(bundlerOptions: any): void;
+    /**
+     * 开启cpu占用优化
+     */
+    startPref(time?: number): Promise<void>;
+    getCpuUsageAsync(): Promise<number>;
+    /**
+     * 停止cpu占用优化
+     */
+    stopPref(): void;
     persistBundlerOptions(): void;
@@ -56,2 +64,3 @@ startMaxWorkers(): void;
     static getShared(options?: any, farmOptions?: any): WorkerFarm;
+    static getSharedResolver(): any;
     /**
@@ -58,0 +67,0 @@ * 获取cpu核心数

lib/workerfarm/WorkerFarm.js

@@ -8,3 +8,2 @@ "use strict";
 var Logger_1 = require("../Logger");
-var decorator_1 = require("../utils/decorator");
 var errorUtils_1 = require("./errorUtils");
@@ -23,3 +22,3 @@ var Worker_1 = require("./Worker");
         _this.options = Object.assign({
-            maxConcurrentWorkers: 1,
+            maxConcurrentWorkers: WorkerFarm.getNumWorkers(),
             maxConcurrentCallsPerWorker: WorkerFarm.getConcurrentCallsPerWorker(),
@@ -34,2 +33,3 @@ forcedKillTime: 500,
         _this.init(options);
+        _this.startPref();
         return _this;
@@ -160,5 +160,4 @@ }
                 if (this.workers.size < this.options.maxConcurrentWorkers) {
-                    this.prefStartChild();
+                    this.startChild();
                 }
-                this.prefCpuUsage();
                 workers = tslib_1.__spread(this.workers.values()).filter(function (worker) { return !(!worker.ready || worker.stopped || worker.isStopping); })
@@ -190,36 +189,2 @@ .sort(function (w1, w2) { return w1.calls.size - w2.calls.size; });
     };
-    WorkerFarm.prototype.prefStartChild = function () {
-        var _this = this;
-        if (this.cpuUsage > 0.8) {
-            return;
-        }
-        osUtil.cpuUsage(function (v) {
-            _this.cpuUsage = v;
-            if (v < 0.8 && _this.workers.size < _this.options.maxConcurrentWorkers) {
-                _this.startChild();
-            }
-        });
-    };
-    WorkerFarm.prototype.prefCpuUsage = function () {
-        var _this = this;
-        // 优化cpu占用率
-        osUtil.cpuUsage(function (v) {
-            _this.cpuUsage = v;
-            // 满cpu需要暂停一个进程
-            if (v >= 0.99) {
-                var _a = tslib_1.__read(_this.workers.values(), 1), worker = _a[0];
-                worker.isStopping = true;
-            }
-            // cpu空闲可以开启进程
-            if (v <= 0.5) {
-                var stopedWorkers = tslib_1.__spread(_this.workers.values()).filter(function (worker) { return worker.isStopping; });
-                if (stopedWorkers.length) {
-                    stopedWorkers[0].isStopping = false;
-                }
-                else {
-                    _this.options.maxConcurrentWorkers++;
-                }
-            }
-        });
-    };
     /**
@@ -308,2 +273,3 @@ * 处理请求
                         this.ending = true;
+                        this.stopPref();
                         return [4 /*yield*/, Promise.all(Array.from(this.workers.values()).map(function (worker) { return _this.stopWorker(worker); }))];
@@ -327,2 +293,60 @@ case 1:
     };
+    /**
+     * 开启cpu占用优化
+     */
+    WorkerFarm.prototype.startPref = function (time) {
+        if (time === void 0) { time = 1000; }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                this.startPrefTime = setTimeout(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                    var workers, cpu, noStoppedWorkers, targetWorker, stopedWorkers, targetWorker;
+                    return tslib_1.__generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                workers = tslib_1.__spread(this.workers.values());
+                                return [4 /*yield*/, this.getCpuUsageAsync()];
+                            case 1:
+                                cpu = _a.sent();
+                                // 满cpu需要暂停一个进程
+                                if (cpu >= 0.9) {
+                                    noStoppedWorkers = workers.filter(function (w) { return !w.isStopping; });
+                                    if (noStoppedWorkers.length > 1) {
+                                        targetWorker = noStoppedWorkers.pop();
+                                        Logger_1.logger.info("current cpu: " + Number(cpu.toFixed(2)) * 100 + "%. stop a worker " + targetWorker.id);
+                                        targetWorker.isStopping = true;
+                                    }
+                                }
+                                // cpu空闲可以开启执行更多任务
+                                if (cpu <= 0.5 && this.cpuUsage <= 0.5) {
+                                    stopedWorkers = workers.filter(function (worker) { return worker.isStopping; });
+                                    if (stopedWorkers.length) {
+                                        targetWorker = stopedWorkers[0];
+                                        Logger_1.logger.info("current cpu: " + cpu + ". start a stopped worker " + targetWorker.id);
+                                        targetWorker.isStopping = false;
+                                    }
+                                }
+                                this.cpuUsage = cpu;
+                                this.startPref(time * 1.2);
+                                return [2 /*return*/];
+                        }
+                    });
+                }); }, time);
+                return [2 /*return*/];
+            });
+        });
+    };
+    WorkerFarm.prototype.getCpuUsageAsync = function () {
+        return new Promise(function (resolve) {
+            osUtil.cpuUsage(function (v) {
+                resolve(v);
+            });
+        });
+    };
+    /**
+     * 停止cpu占用优化
+     */
+    WorkerFarm.prototype.stopPref = function () {
+        clearTimeout(this.startPrefTime);
+    };
     WorkerFarm.prototype.persistBundlerOptions = function () {
@@ -372,2 +396,8 @@ var e_4, _a;
     };
+    WorkerFarm.getSharedResolver = function () {
+        if (shared) {
+            var core = shared.options.core;
+            return core && core.resolver;
+        }
+    };
     /**
@@ -413,11 +443,5 @@ * 获取cpu核心数
     };
-    tslib_1.__decorate([
-        decorator_1.debounce(100)
-    ], WorkerFarm.prototype, "prefStartChild", null);
-    tslib_1.__decorate([
-        decorator_1.throttle(1000)
-    ], WorkerFarm.prototype, "prefCpuUsage", null);
     return WorkerFarm;
 }(events_1.EventEmitter));
 exports.default = WorkerFarm;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"WorkerFarm.js","sourceRoot":"","sources":["../../src/workerfarm/WorkerFarm.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"WorkerFarm.js","sourceRoot":"","sources":["../../src/workerfarm/WorkerFarm.ts"],"names":[],"mappings":"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"}

package.json

 {
   "name": "jgb-shared",
-  "version": "1.4.3",
+  "version": "1.4.4-alpha.0",
   "main": "lib/index.js",
@@ -44,3 +44,3 @@ "license": "MIT",
   },
-  "gitHead": "f517f4e6e2a9c4eb0e2fa38837c8f4e996e6ddb9"
+  "gitHead": "738a04f819888ec0eebf98574f1ea152dd00bc64"
 }

src/Asset.ts

@@ -14,3 +14,7 @@ import * as fs from 'fs-extra';
 import objectHash from './utils/objectHash';
+import WorkerFarm from './workerfarm/WorkerFarm';
 
+const DEFAULT_NPM_DIR = 'npm';
+const REG_NODE_MODULES = /(\/node_modules\/|\/npm\/)/g;
+
 const NODE_MODULES = 'node_modules';
@@ -51,5 +55,9 @@
     this.relativeName = path.relative(options.sourceDir, name);
-    this.resolver = new Resolver(options);
+    const resolver = WorkerFarm.getSharedResolver();
+    this.resolver = resolver || new Resolver(options);
   }
 
+  /**
+   * 获取cli的Compiler
+   */
   get compiler() {
@@ -84,24 +92,2 @@ if (this.parentCompiler) {
   async resolveAliasName(name: string, ext: string = '') {
-    let distPath = '';
-    const alias = this.options.alias;
-
-    /**
-     * resolve alias get relativepath
-     * @example
-     *  @/utils/index => ../utils/index
-     */
-    if (alias) {
-      for (const key of Object.keys(alias)) {
-        if (name.includes(key)) {
-          const aliasValue = normalizeAlias(alias[key]);
-          name = path.normalize(name.replace(key, aliasValue.path));
-          const sourceFile = this.name;
-          const dependenceFile = name;
-          // relative path: ..\\utils\\index => ../utils/index
-          name = promoteRelativePath(path.relative(sourceFile, dependenceFile));
-          break;
-        }
-      }
-    }
-
     /** resolve relative path */
@@ -119,3 +105,3 @@ const { path: absolutePath } = (await this.resolver.resolve(
 
-    distPath = this.generateDistPath(absolutePath, ext);
+    const distPath = this.generateDistPath(absolutePath, ext);
     const parentDistPath = this.generateDistPath(this.name, ext);
@@ -131,3 +117,3 @@
       /* 文件真实路径 */
-      realName: name,
+      realName: absolutePath,
       distPath,
@@ -280,9 +266,10 @@ absolutePath,
   generateDistPath(sourcePath: string, ext: string = '') {
-    if (cache.has(sourcePath)) {
-      return cache.get(sourcePath);
+    const cacheKey = `${sourcePath}${ext}`;
+    if (cache.has(cacheKey)) {
+      return cache.get(cacheKey);
     }
 
     const alias = this.options.alias;
-    const sourceDir = path.resolve(this.options.sourceDir);
-    const name = sourcePath;
+    const sourceDir = pathToUnixType(path.resolve(this.options.sourceDir));
+    const name = pathToUnixType(sourcePath);
     let distPath = '';
@@ -295,4 +282,6 @@
       const normalizedAlias = normalizeAlias(aliasValue);
-      const dir = normalizedAlias.path;
-      const distDir = normalizedAlias.dist ? normalizedAlias.dist : 'npm';
+      const dir = pathToUnixType(normalizedAlias.path);
+      const distDir = normalizedAlias.dist
+        ? normalizedAlias.dist
+        : DEFAULT_NPM_DIR;
       // in alias source dir but not in build source file
@@ -318,2 +307,8 @@ if (name.includes(sourceDir)) {
 
+    // fix style
+    distPath = pathToUnixType(distPath);
+
+    /**
+     * node_modules/npm => npm
+     */
     if (
@@ -325,3 +320,3 @@ (!distPath && name.includes(NODE_MODULES)) ||
       const relativeAlias = spNM.pop();
-      distPath = path.join(this.options.outDir, 'npm', relativeAlias);
+      distPath = path.join(this.options.outDir, DEFAULT_NPM_DIR, relativeAlias);
     }
@@ -344,3 +339,3 @@
 
-    cache.set(sourcePath, distPath);
+    cache.set(cacheKey, distPath);
     return distPath;
@@ -347,0 +342,0 @@ }

src/Logger.ts

 import chalk, { Chalk } from 'chalk';
-import { Console } from 'console';
 import WorkerFarm from './workerfarm/WorkerFarm';
@@ -4,0 +3,0 @@

src/pluginDeclare.ts

@@ -0,5 +1,10 @@
+import chalk, { Chalk } from 'chalk';
 import Asset from './Asset';
 import AwaitEventEmitter from './awaitEventEmitter';
+import { logger } from './Logger';
 export type TypeAsset = typeof Asset;
 
+/**
+ * cli的Compiler实例
+ */
 export interface ICompiler extends AwaitEventEmitter {
@@ -9,10 +14,16 @@ addAssetsType(exts: string | string[], asset: TypeAsset): void;
 
-export type IPluginRegister = (compiler: ICompiler, config: any) => any;
+/** 返回pluginName  */
+export type IPluginRegister = (compiler: ICompiler, config: any) => string | void;
 
-export default function declare(
-  pluginRegister: IPluginRegister
-): IPluginRegister {
+const loadedPlugins = new Set();
+
+export default function declare(pluginRegister: IPluginRegister): any {
   return (compiler: ICompiler, config: any) => {
-    return pluginRegister(compiler, config);
+    const pluginName = pluginRegister(compiler, config);
+    if (!pluginName || loadedPlugins.has(pluginName)) {
+      return;
+    }
+    loadedPlugins.add(pluginName);
+    logger.log(chalk.gray(`[加载]: ${pluginName}`));
   };
 }

src/Resolver.ts

@@ -1,8 +0,8 @@
-import * as debug from "debug";
-import * as fs from "fs";
-import * as fsExtra from "fs-extra";
-import * as path from "path";
-import { promisify } from "util";
-import { IAliasValue, IInitOptions } from "../typings/jgb-shared";
-import { normalizeAlias } from "./utils";
+import * as debug from 'debug';
+import * as fs from 'fs';
+import * as fsExtra from 'fs-extra';
+import * as path from 'path';
+import { promisify } from 'util';
+import { IAliasValue, IInitOptions } from '../typings/jgb-shared';
+import { normalizeAlias, pathToUnixType } from './utils';
 
@@ -45,3 +45,3 @@ // debug.enable('*');
 
-    exts.unshift("");
+    exts.unshift('');
 
@@ -53,3 +53,3 @@ // Resolve the module directory or local file path
 
-    if ("moduleDir" in module && module.moduleDir) {
+    if ('moduleDir' in module && module.moduleDir) {
       resolved = await this.loadNodeModules(module, exts);
@@ -74,3 +74,3 @@ } else if (module.filePath) {
   getCacheKey(fileName: string, parent: any) {
-    return (parent ? path.dirname(parent) : "") + ":" + fileName;
+    return (parent ? path.dirname(parent) : '') + ':' + fileName;
   }
@@ -124,3 +124,3 @@
       // Skip node_modules directories
-      if (path.basename(dir) === "node_modules") {
+      if (path.basename(dir) === 'node_modules') {
         dir = path.dirname(dir);
@@ -131,3 +131,3 @@ }
         // First, check if the module directory exists. This prevents a lot of unnecessary checks later.
-        const moduleDir = path.join(dir, "node_modules", parts[0]);
+        const moduleDir = path.join(dir, 'node_modules', parts[0]);
         const stats = await promisify(fs.stat)(moduleDir);
@@ -139,3 +139,3 @@ if (stats.isDirectory()) {
             moduleDir,
-            filePath: path.join(dir, "node_modules", filename)
+            filePath: path.join(dir, 'node_modules', filename)
           };
@@ -226,3 +226,3 @@ }
     let browser = this.getBrowserField(pkg);
-    if (browser && typeof browser === "object" && browser[pkg.name]) {
+    if (browser && typeof browser === 'object' && browser[pkg.name]) {
       browser = browser[pkg.name];
@@ -235,7 +235,7 @@ }
     return [pkg.source, browser, pkg.main, pkg.module]
-      .filter(entry => typeof entry === "string")
+      .filter(entry => typeof entry === 'string')
       .map(main => {
         // Default to index file if no main field find
-        if (!main || main === "." || main === "./") {
-          main = "index";
+        if (!main || main === '.' || main === './') {
+          main = 'index';
         }
@@ -275,3 +275,3 @@
     // Fall back to an index file inside the directory.
-    return await this.loadAsFile(path.join(dir, "index"), extensions, pkg);
+    return await this.loadAsFile(path.join(dir, 'index'), extensions, pkg);
   }
@@ -282,3 +282,3 @@
       switch (fileName[0]) {
-        case "/":
+        case '/':
           if (fsExtra.existsSync(fileName)) {
@@ -290,3 +290,3 @@ return fileName;
 
-        case "~":
+        case '~':
           // Tilde path. Resolve relative to nearest node_modules directory,
@@ -296,3 +296,3 @@ // or the project root - whichever comes first.
             dir !== this.options.rootDir &&
-            path.basename(path.dirname(dir)) !== "node_modules"
+            path.basename(path.dirname(dir)) !== 'node_modules'
           ) {
@@ -304,3 +304,3 @@ dir = path.dirname(dir);
 
-        case ".":
+        case '.':
           // Relative path.
@@ -337,15 +337,24 @@ return path.resolve(dir, fileName);
 
-  async loadResolveAlias(fileName: string, dir: string) {
+  /**
+   * resolve alias get relativepath
+   * @param fileName
+   * @param dir 如果有dir则返回相对路径，否则返回绝对路径
+   * @example
+   *  @/utils/index => ../utils/index
+   */
+  loadResolveAlias(fileName: string, dir?: string) {
+    fileName = pathToUnixType(fileName);
     for (const key of this.alias.keys()) {
-      if (fileName.startsWith(key)) {
+      if (fileName.includes(key)) {
         const target = this.alias.get(key);
-        /**
-         * @src: path.resolve('src')
-         *
-         * @src/abc => /src/abc
-         */
-        fileName = fileName.replace(key, normalizeAlias(target).path);
-        return this.resolveFilename(fileName, dir);
+        const normalizedAlias = normalizeAlias(target);
+        fileName = fileName.replace(key, normalizedAlias.path);
+        // if (dir) {
+        //   const relativePath = path.relative(dir, fileName);
+        //   return pathToUnixType(relativePath);
+        // }
+        return pathToUnixType(fileName);
       }
     }
+    return;
   }
@@ -376,8 +385,8 @@
   getBrowserField(pkg: any) {
-    const target = this.options.target || "browser";
-    return target === "browser" ? pkg.browser : null;
+    const target = this.options.target || 'browser';
+    return target === 'browser' ? pkg.browser : null;
   }
 
   getAlias(fileName: string, dir: string, aliases: any): string | null {
-    if (!fileName || !aliases || typeof aliases !== "object") {
+    if (!fileName || !aliases || typeof aliases !== 'object') {
       return null;
@@ -391,4 +400,4 @@ }
       fileName = path.relative(dir, fileName);
-      if (fileName[0] !== ".") {
-        fileName = "./" + fileName;
+      if (fileName[0] !== '.') {
+        fileName = './' + fileName;
       }
@@ -404,3 +413,3 @@
         alias = this.lookupAlias(aliases, parts[0], dir);
-        if (typeof alias === "string") {
+        if (typeof alias === 'string') {
           // Append the fileName back onto the aliased module.
@@ -414,3 +423,3 @@ alias = path.join(alias, ...parts.slice(1));
     if (alias === false) {
-      return "";
+      return '';
     }
@@ -425,3 +434,3 @@
 
-    if (typeof alias === "string") {
+    if (typeof alias === 'string') {
       return this.resolveFilename(alias, dir);
@@ -436,3 +445,3 @@ }
     const root = path.parse(dir).root;
-    while (dir !== root && path.basename(dir) !== "node_modules") {
+    while (dir !== root && path.basename(dir) !== 'node_modules') {
       try {
@@ -451,3 +460,3 @@ return await this.readPackage(dir);
     const root = path.parse(dir).root;
-    while (dir !== root && path.basename(dir) !== "node_modules") {
+    while (dir !== root && path.basename(dir) !== 'node_modules') {
       try {
@@ -464,3 +473,3 @@ return this.readPackageSync(dir);
   async readPackage(dir: string) {
-    const file = path.join(dir, "package.json");
+    const file = path.join(dir, 'package.json');
     if (this.packageCache.has(file)) {
@@ -470,3 +479,3 @@ return this.packageCache.get(file);
 
-    const json = await promisify(fs.readFile)(file, { encoding: "utf8" });
+    const json = await promisify(fs.readFile)(file, { encoding: 'utf8' });
     const pkg = JSON.parse(json);
@@ -491,3 +500,3 @@
   readPackageSync(dir: string) {
-    const file = path.join(dir, "package.json");
+    const file = path.join(dir, 'package.json');
     if (this.packageCache.has(file)) {
@@ -497,3 +506,3 @@ return this.packageCache.get(file);
 
-    const json = fs.readFileSync(file, { encoding: "utf8" });
+    const json = fs.readFileSync(file, { encoding: 'utf8' });
     const pkg = JSON.parse(json);
@@ -507,3 +516,3 @@
     if (pkg.source) {
-      const realpath = fs.readFileSync(file, { encoding: "utf8" });
+      const realpath = fs.readFileSync(file, { encoding: 'utf8' });
       if (realpath === file) {
@@ -520,3 +529,3 @@ delete pkg.source;
     const parts = path.normalize(name).split(path.sep);
-    if (parts[0].charAt(0) === "@") {
+    if (parts[0].charAt(0) === '@') {
       // Scoped module (e.g. @scope/module). Merge the first two parts back together.
@@ -523,0 +532,0 @@ parts.splice(0, 2, `${parts[0]}/${parts[1]}`);

src/workerfarm/WorkerFarm.ts

@@ -22,2 +22,3 @@ import { EventEmitter } from 'events';
   bundlerOptions: any;
+  startPrefTime: any;
 
@@ -29,3 +30,3 @@ constructor(options: any, farmOptions: any = {}) {
       {
-        maxConcurrentWorkers: 1, // WorkerFarm.getNumWorkers(),
+        maxConcurrentWorkers: WorkerFarm.getNumWorkers(),
         maxConcurrentCallsPerWorker: WorkerFarm.getConcurrentCallsPerWorker(),
@@ -44,2 +45,3 @@ forcedKillTime: 500,
     this.init(options);
+    this.startPref();
   }
@@ -159,7 +161,5 @@
     if (this.workers.size < this.options.maxConcurrentWorkers) {
-      this.prefStartChild();
+      this.startChild();
     }
 
-    this.prefCpuUsage();
-
     // 能够工作并且任务量最少优先的worker
@@ -184,40 +184,2 @@ const workers = [...this.workers.values()]
 
-  @debounce(100)
-  prefStartChild() {
-    if (this.cpuUsage > 0.8) {
-      return;
-    }
-    osUtil.cpuUsage((v: any) => {
-      this.cpuUsage = v;
-      if (v < 0.8 && this.workers.size < this.options.maxConcurrentWorkers) {
-        this.startChild();
-      }
-    });
-  }
-
-  @throttle(1000)
-  prefCpuUsage() {
-    // 优化cpu占用率
-    osUtil.cpuUsage((v: any) => {
-      this.cpuUsage = v;
-      // 满cpu需要暂停一个进程
-      if (v >= 0.99) {
-        const [worker] = this.workers.values();
-        worker.isStopping = true;
-      }
-
-      // cpu空闲可以开启进程
-      if (v <= 0.5) {
-        const stopedWorkers = [...this.workers.values()].filter(
-          worker => worker.isStopping
-        );
-        if (stopedWorkers.length) {
-          stopedWorkers[0].isStopping = false;
-        } else {
-          this.options.maxConcurrentWorkers++;
-        }
-      }
-    });
-  }
-
   /**
@@ -285,2 +247,3 @@ * 处理请求
     this.ending = true;
+    this.stopPref();
     await Promise.all(
@@ -304,2 +267,52 @@ Array.from(this.workers.values()).map(worker => this.stopWorker(worker))
 
+  /**
+   * 开启cpu占用优化
+   */
+  async startPref(time = 1000) {
+    this.startPrefTime = setTimeout(async () => {
+      const workers = [...this.workers.values()];
+      const cpu = await this.getCpuUsageAsync();
+      // 满cpu需要暂停一个进程
+      if (cpu >= 0.9) {
+        const noStoppedWorkers = workers.filter(w => !w.isStopping);
+        if (noStoppedWorkers.length > 1) {
+          const targetWorker = noStoppedWorkers.pop();
+          logger.info(
+            `current cpu: ${Number(cpu.toFixed(2)) * 100}%. stop a worker ${
+              targetWorker.id
+            }`
+          );
+          targetWorker.isStopping = true;
+        }
+      }
+      // cpu空闲可以开启执行更多任务
+      if (cpu <= 0.5 && this.cpuUsage <= 0.5) {
+        const stopedWorkers = workers.filter(worker => worker.isStopping);
+        if (stopedWorkers.length) {
+          const targetWorker = stopedWorkers[0];
+          logger.info(
+            `current cpu: ${cpu}. start a stopped worker ${targetWorker.id}`
+          );
+          targetWorker.isStopping = false;
+        }
+      }
+      this.cpuUsage = cpu;
+      this.startPref(time * 1.2);
+    }, time);
+  }
+  getCpuUsageAsync(): Promise<number> {
+    return new Promise(resolve => {
+      osUtil.cpuUsage((v: number) => {
+        resolve(v);
+      });
+    });
+  }
+
+  /**
+   * 停止cpu占用优化
+   */
+  stopPref() {
+    clearTimeout(this.startPrefTime);
+  }
+
   persistBundlerOptions() {
@@ -349,2 +362,9 @@ for (const worker of this.workers.values()) {
 
+  static getSharedResolver() {
+    if (shared) {
+      const core = shared.options.core;
+      return core && core.resolver;
+    }
+  }
+
   /**
@@ -351,0 +371,0 @@ * 获取cpu核心数

New alerts

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

354057

increased by0.97%

Lines of code

5946

increased by1.31%

Worsened metrics

Number of low quality alerts

1

increased byInfinity%

No dependency changes