jgb-shared - npm Package Compare versions

Comparing version 1.8.6 to 1.8.8-alpha.0

lib/Asset.js

@@ -372,4 +372,6 @@ "use strict";
         else if (ext && extName && extName !== ext) {
-            // index.es6 => index.js
-            distPath = distPath.replace(extName, ext);
+            if (this.options.extensions.has(extName)) {
+                // index.es6 => index.js
+                distPath = distPath.replace(extName, ext);
+            }
         }
@@ -552,2 +554,2 @@ // fix style
 }
-//# 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":"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"}

lib/Compiler.d.ts

@@ -15,3 +15,3 @@ import Asset from './Asset';
     preload(options: IInitOptions): Promise<void>;
-    init(resolver: Resolver): Promise<void>;
+    init(resolver?: Resolver): Promise<void>;
     /**
@@ -18,0 +18,0 @@ * 加载插件

lib/Compiler.js

@@ -195,2 +195,2 @@ "use strict";
 exports.default = Compiler;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29tcGlsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvQ29tcGlsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsMkJBQTZCO0FBRTdCLHlEQUFvRDtBQUdwRCw2Q0FBd0M7QUFDeEMsaUNBQXVDO0FBSXZDO0lBQXNDLG9DQUFpQjtJQUlyRCxrQkFBb0IsT0FBcUI7UUFBekMsWUFDRSxpQkFBTyxTQUNSO1FBRm1CLGFBQU8sR0FBUCxPQUFPLENBQWM7UUFIakMsZ0JBQVUsR0FBRyxJQUFJLEdBQUcsRUFBcUIsQ0FBQzs7SUFLbEQsQ0FBQztJQUVEOztPQUVHO0lBQ0csMEJBQU8sR0FBYixVQUFjLE9BQXFCOzs7OzRCQUNqQyxxQkFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFBQTs7d0JBQXZDLFNBQXVDLENBQUM7d0JBQ3hDLHFCQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFBOzt3QkFBdkMsU0FBdUMsQ0FBQzs7Ozs7S0FDekM7SUFFSyx1QkFBSSxHQUFWLFVBQVcsUUFBa0I7Ozs7OzRCQUMzQixxQkFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBQTs7d0JBQWhDLFNBQWdDLENBQUM7d0JBQ2pDLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO3dCQUNuQixJQUFJLG9CQUFPLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQzt3QkFDekMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLEdBQUcsSUFBSSxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7Ozs7O0tBQ3pDO0lBRUQ7OztPQUdHO0lBQ0csOEJBQVcsR0FBakIsVUFBa0IsT0FBNkI7UUFBN0Isd0JBQUEsRUFBQSxZQUE2Qjs7Ozs7Ozt3QkFDdkMsUUFBUSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9B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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29tcGlsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvQ29tcGlsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkJBQTZCO0FBRTdCLHlEQUFvRDtBQUdwRCw2Q0FBd0M7QUFDeEMsaUNBQXVDO0FBSXZDO0lBQXNDLG9DQUFpQjtJQUlyRCxrQkFBb0IsT0FBcUI7UUFBekMsWUFDRSxpQkFBTyxTQUNSO1FBRm1CLGFBQU8sR0FBUCxPQUFPLENBQWM7UUFIakMsZ0JBQVUsR0FBRyxJQUFJLEdBQUcsRUFBcUIsQ0FBQzs7SUFLbEQsQ0FBQztJQUVEOztPQUVHO0lBQ0csMEJBQU8sR0FBYixVQUFjLE9BQXFCOzs7OzRCQUNqQyxxQkFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFBQTs7d0JBQXZDLFNBQXVDLENBQUM7d0JBQ3hDLHFCQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFBOzt3QkFBdkMsU0FBdUMsQ0FBQzs7Ozs7S0FDekM7SUFFSyx1QkFBSSxHQUFWLFVBQVcsUUFBbUI7Ozs7OzRCQUM1QixxQkFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBQTs7d0JBQWhDLFNBQWdDLENBQUM7d0JBQ2pDLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO3dCQUNuQixJQUFJLG9CQUFPLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQzt3QkFDekMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLEdBQUcsSUFBSSxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7Ozs7O0tBQ3pDO0lBRUQ7OztPQUdHO0lBQ0csOEJBQVcsR0FBakIsVUFBa0IsT0FBNkI7UUFBN0Isd0JBQUEsRUFBQSxZQUE2Qjs7Ozs7Ozt3QkFDdkMsUUFBUSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9B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

lib/Logger.d.ts

@@ -12,3 +12,5 @@ import { Chalk } from 'chalk';
     cache: Map<any, any>;
+    logLevel: number;
     constructor();
+    setOptions(options?: any): void;
     log(message: any, type?: LogType | LogTypeColor, usedTime?: number): void;
@@ -15,0 +17,0 @@ warning(message: any): void;

lib/Logger.js

@@ -19,2 +19,9 @@ "use strict";
     }
+    Logger.prototype.setOptions = function (options) {
+        if (options === void 0) { options = {}; }
+        this.logLevel =
+            options && isNaN(options.logLevel) === false
+                ? Number(options.logLevel)
+                : 3;
+    };
     Logger.prototype.log = function (message, type, usedTime) {
@@ -34,2 +41,5 @@ if (type === void 0) { type = LogType.LOG; }
         }
+        if (this.logLevel < 3) {
+            return;
+        }
         if (type === LogType.LOG) {
@@ -46,8 +56,17 @@ return console.log(message);
     Logger.prototype.warning = function (message) {
+        if (this.logLevel < 2) {
+            return;
+        }
         this.log(message, LogType.WARNING);
     };
     Logger.prototype.error = function (message) {
+        if (this.logLevel < 1) {
+            return;
+        }
         this.log(message, LogType.ERROR);
     };
     Logger.prototype.info = function (message) {
+        if (this.logLevel < 3) {
+            return;
+        }
         this.log(message, LogType.INFO);
@@ -66,2 +85,3 @@ };
             default:
+                fn = chalk_1.default.keyword('gray');
                 break;
@@ -123,2 +143,2 @@ }
 exports.error = error;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsK0JBQXFDO0FBQ3JDLHNEQUFpRDtBQUlqRCxJQUFZLE9BS1g7QUFMRCxXQUFZLE9BQU87SUFDakIsMkNBQU8sQ0FBQTtJQUNQLHVDQUFLLENBQUE7SUFDTCxxQ0FBSSxDQUFBO0lBQ0osbUNBQUcsQ0FBQTtBQUNMLENBQUMsRUFMVyxPQUFPLEdBQVAsZUFBTyxLQUFQLGVBQU8sUUFLbEI7QUFFRDtJQUlFO1FBRkEsVUFBSyxHQUFHLElBQUksR0FBRyxFQUFFLENBQUM7UUFHaEIsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLGVBQUssQ0FBQyxXQUFXLENBQUMsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsb0JBQUcsR0FBSCxVQUNFLE9BQVksRUFDWixJQUEwQyxFQUMxQyxRQUFpQjtRQURqQixxQkFBQSxFQUFBLE9BQStCLE9BQU8sQ0FBQyxHQUFHO1FBRzFDLElBQUksT0FBTyxPQUFPLEtBQUssUUFBUSxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUU7WUFDekQsT0FBTyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUM7U0FDbkM7UUFFRCxJQUFJLElBQUksS0FBSyxPQUFPLENBQUMsS0FBSyxFQUFFO1lBQzFCLE9BQU8sT0FBTyxDQUFDLEtBQUssQ0FBQyxlQUFLLENBQUMsR0FBRyxDQUFDLFVBQVUsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDO1NBQ3ZEO1FBRUQsSUFBSSxJQUFJLEtBQUssT0FBTyxDQUFDLE9BQU8sRUFBRTtZQUM1QixPQUFPLE9BQU8sQ0FBQyxJQUFJLENBQUMsZUFBSyxDQUFDLE1BQU0sQ0FBQyxZQUFZLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQztTQUMzRDtRQUVELElBQUksSUFBSSxL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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsK0JBQXFDO0FBQ3JDLHNEQUFpRDtBQUlqRCxJQUFZLE9BS1g7QUFMRCxXQUFZLE9BQU87SUFDakIsMkNBQU8sQ0FBQTtJQUNQLHVDQUFLLENBQUE7SUFDTCxxQ0FBSSxDQUFBO0lBQ0osbUNBQUcsQ0FBQTtBQUNMLENBQUMsRUFMVyxPQUFPLEdBQVAsZUFBTyxLQUFQLGVBQU8sUUFLbEI7QUFFRDtJQUtFO1FBSEEsVUFBSyxHQUFHLElBQUksR0FBRyxFQUFFLENBQUM7UUFJaEIsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLGVBQUssQ0FBQyxXQUFXLENBQUMsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsMkJBQVUsR0FBVixVQUFXLE9BQWlCO1FBQWpCLHdCQUFBLEVBQUEsWUFBaUI7UUFDMUIsSUFBSSxDQUFDLFFBQVE7WUFDWCxPQUFPLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSyxLQUFLO2dCQUMxQyxDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUM7Z0JBQzFCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDVixDQUFDO0lBRUQsb0JBQUcsR0FBSCxVQUNFLE9BQVksRUFDWixJQUEwQyxFQUMxQyxRQUFpQjtRQURqQixxQkFBQSxFQUFBLE9BQStCLE9BQU8sQ0FBQyxHQUFHO1FBRzFDLElBQUksT0FBTyxPQUFPLEtBQUssUUFBUSxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUU7WUFDekQsT0FBTyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUM7U0FDbkM7UUFFRCxJQUFJLElBQUksS0FBSyxPQUFPLENBQUMsS0FBSyxFQUFFO1lBQzFCLE9BQU8sT0FBTyxDQUFDLEtBQUssQ0FBQyxlQUFLLENBQUMsR0FBRyxDQUFDLFVBQVUsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDO1NBQ3ZEO1FBRUQsSUFBSSxJQUFJLEtBQUssT0FBTyxDQUFDLE9BQU8sRUFBRTtZQUM1QixPQUFPLE9BQU8sQ0FBQyxJQUFJLENBQUMsZUFBSyxDQUFDLE1BQU0sQ0FBQyxZQUFZLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQztTQUMzRDtRQUVELElBQUksSUFBSSxLQUFLLE9BQU8sQ0FBQyxJQUFJLEVBQUU7WUFDekIsT0FBTyxPQUFPLENBQUMsSUFBSSxDQUFDLGVBQUssQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLElBQUcsTUFBSSxPQUFTLENBQUEsQ0FBQyxDQUFDO1NBQ2pFO1FBRUQsSUFBSSxJQUFJLENBQUMsUUFBUSxHQUFHLENBQUMsRUFBRTtZQUNyQixPQUFPO1NBQ1I7UUFFRCxJQUFJLElBQUksS0FBSyxPQUFPLENBQUMsR0FBRyxFQUFFO1lBQ3hCLE9BQU8sT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztTQUM3QjtRQUVELElBQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBb0IsQ0FBQyxDQUFDO1FBQ2pELElBQU0sR0FBRyxHQUNQLEVBQUUsQ0FBQyxNQUFJLElBQUksT0FBSSxDQUFDO1lBQ2hCLE9BQU87YUFDUCxPQUFJLFFBQVEsQ0FBQyxDQUFDLENBQUMsZUFBSyxDQUFDLElBQUksQ0FBQyxNQUFJLFFBQVEsUUFBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBRSxDQUFBLENBQUM7UUFFdEQsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxHQUFHLElBQUksQ0FBQyxDQUFDO1FBQ2pDLG9CQUFvQjtJQUN0QixDQUFDO0lBRUQsd0JBQU8sR0FBUCxVQUFRLE9BQVk7UUFDbEIsSUFBSSxJQUFJLENBQUMsUUFBUSxHQUFHLENBQUMsRUFBRTtZQUNyQixPQUFPO1NBQ1I7UUFDRCxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUVELHNCQUFLLEdBQUwsVUFBTSxPQUFZO1FBQ2hCLElBQUksSUFBSSxDQUFDLFFBQVEsR0FBRyxDQUFDLEVBQUU7WUFDckIsT0FBTztTQUNSO1FBQ0QsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ25DLENBQUM7SUFFRCxxQkFBSSxHQUFKLFVBQUssT0FBWTtRQUNmLElBQUksSUFBSSxDQUFDLFFBQVEsR0FBRyxDQUFDLEVBQUU7WUFDckIsT0FBTztTQUNSO1FBQ0QsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2xDLENBQUM7SUFFTywyQkFBVSxHQUFsQixVQUFtQixJQUFrQjtRQUNuQyxJQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDO1FBRXpCLElBQUksS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUNuQixPQUFPLEtBQUssQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDeEI7UUFFRCxJQUFJLEVBQUUsQ0FBQztRQUVQLFFBQVEsSUFBSSxFQUFFO1lBQ1osS0FBSyxJQUFJO2dCQUNQLEVBQUUsR0FBRyxlQUFLLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO2dCQUMzQixNQUFNO1lBRVI7Z0JBQ0UsRUFBRSxHQUFHLGVBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQzNCLE1BQU07U0FDVDtRQUVELEtBQUssQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRXBCLE9BQU8sRUFBRSxDQUFDO0lBQ1osQ0FBQztJQUNILGFBQUM7QUFBRCxDQUFDLEFBbkdELElBbUdDOztBQUVELGdEQUFnRDtBQUNoRDtJQUFBO0lBRUEsQ0FBQztJQUFELGtCQUFDO0FBQUQsQ0FBQyxBQUZELElBRUM7QUFFRCxJQUFJLE1BQTRCLENBQUM7QUEwQnhCLHdCQUFNO0FBeEJmLElBQUksb0JBQVUsQ0FBQyxRQUFRLEVBQUUsRUFBRTs0QkFDZCxNQUFNO1FBQ2YsV0FBVyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRztZQUFDLGNBQWM7aUJBQWQsVUFBYyxFQUFkLHFCQUFjLEVBQWQsSUFBYztnQkFBZCx5QkFBYzs7WUFDN0Msb0JBQVUsQ0FBQyxVQUFVLENBQ25CO2dCQUNFLFFBQVEsRUFBRSxVQUFVO2dCQUNwQixNQUFNLFFBQUE7Z0JBQ04sSUFBSSxNQUFBO2FBQ0wsRUFDRCxLQUFLLENBQ04sQ0FBQztRQUNKLENBQUMsQ0FBQzs7O1FBVkosS0FBcUIsSUFBQSxLQUFBLGlCQUFBLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUEsZ0JBQUE7WUFBNUQsSUFBTSxNQUFNLFdBQUE7b0JBQU4sTUFBTTtTQVdoQjs7Ozs7Ozs7O0lBRUQsaUJBQUEsTUFBTSxHQUFHLElBQUksV0FBVyxFQUFFLENBQUM7Q0FDNUI7S0FBTTtJQUNMLGlCQUFBLE1BQU0sR0FBRyxJQUFJLE1BQU0sRUFBRSxDQUFDO0NBQ3ZCO0FBRUQsSUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7QUFLbkIsa0JBQUc7QUFKcEIsSUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7QUFJaEIsb0JBQUk7QUFIMUIsSUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7QUFHaEIsMEJBQU87QUFGbkMsSUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7QUFFSCxzQkFBSyJ9

lib/Resolver.d.ts

 /// <reference types="lodash" />
-import { IAliasValue, IInitOptions } from '../typings/jgb-shared';
-export default class Resolver {
+import { Dictionary } from 'enhanced-resolve/lib/concord';
+import TypedResolver = require('enhanced-resolve/lib/Resolver');
+import { IInitOptions } from '../typings/jgb-shared';
+interface IResolveResult {
+    path: string;
+    pkg: any;
+}
+export default class NewResolver {
     private options;
-    cache: Map<any, any>;
+    resolver: TypedResolver;
     packageCache: Map<any, any>;
-    exts: Set<string>;
-    rootPackage: any;
+    alias: Dictionary<string>;
+    constructor(options: IInitOptions);
+    private innerResolve;
+    resolve(fileName: string, parent?: string): Promise<IResolveResult>;
+    resolveModule(fileName: string, parent: any): Promise<any>;
     /**
-     * 类似webpack resolve alias
-     * 但是只匹配字符串
+     * 判断是否真实的绝对路径
+     * 小程序中绝对路径的根目录 往往解析到小程序项目的目录
      */
