balm-core 3.23.1 → 3.23.2

package/lib/plugins/sass.js

@@ -7,111 +7,36 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _stream = require("stream");
-
-var _sass = _interopRequireDefault(require("sass"));
-
 var _replaceExt = _interopRequireDefault(require("replace-ext"));
 
 var _vinylSourcemapsApply = _interopRequireDefault(require("vinyl-sourcemaps-apply"));
 
-// Reference `gulp-sass@5.1.0`
 var PLUGIN_NAME = 'sass';
 
-var transformObj = function transformObj(transform) {
-  return new _stream.Transform({
-    transform: transform,
-    objectMode: true
-  });
-};
-/**
- * Handles returning the file to the stream
- */
-
-
-var filePush = function filePush(file, sassObject, callback) {
-  // Build Source Maps!
-  if (sassObject.map) {
-    // Transform map into JSON
-    var sassMap = JSON.parse(sassObject.map.toString()); // Grab the stdout and transform it into stdin
-
-    var sassMapFile = sassMap.file.replace(/^stdout$/, 'stdin'); // Grab the base filename that's being worked on
-
-    var sassFileSrc = file.relative; // Grab the path portion of the file that's being worked on
-
-    var sassFileSrcPath = path.dirname(sassFileSrc);
-
-    if (sassFileSrcPath) {
-      var sourceFileIndex = sassMap.sources.indexOf(sassMapFile); // Prepend the path to all files in the sources array except the file that's being worked on
-
-      sassMap.sources = sassMap.sources.map(function (source, index) {
-        return index === sourceFileIndex ? source : path.join(sassFileSrcPath, source);
-      });
-    } // Remove 'stdin' from sources and replace with filenames!
-
-
-    sassMap.sources = sassMap.sources.filter(function (src) {
-      return src !== 'stdin' && src;
-    }); // Replace the map file with the original filename (but new extension)
-
-    sassMap.file = (0, _replaceExt["default"])(sassFileSrc, '.css'); // Apply the map
-
-    (0, _vinylSourcemapsApply["default"])(file, sassMap);
-  }
-
-  file.contents = sassObject.css;
-  file.path = (0, _replaceExt["default"])(file.path, '.css');
-
-  if (file.stat) {
-    file.stat.atime = file.stat.mtime = file.stat.ctime = new Date();
-  }
-
-  callback(null, file);
-};
-/**
- * Handles error message
- */
-
-
-var handleError = function handleError(error, file, callback) {
-  var filePath = (error.file === 'stdin' ? file.path : error.file) || file.path;
-  var relativePath = path.relative(process.cwd(), filePath);
-  var message = "".concat(require('ansi-colors').underline(relativePath), "\n").concat(error.formatted);
-  error.messageFormatted = message;
-  error.messageOriginal = error.message;
-  error.message = require('strip-ansi')(message);
-  error.relativePath = relativePath;
-  return callback(new PluginError(PLUGIN_NAME, error));
-}; //////////////////////////////
+//////////////////////////////
 // Main Gulp Sass function
 //////////////////////////////
