balm-core 4.21.1 → 4.22.1

package/lib/bundler/webpack/rules/css.js

@@ -94,8 +94,8 @@ function cssLoader() {
       // Prefer `dart-sass`
       implementation: requireModule.resolve('sass'),
       sassOptions: Object.assign({
-        includePaths: BalmJS.file.stylePaths,
-        outputStyle: 'expanded',
+        loadPaths: BalmJS.file.stylePaths,
+        sourceMap: true,
         quietDeps: BalmJS.config.logs.level < BalmJS.LogLevel.Warn
       }, BalmJS.config.styles.sassOptions)
     }),

package/lib/plugins/less.js

@@ -23,35 +23,39 @@ function inlineSources(sourcemap) {
     return sourcemap;
   }, () => sourcemap);
 }
-function renderLess(str, opts) {
+function renderLess(input, options) {
   return new Promise((resolve, reject) => {
-    less.render(str, opts, (err, res) => {
-      if (err) {
-        reject(err);
+    less.render(input, options, (error, output) => {
+      if (error) {
+        reject(error);
       } else {
-        const obj = {
-          result: res.css,
-          imports: res.imports
+        const {
+          css,
+          imports
+        } = output;
+        const result = {
+          css,
+          imports
         };
-        if (opts.sourceMap && res.map) {
-          obj.sourcemap = JSON.parse(res.map);
-          inlineSources(obj.sourcemap).then(map => {
-            obj.sourcemap = map;
-            resolve(obj);
+        if (options.sourceMap && output.map) {
+          result.sourcemap = JSON.parse(output.map);
+          inlineSources(result.sourcemap).then(map => {
+            result.sourcemap = map;
+            resolve(result);
           });
         } else {
-          resolve(obj);
+          resolve(result);
         }
       }
     });
   });
 }
-function gulpLess(options) {
+function gulpLess(customOptions) {
   // Mixes in default options.
-  const opts = Object.assign({}, {
+  const options = Object.assign({}, {
     compress: false,
     paths: []
-  }, options);
+  }, customOptions);
   return through2.obj((file, enc, cb) => {
     if (file.isNull()) {
       return cb(null, file);
@@ -59,22 +63,22 @@ function gulpLess(options) {
     if (file.isStream()) {
       return cb(new PluginError(PLUGIN_NAME, 'Streaming not supported'));
     }
-    const str = file.contents.toString();
+    const input = file.contents.toString();
 
     // Injects the path of the current file
-    opts.filename = file.path;
+    options.filename = file.path;
 
     // Bootstrap source maps
-    if (file.sourceMap || opts.sourcemap) {
-      opts.sourceMap = true;
+    if (file.sourceMap || options.sourcemap) {
+      options.sourceMap = true;
     }
-    renderLess(str, opts).then(res => {
-      file.contents = Buffer.from(res.result);
+    renderLess(input, options).then(output => {
+      file.contents = Buffer.from(output.css);
       file.path = replaceExtension(file.path, '.css');
-      if (res.sourcemap) {
-        res.sourcemap.file = file.relative;
-        res.sourcemap.sources = res.sourcemap.sources.map(source => node.path.relative(file.base, source));
-        applySourceMap(file, res.sourcemap);
+      if (output.sourcemap) {
+        output.sourcemap.file = file.relative;
+        output.sourcemap.sources = output.sourcemap.sources.map(source => node.path.relative(file.base, source));
+        applySourceMap(file, output.sourcemap);
       }
       return file;
     }).then(file => {

package/lib/plugins/postcss.js

@@ -109,7 +109,7 @@ export default gulpPostcss(loadConfig => {
       // Prevent stream’s unhandled exception from
       // being suppressed by Promise
       setImmediate(function () {
-        cb(new PluginError('gulp-postcss', error, errorOptions));
+        cb(new PluginError(PLUGIN_NAME, error, errorOptions));
       });
     }
   };

package/lib/plugins/sass.js

@@ -2,16 +2,17 @@ import path from 'node:path';
 import fs from 'node:fs';
 // Reference `gulp-sass@5.1.0`
 import { Transform } from 'node:stream';
-import sass from 'sass';
+import * as sass from 'sass';
 import replaceExtension from 'replace-ext';
 import stripAnsi from 'strip-ansi';
 import applySourceMap from 'vinyl-sourcemaps-apply';
 import ansiColors from 'ansi-colors';
 process.env.BALM_CWD = process.env.INIT_CWD || process.cwd();
 const localSassModule = path.join(process.env.BALM_ROOT || process.env.BALM_CWD, 'node_modules', 'sass');
-const newLocalSassModule = path.join(localSassModule, 'sass.default.js');
-const oldLocalSassModule = path.join(localSassModule, 'sass.dart.js'); // Just for `npm i -D sass@1.39.2`
-const sassModule = fs.existsSync(newLocalSassModule) ? requireModule(newLocalSassModule) : fs.existsSync(oldLocalSassModule) ? requireModule(oldLocalSassModule) : sass;
+const nodeLocalSassModule = path.join(localSassModule, 'sass.node.js');
+const defaultLocalSassModule = path.join(localSassModule, 'sass.default.js'); // For `npm i -D sass <= 1.62.1`
+const dartLocalSassModule = path.join(localSassModule, 'sass.dart.js'); // For `npm i -D sass <= 1.39.2`
+const sassModule = fs.existsSync(nodeLocalSassModule) ? requireModule(nodeLocalSassModule) : fs.existsSync(defaultLocalSassModule) ? requireModule(defaultLocalSassModule) : fs.existsSync(dartLocalSassModule) ? requireModule(dartLocalSassModule) : sass;
 const PLUGIN_NAME = 'sass';
 const transformObj = transform => new Transform({
   transform,
@@ -21,32 +22,16 @@ const transformObj = transform => new Transform({
 /**
  * Handles returning the file to the stream
  */
-const filePush = (file, sassObject, callback) => {
+const filePush = (file, result, callback) => {
   // Build Source Maps!
-  if (sassObject.map) {
-    // Transform map into JSON
-    const sassMap = JSON.parse(sassObject.map.toString());
-    // Grab the stdout and transform it into stdin
-    const sassMapFile = sassMap.file.replace(/^stdout$/, 'stdin');
-    // Grab the base filename that's being worked on
-    const sassFileSrc = file.relative;
-    // Grab the path portion of the file that's being worked on
-    const sassFileSrcPath = node.path.dirname(sassFileSrc);
-    if (sassFileSrcPath) {
-      const 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((source, index) => index === sourceFileIndex ? source : node.path.join(sassFileSrcPath, source));
-    }
-
-    // Remove 'stdin' from sources and replace with filenames!
-    sassMap.sources = sassMap.sources.filter(src => src !== 'stdin' && src);
-
+  if (result.sourceMap) {
+    const sassMap = result.sourceMap;
     // Replace the map file with the original filename (but new extension)
-    sassMap.file = replaceExtension(sassFileSrc, '.css');
+    sassMap.file = replaceExtension(file.relative, '.css');
     // Apply the map
     applySourceMap(file, sassMap);
   }
-  file.contents = sassObject.css;
+  file.contents = Buffer.from(result.css);
   file.path = replaceExtension(file.path, '.css');
   if (file.stat) {
     file.stat.atime = file.stat.mtime = file.stat.ctime = new Date();
@@ -58,13 +43,9 @@ const filePush = (file, sassObject, callback) => {
  * Handles error message
  */
 const handleError = (error, file, callback) => {
-  const filePath = (error.file === 'stdin' ? file.path : error.file) || file.path;
-  const relativePath = node.path.relative(process.cwd(), filePath);
-  const message = `${ansiColors.underline(relativePath)}\n${error.formatted}`;
-  error.messageFormatted = message;
-  error.messageOriginal = error.message;
+  const relativePath = node.path.relative(process.cwd(), file.path);
+  const message = `${ansiColors.underline(relativePath)}\n${error.message}`;
   error.message = stripAnsi(message);
-  error.relativePath = relativePath;
   return callback(new PluginError(PLUGIN_NAME, error));
 };
 
@@ -73,58 +54,23 @@ const handleError = (error, file, callback) => {
 //////////////////////////////
 const gulpSass = options => transformObj((file, encoding, callback) => {
   if (file.isNull()) {
-    callback(null, file);
-    return;
+    return callback(null, file);
   }
   if (file.isStream()) {
-    callback(new PluginError(PLUGIN_NAME, 'Streaming not supported'));
-    return;
+    return callback(new PluginError(PLUGIN_NAME, 'Streaming not supported'));
   }
   if (node.path.basename(file.path).startsWith('_')) {
-    callback();
-    return;
+    return callback();
   }
   if (!file.contents.length) {
     file.path = replaceExtension(file.path, '.css');
-    callback(null, file);
-    return;
-  }
-  const opts = options || {};
-  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
-  if (node.path.extname(file.path) === '.sass') {
-    opts.indentedSyntax = true;
+    return callback(null, file);
   }
-
-  // Ensure file's parent directory in the include path
-  if (opts.includePaths) {
-    if (typeof opts.includePaths === 'string') {
-      opts.includePaths = [opts.includePaths];
-    }
-  } else {
-    opts.includePaths = [];
-  }
-  opts.includePaths.unshift(node.path.dirname(file.path));
-
-  // Generate Source Maps if the source-map plugin is present
-  if (file.sourceMap) {
-    opts.sourceMap = file.path;
-    opts.omitSourceMapUrl = true;
-    opts.sourceMapContents = true;
-  }
-
-  //////////////////////////////
-  // Sync Sass render
-  //////////////////////////////
+  const path = file.path;
   try {
-    gulpSass.compiler && filePush(file, gulpSass.compiler.renderSync(opts), callback);
+    filePush(file, sassModule.compile(path, options), callback);
   } catch (error) {
     handleError(error, file, callback);
   }
 });
-gulpSass.compiler = sassModule;
 export default gulpSass;

package/lib/tasks/public/sass.js

@@ -4,8 +4,8 @@ class SassTask extends BalmJS.BalmStyleTask {
   }
   get options() {
     return Object.assign({
-      includePaths: BalmJS.file.stylePaths,
-      outputStyle: 'expanded',
+      loadPaths: BalmJS.file.stylePaths,
+      sourceMap: true,
       quietDeps: BalmJS.config.logs.level < BalmJS.LogLevel.Warn
     }, BalmJS.config.styles.sassOptions, this.customOptions);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balm-core",
-  "version": "4.21.1",
+  "version": "4.22.1",
   "description": "BalmJS compiler core",
   "keywords": [
     "balm",
@@ -44,7 +44,7 @@
     "@rollup/plugin-terser": "^0.4.3",
     "ansi-colors": "^4.1.3",
     "async": "^3.2.4",
-    "autoprefixer": "^10.4.14",
+    "autoprefixer": "^10.4.15",
     "babel-loader": "^9.1.3",
     "browser-sync": "^2.29.3",
     "connect-history-api-fallback": "^2.0.0",
@@ -54,7 +54,7 @@
     "del": "^7.0.0",
     "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",
-    "esbuild": "^0.18.0",
+    "esbuild": "^0.19.0",
     "fancy-log": "^2.0.0",
     "gulp-eslint": "^6.0.0",
     "gulp-if": "^3.0.0",
@@ -71,7 +71,7 @@
     "http-proxy-middleware": "^2.0.6",
     "imagemin": "^8.0.1",
     "istextorbinary": "^6.0.0",
-    "less": "^4.1.3",
+    "less": "^4.2.0",
     "mini-css-extract-plugin": "^2.7.6",
     "modernizr": "^3.12.0",
     "parents": "^1.0.1",
@@ -81,12 +81,12 @@
     "postcss-import": "^15.1.0",
     "postcss-load-config": "^4.0.1",
     "postcss-loader": "7.3.3",
-    "postcss-preset-env": "^9.1.0",
+    "postcss-preset-env": "^9.1.1",
     "pretty-bytes": "^6.1.1",
     "readable-stream": "^4.4.2",
     "replace-ext": "^2.0.0",
     "rollup": "^3.24.0",
-    "sass": "1.62.1",
+    "sass": "^1.65.1",
     "sass-loader": "^13.3.2",
     "ssh2": "^1.14.0",
     "strip-ansi": "^7.1.0",
@@ -121,5 +121,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "1549386272d6252db00d6b0680f6404f31e33442"
+  "gitHead": "ab3af9d04a485cf0ffa666c9bde1ea3930efbfae"
 }

package/tslib/bundler/webpack/rules/css.js

@@ -83,8 +83,8 @@ function cssLoader() {
             }, 'sass-loader', {
                 implementation: requireModule.resolve('sass'),
                 sassOptions: Object.assign({
-                    includePaths: BalmJS.file.stylePaths,
-                    outputStyle: 'expanded',
+                    loadPaths: BalmJS.file.stylePaths,
+                    sourceMap: true,
                     quietDeps: BalmJS.config.logs.level < BalmJS.LogLevel.Warn
                 }, BalmJS.config.styles.sassOptions)
             }),

package/tslib/plugins/less.js

@@ -22,36 +22,37 @@ function inlineSources(sourcemap) {
         return sourcemap;
     }, () => sourcemap);
 }
-function renderLess(str, opts) {
+function renderLess(input, options) {
     return new Promise((resolve, reject) => {
-        less.render(str, opts, (err, res) => {
-            if (err) {
-                reject(err);
+        less.render(input, options, (error, output) => {
+            if (error) {
+                reject(error);
             }
             else {
-                const obj = {
-                    result: res.css,
-                    imports: res.imports
+                const { css, imports } = output;
+                const result = {
+                    css,
+                    imports
                 };
-                if (opts.sourceMap && res.map) {
-                    obj.sourcemap = JSON.parse(res.map);
-                    inlineSources(obj.sourcemap).then((map) => {
-                        obj.sourcemap = map;
-                        resolve(obj);
+                if (options.sourceMap && output.map) {
+                    result.sourcemap = JSON.parse(output.map);
+                    inlineSources(result.sourcemap).then((map) => {
+                        result.sourcemap = map;
+                        resolve(result);
                     });
                 }
                 else {
-                    resolve(obj);
+                    resolve(result);
                 }
             }
         });
     });
 }
-function gulpLess(options) {
-    const opts = Object.assign({}, {
+function gulpLess(customOptions) {
+    const options = Object.assign({}, {
         compress: false,
         paths: []
-    }, options);
+    }, customOptions);
     return through2.obj((file, enc, cb) => {
         if (file.isNull()) {
             return cb(null, file);
@@ -59,19 +60,19 @@ function gulpLess(options) {
         if (file.isStream()) {
             return cb(new PluginError(PLUGIN_NAME, 'Streaming not supported'));
         }
-        const str = file.contents.toString();
-        opts.filename = file.path;
-        if (file.sourceMap || opts.sourcemap) {
-            opts.sourceMap = true;
+        const input = file.contents.toString();
+        options.filename = file.path;
+        if (file.sourceMap || options.sourcemap) {
+            options.sourceMap = true;
         }
-        renderLess(str, opts)
-            .then((res) => {
-            file.contents = Buffer.from(res.result);
+        renderLess(input, options)
+            .then((output) => {
+            file.contents = Buffer.from(output.css);
             file.path = replaceExtension(file.path, '.css');
-            if (res.sourcemap) {
-                res.sourcemap.file = file.relative;
-                res.sourcemap.sources = res.sourcemap.sources.map((source) => node.path.relative(file.base, source));
-                applySourceMap(file, res.sourcemap);
+            if (output.sourcemap) {
+                output.sourcemap.file = file.relative;
+                output.sourcemap.sources = output.sourcemap.sources.map((source) => node.path.relative(file.base, source));
+                applySourceMap(file, output.sourcemap);
             }
             return file;
         })

package/tslib/plugins/postcss.js

@@ -103,7 +103,7 @@ export default gulpPostcss((loadConfig) => {
                 error = `${error.message}\n\n${error.showSourceCode()}\n`;
             }
             setImmediate(function () {
-                cb(new PluginError('gulp-postcss', error, errorOptions));
+                cb(new PluginError(PLUGIN_NAME, error, errorOptions));
             });
         }
     };

package/tslib/plugins/sass.js

@@ -1,39 +1,32 @@
 import path from 'node:path';
 import fs from 'node:fs';
 import { Transform } from 'node:stream';
-import sass from 'sass';
+import * as sass from 'sass';
 import replaceExtension from 'replace-ext';
 import stripAnsi from 'strip-ansi';
 import applySourceMap from 'vinyl-sourcemaps-apply';
 import ansiColors from 'ansi-colors';
 process.env.BALM_CWD = process.env.INIT_CWD || process.cwd();
 const localSassModule = path.join(process.env.BALM_ROOT || process.env.BALM_CWD, 'node_modules', 'sass');
-const newLocalSassModule = path.join(localSassModule, 'sass.default.js');
-const oldLocalSassModule = path.join(localSassModule, 'sass.dart.js');
-const sassModule = fs.existsSync(newLocalSassModule)
-    ? requireModule(newLocalSassModule)
-    : fs.existsSync(oldLocalSassModule)
-        ? requireModule(oldLocalSassModule)
-        : sass;
+const nodeLocalSassModule = path.join(localSassModule, 'sass.node.js');
+const defaultLocalSassModule = path.join(localSassModule, 'sass.default.js');
+const dartLocalSassModule = path.join(localSassModule, 'sass.dart.js');
+const sassModule = fs.existsSync(nodeLocalSassModule)
+    ? requireModule(nodeLocalSassModule)
+    : fs.existsSync(defaultLocalSassModule)
+        ? requireModule(defaultLocalSassModule)
+        : fs.existsSync(dartLocalSassModule)
+            ? requireModule(dartLocalSassModule)
+            : sass;
 const PLUGIN_NAME = 'sass';
 const transformObj = (transform) => new 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 = node.path.dirname(sassFileSrc);
-        if (sassFileSrcPath) {
-            const sourceFileIndex = sassMap.sources.indexOf(sassMapFile);
-            sassMap.sources = sassMap.sources.map((source, index) => index === sourceFileIndex
-                ? source
-                : node.path.join(sassFileSrcPath, source));
-        }
-        sassMap.sources = sassMap.sources.filter((src) => src !== 'stdin' && src);
-        sassMap.file = replaceExtension(sassFileSrc, '.css');
+const filePush = (file, result, callback) => {
+    if (result.sourceMap) {
+        const sassMap = result.sourceMap;
+        sassMap.file = replaceExtension(file.relative, '.css');
         applySourceMap(file, sassMap);
     }
-    file.contents = sassObject.css;
+    file.contents = Buffer.from(result.css);
     file.path = replaceExtension(file.path, '.css');
     if (file.stat) {
         file.stat.atime = file.stat.mtime = file.stat.ctime = new Date();
@@ -41,61 +34,31 @@ const filePush = (file, sassObject, callback) => {
     callback(null, file);
 };
 const handleError = (error, file, callback) => {
-    const filePath = ((error.file === 'stdin' ? file.path : error.file) ||
-        file.path);
-    const relativePath = node.path.relative(process.cwd(), filePath);
-    const message = `${ansiColors.underline(relativePath)}\n${error.formatted}`;
-    error.messageFormatted = message;
-    error.messageOriginal = error.message;
+    const relativePath = node.path.relative(process.cwd(), file.path);
+    const message = `${ansiColors.underline(relativePath)}\n${error.message}`;
     error.message = stripAnsi(message);
-    error.relativePath = relativePath;
     return callback(new PluginError(PLUGIN_NAME, error));
 };
 const gulpSass = (options) => transformObj((file, encoding, callback) => {
     if (file.isNull()) {
-        callback(null, file);
-        return;
+        return callback(null, file);
     }
     if (file.isStream()) {
-        callback(new PluginError(PLUGIN_NAME, 'Streaming not supported'));
-        return;
+        return callback(new PluginError(PLUGIN_NAME, 'Streaming not supported'));
     }
     if (node.path.basename(file.path).startsWith('_')) {
-        callback();
-        return;
+        return callback();
     }
     if (!file.contents.length) {
         file.path = replaceExtension(file.path, '.css');
-        callback(null, file);
-        return;
-    }
-    const opts = (options || {});
-    opts.data = file.contents.toString();
-    opts.file = file.path;
-    if (node.path.extname(file.path) === '.sass') {
-        opts.indentedSyntax = true;
-    }
-    if (opts.includePaths) {
-        if (typeof opts.includePaths === 'string') {
-            opts.includePaths = [opts.includePaths];
-        }
-    }
-    else {
-        opts.includePaths = [];
-    }
-    opts.includePaths.unshift(node.path.dirname(file.path));
-    if (file.sourceMap) {
-        opts.sourceMap = file.path;
-        opts.omitSourceMapUrl = true;
-        opts.sourceMapContents = true;
+        return callback(null, file);
     }
+    const path = file.path;
     try {
-        gulpSass.compiler &&
-            filePush(file, gulpSass.compiler.renderSync(opts), callback);
+        filePush(file, sassModule.compile(path, options), callback);
     }
     catch (error) {
         handleError(error, file, callback);
     }
 });
-gulpSass.compiler = sassModule;
 export default gulpSass;

package/tslib/tasks/public/sass.js

@@ -4,8 +4,8 @@ class SassTask extends BalmJS.BalmStyleTask {
     }
     get options() {
         return Object.assign({
-            includePaths: BalmJS.file.stylePaths,
-            outputStyle: 'expanded',
+            loadPaths: BalmJS.file.stylePaths,
+            sourceMap: true,
             quietDeps: BalmJS.config.logs.level < BalmJS.LogLevel.Warn
         }, BalmJS.config.styles.sassOptions, this.customOptions);
     }