-    alias: Map<string, IAliasValue[]>;
-    constructor(options: IInitOptions);
-    resolve(fileName: string, parent: any): Promise<any>;
-    getCacheKey(fileName: string, parent: any): string;
-    get isSameTarget(): boolean;
+    isAbsolute: ((fileName: string) => boolean) & import("lodash").MemoizedFunction;
     /**
-     * 解析是否有对应的跨平台文件，并返回
-     *  目录
-     *  |- index.js
-     *  |- index.alipay.js
-     *
-     *   1. target = alipay
-     *       index.js => ndex.alipay.js
-     *   2. target = swan
-     *      ndex.js => index.js
+     * componets/comp => components/comp.*
+     * /componets/comp => components/comp.*
      */
-    resolvePlatformModule(fileName: string): Promise<string>;
-    resolveModule(fileName: string, parent: any): Promise<any>;
+    expandFile(file: string, extensions: string[], pkg?: any, expandAliases?: boolean): string[];
+    resolveFilename: ((fileName: string, dir: string) => string) & import("lodash").MemoizedFunction;
+    private innerResolveFilename;
+    getModuleParts(name: string): string[];
     /**
@@ -44,25 +44,16 @@ * find npm package in node_modules , ensure package amostly is same reference
     private findModulePath;
-    expandFileGenerator(file: string, extensions: string[], pkg: any, expandAliases?: boolean): IterableIterator<string>;
-    expandFile(file: string, extensions: string[], pkg: any, expandAliases?: boolean): any[];
-    loadAsFile(file: string, extensions: string[], pkg: any): Promise<{
-        path: string;
-        pkg: any;
-    }>;
-    loadRelative(filename: string, extensions: string[]): Promise<{
-        path: any;
-        pkg: any;
-    }>;
-    loadNodeModules(module: any, extensions: string[]): Promise<{
-        path: any;
-        pkg: any;
-    }>;
+    /**
+     * 解析是否有对应的跨平台文件，并返回
+     *  目录
+     *  |- index.js
+     *  |- index.alipay.js
+     *
+     *   1. target = alipay
+     *       index.js => ndex.alipay.js
+     *   2. target = swan
+     *      ndex.js => index.js
+     */
+    resolvePlatformModule(fileName: string): Promise<string>;
+    findPackage(dir: string): Promise<any>;
     isFile(file: string): Promise<boolean>;