-
-
 var gulpSass = function gulpSass(options) {
-  return transformObj(function (file, encoding, callback) {
+  return through2.obj(function (file, encoding, cb) {
     if (file.isNull()) {
-      callback(null, file);
-      return;
+      return cb(null, file);
     }
 
     if (file.isStream()) {
-      callback(new PluginError(PLUGIN_NAME, 'Streaming not supported'));
-      return;
+      return cb(new PluginError(PLUGIN_NAME, 'Streaming not supported'));
     }
 
-    if (path.basename(file.path).startsWith('_')) {
-      callback();
-      return;
+    if (path.basename(file.path).indexOf('_') === 0) {
+      return cb();
     }
 
     if (!file.contents.length) {
       file.path = (0, _replaceExt["default"])(file.path, '.css');
-      callback(null, file);
-      return;
+      return cb(null, file);
     }
 
     var opts = options || {};
-    opts.data = file.contents.toString(); // We set the file path here so that libsass can correctly resolve import paths
+    opts.data = file.contents.toString(); // we set the file path here so that libsass can correctly resolve import paths
 
     opts.file = file.path; // Ensure `indentedSyntax` is true if a `.sass` file
 
@@ -128,25 +53,90 @@ var gulpSass = function gulpSass(options) {
       opts.includePaths = [];
     }
 
-    opts.includePaths.unshift(path.dirname(file.path)); // Generate Source Maps if the source-map plugin is present
+    opts.includePaths.unshift(path.dirname(file.path)); // Generate Source Maps if plugin source-map present
 
     if (file.sourceMap) {
       opts.sourceMap = file.path;
       opts.omitSourceMapUrl = true;
       opts.sourceMapContents = true;
     } //////////////////////////////
+    // Handles returning the file to the stream
+    //////////////////////////////
+
+
+    var filePush = function filePush(sassObj) {
+      var sassMap;
+      var sassMapFile;
+      var sassFileSrc;
+      var sassFileSrcPath;
+      var sourceFileIndex; // Build Source Maps!
+
+      if (sassObj.map) {
+        // Transform map into JSON
+        sassMap = JSON.parse(sassObj.map.toString()); // Grab the stdout and transform it into stdin
+
+        sassMapFile = sassMap.file.replace(/^stdout$/, 'stdin'); // Grab the base file name that's being worked on
+
+        sassFileSrc = file.relative; // Grab the path portion of the file that's being worked on
+
+        sassFileSrcPath = path.dirname(sassFileSrc);
+
+        if (sassFileSrcPath) {
+          // Prepend the path to all files in the sources array except the file that's being worked on
+          sourceFileIndex = sassMap.sources.indexOf(sassMapFile);
+          sassMap.sources = sassMap.sources.map(function (source, index) {
+            return index === sourceFileIndex ? source : path.join(sassFileSrcPath, source);
+          });
+        } // Remove 'stdin' from sources and replace with filenames!
+
+
+        sassMap.sources = sassMap.sources.filter(function (src) {
+          return src !== 'stdin' && src;
+        }); // Replace the map file with the original file name (but new extension)
+
+        sassMap.file = (0, _replaceExt["default"])(sassFileSrc, '.css'); // Apply the map
+
+        (0, _vinylSourcemapsApply["default"])(file, sassMap);
+      }
+
+      file.contents = sassObj.css;
+      file.path = (0, _replaceExt["default"])(file.path, '.css');
+
+      if (file.stat) {
+        file.stat.atime = file.stat.mtime = file.stat.ctime = new Date();
+      }
+
+      cb(null, file);
+    }; //////////////////////////////
+    // Handles error message
+    //////////////////////////////
+
+
+    var errorM = function errorM(error) {
+      var filePath = (error.file === 'stdin' ? file.path : error.file) || file.path;
+      var relativePath = path.relative(process.cwd(), filePath);
+      var message = [relativePath, error.formatted].join('\n');
+      error.messageFormatted = message;
+      error.messageOriginal = error.message;
+      error.message = require('strip-ansi')(message);
+      error.relativePath = relativePath;
+      return cb(new PluginError(PLUGIN_NAME, error));
+    }; //////////////////////////////
     // Sync Sass render
     //////////////////////////////
 
 
     try {
-      gulpSass.compiler && filePush(file, gulpSass.compiler.renderSync(opts), callback);
+      gulpSass.compiler && filePush(gulpSass.compiler.renderSync(opts));
     } catch (error) {
-      handleError(error, file, callback);
+      return errorM(error);
     }
   });
 };
 
-gulpSass.compiler = _sass["default"];
-var _default = gulpSass;
+var _default = function _default(options) {
+  gulpSass.compiler = require('sass');
+  return gulpSass(options);
+};
+
 exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balm-core",
-  "version": "3.23.1",
+  "version": "3.23.2",
   "description": "BalmJS compiler core",
   "keywords": [
     "balm",
@@ -89,7 +89,7 @@
     "ssh2": "0.8.9",
     "strip-ansi": "6",
     "style-loader": "2",
-    "terser": "^5.13.0",
+    "terser": "^5.13.1",
     "terser-webpack-plugin": "4",
     "through2": "^4.0.2",
     "through2-concurrent": "^2.0.0",
@@ -117,5 +117,5 @@
   "engines": {
     "node": ">=10.13.0"
   },
-  "gitHead": "dc9280e2ecb912ff389d795634ad460a4ac2e962"
+  "gitHead": "b411c85a2dac2c93648c22c7c662a90280246cd0"
 }

package/tslib/plugins/sass.js

@@ -1,61 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const stream_1 = require("stream");
-const sass_1 = tslib_1.__importDefault(require("sass"));
 const replace_ext_1 = tslib_1.__importDefault(require("replace-ext"));
 const vinyl_sourcemaps_apply_1 = tslib_1.__importDefault(require("vinyl-sourcemaps-apply"));
 const PLUGIN_NAME = 'sass';
-const transformObj = (transform) => new stream_1.Transform({ transform, objectMode: true });
-const filePush = (file, sassObject, callback) => {
-    if (sassObject.map) {
-        const sassMap = JSON.parse(sassObject.map.toString());
-        const sassMapFile = sassMap.file.replace(/^stdout$/, 'stdin');
-        const sassFileSrc = file.relative;
-        const sassFileSrcPath = path.dirname(sassFileSrc);
-        if (sassFileSrcPath) {
-            const sourceFileIndex = sassMap.sources.indexOf(sassMapFile);
-            sassMap.sources = sassMap.sources.map((source, index) => index === sourceFileIndex ? source : path.join(sassFileSrcPath, source));
-        }
-        sassMap.sources = sassMap.sources.filter((src) => src !== 'stdin' && src);
-        sassMap.file = (0, replace_ext_1.default)(sassFileSrc, '.css');
-        (0, vinyl_sourcemaps_apply_1.default)(file, sassMap);
-    }
-    file.contents = sassObject.css;
-    file.path = (0, replace_ext_1.default)(file.path, '.css');
-    if (file.stat) {
-        file.stat.atime = file.stat.mtime = file.stat.ctime = new Date();
-    }
-    callback(null, file);
-};
-const handleError = (error, file, callback) => {
-    const filePath = ((error.file === 'stdin' ? file.path : error.file) ||
-        file.path);
-    const relativePath = path.relative(process.cwd(), filePath);
-    const message = `${require('ansi-colors').underline(relativePath)}\n${error.formatted}`;
-    error.messageFormatted = message;
-    error.messageOriginal = error.message;
-    error.message = require('strip-ansi')(message);
-    error.relativePath = relativePath;
-    return callback(new PluginError(PLUGIN_NAME, error));
-};
-const gulpSass = (options) => transformObj((file, encoding, callback) => {
+const gulpSass = (options) => through2.obj((file, encoding, cb) => {
     if (file.isNull()) {
-        callback(null, file);
-        return;
+        return cb(null, file);
     }
     if (file.isStream()) {
-        callback(new PluginError(PLUGIN_NAME, 'Streaming not supported'));
-        return;
+        return cb(new PluginError(PLUGIN_NAME, 'Streaming not supported'));
     }
-    if (path.basename(file.path).startsWith('_')) {
-        callback();
-        return;
+    if (path.basename(file.path).indexOf('_') === 0) {
+        return cb();
     }
     if (!file.contents.length) {
         file.path = (0, replace_ext_1.default)(file.path, '.css');
-        callback(null, file);
-        return;
+        return cb(null, file);
     }
     const opts = (options || {});
     opts.data = file.contents.toString();
@@ -77,13 +38,55 @@ const gulpSass = (options) => transformObj((file, encoding, callback) => {
         opts.omitSourceMapUrl = true;
         opts.sourceMapContents = true;
     }
+    const filePush = (sassObj) => {
+        let sassMap;
+        let sassMapFile;
+        let sassFileSrc;
+        let sassFileSrcPath;
+        let sourceFileIndex;
+        if (sassObj.map) {
+            sassMap = JSON.parse(sassObj.map.toString());
+            sassMapFile = sassMap.file.replace(/^stdout$/, 'stdin');
+            sassFileSrc = file.relative;
+            sassFileSrcPath = path.dirname(sassFileSrc);
+            if (sassFileSrcPath) {
+                sourceFileIndex = sassMap.sources.indexOf(sassMapFile);
+                sassMap.sources = sassMap.sources.map((source, index) => {
+                    return index === sourceFileIndex
+                        ? source
+                        : path.join(sassFileSrcPath, source);
+                });
+            }
+            sassMap.sources = sassMap.sources.filter((src) => src !== 'stdin' && src);
+            sassMap.file = (0, replace_ext_1.default)(sassFileSrc, '.css');
+            (0, vinyl_sourcemaps_apply_1.default)(file, sassMap);
+        }
+        file.contents = sassObj.css;
+        file.path = (0, replace_ext_1.default)(file.path, '.css');
+        if (file.stat) {
+            file.stat.atime = file.stat.mtime = file.stat.ctime = new Date();
+        }
+        cb(null, file);
+    };
+    const errorM = (error) => {
+        const filePath = ((error.file === 'stdin' ? file.path : error.file) ||
+            file.path);
+        const relativePath = path.relative(process.cwd(), filePath);
+        const message = [relativePath, error.formatted].join('\n');
+        error.messageFormatted = message;
+        error.messageOriginal = error.message;
+        error.message = require('strip-ansi')(message);
+        error.relativePath = relativePath;
+        return cb(new PluginError(PLUGIN_NAME, error));
+    };
     try {
-        gulpSass.compiler &&
-            filePush(file, gulpSass.compiler.renderSync(opts), callback);
+        gulpSass.compiler && filePush(gulpSass.compiler.renderSync(opts));
     }
     catch (error) {
-        handleError(error, file, callback);
+        return errorM(error);
     }
 });
-gulpSass.compiler = sass_1.default;
-exports.default = gulpSass;
+exports.default = (options) => {
+    gulpSass.compiler = require('sass');
+    return gulpSass(options);
+};