balm-core 3.33.0 → 3.33.2

package/lib/plugins/sass.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _stream = require("stream");
 var _sass = _interopRequireDefault(require("sass"));
 var _replaceExt = _interopRequireDefault(require("replace-ext"));
@@ -125,25 +124,24 @@ var gulpSass = function gulpSass(options) {
     }
 
     // Create alias
-    if (!opts.importer && Object.keys(BalmJS.config.scripts.alias).length) {
-      opts.importer = [];
-      var _loop = function _loop() {
-        var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
-          key = _Object$entries$_i[0],
-          value = _Object$entries$_i[1];
-        opts.importer.push(function (url, prev) {
-          if (new RegExp("^".concat(key)).test(url)) {
-            var importerPaths = url.split('/');
-            importerPaths[0] = value;
-            BalmJS.logger.debug("".concat(PLUGIN_NAME, " alias"), "".concat(key, " -> ").concat(importerPaths.join('/')));
-            return {
-              file: importerPaths.join('/')
-            };
+    if (!opts.importer) {
+      var aliasKeys = Object.keys(BalmJS.config.scripts.alias).filter(function (key) {
+        return /^@\w+/.test(key);
+      });
+      if (aliasKeys.length) {
+        var aliasKeyRegex = new RegExp("^".concat(aliasKeys.join('|')));
+        opts.importer = [function (url) {
+          var file = url;
+          var result = url.match(aliasKeyRegex);
+          var key = result ? result[0] : null;
+          if (key) {
+            file = url.replace(aliasKeyRegex, BalmJS.config.scripts.alias[key]);
+            BalmJS.logger.debug("".concat(PLUGIN_NAME, " alias"), "".concat(url, " -> ").concat(file));
           }
-        });
-      };
-      for (var _i = 0, _Object$entries = Object.entries(BalmJS.config.scripts.alias); _i < _Object$entries.length; _i++) {
-        _loop();
+          return {
+            file: file
+          };
+        }];
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balm-core",
-  "version": "3.33.0",
+  "version": "3.33.2",
   "description": "BalmJS compiler core",
   "keywords": [
     "balm",
@@ -119,5 +119,5 @@
   "engines": {
     "node": ">=10.13.0"
   },
-  "gitHead": "dd9c9c8d8d0e012c4c65d3fcaddb7455354b92c0"
+  "gitHead": "dfd512a732f560da942949874ad21999603b2228"
 }

package/tslib/plugins/sass.js

@@ -77,19 +77,22 @@ const gulpSass = (options) => transformObj((file, encoding, callback) => {
         opts.omitSourceMapUrl = true;
         opts.sourceMapContents = true;
     }
-    if (!opts.importer && Object.keys(BalmJS.config.scripts.alias).length) {
-        opts.importer = [];
-        for (const [key, value] of Object.entries(BalmJS.config.scripts.alias)) {
-            opts.importer.push(function (url, prev) {
-                if (new RegExp(`^${key}`).test(url)) {
-                    const importerPaths = url.split('/');
-                    importerPaths[0] = value;
-                    BalmJS.logger.debug(`${PLUGIN_NAME} alias`, `${key} -> ${importerPaths.join('/')}`);
-                    return {
-                        file: importerPaths.join('/')
-                    };
+    if (!opts.importer) {
+        const aliasKeys = Object.keys(BalmJS.config.scripts.alias).filter((key) => /^@\w+/.test(key));
+        if (aliasKeys.length) {
+            const aliasKeyRegex = new RegExp(`^${aliasKeys.join('|')}`);
+            opts.importer = [
+                function (url) {
+                    let file = url;
+                    const result = url.match(aliasKeyRegex);
+                    const key = result ? result[0] : null;
+                    if (key) {
+                        file = url.replace(aliasKeyRegex, BalmJS.config.scripts.alias[key]);
+                        BalmJS.logger.debug(`${PLUGIN_NAME} alias`, `${url} -> ${file}`);
+                    }
+                    return { file };
                 }
-            });
+            ];
         }
     }
     try {