-    getPackageEntries(pkg: any): string[];
-    loadDirectory(dir: string, extensions: string[], pkg?: any): Promise<{
-        path: any;
-        pkg: any;
-    }>;
-    resolveFilename: ((fileName: string, dir: string) => string) & import("lodash").MemoizedFunction;
-    private innerResolveFilename;
-    loadAlias(fileName: string, dir: string): Promise<string>;
     /**
@@ -76,13 +67,6 @@ * resolve alias get relativepath
     loadResolveAlias(fileName: string, dir?: string): string;
-    resolveAliases(fileName: string, pkg: any): string;
-    resolvePackageAliases(fileName: string, pkg: any): string;
-    getBrowserField(pkg: any): any;
-    getAlias(fileName: string, dir: string, aliases: any): string | null;
-    lookupAlias(aliases: any, fileName: string, dir: string): any;
-    findPackage(dir: string): Promise<any>;
-    findPackageSync(dir: string): any;
+    get isSameTarget(): boolean;
     readPackage(dir: string): Promise<any>;
-    readPackageSync(dir: string): any;
-    getModuleParts(name: string): string[];
 }
+export declare function resolveTsconfigPathsToAlias(alias: IInitOptions['alias'], resolveBase?: string): Dictionary<string>;
 /**
@@ -95,1 +79,2 @@ * alias  sort
 export declare function sortAliasKeys(alias: IInitOptions['alias']): string[];
+export {};

lib/Resolver.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
+var enhanced_resolve_1 = require("enhanced-resolve");
+var glob = require("fast-glob");
 var fs = require("fs");
@@ -11,16 +13,18 @@ var fsExtra = require("fs-extra");
 var matchAlias_1 = require("./utils/matchAlias");
-// debug.enable('*');
-var isWin = process.platform.includes('win');
-var Resolver = /** @class */ (function () {
-    function Resolver(options) {
+var cachedInputFileSystem = new enhanced_resolve_1.CachedInputFileSystem(new enhanced_resolve_1.NodeJsInputFileSystem(), 4000);
+var defaultExts = ['.wxs', '.js', '.json', '.wxss', '.wxml'];
+var NewResolver = /** @class */ (function () {
+    function NewResolver(options) {
         var _this = this;
         this.options = options;
-        this.cache = new Map();
         this.packageCache = new Map();
-        this.exts = new Set();
+        this.alias = {};
         /**
-         * 类似webpack resolve alias
-         * 但是只匹配字符串
+         * 判断是否真实的绝对路径
+         * 小程序中绝对路径的根目录 往往解析到小程序项目的目录
          */
-        this.alias = new Map();
+        this.isAbsolute = lodash_1.memoize(function (fileName) {
+            return ((fileName[0] === '/' && fileName.includes(this.options.sourceDir)) ||
+                (fileName[0] !== '/' && path.isAbsolute(fileName)));
+        });
         this.resolveFilename = lodash_1.memoize(function (fileName, dir) {
@@ -39,55 +43,86 @@ var result = _this.innerResolveFilename(fileName, dir);
         });
-        if (options.alias) {
-            var alias_1 = options.alias;
-            sortAliasKeys(alias_1).forEach(function (key) {
-                return _this.alias.set(key, [].concat(alias_1[key]));
-            });
-        }
+        var alias = Object.assign({}, resolveTsconfigPathsToAlias(options.alias || {}, this.options.sourceDir));
+        var extensions = new Set(tslib_1.__spread(defaultExts, (this.options.extensions || [])));
+        var resolveOpt = Object.assign({
+            // @ts-ignore
+            fileSystem: cachedInputFileSystem,
+            extensions: tslib_1.__spread(extensions),
+            modules: [
+                // precedence resolve root node_modules
+                path.resolve(this.options.rootDir, 'node_modules'),
+                'node_modules'
+            ],
+            mainFields: ['browser', 'main'],
+            alias: alias
+        }, options.resolve || {});
+        this.resolver = enhanced_resolve_1.ResolverFactory.createResolver(resolveOpt);
+        this.alias = alias;
     }
-    Resolver.prototype.resolve = function (fileName, parent) {
+    NewResolver.prototype.innerResolve = function (fileName, parent) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var cacheKey, exts, parentExt_1, module, dir, resolved, err;
+            var dir;
+            var _this = this;
             return tslib_1.__generator(this, function (_a) {
+                dir = parent ? path.dirname(parent) : this.options.sourceDir;
+                return [2 /*return*/, new Promise(function (r, reject) {
+                        var context = {};
+                        _this.resolver.resolve(context, dir, fileName, {}, 
+                        // @ts-ignore
+                        function (err, filepath) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            var _a, _b;
+                            return tslib_1.__generator(this, function (_c) {
+                                switch (_c.label) {
+                                    case 0:
+                                        if (err) {
+                                            return [2 /*return*/, reject(err)];
+                                        }
+                                        _a = r;
+                                        _b = {
+                                            path: utils_1.pathToUnixType(filepath)
+                                        };
+                                        return [4 /*yield*/, this.findPackage(path.dirname(filepath))];
+                                    case 1:
+                                        _a.apply(void 0, [(_b.pkg = _c.sent(),
+                                                _b)]);
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); });
+                    })];
+            });
+        });
+    };
+    NewResolver.prototype.resolve = function (fileName, parent) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var relativeFileName, error_1, error_2, relativeFileName, error_3;
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        cacheKey = this.getCacheKey(fileName, parent);
-                        if (this.cache.has(cacheKey)) {
-                            return [2 /*return*/, this.cache.get(cacheKey)];
-                        }
-                        exts = tslib_1.__spread([''], this.options.extensions);
-                        if (parent) {
-                            parentExt_1 = path.extname(parent);
-                            exts = tslib_1.__spread([parentExt_1], exts.filter(function (ext) { return ext !== parentExt_1; }));
-                        }
-                        return [4 /*yield*/, this.resolveModule(fileName, parent)];
-                    case 1:
-                        module = _a.sent();
-                        dir = parent ? path.dirname(parent) : process.cwd();
-                        if (!('moduleDir' in module && module.moduleDir)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.loadNodeModules(module, exts)];
-                    case 2:
-                        resolved = _a.sent();
-                        return [3 /*break*/, 7];
+                        _a.trys.push([0, 3, , 4]);
+                        if (!(fileName.startsWith('/') && !this.isAbsolute(fileName))) return [3 /*break*/, 2];
+                        relativeFileName = "./" + path.join('.', fileName);
+                        return [4 /*yield*/, this.innerResolve(relativeFileName, path.join(this.options.sourceDir, 'temp'))];
+                    case 1: return [2 /*return*/, _a.sent()];
+                    case 2: return [3 /*break*/, 4];
                     case 3:
-                        if (!module.filePath) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.loadRelative(module.filePath, exts)];
+                        error_1 = _a.sent();
+                        return [3 /*break*/, 4];
                     case 4:
-                        resolved = _a.sent();
-                        return [3 /*break*/, 7];
-                    case 5:
-                        if (!parent) return [3 /*break*/, 7];
-                        module.filePath = path.resolve(dir, fileName);
-                        return [4 /*yield*/, this.loadRelative(module.filePath, exts)];
+                        _a.trys.push([4, 6, , 11]);
+                        return [4 /*yield*/, this.innerResolve(fileName, parent)];
+                    case 5: return [2 /*return*/, _a.sent()];
                     case 6:
-                        resolved = _a.sent();
+                        error_2 = _a.sent();
+                        if (!(!path.isAbsolute(fileName) && !fileName.startsWith('.'))) return [3 /*break*/, 10];
+                        relativeFileName = "./" + path.join('.', fileName);
                         _a.label = 7;
                     case 7:
-                        // console.log('module', module);
-                        if (!resolved) {
-                            err = new Error("Cannot find module '" + fileName + "' from '" + (parent || dir) + "'.\n        Detail: \n " + JSON.stringify(module));
-                            // err.code = 'MODULE_NOT_FOUND';
-                            throw err;
-                        }
-                        this.cache.set(cacheKey, resolved);
-                        return [2 /*return*/, resolved];
+                        _a.trys.push([7, 9, , 10]);
+                        return [4 /*yield*/, this.innerResolve(relativeFileName, parent)];
+                    case 8: return [2 /*return*/, _a.sent()];
+                    case 9:
+                        error_3 = _a.sent();
+                        return [3 /*break*/, 10];
+                    case 10: throw error_2;
+                    case 11: return [2 /*return*/];
                 }
@@ -97,43 +132,4 @@ });
     };
