@tarojs/rn-style-transformer 3.3.4 → 3.3.8

package/__tests__/config.spec.js

@@ -1,7 +1,7 @@
 import path from 'path'
 import { recursiveMerge } from '@tarojs/helper'
 
-import StyleTransform, { getWrapedCSS } from '../dist/transforms'
+import StyleTransform, { getWrapedCSS } from '../src/transforms'
 
 const defaultConfig = {
   designWidth: 750,

package/__tests__/index.spec.js

@@ -1,4 +1,4 @@
-import StyleTransform, { getWrapedCSS } from '../dist/transforms'
+import StyleTransform, { getWrapedCSS } from '../src/transforms'
 
 // 初始化
 const styleTransform = new StyleTransform()

package/__tests__/platform.spec.js

@@ -1,4 +1,4 @@
-import StyleTransform, { getWrapedCSS } from '../dist/transforms'
+import StyleTransform, { getWrapedCSS } from '../src/transforms'
 
 // 初始化config
 const styleTransform = new StyleTransform()

package/dist/transforms/index.js

@@ -27,10 +27,11 @@ const path_1 = __importDefault(require("path"));
 const taro_css_to_react_native_1 = __importDefault(require("taro-css-to-react-native"));
 const helper_1 = require("@tarojs/helper");
 const postcss_1 = __importStar(require("./postcss"));
-const sass_1 = __importStar(require("./sass"));
+const sass_1 = __importDefault(require("./sass"));
 const less_1 = __importDefault(require("./less"));
 const stylus_1 = __importStar(require("./stylus"));
 const StyleSheet_1 = require("./StyleSheet");
+const utils_1 = require("../utils");
 function getWrapedCSS(css) {
     return `
 import { StyleSheet, Dimensions } from 'react-native'
@@ -62,7 +63,7 @@ function validateStyle({ styleObject, filename }) {
             // 先忽略掉 scalePx2dp 的报错
             if (/Invalid prop `.*` of type `string` supplied to `.*`, expected `number`[^]*/g.test(err.message))
                 return;
-            helper_1.printLog("warning" /* WARNING */, err.message, filename);
+            helper_1.printLog("warning" /* WARNING */, err.message, `entry file: ${filename}`);
         }
     }
 }
@@ -72,31 +73,24 @@ const deviceRatio = {
     750: 1,
     828: 1.81 / 2
 };
-var StyleTypes;
-(function (StyleTypes) {
-    StyleTypes["POSTCSS"] = "postcss";
-    StyleTypes["SASS"] = "sass";
-    StyleTypes["LESS"] = "less";
-    StyleTypes["STYLUS"] = "stylus";
-})(StyleTypes || (StyleTypes = {}));
 const DEFAULT_RN_CONFIG = {
-    [StyleTypes.POSTCSS]: {
+    ["postcss" /* POSTCSS */]: {
         options: {},
         scalable: true
     },
-    [StyleTypes.SASS]: {
+    ["sass" /* SASS */]: {
         options: {}
     },
-    [StyleTypes.LESS]: {
+    ["less" /* LESS */]: {
         options: {}
     },
-    [StyleTypes.STYLUS]: {
+    ["stylus" /* STYLUS */]: {
         options: stylus_1.defaultOptions
     }
 };
 class StyleTransform {
     constructor(config = {}) {
-        this.extConfigMap = new Map();
+        this.processConfigMap = new Map();
         this.init = (config) => {
             var _a;
             this.config = {
@@ -106,7 +100,21 @@ class StyleTransform {
                 alias: (_a = config.alias) !== null && _a !== void 0 ? _a : {},
                 rn: helper_1.recursiveMerge({}, DEFAULT_RN_CONFIG, config.rn)
             };
-            Reflect.ownKeys(this.config.rn).forEach(key => { var _a; return this.extConfigMap.set(key, Object.assign(Object.assign({}, this.config.rn[key]), { alias: (_a = config.alias) !== null && _a !== void 0 ? _a : {} })); });
+            Reflect.ownKeys(this.config.rn).forEach((key) => {
+                var _a;
+                if ([
+                    "sass" /* SASS */,
+                    "less" /* LESS */,
+                    "stylus" /* STYLUS */,
+                    "postcss" /* POSTCSS */
+                ].includes(key.toLocaleLowerCase())) {
+                    const processConfig = Object.assign(Object.assign({}, this.config.rn[key]), { alias: (_a = config.alias) !== null && _a !== void 0 ? _a : {} });
+                    if (key.toLocaleLowerCase() === "sass" /* SASS */) {
+                        processConfig.sass = this.config.sass;
+                    }
+                    this.processConfigMap.set(key, processConfig);
+                }
+            });
         };
         this.init(config);
     }
@@ -117,41 +125,58 @@ class StyleTransform {
      * @param {object} options
      */
     async processStyle(src, filename, options) {
+        let result;
         let css = src;
+        let map;
+        let additionalData = '';
         const ext = path_1.default.extname(filename);
-        if (ext === '.less') {
-            css = await less_1.default(src, filename, this.extConfigMap.get(StyleTypes.LESS));
+        if (/.less$/i.test(ext)) {
+            result = await less_1.default(src, filename, this.processConfigMap.get("less" /* LESS */));
         }
-        else if (ext === '.sass' || ext === '.scss') {
-            src = sass_1.processByExternal(src, filename, this.config.sass);
-            css = await sass_1.default(src, filename, this.extConfigMap.get(StyleTypes.SASS), options);
+        else if (/.s(c|a)ss$/i.test(ext)) {
+            result = await sass_1.default(src, filename, this.processConfigMap.get("sass" /* SASS */), options);
         }
-        else if (ext === '.styl' || ext === '.stylus') {
-            css = await stylus_1.default(src, filename, this.extConfigMap.get(StyleTypes.STYLUS));
+        else if (/.styl(us)?$/i.test(ext)) {
+            result = await stylus_1.default(src, filename, this.processConfigMap.get("stylus" /* STYLUS */));
+        }
+        if (result) {
+            css = Buffer.isBuffer(result.css) ? result.css.toString() : result.css;
+            map = Buffer.isBuffer(result.map) ? result.map.toString() : result.map;
+            additionalData = result.additionalData;
         }
         // postcss 插件，比如处理平台特有样式，单位转换
-        const cssItem = await this.postCSS(css, filename, this.extConfigMap.get(StyleTypes.POSTCSS), options);
-        return cssItem;
+        return await this.postCSS({
+            css,
+            map,
+            filename,
+            additionalData,
+            transformOptions: options,
+            postcssConfig: this.processConfigMap.get("postcss" /* POSTCSS */)
+        });
     }
     /**
-     * @description postcss处理
-     * @param {string} css
-     * @param {string} filename
-     * @returns {Function | any}
+     * postcss处理
+     * @param param0 PostcssParam
+     * @returns {Promise | any}
      */
-    postCSS(css, filename, postcssConfig, transformOptions) {
-        const plugins = postcss_1.getPostcssPlugins({
+    postCSS({ css, map, filename, postcssConfig, transformOptions, additionalData }) {
+        const plugins = postcss_1.makePostcssPlugins({
+            filename,
+            postcssConfig,
+            transformOptions,
             designWidth: this.config.designWidth,
             deviceRatio: this.config.deviceRatio,
-            postcssConfig,
-            transformOptions
+            additionalData: additionalData
         });
-        return postcss_1.default(css, filename, { options: postcssConfig.options, plugins })
-            .then(cssString => {
-            return {
-                css: cssString,
-                filename
-            };
+        return postcss_1.default(css, filename, {
+            plugins,
+            options: Object.assign(Object.assign({}, postcssConfig.options), { map: map && {
+                    prev: utils_1.normalizeSourceMap(map, filename),
+                    inline: false,
+                    annotation: false
+                } })
+        }).then(result => {
+            return Object.assign(Object.assign({}, result), { filename });
         });
     }
     /**
@@ -162,15 +187,17 @@ class StyleTransform {
      * @return {string} JSONString
      */
     async transform(src, filename, options = {}) {
-        helper_1.printLog("start" /* START */, '样式文件处理开始', filename);
-        const { css: cssSrc } = await this.processStyle(src, filename, options);
-        // printLog(processTypeEnum.REMIND, cssSrc, filename)
+        // printLog(processTypeEnum.START, '样式文件处理开始', filename)
+        const result = await this.processStyle(src, filename, options);
         // 把 css 转换成对象 rn 的样式，接入 taro 的 css-to-react-native，比如有单位的处理
-        const styleObject = taro_css_to_react_native_1.default(cssSrc, { parseMediaQueries: true, scalable: this.config.rn.postcss.scalable });
+        const styleObject = taro_css_to_react_native_1.default(result.css, {
+            parseMediaQueries: true,
+            scalable: this.config.rn.postcss.scalable
+        });
         // stylelint，转换成对象，对对象进行校验
         validateStyle({ styleObject, filename });
-        const css = JSON.stringify(styleObject, null, 2).replace(/"(scalePx2dp\(.*?\))"/g, '$1');
-        helper_1.printLog("compile" /* COMPILE */, '样式文件处理完毕', filename);
+        const css = JSON.stringify(styleObject, null, 2)
+            .replace(/"(scalePx2dp\(.*?\))"/g, '$1');
         // 注入自适应方法 scalePx2dp
         return getWrapedCSS(css);
     }

package/dist/transforms/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/transforms/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/transforms/index.ts"],"names":[],"mappings":"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"}

package/dist/transforms/less.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const less_1 = __importDefault(require("less"));
 const lessImport_1 = __importDefault(require("../utils/lessImport"));
+const utils_1 = require("../utils");
 function renderToCSS(src, filename, options = {}) {
     // default plugins
     const plugins = [lessImport_1.default(options)];
@@ -13,25 +14,21 @@ function renderToCSS(src, filename, options = {}) {
     const paths = [path_1.default.dirname(path_1.default.resolve(process.cwd(), filename))];
     return new Promise((resolve, reject) => {
         less_1.default
-            .render(src, Object.assign(Object.assign({}, options), { filename, plugins: plugins.concat(options.plugins || []), paths: paths.concat(options.paths || []) }), (err, output) => {
+            .render(src, Object.assign(Object.assign({}, options), { filename, plugins: plugins.concat(options.plugins || []), paths: paths.concat(options.paths || []) }), (err, result) => {
             if (err) {
                 return reject(err.message);
             }
-            resolve(output.css);
+            resolve(result);
         });
     });
 }
 function transform(src, filename, config) {
-    let data = src;
-    if (typeof config.additionalData !== 'undefined') {
-        data =
-            typeof config.additionalData === 'function'
-                ? `${config.additionalData(data)}`
-                : `${config.additionalData}\n${data}`;
-    }
-    return renderToCSS(data, filename, Object.assign(Object.assign({}, config.options), { alias: config.alias }))
-        .then((css) => {
-        return css;
+    const additionalData = utils_1.getAdditionalData(src, config.additionalData);
+    const data = utils_1.insertBefore(src, additionalData);
+    return renderToCSS(data, filename, Object.assign({ sourceMap: {
+            outputFilename: `${filename}.map`
+        }, alias: config.alias }, config.options)).then((result) => {
+        return Object.assign(Object.assign({}, result), { additionalData });
     });
 }
 exports.default = transform;

package/dist/transforms/less.js.map

@@ -1 +1 @@
-{"version":3,"file":"less.js","sourceRoot":"","sources":["../../src/transforms/less.ts"],"names":[],"mappings":";;;;;AAAA,gDAAuB;AACvB,gDAAuB;AACvB,qEAAgD;AA6DhD,SAAS,WAAW,CAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAS;IACtD,kBAAkB;IAClB,MAAM,OAAO,GAAG,CAAC,oBAAc,CAAC,OAAO,CAAC,CAAC,CAAA;IACzC,qCAAqC;IACrC,MAAM,KAAK,GAAG,CAAC,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAA;IACnE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,cAAI;aACD,MAAM,CAAC,GAAG,kCACN,OAAO,KACV,QAAQ,EACR,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAC9C,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,KACvC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YACjB,IAAI,GAAG,EAAE;gBACP,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;aAC3B;YACD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACrB,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAwB,SAAS,CAAE,GAAW,EAAE,QAAgB,EAAE,MAAc;IAC9E,IAAI,IAAI,GAAG,GAAG,CAAA;IAEd,IAAI,OAAO,MAAM,CAAC,cAAc,KAAK,WAAW,EAAE;QAChD,IAAI;YACF,OAAO,MAAM,CAAC,cAAc,KAAK,UAAU;gBACzC,CAAC,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;gBAClC,CAAC,CAAC,GAAG,MAAM,CAAC,cAAc,KAAK,IAAI,EAAE,CAAA;KAC1C;IACD,OAAO,WAAW,CAAC,IAAI,EAAE,QAAQ,kCAAO,MAAM,CAAC,OAAO,KAAE,KAAK,EAAE,MAAM,CAAC,KAAK,IAAG;SAC3E,IAAI,CAAC,CAAC,GAAW,EAAE,EAAE;QACpB,OAAO,GAAG,CAAA;IACZ,CAAC,CAAC,CAAA;AACN,CAAC;AAbD,4BAaC"}
+{"version":3,"file":"less.js","sourceRoot":"","sources":["../../src/transforms/less.ts"],"names":[],"mappings":";;;;;AAAA,gDAAuB;AACvB,gDAAuB;AACvB,qEAAgD;AAChD,oCAA0D;AA8D1D,SAAS,WAAW,CAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAS;IACtD,kBAAkB;IAClB,MAAM,OAAO,GAAG,CAAC,oBAAc,CAAC,OAAO,CAAC,CAAC,CAAA;IACzC,qCAAqC;IACrC,MAAM,KAAK,GAAG,CAAC,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAA;IACnE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,cAAI;aACD,MAAM,CAAC,GAAG,kCACN,OAAO,KACV,QAAQ,EACR,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAC9C,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,KACvC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YACjB,IAAI,GAAG,EAAE;gBACP,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;aAC3B;YACD,OAAO,CAAC,MAAM,CAAC,CAAA;QACjB,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAwB,SAAS,CAC/B,GAAW,EACX,QAAgB,EAChB,MAAc;IAEd,MAAM,cAAc,GAAG,yBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,cAAc,CAAC,CAAA;IACpE,MAAM,IAAI,GAAG,oBAAY,CAAC,GAAG,EAAE,cAAc,CAAC,CAAA;IAE9C,OAAO,WAAW,CAChB,IAAI,EACJ,QAAQ,kBAEN,SAAS,EAAE;YACT,cAAc,EAAE,GAAG,QAAQ,MAAM;SAClC,EACD,KAAK,EAAE,MAAM,CAAC,KAAK,IAChB,MAAM,CAAC,OAAO,EAEpB,CAAC,IAAI,CAAC,CAAC,MAAoB,EAAE,EAAE;QAC9B,OAAO,gCAAK,MAAM,KAAE,cAAc,GAA4B,CAAA;IAChE,CAAC,CAAC,CAAA;AACJ,CAAC;AArBD,4BAqBC"}

package/dist/transforms/postcss.js

@@ -3,12 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPostcssPlugins = void 0;
+exports.makePostcssPlugins = void 0;
 const postcss_1 = __importDefault(require("postcss"));
 const postcss_pxtransform_1 = __importDefault(require("postcss-pxtransform"));
 const postcss_import_1 = __importDefault(require("postcss-import"));
 const helper_1 = require("@tarojs/helper");
 const utils_1 = require("../utils");
+const reporterSkip_1 = __importDefault(require("../utils/reporterSkip"));
 const rn_stylelint_json_1 = __importDefault(require("../config/rn-stylelint.json"));
 const defaultPxtransformOption = {
     enable: true,
@@ -16,7 +17,7 @@ const defaultPxtransformOption = {
         platform: 'rn'
     }
 };
-function getPostcssPlugins({ designWidth, deviceRatio, postcssConfig, transformOptions }) {
+function makePostcssPlugins({ filename, designWidth, deviceRatio, postcssConfig, transformOptions, additionalData }) {
     if (designWidth) {
         defaultPxtransformOption.config.designWidth = designWidth;
     }
@@ -34,16 +35,16 @@ function getPostcssPlugins({ designWidth, deviceRatio, postcssConfig, transformO
     if (pxtransformOption.enable) {
         plugins.push(postcss_pxtransform_1.default(pxtransformOption.config));
     }
-    plugins.push(require('stylelint')(rn_stylelint_json_1.default), require('postcss-reporter')({ clearReportedMessages: true }));
+    const skipRows = additionalData ? additionalData.split('\n').length : 0;
+    plugins.push(require('stylelint')(rn_stylelint_json_1.default), reporterSkip_1.default({ skipRows, filename }), require('postcss-reporter')({ clearReportedMessages: true }));
     return plugins;
 }
-exports.getPostcssPlugins = getPostcssPlugins;
+exports.makePostcssPlugins = makePostcssPlugins;
 function transform(src, filename, { options, plugins }) {
     return postcss_1.default(plugins)
         .process(src, Object.assign({ from: filename }, options))
         .then(result => {
-        const css = result.css;
-        return css;
+        return result;
     });
 }
 exports.default = transform;

package/dist/transforms/postcss.js.map

@@ -1 +1 @@
-{"version":3,"file":"postcss.js","sourceRoot":"","sources":["../../src/transforms/postcss.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAiD;AACjD,8EAA6C;AAC7C,oEAA0C;AAC1C,2CAA+C;AAC/C,oCAAuC;AACvC,oFAAyD;AAWzD,MAAM,wBAAwB,GAE1B;IACF,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE;QACN,QAAQ,EAAE,IAAI;KACf;CACF,CAAA;AAED,SAAgB,iBAAiB,CAAE,EACjC,WAAW,EACX,WAAW,EACX,aAAa,EACb,gBAAgB,EACjB;IACC,IAAI,WAAW,EAAE;QACf,wBAAwB,CAAC,MAAM,CAAC,WAAW,GAAG,WAAW,CAAA;KAC1D;IAED,IAAI,WAAW,EAAE;QACf,wBAAwB,CAAC,MAAM,CAAC,WAAW,GAAG,WAAW,CAAA;KAC1D;IACD,MAAM,iBAAiB,GAAG,uBAAc,CAAC,EAAE,EAAE,wBAAwB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAA;IAEjG,MAAM,OAAO,GAAG;QACd,wBAAa,CAAC;YACZ,OAAO,EAAE,SAAS,OAAO,CAAE,EAAU,EAAE,OAAe,EAAE,OAAsC;gBAC5F,OAAO,oBAAY,CACjB,EAAE,kCAEG,OAAO,KACV,OAAO,EACP,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,aAAa,CAAC,KAAK,EAC1B,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,IAEtC,CAAA;YACH,CAAC;SACF,CAAC;KACH,CAAA;IAED,IAAI,iBAAiB,CAAC,MAAM,EAAE;QAC5B,OAAO,CAAC,IAAI,CAAC,6BAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAA;KACpD;IAED,OAAO,CAAC,IAAI,CACV,OAAO,CAAC,WAAW,CAAC,CAAC,2BAAe,CAAC,EACrC,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAC7D,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AA1CD,8CA0CC;AAED,SAAwB,SAAS,CAAE,GAAW,EAAE,QAAgB,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;IACpF,OAAO,iBAAO,CAAC,OAAO,CAAC;SACpB,OAAO,CAAC,GAAG,kBAAI,IAAI,EAAE,QAAQ,IAAK,OAAO,EAAG;SAC5C,IAAI,CAAC,MAAM,CAAC,EAAE;QACb,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;QACtB,OAAO,GAAG,CAAA;IACZ,CAAC,CAAC,CAAA;AACN,CAAC;AAPD,4BAOC"}
+{"version":3,"file":"postcss.js","sourceRoot":"","sources":["../../src/transforms/postcss.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAiD;AACjD,8EAA6C;AAC7C,oEAA0C;AAC1C,2CAA+C;AAC/C,oCAAuC;AACvC,yEAAgD;AAChD,oFAAyD;AAWzD,MAAM,wBAAwB,GAE1B;IACF,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE;QACN,QAAQ,EAAE,IAAI;KACf;CACF,CAAA;AAED,SAAgB,kBAAkB,CAAE,EAClC,QAAQ,EACR,WAAW,EACX,WAAW,EACX,aAAa,EACb,gBAAgB,EAChB,cAAc,EACf;IACC,IAAI,WAAW,EAAE;QACf,wBAAwB,CAAC,MAAM,CAAC,WAAW,GAAG,WAAW,CAAA;KAC1D;IAED,IAAI,WAAW,EAAE;QACf,wBAAwB,CAAC,MAAM,CAAC,WAAW,GAAG,WAAW,CAAA;KAC1D;IACD,MAAM,iBAAiB,GAAG,uBAAc,CAAC,EAAE,EAAE,wBAAwB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAA;IAEjG,MAAM,OAAO,GAAG;QACd,wBAAa,CAAC;YACZ,OAAO,EAAE,SAAS,OAAO,CAAE,EAAU,EAAE,OAAe,EAAE,OAAsC;gBAC5F,OAAO,oBAAY,CACjB,EAAE,kCAEG,OAAO,KACV,OAAO,EACP,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,aAAa,CAAC,KAAK,EAC1B,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,IAEtC,CAAA;YACH,CAAC;SACF,CAAC;KACH,CAAA;IAED,IAAI,iBAAiB,CAAC,MAAM,EAAE;QAC5B,OAAO,CAAC,IAAI,CAAC,6BAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAA;KACpD;IAED,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IAEvE,OAAO,CAAC,IAAI,CACV,OAAO,CAAC,WAAW,CAAC,CAAC,2BAAe,CAAC,EACrC,sBAAY,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,EACpC,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAC7D,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AA/CD,gDA+CC;AAED,SAAwB,SAAS,CAAE,GAAW,EAAE,QAAgB,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;IACpF,OAAO,iBAAO,CAAC,OAAO,CAAC;SACpB,OAAO,CAAC,GAAG,kBAAI,IAAI,EAAE,QAAQ,IAAK,OAAO,EAAG;SAC5C,IAAI,CAAC,MAAM,CAAC,EAAE;QACb,OAAO,MAAM,CAAA;IACf,CAAC,CAAC,CAAA;AACN,CAAC;AAND,4BAMC"}

package/dist/transforms/sass.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processByExternal = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const sass_1 = __importDefault(require("sass"));
@@ -20,13 +19,7 @@ function makeImportStatement(filePath, resource, rootDir) {
     const relativePath = path_1.default.relative(filePath, url).replace(/\\/g, '/'); // fix window path error
     return `@import '${relativePath}'`;
 }
-/**
- * 处理 additional 配置，比如 config.sass 配置
- * @param src
- * @param filename
- * @returns
- */
-function processByExternal(src, filename, config) {
+function getGlobalResource(filename, config) {
     var _a;
     let resource = '';
     const projectDirectory = config.projectDirectory || process.cwd();
@@ -38,10 +31,16 @@ function processByExternal(src, filename, config) {
         const resources = ((_a = config.resource) === null || _a === void 0 ? void 0 : _a.map(source => makeImportStatement(filePath, source, projectDirectory))) || [];
         resource = resources.join(';\n');
     }
-    const combineSource = utils_1.insertBefore(config === null || config === void 0 ? void 0 : config.data, resource);
-    return utils_1.insertBefore(src, combineSource);
+    // https://taro-docs.jd.com/taro/docs/config-detail/#sassdata, data 覆盖 resurce 配置
+    return utils_1.insertAfter(resource, config === null || config === void 0 ? void 0 : config.data);
+}
+function combineResource(src, filename, config) {
+    // sass config
+    const globalResource = getGlobalResource(filename, config.sass);
+    // sass tranform config
+    const additionalData = utils_1.getAdditionalData(src, config.additionalData);
+    return utils_1.insertAfter(globalResource, additionalData);
 }
-exports.processByExternal = processByExternal;
 function renderToCSS(src, filename, options, transformOptions) {
     const defaultOpts = {
         importer: function (...params) {
@@ -69,7 +68,8 @@ function renderToCSS(src, filename, options, transformOptions) {
                     alias: options.alias,
                     platform: transformOptions.platform
                 });
-                return { file: file };
+                const contents = fs_1.default.readFileSync(file, 'utf8');
+                return { file, contents };
             }
             catch (err) {
                 return err;
@@ -83,26 +83,19 @@ function renderToCSS(src, filename, options, transformOptions) {
                 reject(err);
             }
             else {
-                const css = result.css.toString();
-                resolve(css);
+                resolve(result);
             }
         });
     });
 }
 function transform(src, filename, config, transformOptions) {
-    let data = src;
+    const additionalData = combineResource(src, filename, config);
+    let data = utils_1.insertBefore(src, additionalData);
     if (!data) {
         data = `\n${data}`; // fix empty file error. reference https://github.com/sass/node-sass/blob/91c40a0bf0a3923ab9f91b82dcd479c25486235a/lib/index.js#L430
     }
-    if (typeof config.additionalData !== 'undefined') {
-        data =
-            typeof config.additionalData === 'function'
-                ? `${config.additionalData(data)}`
-                : `${config.additionalData}\n${data}`;
-    }
-    return renderToCSS(data, filename, Object.assign(Object.assign({}, config.options), { alias: config.alias }), transformOptions)
-        .then((css) => {
-        return css;
+    return renderToCSS(data, filename, Object.assign({ file: filename, outFile: `${filename}.map`, sourceMap: true, alias: config.alias }, config.options), transformOptions).then((result) => {
+        return Object.assign(Object.assign({}, result), { additionalData });
     });
 }
 exports.default = transform;

package/dist/transforms/sass.js.map

@@ -1 +1 @@
-{"version":3,"file":"sass.js","sourceRoot":"","sources":["../../src/transforms/sass.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sass.js","sourceRoot":"","sources":["../../src/transforms/sass.ts"],"names":[],"mappings":"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"}

package/dist/transforms/stylus.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultOptions = void 0;
 const stylus_1 = __importDefault(require("stylus"));
+const utils_1 = require("../utils");
 class Evaluator {
 }
 exports.defaultOptions = {
@@ -21,6 +22,11 @@ exports.defaultOptions = {
 function renderToCSS(src, filename, options = {}) {
     const stylusOptions = Object.assign({ filename }, options);
     const styl = stylus_1.default(src, stylusOptions);
+    styl.set('sourcemap', {
+        comment: true,
+        sourceRoot: '.',
+        basePath: '.'
+    });
     // include regular CSS on @import
     if (stylusOptions.includeCSS) {
         styl.set('include css', true);
@@ -82,22 +88,19 @@ function renderToCSS(src, filename, options = {}) {
                 reject(err);
             }
             else {
-                resolve(css);
+                resolve({
+                    css,
+                    map: styl.sourcemap
+                });
             }
         });
     });
 }
 function transform(src, filename, config) {
-    let data = src;
-    if (typeof config.additionalData !== 'undefined') {
-        data =
-            typeof config.additionalData === 'function'
-                ? `${config.additionalData(data)}`
-                : `${config.additionalData}\n${data}`;
-    }
-    return renderToCSS(data, filename, config.options)
-        .then((css) => {
-        return css;
+    const additionalData = utils_1.getAdditionalData(src, config.additionalData);
+    const data = utils_1.insertBefore(src, additionalData);
+    return renderToCSS(data, filename, config.options).then((result) => {
+        return Object.assign(Object.assign({}, result), { additionalData });
     });
 }
 exports.default = transform;