@tarojs/rn-style-transformer 3.3.6 → 3.3.10

package/dist/utils/index.js

@@ -3,35 +3,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveStyle = exports.findVariant = exports.insertAfter = exports.insertBefore = void 0;
+exports.getAdditionalData = exports.normalizeSourceMap = exports.normalizePath = exports.resolveStyle = exports.findVariant = exports.insertAfter = exports.insertBefore = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const helper_1 = require("@tarojs/helper");
-const types_1 = require("../types");
-function insertBefore(source, target) {
-    if (!source && !target) {
+const resolve_1 = __importDefault(require("resolve"));
+const node_modules_paths_1 = __importDefault(require("resolve/lib/node-modules-paths"));
+function insertBefore(source, additional) {
+    if (!source && !additional) {
         return '';
     }
     if (!source) {
-        return target;
+        return additional;
     }
-    if (!target) {
+    if (!additional) {
         return source;
     }
-    return target + ';\n' + source;
+    return additional + ';\n' + source;
 }
 exports.insertBefore = insertBefore;
-function insertAfter(source, target) {
-    if (!source && !target) {
+function insertAfter(source, additional) {
+    if (!source && !additional) {
         return '';
     }
     if (!source) {
-        return target;
+        return additional;
     }
-    if (!target) {
+    if (!additional) {
         return source;
     }
-    return source + ';\n' + target;
+    return source + ';\n' + additional;
 }
 exports.insertAfter = insertAfter;
 // Iterate through the include paths and extensions to find the file variant
@@ -56,7 +57,8 @@ exports.findVariant = findVariant;
  * @param opts { basedir, platform, paths }
  */
 function resolveStyle(id, opts) {
-    const { basedir, platform, paths = [], alias = {}, defaultExt = '', logLevel = types_1.LogLevelEnum.ERROR } = opts;
+    const { basedir, platform, paths = [], alias = {}, defaultExt = '', logLevel = "error" /* ERROR */ } = opts;
+    id = id.trim();
     Object.keys(alias).forEach(key => {
         if (id.startsWith(key)) {
             id = id.replace(key, alias[key]);
@@ -65,24 +67,42 @@ function resolveStyle(id, opts) {
     const { dir, name, ext: idExt } = path_1.default.parse(id);
     const incPaths = [path_1.default.resolve(basedir, dir)].concat(paths);
     const ext = idExt || defaultExt;
-    const exts = [
+    const extensions = [
         // add the platform specific extension, first in the array to take precedence
         platform === 'android' ? '.android' + ext : '.ios' + ext,
         '.rn' + ext,
         ext
     ];
-    const file = findVariant(name, exts, incPaths);
+    let file;
+    let isNodeModulesPath = false;
+    try {
+        if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(id)) {
+            file = findVariant(name, extensions, incPaths);
+        }
+        else {
+            // lookup node_modules file
+            isNodeModulesPath = true;
+            // like `@import 'taro-ui/dist/base.css';` or `@import '~taro-ui/dist/base.css';`
+            file = resolve_1.default.sync(path_1.default.join(dir, name).replace(/^~/, ''), { basedir, extensions });
+        }
+    }
+    catch (error) {
+    }
     if (!file) {
+        let includePaths = incPaths;
+        if (isNodeModulesPath) {
+            includePaths = node_modules_paths_1.default(basedir, { extensions }, id);
+        }
         const levelMessage = `
     样式文件没有找到，请检查文件路径: ${id}
       在 [
-        ${incPaths.join(',\n       ')}
+        ${includePaths.join(',\n       ')}
       ]
     `;
-        if (logLevel === types_1.LogLevelEnum.ERROR) {
+        if (logLevel === "error" /* ERROR */) {
             throw new Error(levelMessage);
         }
-        if (logLevel === types_1.LogLevelEnum.WARNING) {
+        if (logLevel === "warning" /* WARNING */) {
             helper_1.printLog("warning" /* WARNING */, levelMessage);
             return id;
         }
@@ -90,5 +110,68 @@ function resolveStyle(id, opts) {
     return file;
 }
 exports.resolveStyle = resolveStyle;
+// copy from https://github.com/webpack-contrib/css-loader/blob/master/src/utils.js
+const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
+const ABSOLUTE_SCHEME = /^[a-z0-9+\-.]+:/i;
+function normalizePath(file) {
+    return path_1.default.sep === '\\' ? file.replace(/\\/g, '/') : file;
+}
+exports.normalizePath = normalizePath;
+function getURLType(source) {
+    if (source[0] === '/') {
+        if (source[1] === '/') {
+            return 'scheme-relative';
+        }
+        return 'path-absolute';
+    }
+    if (IS_NATIVE_WIN32_PATH.test(source)) {
+        return 'path-absolute';
+    }
+    return ABSOLUTE_SCHEME.test(source) ? 'absolute' : 'path-relative';
+}
+function normalizeSourceMap(map, resourcePath) {
+    let newMap = map;
+    // Some loader emit source map as string
+    // Strip any JSON XSSI avoidance prefix from the string (as documented in the source maps specification), and then parse the string as JSON.
+    if (typeof newMap === 'string') {
+        newMap = JSON.parse(newMap);
+    }
+    delete newMap.file;
+    const { sourceRoot } = newMap;
+    delete newMap.sourceRoot;
+    if (newMap.sources) {
+        // Source maps should use forward slash because it is URLs (https://github.com/mozilla/source-map/issues/91)
+        // We should normalize path because previous loaders like `sass-loader` using backslash when generate source map
+        newMap.sources = newMap.sources.map((source) => {
+            // Non-standard syntax from `postcss`
+            if (source.indexOf('<') === 0) {
+                return source;
+            }
+            const sourceType = getURLType(source);
+            // Do no touch `scheme-relative` and `absolute` URLs
+            if (sourceType === 'path-relative' || sourceType === 'path-absolute') {
+                const absoluteSource = sourceType === 'path-relative' && sourceRoot
+                    ? path_1.default.resolve(sourceRoot, normalizePath(source))
+                    : normalizePath(source);
+                return path_1.default.relative(path_1.default.dirname(resourcePath), absoluteSource);
+            }
+            return source;
+        });
+    }
+    return newMap;
+}
+exports.normalizeSourceMap = normalizeSourceMap;
+// copy end
+function getAdditionalData(data, config) {
+    let additionalData = '';
+    if (typeof config !== 'undefined') {
+        additionalData =
+            typeof config === 'function'
+                ? `${config(data)}`
+                : config;
+    }
+    return additionalData;
+}
+exports.getAdditionalData = getAdditionalData;
 exports.default = {};
 //# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

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

package/dist/utils/lessImport.js

@@ -3,40 +3,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
+const less_1 = __importDefault(require("less"));
 const index_1 = require("./index");
-const types_1 = require("../types");
-class Importer {
+class Importer extends less_1.default.FileManager {
     constructor(opt) {
+        super();
         this.alias = {};
         this.platform = opt.platform;
         this.alias = opt.alias;
     }
-    process(src, options) {
-        const { fileInfo } = options;
-        const { filename, currentDirectory: basedir } = fileInfo;
-        if (!basedir) {
-            return src;
-        }
+    supports() {
+        return true;
+    }
+    supportsSync() {
+        return false;
+    }
+    async loadFile(filename, currentDirectory, options, environment) {
         const resolveOpts = {
-            basedir,
+            basedir: currentDirectory,
             alias: this.alias,
             platform: this.platform,
-            logLevel: types_1.LogLevelEnum.WARNING,
-            defaultExt: path_1.default.extname(filename)
+            defaultExt: '.less'
         };
-        // 解析 @import "a.less" 字符串里面的内容
-        src = src.replace(/@import\s+['"]([^'|"]*)['"]/gi, (_, id) => {
-            const relativePath = path_1.default.relative(basedir, index_1.resolveStyle(id.trim(), resolveOpts)).replace(/\\/g, '/');
-            return `@import '${relativePath}';`;
-        });
-        return src;
+        const rewriteFilename = index_1.resolveStyle(filename, resolveOpts);
+        return super.loadFile(rewriteFilename, currentDirectory, options, environment);
     }
 }
 function makeLessImport(options) {
     return {
         install: (_, pluginManager) => {
-            pluginManager.addPreProcessor(new Importer(options));
+            pluginManager.addFileManager(new Importer(options));
         },
         minVersion: [2, 7, 1]
     };

package/dist/utils/lessImport.js.map

@@ -1 +1 @@
-{"version":3,"file":"lessImport.js","sourceRoot":"","sources":["../../src/utils/lessImport.ts"],"names":[],"mappings":";;;;;AAAA,gDAAuB;AACvB,mCAAsC;AACtC,oCAAuC;AAEvC,MAAM,QAAQ;IACZ,YAAa,GAAG;QAOhB,UAAK,GAA2B,EAAE,CAAA;QANhC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAA;QAC5B,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAA;IACxB,CAAC;IAMD,OAAO,CAAE,GAAW,EAAE,OAAmC;QACvD,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;QAC5B,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAA;QAExD,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,CAAA;SACX;QAED,MAAM,WAAW,GAAG;YAClB,OAAO;YACP,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,oBAAY,CAAC,OAAO;YAC9B,UAAU,EAAE,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;SACnC,CAAA;QAED,+BAA+B;QAC/B,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,+BAA+B,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE;YAC3D,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,oBAAY,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;YACrG,OAAO,YAAY,YAAY,IAAI,CAAA;QACrC,CAAC,CAAC,CAAA;QAEF,OAAO,GAAG,CAAA;IACZ,CAAC;CACF;AAED,SAAS,cAAc,CAAE,OAAO;IAC9B,OAAO;QACL,OAAO,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE;YAC5B,aAAa,CAAC,eAAe,CAAC,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;QACtD,CAAC;QACD,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KACtB,CAAA;AACH,CAAC;AAED,kBAAe,cAAc,CAAA"}
+{"version":3,"file":"lessImport.js","sourceRoot":"","sources":["../../src/utils/lessImport.ts"],"names":[],"mappings":";;;;;AAAA,gDAAuB;AACvB,mCAAsC;AAEtC,MAAM,QAAS,SAAQ,cAAI,CAAC,WAAW;IAIrC,YAAa,GAAG;QACd,KAAK,EAAE,CAAA;QAHT,UAAK,GAA2B,EAAE,CAAA;QAIhC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAA;QAC5B,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAA;IACxB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAA;IACb,CAAC;IAED,YAAY;QACV,OAAO,KAAK,CAAA;IACd,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,QAAgB,EAChB,gBAAwB,EACxB,OAAY,EACZ,WAAgB;QAEhB,MAAM,WAAW,GAAG;YAClB,OAAO,EAAE,gBAAgB;YACzB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,OAAO;SACpB,CAAA;QACD,MAAM,eAAe,GAAG,oBAAY,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;QAE3D,OAAO,KAAK,CAAC,QAAQ,CAAC,eAAe,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;IAChF,CAAC;CACF;AAED,SAAS,cAAc,CAAE,OAAO;IAC9B,OAAO;QACL,OAAO,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE;YAC5B,aAAa,CAAC,cAAc,CAAC,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;QACrD,CAAC;QACD,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KACtB,CAAA;AACH,CAAC;AAED,kBAAe,cAAc,CAAA"}

package/dist/utils/reporterSkip.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function reporterSkip({ skipRows, filename }) {
+    // @ts-ignore
+    return (css, result) => {
+        var _a;
+        (_a = result.messages) === null || _a === void 0 ? void 0 : _a.forEach((message) => {
+            var _a;
+            const { line, column, node } = message;
+            const messageInput = (_a = node === null || node === void 0 ? void 0 : node.source) === null || _a === void 0 ? void 0 : _a.input;
+            if (messageInput) {
+                const originLocation = messageInput.origin(line, column);
+                // 如果是原始引入的样式文件，则对拼接的代码（addionalData）函数做减法
+                if (originLocation && originLocation.file.includes(filename)) {
+                    // force modify line，then source map cannot read origin column, value is 0.
+                    message.line -= skipRows;
+                }
+            }
+        });
+    };
+}
+exports.default = reporterSkip;
+//# sourceMappingURL=reporterSkip.js.map

package/dist/utils/reporterSkip.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reporterSkip.js","sourceRoot":"","sources":["../../src/utils/reporterSkip.ts"],"names":[],"mappings":";;AAMA,SAAwB,YAAY,CAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE;IAC1D,aAAa;IACb,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;;QACrB,MAAA,MAAM,CAAC,QAAQ,0CAAE,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;;YACxC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;YAEtC,MAAM,YAAY,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,0CAAE,KAAK,CAAA;YACxC,IAAI,YAAY,EAAE;gBAChB,MAAM,cAAc,GAAa,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBAClE,0CAA0C;gBAC1C,IAAI,cAAc,IAAI,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBAC5D,2EAA2E;oBAC3E,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAA;iBACzB;aACF;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC;AAjBD,+BAiBC"}

package/jest.config.js

@@ -1,7 +1,8 @@
 module.exports = {
   verbose: true,
   transform: {
-    '^.+\\.js$': 'babel-jest'
+    '^.+\\.js$': 'babel-jest',
+    '^.+\\.tsx?$': 'ts-jest'
   },
-  testPathIgnorePatterns: ['/node_modules/', '/__tests__/mocks/']
+  testPathIgnorePatterns: ['/node_modules/']
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/rn-style-transformer",
-  "version": "3.3.6",
+  "version": "3.3.10",
   "description": "提供Taro RN 统一处理样式文件能力",
   "main": "dist/index.js",
   "scripts": {
@@ -23,24 +23,25 @@
     "npm": ">=6.0.0"
   },
   "dependencies": {
-    "@tarojs/helper": "3.3.6",
+    "@tarojs/helper": "3.3.10",
     "fbjs": "^2.0.0",
     "less": "^3.12.2",
     "postcss": "^7.0.35",
     "postcss-import": "^12.0.1",
-    "postcss-pxtransform": "3.3.6",
+    "postcss-pxtransform": "3.3.10",
     "postcss-reporter": "^6.0.1",
     "prop-types": "^15.7.2",
     "sass": "^1.34.1",
     "stylelint": "^13.8.0",
-    "stylelint-config-taro-rn": "3.3.6",
-    "stylelint-taro-rn": "3.3.6",
+    "stylelint-config-taro-rn": "3.3.10",
+    "stylelint-taro-rn": "3.3.10",
     "stylus": "^0.54.8",
-    "taro-css-to-react-native": "3.3.6"
+    "taro-css-to-react-native": "3.3.10"
   },
   "devDependencies": {
     "@types/less": "^3.0.2",
-    "@types/postcss-import": "^12.0.0"
+    "@types/postcss-import": "^12.0.0",
+    "@types/sass": "^1.16.1"
   },
-  "gitHead": "c172d1093ed0cbf7c00cfa3d6e8012cae6dfd1fe"
+  "gitHead": "2eae6e5dbef3f5f12a64ed52875901550ac21924"
 }

package/src/transforms/index.ts

@@ -2,12 +2,13 @@ import path from 'path'
 import transformCSS from 'taro-css-to-react-native'
 import { recursiveMerge, printLog, processTypeEnum } from '@tarojs/helper'
 
-import postcssTransform, { Config as PostcssConfig, getPostcssPlugins } from './postcss'
-import sassTransform, { Config as SassConfig, SassExternalConfig, processByExternal } from './sass'
+import postcssTransform, { Config as PostcssConfig, makePostcssPlugins } from './postcss'
+import sassTransform, { Config as SassConfig, SassGlobalConfig } from './sass'
 import lessTransform, { Config as LessConfig } from './less'
 import stylusTransform, { Config as StylusConfig, defaultOptions as stylusDefaultOptions } from './stylus'
 import { StyleSheetValidation } from './StyleSheet'
-import { TransformOptions } from '../types'
+import { TransformOptions, RenderAdditionalResult } from '../types'
+import { normalizeSourceMap } from '../utils'
 
 export function getWrapedCSS (css) {
   return `
@@ -38,7 +39,7 @@ function validateStyle ({ styleObject, filename }) {
     } catch (err) {
       // 先忽略掉 scalePx2dp 的报错
       if (/Invalid prop `.*` of type `string` supplied to `.*`, expected `number`[^]*/g.test(err.message)) return
-      printLog(processTypeEnum.WARNING, err.message, filename)
+      printLog(processTypeEnum.WARNING, err.message, `entry file: ${filename}`)
     }
   }
 }
@@ -53,11 +54,20 @@ interface RNConfig {
 interface Config {
   designWidth: number;
   deviceRatio: { [key: number]: number };
-  sass: SassExternalConfig;
+  sass: SassGlobalConfig;
   alias: Record<string, string>;
   rn: RNConfig;
 }
 
+interface PostcssParam {
+  css: string
+  map: any
+  filename: string
+  additionalData: string
+  postcssConfig: PostcssConfig
+  transformOptions: TransformOptions
+}
+
 const designWidth = 750
 
 const deviceRatio = {
@@ -66,7 +76,7 @@ const deviceRatio = {
   828: 1.81 / 2
 }
 
-enum StyleTypes {
+const enum ProcessTypes {
   POSTCSS = 'postcss',
   SASS = 'sass',
   LESS = 'less',
@@ -74,17 +84,17 @@ enum StyleTypes {
 }
 
 const DEFAULT_RN_CONFIG = {
-  [StyleTypes.POSTCSS]: {
+  [ProcessTypes.POSTCSS]: {
     options: {},
     scalable: true
   },
-  [StyleTypes.SASS]: {
+  [ProcessTypes.SASS]: {
     options: {}
   },
-  [StyleTypes.LESS]: {
+  [ProcessTypes.LESS]: {
     options: {}
   },
-  [StyleTypes.STYLUS]: {
+  [ProcessTypes.STYLUS]: {
     options: stylusDefaultOptions
   }
 }
@@ -92,7 +102,7 @@ const DEFAULT_RN_CONFIG = {
 export default class StyleTransform {
   config: Config
 
-  extConfigMap = new Map()
+  processConfigMap = new Map()
 
   constructor (config = {}) {
     this.init(config)
@@ -106,7 +116,26 @@ export default class StyleTransform {
       alias: config.alias ?? {},
       rn: recursiveMerge({}, DEFAULT_RN_CONFIG, config.rn)
     }
-    Reflect.ownKeys(this.config.rn).forEach(key => this.extConfigMap.set(key, { ...this.config.rn[key], alias: config.alias ?? {} }))
+
+    Reflect.ownKeys(this.config.rn).forEach((key: string) => {
+      if (
+        [
+          ProcessTypes.SASS,
+          ProcessTypes.LESS,
+          ProcessTypes.STYLUS,
+          ProcessTypes.POSTCSS
+        ].includes(key.toLocaleLowerCase() as any)
+      ) {
+        const processConfig = {
+          ...this.config.rn[key],
+          alias: config.alias ?? {}
+        }
+        if (key.toLocaleLowerCase() === ProcessTypes.SASS) {
+          processConfig.sass = this.config.sass
+        }
+        this.processConfigMap.set(key, processConfig)
+      }
+    })
   }
 
   /**
@@ -116,43 +145,78 @@ export default class StyleTransform {
    * @param {object} options
    */
   async processStyle (src: string, filename: string, options: TransformOptions) {
+    let result: undefined | RenderAdditionalResult
     let css = src
+    let map: undefined | string
+    let additionalData = ''
     const ext = path.extname(filename)
-    if (ext === '.less') {
-      css = await lessTransform(src, filename, this.extConfigMap.get(StyleTypes.LESS))
-    } else if (ext === '.sass' || ext === '.scss') {
-      src = processByExternal(src, filename, this.config.sass)
-      css = await sassTransform(src, filename, this.extConfigMap.get(StyleTypes.SASS), options)
-    } else if (ext === '.styl' || ext === '.stylus') {
-      css = await stylusTransform(src, filename, this.extConfigMap.get(StyleTypes.STYLUS))
+    if (/.less$/i.test(ext)) {
+      result = await lessTransform(src, filename, this.processConfigMap.get(ProcessTypes.LESS))
+    } else if (/.s(c|a)ss$/i.test(ext)) {
+      result = await sassTransform(src, filename, this.processConfigMap.get(ProcessTypes.SASS), options)
+    } else if (/.styl(us)?$/i.test(ext)) {
+      result = await stylusTransform(src, filename, this.processConfigMap.get(ProcessTypes.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(ProcessTypes.POSTCSS)
+    })
   }
 
   /**
-   * @description postcss处理
-   * @param {string} css
-   * @param {string} filename
-   * @returns {Function | any}
+   * postcss处理
+   * @param param0 PostcssParam
+   * @returns {Promise | any}
    */
-  postCSS (css, filename, postcssConfig: PostcssConfig, transformOptions: TransformOptions) {
-    const plugins = getPostcssPlugins({
+  postCSS ({
+    css,
+    map,
+    filename,
+    postcssConfig,
+    transformOptions,
+    additionalData
+  }: PostcssParam) {
+    const plugins = makePostcssPlugins({
+      filename,
+      postcssConfig,
+      transformOptions,
       designWidth: this.config.designWidth,
       deviceRatio: this.config.deviceRatio,
-      postcssConfig,
-      transformOptions
+      additionalData: additionalData
     })
 
-    return postcssTransform(css, filename, { options: postcssConfig.options, plugins })
-      .then(cssString => {
-        return {
-          css: cssString,
-          filename
+    return postcssTransform(
+      css,
+      filename,
+      {
+        plugins,
+        options: {
+          ...postcssConfig.options,
+          map: map && {
+            prev: normalizeSourceMap(map, filename),
+            inline: false,
+            annotation: false
+          }
         }
-      })
+      }
+    ).then(result => {
+      return {
+        ...result,
+        filename
+      }
+    })
   }
 
   /**
@@ -163,15 +227,23 @@ export default class StyleTransform {
    * @return {string} JSONString
    */
   async transform (src: string, filename: string, options = {} as TransformOptions) {
-    printLog(processTypeEnum.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 = transformCSS(cssSrc, { parseMediaQueries: true, scalable: this.config.rn.postcss.scalable })
+    const styleObject = transformCSS(
+      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')
-    printLog(processTypeEnum.COMPILE, '样式文件处理完毕', filename)
+    const css = JSON.stringify(styleObject, null, 2)
+      .replace(/"(scalePx2dp\(.*?\))"/g, '$1')
+
     // 注入自适应方法 scalePx2dp
     return getWrapedCSS(css)
   }

package/src/transforms/less.ts

@@ -1,6 +1,8 @@
 import path from 'path'
 import less from 'less'
 import makeLessImport from '../utils/lessImport'
+import { insertBefore, getAdditionalData } from '../utils'
+import { RenderResult, RenderAdditionalResult } from '../types'
 
 interface SourceMapOption {
   sourceMapURL?: string;
@@ -58,7 +60,7 @@ export interface Options {
 export interface Config {
   alias?: Record<string, string>
   options: Options
-  additionalData?: string | ((string) => string)
+  additionalData?: string | ((key: string) => string)
 }
 
 function renderToCSS (src, filename, options = {} as any) {
@@ -73,26 +75,34 @@ function renderToCSS (src, filename, options = {} as any) {
         filename,
         plugins: plugins.concat(options.plugins || []),
         paths: paths.concat(options.paths || [])
-      }, (err, output) => {
+      }, (err, result) => {
         if (err) {
           return reject(err.message)
         }
-        resolve(output.css)
+        resolve(result)
       })
   })
 }
 
-export default function transform (src: string, filename: string, config: Config) {
-  let data = src
+export default function transform (
+  src: string,
+  filename: string,
+  config: Config
+) {
+  const additionalData = getAdditionalData(src, config.additionalData)
+  const data = insertBefore(src, additionalData)
 
-  if (typeof config.additionalData !== 'undefined') {
-    data =
-      typeof config.additionalData === 'function'
-        ? `${config.additionalData(data)}`
-        : `${config.additionalData}\n${data}`
-  }
-  return renderToCSS(data, filename, { ...config.options, alias: config.alias })
-    .then((css: string) => {
-      return css
-    })
+  return renderToCSS(
+    data,
+    filename,
+    {
+      sourceMap: {
+        outputFilename: `${filename}.map`
+      },
+      alias: config.alias,
+      ...config.options
+    }
+  ).then((result: RenderResult) => {
+    return { ...result, additionalData } as RenderAdditionalResult
+  })
 }