-    Resolver.prototype.getCacheKey = function (fileName, parent) {
-        return (parent ? path.dirname(parent) : '') + ':' + fileName;
-    };
-    Object.defineProperty(Resolver.prototype, "isSameTarget", {
-        get: function () {
-            return this.options.target === this.options.source;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    /**
-     * 解析是否有对应的跨平台文件，并返回
-     *  目录
-     *  |- index.js
-     *  |- index.alipay.js
-     *
-     *   1. target = alipay
-     *       index.js => ndex.alipay.js
-     *   2. target = swan
-     *      ndex.js => index.js
-     */
-    Resolver.prototype.resolvePlatformModule = function (fileName) {
+    NewResolver.prototype.resolveModule = function (fileName, parent) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, ext, name, dir, targetFileName;
-            return tslib_1.__generator(this, function (_b) {
-                if (this.isSameTarget) {
-                    return [2 /*return*/, fileName];
-                }
-                _a = path.parse(fileName), ext = _a.ext, name = _a.name, dir = _a.dir;
-                if (ext) {
-                    targetFileName = dir + "/" + name + "." + this.options.target + ext;
-                    if (fs.existsSync(targetFileName)) {
-                        return [2 /*return*/, targetFileName];
-                    }
-                }
-                return [2 /*return*/, fileName];
-            });
-        });
-    };
-    Resolver.prototype.resolveModule = function (fileName, parent) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var dir, resolved, err_1, parts;
@@ -144,2 +140,3 @@ return tslib_1.__generator(this, function (_a) {
                         dir = parent ? path.dirname(parent) : this.options.sourceDir;
+                        fileName = this.loadResolveAlias(fileName, parent);
                         // If this isn't the entrypoint, resolve the input file to an absolute path
@@ -149,9 +146,4 @@ if (parent) {
                         }
-                        return [4 /*yield*/, this.loadAlias(fileName, dir)];
-                    case 1:
-                        // Resolve aliases in the parent module for this file.
-                        fileName = _a.sent();
-                        // fileName = pathToUnixType(fileName);
                         // Return just the file path if this is a file, not in node_modules
-                        if (path.isAbsolute(fileName)) {
+                        if (this.isAbsolute(fileName)) {
                             return [2 /*return*/, {
@@ -161,10 +153,10 @@ filePath: fileName
                         }
-                        _a.label = 2;
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.findNodeModulePath(fileName, dir)];
                     case 2:
-                        _a.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, this.findNodeModulePath(fileName, dir)];
+                        resolved = _a.sent();
+                        return [3 /*break*/, 4];
                     case 3:
-                        resolved = _a.sent();
-                        return [3 /*break*/, 5];
-                    case 4:
                         err_1 = _a.sent();
@@ -174,4 +166,4 @@ // ignore
                         debugger;
-                        return [3 /*break*/, 5];
-                    case 5:
+                        return [3 /*break*/, 4];
+                    case 4:
                         // If we couldn't resolve the node_modules path, just return the module name info
@@ -191,2 +183,97 @@ if (!resolved) {
     /**
+     * componets/comp => components/comp.*
+     * /componets/comp => components/comp.*
+     */
+    NewResolver.prototype.expandFile = function (file, extensions, pkg, expandAliases) {
+        if (expandAliases === void 0) { expandAliases = true; }
+        var fileName = this.loadResolveAlias(file);
+        var extGlob = '';
+        var isAbsolutePath = this.isAbsolute(fileName);
+        // is real absolute path
+        if (isAbsolutePath) {
+            extGlob = fileName + ".{" + extensions
+                .map(function (ext) { return ext.slice(1); })
+                .join(',') + "}";
+        }
+        else {
+            extGlob = path.join('.', fileName + ".{" + extensions.map(function (ext) { return ext.slice(1); }).join(',') + "}");
+        }
+        extGlob = utils_1.pathToUnixType(extGlob);
+        // componets/comp => components/comp.*
+        return glob.sync([fileName, extGlob], {
+            onlyFiles: true,
+            unique: true,
+            cwd: this.options.sourceDir
+        });
+    };
+    NewResolver.prototype.innerResolveFilename = function (fileName, dir) {
+        var e_1, _a;
+        try {
+            if (path.isAbsolute(fileName)) {
+                // resolve system absolute path;
+                if (fsExtra.existsSync(fileName)) {
+                    return fileName;
+                }
+            }
+            switch (fileName[0]) {
+                case '/':
+                    // Absolute path. Resolve relative to project souceDir.
+                    var abFileName = path.resolve(this.options.sourceDir, fileName.slice(1));
+                    var hasExt = path.extname(fileName);
+                    if (fsExtra.existsSync(abFileName)) {
+                        return abFileName;
+                    }
+                    if (!hasExt) {
+                        try {
+                            for (var _b = tslib_1.__values(this.options.extensions), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                var ext = _c.value;
+                                var abFileNameWithExt = "" + abFileName + ext;
+                                if (fsExtra.existsSync(abFileNameWithExt)) {
+                                    return abFileNameWithExt;
+                                }
+                            }
+                        }
+                        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 fileName;
+                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') {
+                        dir = path.dirname(dir);
+                    }
+                    return path.join(dir, fileName.slice(1));
+                case '.':
+                    // Relative path.
+                    return path.resolve(dir, fileName);
+                default:
+                    // Module
+                    var fixedRelativeFileName = path.resolve(dir, fileName);
+                    if (fsExtra.existsSync(fixedRelativeFileName)) {
+                        return fixedRelativeFileName;
+                    }
+                    return path.normalize(fileName);
+            }
+        }
+        catch (error) {
+            // tslint:disable-next-line:no-debugger
+            debugger;
+        }
+    };
+    NewResolver.prototype.getModuleParts = function (name) {
+        var parts = path.normalize(name).split(path.sep);
+        if (parts[0].charAt(0) === '@') {
+            // Scoped module (e.g. @scope/module). Merge the first two parts back together.
+            parts.splice(0, 2, parts[0] + "/" + parts[1]);
+        }
+        return parts;
+    };
+    /**
      * find npm package in node_modules , ensure package amostly is same reference
@@ -197,3 +284,3 @@ * 1. find package in root node_modules
      */
-    Resolver.prototype.findNodeModulePath = function (filename, dir) {
+    NewResolver.prototype.findNodeModulePath = function (filename, dir) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -243,3 +330,3 @@ var parts, root, rootDir, result, result, err_2;
     };
-    Resolver.prototype.findModulePath = function (parts, dir, filename) {
+    NewResolver.prototype.findModulePath = function (parts, dir, filename) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -269,145 +356,52 @@ var moduleDir, stats;
     };
-    Resolver.prototype.expandFileGenerator = function (file, extensions, pkg, expandAliases) {
-        var extensions_1, extensions_1_1, ext, f, alias, e_1_1;
-        var e_1, _a;
-        if (expandAliases === void 0) { expandAliases = true; }
-        return tslib_1.__generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    _b.trys.push([0, 7, 8, 9]);
-                    extensions_1 = tslib_1.__values(extensions), extensions_1_1 = extensions_1.next();
-                    _b.label = 1;
-                case 1:
-                    if (!!extensions_1_1.done) return [3 /*break*/, 6];
-                    ext = extensions_1_1.value;
-                    f = file + ext;
-                    if (!expandAliases) return [3 /*break*/, 3];
-                    alias = this.resolveAliases(f, pkg);
-                    if (!(alias !== f)) return [3 /*break*/, 3];
-                    return [5 /*yield**/, tslib_1.__values(this.expandFileGenerator(alias, extensions, pkg, false))];
-                case 2:
-                    _b.sent();
-                    _b.label = 3;
-                case 3: return [4 /*yield*/, f];
-                case 4:
-                    _b.sent();
-                    _b.label = 5;
-                case 5:
-                    extensions_1_1 = extensions_1.next();
-                    return [3 /*break*/, 1];
-                case 6: return [3 /*break*/, 9];
-                case 7:
-                    e_1_1 = _b.sent();
-                    e_1 = { error: e_1_1 };
-                    return [3 /*break*/, 9];
-                case 8:
-                    try {
-                        if (extensions_1_1 && !extensions_1_1.done && (_a = extensions_1.return)) _a.call(extensions_1);
-                    }
-                    finally { if (e_1) throw e_1.error; }
-                    return [7 /*endfinally*/];
-                case 9: return [2 /*return*/];
-            }
-        });
-    };
-    Resolver.prototype.expandFile = function (file, extensions, pkg, expandAliases) {
-        if (expandAliases === void 0) { expandAliases = true; }
-        return tslib_1.__spread(this.expandFileGenerator(file, extensions, pkg, expandAliases));
-    };
-    Resolver.prototype.loadAsFile = function (file, extensions, pkg) {
+    /**
+     * 解析是否有对应的跨平台文件，并返回
+     *  目录
+     *  |- index.js
+     *  |- index.alipay.js
+     *
+     *   1. target = alipay
+     *       index.js => ndex.alipay.js
+     *   2. target = swan
+     *      ndex.js => index.js
+     */
+    NewResolver.prototype.resolvePlatformModule = function (fileName) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var ext, alias, _a, _b, f, e_2_1;
-            var e_2, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        ext = path.extname(file);
-                        if (ext) {
-                            alias = this.resolveAliases(file, pkg);
-                            if (alias !== file) {
-                                return [2 /*return*/, { path: alias, pkg: pkg }];
-                            }
-                            return [2 /*return*/, { path: file, pkg: pkg }];
-                        }
-                        _d.label = 1;
-                    case 1:
-                        _d.trys.push([1, 6, 7, 8]);
-                        _a = tslib_1.__values(this.expandFileGenerator(file, extensions, pkg)), _b = _a.next();
-                        _d.label = 2;
-                    case 2:
-                        if (!!_b.done) return [3 /*break*/, 5];
-                        f = _b.value;
-                        return [4 /*yield*/, this.isFile(f)];
-                    case 3:
-                        if (_d.sent()) {
-                            return [2 /*return*/, { path: f, pkg: pkg }];
-                        }
-                        _d.label = 4;
-                    case 4:
-                        _b = _a.next();
-                        return [3 /*break*/, 2];
-                    case 5: return [3 /*break*/, 8];
-                    case 6:
-                        e_2_1 = _d.sent();
-                        e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 8];
-                    case 7:
-                        try {
-                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
-                        }
-                        finally { if (e_2) throw e_2.error; }
-                        return [7 /*endfinally*/];
-                    case 8: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    Resolver.prototype.loadRelative = function (filename, extensions) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var pkg, _a;
+            var _a, ext, name, dir, targetFileName;
             return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.findPackage(path.dirname(filename))];
-                    case 1:
-                        pkg = _b.sent();
-                        return [4 /*yield*/, this.loadAsFile(filename, extensions, pkg)];
-                    case 2:
-                        _a = (_b.sent());
-                        if (_a) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.loadDirectory(filename, extensions, pkg)];
-                    case 3:
-                        _a = (_b.sent());
-                        _b.label = 4;
-                    case 4: 
-                    // First try as a file, then as a directory.
-                    return [2 /*return*/, (_a)];
+                if (this.isSameTarget) {
+                    return [2 /*return*/, fileName];
                 }
