balm-core 4.30.0 → 4.32.0

package/tslib/plugins/sass.js

@@ -1,86 +1,61 @@
-import fs from 'node:fs';
-import { pathToFileURL } from 'node:url';
 import { Transform } from 'node:stream';
-import semver from 'semver';
 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 = node.path.join(process.env.BALM_CWD, 'node_modules', 'sass');
-let isLegacy = false;
-try {
-    const sassPkg = requireModule(node.path.join(localSassModule, 'package.json'));
-    isLegacy = semver.lt(sassPkg.version, '1.40.0');
-}
-catch (_) { }
-const nodeLocalSassModule = node.path.join(localSassModule, 'sass.node.js');
-const defaultLocalSassModule = node.path.join(localSassModule, 'sass.default.js');
-const dartLocalSassModule = node.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 sassModule = node.getSassModule(sass);
 const PLUGIN_NAME = 'sass';
 const transformObj = (transform) => new Transform({ transform, objectMode: true });
 function filePush(file, result, callback) {
-    if (result.sourceMap) {
-        const sassMap = result.sourceMap;
-        sassMap.file = replaceExtension(file.relative, '.css');
-        applySourceMap(file, sassMap);
-    }
     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();
-    }
-    callback(null, file);
-}
-function legacyFilePush(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));
+    if (result.sourceMap) {
+        const proto = /^file:\/\/?/;
+        const leadingSlash = /^\//;
+        const sassMap = result.sourceMap;
+        const base = node.path.resolve(file.cwd, file.base);
+        if (!sassMap.file) {
+            sassMap.file = file.history[0]
+                .replace(base + node.path.sep, '')
+                .replace(proto, '');
         }
-        sassMap.sources = sassMap.sources.filter((src) => src !== 'stdin' && src);
+        sassMap.sources = sassMap.sources.map((src) => {
+            const baseUri = base.replace(/\\/g, '/');
+            if (src.startsWith('data:')) {
+                return file.history[0]
+                    .replace(/\\/g, '/')
+                    .replace(`${baseUri}/`, '')
+                    .replace(proto, '')
+                    .replace(leadingSlash, '');
+            }
+            return src
+                .replace(proto, '')
+                .replace(`${baseUri}/`, '')
+                .replace(leadingSlash, '');
+        });
+        const sassFileSrc = file.relative;
         sassMap.file = replaceExtension(sassFileSrc, '.css');
+        if (file.sourceMap &&
+            file.sourceMap.sourcesContent &&
+            !sassMap.sourcesContent) {
+            sassMap.sourcesContent = file.sourceMap.sourcesContent;
+        }
         applySourceMap(file, sassMap);
     }
-    file.contents = sassObject.css;
-    file.path = replaceExtension(file.path, '.css');
     if (file.stat) {
         file.stat.atime = file.stat.mtime = file.stat.ctime = new Date();
     }
     callback(null, file);
 }
 function handleError(error, file, callback) {
-    const relativePath = node.path.relative(process.cwd(), file.path);
-    const message = `${ansiColors.underline(relativePath)}\n${error.message}`;
-    error.message = stripAnsi(message);
-    return callback(new PluginError(PLUGIN_NAME, error));
-}
-function legacyHandleError(error, file, callback) {
-    const filePath = ((error.file === 'stdin' ? file.path : error.file) ||
-        file.path);
+    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 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) => {
+const gulpSass = (options, sync = false) => transformObj((file, encoding, callback) => {
     if (file.isNull()) {
         return callback(null, file);
     }
@@ -95,77 +70,40 @@ const gulpSass = (options) => transformObj((file, encoding, callback) => {
         return callback(null, file);
     }
     const opts = (options || {});
-    if (isLegacy) {
-        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;
-        }
-        if (!opts.importer) {
-            const aliasKeys = Object.keys(BalmJS.config.scripts.alias).filter((key) => /^@[a-z0-9-]{1,213}/.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[1] : null;
-                        if (key) {
-                            file = url.replace(key, BalmJS.config.scripts.alias[key]);
-                            BalmJS.logger.debug(`${PLUGIN_NAME} alias`, `${key} -> ${url} => ${file}`);
-                        }
-                        return { file };
-                    }
-                ];
-            }
+    if (node.path.extname(file.path) === '.sass') {
+        opts.syntax = 'indented';
+    }
+    if (opts.loadPaths) {
+        if (typeof opts.loadPaths === 'string') {
+            opts.loadPaths = [opts.loadPaths];
         }
     }
     else {
-        if (!options.importers) {
-            const aliasKeys = Object.keys(BalmJS.config.scripts.alias).filter((key) => /^@[a-z0-9-]{1,213}/.test(key));
-            if (aliasKeys.length) {
-                const aliasKeyRegex = new RegExp(`^(${aliasKeys.join('|')})/`);
-                options.importers = [
-                    {
-                        findFileUrl(url) {
-                            let file = url;
-                            const result = url.match(aliasKeyRegex);
-                            const key = result ? result[1] : null;
-                            if (key) {
-                                file = url.replace(key, BalmJS.config.scripts.alias[key]);
-                                BalmJS.logger.debug(`${PLUGIN_NAME} alias`, `${key} -> ${url} => ${file}`);
-                            }
-                            return pathToFileURL(file);
-                        }
-                    }
-                ];
-            }
-        }
+        opts.loadPaths = [];
     }
-    try {
-        isLegacy
-            ? legacyFilePush(file, sassModule.renderSync(opts), callback)
-            : filePush(file, sassModule.compile(file.path, options), callback);
+    opts.loadPaths.unshift(node.path.dirname(file.path));
+    if (file.sourceMap) {
+        opts.sourceMap = true;
+        opts.sourceMapIncludeSources = true;
     }
-    catch (error) {
-        isLegacy
-            ? legacyHandleError(error, file, callback)
-            : handleError(error, file, callback);
+    const fileContents = file.contents.toString();
+    if (sync !== true) {
+        sassModule
+            .compileStringAsync(fileContents, opts)
+            .then((compileResult) => {
+            filePush(file, compileResult, callback);
+        })
+            .catch((error) => {
+            handleError(error, file, callback);
+        });
+    }
+    else {
+        try {
+            filePush(file, sassModule.compileString(fileContents, opts), callback);
+        }
+        catch (error) {
+            handleError(error, file, callback);
+        }
     }
 });
 export default gulpSass;
-export { isLegacy };

package/tslib/tasks/foundation/balm_style.js

@@ -47,7 +47,9 @@ class BalmStyleTask extends BalmTask {
         }));
         switch (style) {
             case 'sass':
-                stream = stream.pipe(BalmJS.plugins.sass(options));
+                stream = stream.pipe(node.isLegacySass
+                    ? BalmJS.plugins.legacySass(options)
+                    : BalmJS.plugins.sass(options));
                 break;
             case 'less':
                 stream = stream.pipe(BalmJS.plugins.less(options));

package/tslib/tasks/public/sass.js

@@ -1,10 +1,9 @@
-import { isLegacy } from '../../plugins/sass.js';
 class SassTask extends BalmJS.BalmStyleTask {
     constructor() {
         super('sass');
     }
     get options() {
-        return Object.assign(isLegacy
+        return Object.assign(node.isLegacySass
             ? {
                 includePaths: BalmJS.file.stylePaths,
                 outputStyle: 'expanded'