+                _a = path.parse(fileName), ext = _a.ext, name = _a.name, dir = _a.dir;
+                if (ext) {
+                    targetFileName = dir + "/" + name + "." + this.options.target + ext;
+                    if (fs.existsSync(targetFileName)) {
+                        return [2 /*return*/, targetFileName];
+                    }
+                }
+                return [2 /*return*/, fileName];
             });
         });
     };
-    Resolver.prototype.loadNodeModules = function (module, extensions) {
+    NewResolver.prototype.findPackage = function (dir) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var pkg, res, e_3;
+            var root, err_3;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 5, , 6]);
-                        if (!module.subPath) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.readPackage(module.moduleDir)];
+                        root = path.parse(dir).root;
+                        _a.label = 1;
                     case 1:
-                        pkg = _a.sent();
-                        return [4 /*yield*/, this.loadAsFile(module.filePath, extensions, pkg)];
+                        if (!(dir !== root && path.basename(dir) !== 'node_modules')) return [3 /*break*/, 6];
+                        _a.label = 2;
                     case 2:
-                        res = _a.sent();
-                        if (res) {
-                            return [2 /*return*/, res];
-                        }
-                        _a.label = 3;
-                    case 3: return [4 /*yield*/, this.loadDirectory(module.filePath, extensions)];
-                    case 4: 
-                    // Otherwise, load as a directory.
-                    return [2 /*return*/, _a.sent()];
+                        _a.trys.push([2, 4, , 5]);
+                        return [4 /*yield*/, this.readPackage(dir)];
+                    case 3: return [2 /*return*/, _a.sent()];
+                    case 4:
+                        err_3 = _a.sent();
+                        return [3 /*break*/, 5];
                     case 5:
-                        e_3 = _a.sent();
-                        return [3 /*break*/, 6];
+                        dir = path.dirname(dir);
+                        return [3 /*break*/, 1];
                     case 6: return [2 /*return*/];
@@ -418,5 +412,5 @@ }
     };
-    Resolver.prototype.isFile = function (file) {
+    NewResolver.prototype.isFile = function (file) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var stat, err_3;
+            var stat, err_4;
             return tslib_1.__generator(this, function (_a) {
@@ -431,3 +425,3 @@ switch (_a.label) {
                     case 2:
-                        err_3 = _a.sent();
+                        err_4 = _a.sent();
                         return [2 /*return*/, false];
@@ -439,163 +433,2 @@ case 3: return [2 /*return*/];
     };
-    Resolver.prototype.getPackageEntries = function (pkg) {
-        var browser = this.getBrowserField(pkg);
-        if (browser && typeof browser === 'object' && browser[pkg.name]) {
-            browser = browser[pkg.name];
-        }
-        // libraries like d3.js specifies node.js specific files in the "main" which breaks the build
-        // we use the "browser" or "module" field to get the full dependency tree if available.
-        // If this is a linked module with a `source` field, use that as the entry point.
-        return [pkg.source, browser, pkg.main, pkg.module]
-            .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';
-            }
-            return path.resolve(pkg.pkgdir, main);
-        });
-    };
-    Resolver.prototype.loadDirectory = function (dir, extensions, pkg) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var entries, entries_1, entries_1_1, file, res, _a, e_4_1, err_4;
-            var e_4, _b;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        _c.trys.push([0, 12, , 13]);
-                        return [4 /*yield*/, this.readPackage(dir)];
-                    case 1:
-                        pkg = _c.sent();
-                        entries = this.getPackageEntries(pkg);
-                        _c.label = 2;
-                    case 2:
-                        _c.trys.push([2, 9, 10, 11]);
-                        entries_1 = tslib_1.__values(entries), entries_1_1 = entries_1.next();
-                        _c.label = 3;
-                    case 3:
-                        if (!!entries_1_1.done) return [3 /*break*/, 8];
-                        file = entries_1_1.value;
-                        return [4 /*yield*/, this.loadAsFile(file, extensions, pkg)];
-                    case 4:
-                        _a = (_c.sent());
-                        if (_a) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.loadDirectory(file, extensions, pkg)];
-                    case 5:
-                        _a = (_c.sent());
-                        _c.label = 6;
-                    case 6:
-                        res = _a;
-                        if (res) {
-                            return [2 /*return*/, res];
-                        }
-                        _c.label = 7;
-                    case 7:
-                        entries_1_1 = entries_1.next();
-                        return [3 /*break*/, 3];
-                    case 8: return [3 /*break*/, 11];
-                    case 9:
-                        e_4_1 = _c.sent();
-                        e_4 = { error: e_4_1 };
-                        return [3 /*break*/, 11];
-                    case 10:
-                        try {
-                            if (entries_1_1 && !entries_1_1.done && (_b = entries_1.return)) _b.call(entries_1);
-                        }
-                        finally { if (e_4) throw e_4.error; }
-                        return [7 /*endfinally*/];
-                    case 11: return [3 /*break*/, 13];
-                    case 12:
-                        err_4 = _c.sent();
-                        return [3 /*break*/, 13];
-                    case 13: return [4 /*yield*/, this.loadAsFile(path.join(dir, 'index'), extensions, pkg)];
-                    case 14: 
-                    // Fall back to an index file inside the directory.
-                    return [2 /*return*/, _c.sent()];
-                }
-            });
-        });
-    };
-    Resolver.prototype.innerResolveFilename = function (fileName, dir) {
-        var e_5, _a;
-        try {
-            if (path.isAbsolute(fileName)) {
-                // resolve system absolute path;
-                if (fsExtra.existsSync(fileName)) {
-                    return fileName;
-                }
-            }
-            switch (fileName[0]) {
-                case '/':
-                    // Absolute path. Resolve relative to project souceDir.
-                    var abFileName = path.resolve(this.options.sourceDir, fileName.slice(1));
-                    var hasExt = path.extname(fileName);
-                    if (fsExtra.existsSync(abFileName)) {
-                        return abFileName;
-                    }
-                    if (!hasExt) {
-                        try {
-                            for (var _b = tslib_1.__values(this.options.extensions), _c = _b.next(); !_c.done; _c = _b.next()) {
-                                var ext = _c.value;
-                                var abFileNameWithExt = "" + abFileName + ext;
-                                if (fsExtra.existsSync(abFileNameWithExt)) {
-                                    return abFileNameWithExt;
-                                }
-                            }
-                        }
-                        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 fileName;
-                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') {
-                        dir = path.dirname(dir);
-                    }
-                    return path.join(dir, fileName.slice(1));
-                case '.':
-                    // Relative path.
-                    return path.resolve(dir, fileName);
-                default:
-                    // Module
-                    var fixedRelativeFileName = path.resolve(dir, fileName);
-                    if (fsExtra.existsSync(fixedRelativeFileName)) {
-                        return fixedRelativeFileName;
-                    }
-                    return path.normalize(fileName);
-            }
-        }
-        catch (error) {
-            // tslint:disable-next-line:no-debugger
-            debugger;
-        }
-    };
-    Resolver.prototype.loadAlias = function (fileName, dir) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, pkg;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (!!this.rootPackage) return [3 /*break*/, 2];
-                        _a = this;
-                        return [4 /*yield*/, this.findPackage(this.options.rootDir)];
-                    case 1:
-                        _a.rootPackage = _b.sent();
-                        _b.label = 2;
-                    case 2: return [4 /*yield*/, this.findPackage(dir)];
-                    case 3:
-                        pkg = _b.sent();
-                        return [4 /*yield*/, this.loadResolveAlias(fileName, dir)];
-                    case 4: return [2 /*return*/, ((_b.sent()) ||
-                            this.resolveAliases(fileName, pkg))];
-                }
-            });
-        });
-    };
     /**
@@ -608,5 +441,4 @@ * resolve alias get relativepath
      */
-    Resolver.prototype.loadResolveAlias = function (fileName, dir) {
-        var e_6, _a;
-        // console.log(fileName,this.alias ,'loadResolveAlias');
+    NewResolver.prototype.loadResolveAlias = function (fileName, dir) {
+        var e_2, _a;
         fileName = utils_1.pathToUnixType(fileName);
@@ -617,19 +449,8 @@ if (path.isAbsolute(fileName)) {
         try {
-            for (var _b = tslib_1.__values(this.alias.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = tslib_1.__values(Object.keys(this.alias)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var key = _c.value;
                 var match = matchAlias_1.matchAlias(key, fileName);
                 if (match) {
-                    var target = this.alias.get(key);
-                    var _d = tslib_1.__read(utils_1.normalizeAlias(target), 1), normalizedAlias = _d[0];
-                    // tsconfig paths
-                    if (key.includes('*') && match.length > 1) {
-                        fileName = normalizedAlias.path.replace(/\*/g, match[1]);
-                    }
-                    else {
-                        fileName = fileName.replace(key, normalizedAlias.path);
-                    }
-                    // if (dir) {
-                    //   const relativePath = path.relative(dir, fileName);
-                    //   return pathToUnixType(relativePath);
-                    // }
+                    var target = this.alias[key];
+                    fileName = fileName.replace(key, target);
                     return utils_1.pathToUnixType(fileName);
@@ -639,3 +460,3 @@ }
         }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
@@ -645,105 +466,15 @@ try {
             }
-            finally { if (e_6) throw e_6.error; }
+            finally { if (e_2) throw e_2.error; }
         }
-        return;
+        return fileName;
     };
-    Resolver.prototype.resolveAliases = function (fileName, pkg) {
-        // First resolve local package aliases, then project global ones.
-        return this.resolvePackageAliases(this.resolvePackageAliases(fileName, pkg), this.rootPackage);
-    };
-    Resolver.prototype.resolvePackageAliases = function (fileName, pkg) {
-        if (!pkg) {
-            return fileName;
-        }
-        // Resolve aliases in the package.source, package.alias, and package.browser fields.
-        return (this.getAlias(fileName, pkg.pkgdir, pkg.source) ||
-            this.getAlias(fileName, pkg.pkgdir, pkg.alias) ||
-            this.getAlias(fileName, pkg.pkgdir, this.getBrowserField(pkg)) ||
-            fileName);
-    };
-    Resolver.prototype.getBrowserField = function (pkg) {
-        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') {
-            return null;
-        }
-        var alias;
-        // If fileName is an absolute path, get one relative to the package.json directory.
-        if (path.isAbsolute(fileName)) {
-            fileName = path.relative(dir, fileName);
-            if (fileName[0] !== '.') {
-                fileName = './' + fileName;
-            }
-            alias = this.lookupAlias(aliases, fileName, dir);
-        }
-        else {
-            // It is a node_module. First try the entire fileName as a key.
-            alias = this.lookupAlias(aliases, fileName, dir);
-            if (alias == null) {
-                // If it didn't match, try only the module name.
-                var parts = this.getModuleParts(fileName);
-                alias = this.lookupAlias(aliases, parts[0], dir);
-                if (typeof alias === 'string') {
-                    // Append the fileName back onto the aliased module.
-                    alias = path.join.apply(path, tslib_1.__spread([alias], parts.slice(1)));
-                }
-            }
-        }
-        // If the alias is set to `false`, return an empty file.
-        if (alias === false) {
-            return '';
-        }
-        return alias;
-    };
-    Resolver.prototype.lookupAlias = function (aliases, fileName, dir) {
-        // First, try looking up the exact fileName
-        var alias = aliases[fileName];
-        if (typeof alias === 'string') {
-            return this.resolveFilename(alias, dir);
-        }
-        return alias;
-    };
-    Resolver.prototype.findPackage = function (dir) {
+    Object.defineProperty(NewResolver.prototype, "isSameTarget", {
+        get: function () {
+            return this.options.target === this.options.source;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    NewResolver.prototype.readPackage = function (dir) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var root, err_5;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        root = path.parse(dir).root;
-                        _a.label = 1;
-                    case 1:
-                        if (!(dir !== root && path.basename(dir) !== 'node_modules')) return [3 /*break*/, 6];
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, this.readPackage(dir)];
-                    case 3: return [2 /*return*/, _a.sent()];
-                    case 4:
-                        err_5 = _a.sent();
-                        return [3 /*break*/, 5];
-                    case 5:
-                        dir = path.dirname(dir);
-                        return [3 /*break*/, 1];
-                    case 6: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    Resolver.prototype.findPackageSync = function (dir) {
-        // Find the nearest package.json file within the current node_modules folder
-        var root = path.parse(dir).root;
-        while (dir !== root && path.basename(dir) !== 'node_modules') {
-            try {
-                return this.readPackageSync(dir);
-            }
-            catch (err) {
-                // ignore
-            }
-            dir = path.dirname(dir);
-        }
-    };
-    Resolver.prototype.readPackage = function (dir) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var file, json, pkg, realpath;
@@ -778,33 +509,32 @@ return tslib_1.__generator(this, function (_a) {
     };
-    Resolver.prototype.readPackageSync = function (dir) {
-        var file = path.join(dir, 'package.json');
-        if (this.packageCache.has(file)) {
-            return this.packageCache.get(file);
+    return NewResolver;
+}());
+exports.default = NewResolver;
+function resolveTsconfigPathsToAlias(alias, resolveBase) {
+    if (resolveBase === void 0) { resolveBase = process.cwd(); }
+    var aliases = {};
+    var keys = Object.keys(alias);
+    keys.forEach(function (item) {
+        var key = item.replace('/*', '');
+        var value = '';
+        var v = alias[item];
+        if (Array.isArray(v)) {
+            value = resolveAlias(v[0], resolveBase);
         }
-        var json = fs.readFileSync(file, { encoding: 'utf8' });
-        var pkg = JSON.parse(json);
-        pkg.pkgfile = file;
-        pkg.pkgdir = dir;
-        // If the package has a `source` field, check if it is behind a symlink.
-        // If so, we treat the module as source code rather than a pre-compiled module.
-        if (pkg.source) {
-            var realpath = fs.readFileSync(file, { encoding: 'utf8' });
-            if (realpath === file) {
-                delete pkg.source;
-            }
+        else {
+            value = resolveAlias(v, resolveBase);
         }
-        this.packageCache.set(file, pkg);
-        return pkg;
-    };
-    Resolver.prototype.getModuleParts = function (name) {
-        var parts = path.normalize(name).split(path.sep);
-        if (parts[0].charAt(0) === '@') {
-            // Scoped module (e.g. @scope/module). Merge the first two parts back together.
-            parts.splice(0, 2, parts[0] + "/" + parts[1]);
-        }
-        return parts;
-    };
-    return Resolver;
-}());
-exports.default = Resolver;
+        aliases[key] = value;
+    });
+    return aliases;
+}
+exports.resolveTsconfigPathsToAlias = resolveTsconfigPathsToAlias;
+function resolveAlias(v, resolveBase) {
+    if (typeof v === 'string') {
+        return path.resolve(resolveBase, v.replace('/*', '').replace('*', ''));
+    }
+    else {
+        return path.resolve(resolveBase, v.path.replace('/*', '').replace('*', ''));
+    }
+}
 /**
@@ -827,2 +557,2 @@ * alias  sort
 exports.sortAliasKeys = sortAliasKeys;
-//# 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/utils/index.js

@@ -58,4 +58,7 @@ "use strict";
 exports.pathToUnixType = lodash_1.memoize(function (fPath) {
+    if (!fPath) {
+        return '';
+    }
     return fPath.replace(/\\/g, '/');
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsaUNBQWlDO0FBQ2pDLDJCQUE2QjtBQUU3QixpQ0FBNEI7QUFPbkIsZ0JBUEYsZUFBSyxDQU9FO0FBTmQsNkNBQXdDO0FBTXhCLHNCQU5ULHFCQUFXLENBTVM7QUFMM0IsK0NBQTBDO0FBS2IsdUJBTHRCLHNCQUFZLENBS3NCO0FBSnpDLDZCQUF3QjtBQUltQixjQUpwQyxhQUFHLENBSW9DO0FBSDlDLDJDQUFzQztBQUdVLHFCQUh6QyxvQkFBVSxDQUd5QztBQUYxRCxxQ0FBZ0M7QUFFNEIsa0JBRnJELGlCQUFPLENBRXFEO0FBQ25FLHlEQUErQjtBQUMvQixnREFBc0I7QUFFdEIsU0FBZ0IsY0FBYyxDQUFDLEtBQWtDO0lBQy9ELElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRTtRQUN4QixPQUFPLEtBQUssQ0FBQyxHQUFHLENBQUMsVUFBQSxDQUFDLElBQUksT0FBQSxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsRUFBdEIsQ0FBc0IsQ0FBQyxDQUFDO0tBQy9DO0lBRUQsT0FBTyxDQUFDLG1CQUFtQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7QUFDdEMsQ0FBQztBQU5ELHdDQU1DO0FBRUQsU0FBUyxtQkFBbUIsQ0FBQyxLQUFrQjtJQUM3QyxJQUFJLE9BQU8sS0FBSyxLQUFLLFFBQVEsRUFBRTtRQUM3QixPQUFPO1lBQ0wsSUFBSSxFQUFFLEtBQUs7U0FDWixDQUFDO0tBQ0g7SUFFRCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUM7QUFFRDs7O0dBR0c7QUFDVSxRQUFBLG1CQUFtQixHQUFHLGdCQUFPLENBQUMsVUFBQyxLQUFhO0lBQ3ZELElBQU0sUUFBUSxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3ZDLElBQUksUUFBUSxHQUFHLENBQUMsQ0FBQztJQUNqQixRQUFRLENBQUMsT0FBTyxDQUFDLFVBQUEsSUFBSTtRQUNuQixJQUFJLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQzNCLFFBQVEsRUFBRSxDQUFDO1NBQ1o7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUNILElBQUksUUFBUSxLQUFLLENBQUMsRUFBRTtRQUNsQixRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDM0IsT0FBTyxRQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0tBQzNCO0lBQ0QsSUFBSSxRQUFRLEdBQUcsQ0FBQyxFQUFFO1FBQ2hCLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3RCLE9BQU8sUUFBUSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztLQUMzQjtJQUNELE9BQU8sS0FBSyxDQUFDO0FBQ2YsQ0FBQyxDQUFDLENBQUM7QUFFVSxRQUFBLGNBQWMsR0FBRyxnQkFBTyxDQUFDLFVBQUMsS0FBYTtJQUNsRCxPQUFPLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0FBQ25DLENBQUMsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsaUNBQWlDO0FBQ2pDLDJCQUE2QjtBQUU3QixpQ0FBNEI7QUFPbkIsZ0JBUEYsZUFBSyxDQU9FO0FBTmQsNkNBQXdDO0FBTXhCLHNCQU5ULHFCQUFXLENBTVM7QUFMM0IsK0NBQTBDO0FBS2IsdUJBTHRCLHNCQUFZLENBS3NCO0FBSnpDLDZCQUF3QjtBQUltQixjQUpwQyxhQUFHLENBSW9DO0FBSDlDLDJDQUFzQztBQUdVLHFCQUh6QyxvQkFBVSxDQUd5QztBQUYxRCxxQ0FBZ0M7QUFFNEIsa0JBRnJELGlCQUFPLENBRXFEO0FBQ25FLHlEQUErQjtBQUMvQixnREFBc0I7QUFFdEIsU0FBZ0IsY0FBYyxDQUFDLEtBQWtDO0lBQy9ELElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRTtRQUN4QixPQUFPLEtBQUssQ0FBQyxHQUFHLENBQUMsVUFBQSxDQUFDLElBQUksT0FBQSxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsRUFBdEIsQ0FBc0IsQ0FBQyxDQUFDO0tBQy9DO0lBRUQsT0FBTyxDQUFDLG1CQUFtQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7QUFDdEMsQ0FBQztBQU5ELHdDQU1DO0FBRUQsU0FBUyxtQkFBbUIsQ0FBQyxLQUFrQjtJQUM3QyxJQUFJLE9BQU8sS0FBSyxLQUFLLFFBQVEsRUFBRTtRQUM3QixPQUFPO1lBQ0wsSUFBSSxFQUFFLEtBQUs7U0FDWixDQUFDO0tBQ0g7SUFFRCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUM7QUFFRDs7O0dBR0c7QUFDVSxRQUFBLG1CQUFtQixHQUFHLGdCQUFPLENBQUMsVUFBQyxLQUFhO0lBQ3ZELElBQU0sUUFBUSxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3ZDLElBQUksUUFBUSxHQUFHLENBQUMsQ0FBQztJQUNqQixRQUFRLENBQUMsT0FBTyxDQUFDLFVBQUEsSUFBSTtRQUNuQixJQUFJLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQzNCLFFBQVEsRUFBRSxDQUFDO1NBQ1o7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUNILElBQUksUUFBUSxLQUFLLENBQUMsRUFBRTtRQUNsQixRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDM0IsT0FBTyxRQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0tBQzNCO0lBQ0QsSUFBSSxRQUFRLEdBQUcsQ0FBQyxFQUFFO1FBQ2hCLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3RCLE9BQU8sUUFBUSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztLQUMzQjtJQUNELE9BQU8sS0FBSyxDQUFDO0FBQ2YsQ0FBQyxDQUFDLENBQUM7QUFFVSxRQUFBLGNBQWMsR0FBRyxnQkFBTyxDQUFDLFVBQUMsS0FBYTtJQUNsRCxJQUFJLENBQUMsS0FBSyxFQUFFO1FBQUUsT0FBTyxFQUFFLENBQUM7S0FBRTtJQUMxQixPQUFPLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0FBQ25DLENBQUMsQ0FBQyxDQUFDIn0=

package.json

 {
   "name": "jgb-shared",
-  "version": "1.8.6",
+  "version": "1.8.8-alpha.0",
   "main": "lib/index.js",
@@ -25,6 +25,7 @@ "license": "MIT",
     "@types/debug": "^0.0.30",
+    "@types/enhanced-resolve": "^3.0.6",
     "@types/fs-extra": "^5.0.4",
     "@types/jest": "^23.3.12",
     "@types/json5": "^0.0.29",
-    "@types/lodash": "^4.14.115",
+    "@types/lodash": "^4.14.117",
     "@types/node": "12.12.6",
@@ -44,2 +45,3 @@ "@types/resolve": "^0.0.8",
     "debug": "^3.1.0",
+    "enhanced-resolve": "^4.1.1",
     "fs-extra": "^7.0.0",
@@ -54,3 +56,3 @@ "glob": "^7.1.2",
   },
-  "gitHead": "67187da79f199cd1554ea627af5103e6e1259826"
+  "gitHead": "f01036de6b930d74e564cde8d53411ea0563802f"
 }

typings/jgb-shared.d.ts

@@ -0,1 +1,3 @@
+import { ResolverFactory } from 'enhanced-resolve';
+
 export type IPluginConfig = string | [string] | [string, any];
@@ -54,2 +56,4 @@
 
+  logLevel?: number;
+
   /**
@@ -68,3 +72,4 @@ * 是否监听
 
-  /** 是否内联sourcemap */ 
+  /** 是否内联sourcemap */
+
   inlineSourceMap?: string;
@@ -81,2 +86,4 @@ /** 是否开启缓存 */
   lib?: string;
+
+  resolve?: Parameters<typeof ResolverFactory['createResolver']>[0];
 }

typings/os-utils.d.ts

 declare module 'os-utils' {
   export function cpuUsage(cb: Function): void;
 }

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

Number of package files

52

increased by4%

Worsened metrics

Total package byte prevSize

267127

decreased by-5.74%

Dependency count

13

increased by8.33%

Dev dependency count

14

increased by7.69%

Lines of code

3825

decreased by-5.97%

Number of low quality alerts

1

increased byInfinity%

Dependency changes

• + Addedenhanced-resolve@^4.1.1

• + Addedcore-util-is@1.0.3(transitive)

• + Addedenhanced-resolve@4.5.0(transitive)

• + Addederrno@0.1.8(transitive)

• + Addedisarray@1.0.0(transitive)

• + Addedmemory-fs@0.5.0(transitive)

• + Addedprocess-nextick-args@2.0.1(transitive)

• + Addedprr@1.0.1(transitive)

• + Addedreadable-stream@2.3.8(transitive)

• + Addedsafe-buffer@5.1.2(transitive)

• + Addedstring_decoder@1.1.1(transitive)

• + Addedtapable@1.1.3(transitive)

• + Addedutil-deprecate@1.0.2(transitive)