@tarojs/rn-style-transformer 3.3.13 → 3.3.17

package/__tests__/config.spec.js

@@ -34,7 +34,20 @@ const defaultConfig = {
   }
 }
 
-async function run (src, config = {}, filename = './__tests__/styles/a.css', options, debug = false) {
+async function run (src, filename = './__tests__/styles/a.css', debug) {
+  let options
+  let config
+
+  if (typeof src === 'object') {
+    ({
+      src,
+      filename = './__tests__/styles/a.css',
+      options,
+      debug,
+      config
+    } = src || {})
+  }
+
   const mergeConfig = recursiveMerge({}, defaultConfig, config)
   // console.log('mergeConfig', JSON.stringify(mergeConfig, null, '  '))
   const styleTransform = new StyleTransform(mergeConfig)
@@ -50,21 +63,25 @@ async function run (src, config = {}, filename = './__tests__/styles/a.css', opt
 
 describe('style transform with config options', () => {
   it('config.sass option', async () => {
-    const css = await run(`
-    .test {
-      color: $base-color;
-      height: 10px;
-    }
-  `, {
-      sass: {
-        resource: [
-          '__tests__/styles/variable.scss',
-          '__tests__/styles/b.css'
-        ],
-        projectDirectory: path.resolve(__dirname, '..'),
-        data: '.data { width: 200px }'
-      }
-    }, './__tests__/styles/a.scss')
+    const css = await run({
+      src: `
+        .test {
+          color: $base-color;
+          height: 10px;
+        }
+      `,
+      config: {
+        sass: {
+          resource: [
+            '__tests__/styles/variable.scss',
+            '__tests__/styles/b.css'
+          ],
+          projectDirectory: path.resolve(__dirname, '..'),
+          data: '.data { width: 200px }'
+        }
+      },
+      filename: './__tests__/styles/a.scss'
+    })
     expect(css).toEqual(getWrapedCSS(`{
   "brn": {
     "color": "red"
@@ -80,21 +97,25 @@ describe('style transform with config options', () => {
   })
 
   it('config.sass option without projectDirectory', async () => {
-    const css = await run(`
-    .test {
-      color: $base-color;
-      height: 10px;
-    }
-  `, {
-      sass: {
-        resource: [
-          path.resolve(__dirname, 'styles/variable.scss'),
-          path.resolve(__dirname, 'styles/b.css')
-        ],
-        projectDirectory: path.resolve(__dirname, '..'),
-        data: '.data { width: 200px }'
+    const css = await run({
+      src: `
+        .test {
+          color: $base-color;
+          height: 10px;
+        }
+      `,
+      filename: './__tests__/styles/a.scss',
+      config: {
+        sass: {
+          resource: [
+            path.resolve(__dirname, 'styles/variable.scss'),
+            path.resolve(__dirname, 'styles/b.css')
+          ],
+          projectDirectory: path.resolve(__dirname, '..'),
+          data: '.data { width: 200px }'
+        }
       }
-    }, './__tests__/styles/a.scss')
+    })
     expect(css).toEqual(getWrapedCSS(`{
   "brn": {
     "color": "red"
@@ -111,10 +132,10 @@ describe('style transform with config options', () => {
 
   it('config.postcss disable pxTransform', async () => {
     const css = await run(`
-    .test {
-      height: 10px;
-    }
-  `)
+      .test {
+        height: 10px;
+      }
+    `)
     expect(css).toEqual(getWrapedCSS(`{
   "test": {
     "height": scalePx2dp(5)
@@ -133,11 +154,14 @@ describe('style transform with config options', () => {
         }
       }
     }
-    const css = await run(`
-    .test {
-      height: 10px;
-    }
-  `, config)
+    const css = await run({
+      src: `
+        .test {
+          height: 10px;
+        }
+      `,
+      config
+    })
     expect(css).toEqual(getWrapedCSS(`{
   "test": {
     "height": 5
@@ -145,9 +169,7 @@ describe('style transform with config options', () => {
 }`))
   })
   it('config.alias in css', async () => {
-    const css = await run(`
-    @import '@/b.css';
-  `)
+    const css = await run("@import '@/b.css';")
     expect(css).toEqual(getWrapedCSS(`{
   "brn": {
     "color": "red"
@@ -156,9 +178,10 @@ describe('style transform with config options', () => {
   })
 
   it('config.alias in sass', async () => {
-    const css = await run(`
-    @import '@/b.scss';
-  `, {}, './__tests__/styles/a.scss')
+    const css = await run({
+      src: "@import '@/b.scss';",
+      filename: './__tests__/styles/a.scss'
+    })
     expect(css).toEqual(getWrapedCSS(`{
   "b": {
     "color": "red"
@@ -167,9 +190,10 @@ describe('style transform with config options', () => {
   })
 
   it('config.alias in less', async () => {
-    const css = await run(`
-    @import '@/b.less';
-  `, {}, './__tests__/styles/a.less')
+    const css = await run({
+      src: "@import '@/b.less';",
+      filename: './__tests__/styles/a.less'
+    })
     expect(css).toEqual(getWrapedCSS(`{
   "b": {
     "color": "red"

package/__tests__/index.spec.js

@@ -3,7 +3,18 @@ import StyleTransform, { getWrapedCSS } from '../src/transforms'
 // 初始化
 const styleTransform = new StyleTransform()
 
-async function run (src, filename = './__tests__/styles/a.css', options, debug) {
+async function run (src, filename = './__tests__/styles/a.css', debug) {
+  let options
+
+  if (typeof src === 'object') {
+    ({
+      src,
+      filename = './__tests__/styles/a.css',
+      options,
+      debug
+    } = src || {})
+  }
+
   const css = await styleTransform.transform(src, filename, options)
   if (debug) {
     // eslint-disable-next-line
@@ -48,9 +59,7 @@ describe('style transform', () => {
   })
 
   it('.css import source omit extension', async () => {
-    const css = await run(`
-      @import './b';
-    `, './__tests__/styles/a.css')
+    const css = await run("@import './b';", './__tests__/styles/a.css')
     expect(css).toEqual(getWrapedCSS(`{
   "brn": {
     "color": "red"
@@ -121,9 +130,7 @@ describe('style transform', () => {
   })
 
   it('.sass import source omit extension', async () => {
-    const css = await run(`
-      @import './b';
-    `, './__tests__/styles/a.scss')
+    const css = await run("@import './b';", './__tests__/styles/a.scss')
     expect(css).toEqual(getWrapedCSS(`{
   "b": {
     "color": "red"
@@ -182,9 +189,7 @@ describe('style transform', () => {
   })
 
   it('.less tranform node_modules file import', async () => {
-    const css = await run(`
-      @import 'less/test/browser/css/global-vars/simple.css';
-    `, './__tests__/styles/a.less')
+    const css = await run("@import 'less/test/browser/css/global-vars/simple.css';", './__tests__/styles/a.less')
     expect(css).toEqual(getWrapedCSS(`{
   "test": {
     "color": "red"
@@ -193,9 +198,7 @@ describe('style transform', () => {
   })
 
   it('.less import source omit extension', async () => {
-    const css = await run(`
-      @import './b';
-    `, './__tests__/styles/a.less')
+    const css = await run("@import './b';", './__tests__/styles/a.less')
     expect(css).toEqual(getWrapedCSS(`{
   "b": {
     "color": "red"

package/__tests__/platform.spec.js

@@ -4,6 +4,15 @@ import StyleTransform, { getWrapedCSS } from '../src/transforms'
 const styleTransform = new StyleTransform()
 
 async function run (src, filename = './__tests__/styles/a.css', options, debug) {
+  if (typeof src === 'object') {
+    ({
+      src,
+      filename = './__tests__/styles/a.css',
+      options,
+      debug
+    } = src || {})
+  }
+
   const css = await styleTransform.transform(src, filename, options)
   if (debug) {
     // eslint-disable-next-line
@@ -17,16 +26,16 @@ async function run (src, filename = './__tests__/styles/a.css', options, debug)
 describe('style transform in cross platform', () => {
   it('postcss cross platform conditional compile', async () => {
     const css = await run(`
-    .test {
-      color: red;
-    }
-    /*  #ifdef  rn  */
-    .rn { width: 100px }
-    /*  #endif  */
-    /*  #ifndef  rn  */
-    .h5 { errSet: 100px }
-    /*  #endif  */
-  `)
+      .test {
+        color: red;
+      }
+      /*  #ifdef  rn  */
+      .rn { width: 100px }
+      /*  #endif  */
+      /*  #ifndef  rn  */
+      .h5 { errSet: 100px }
+      /*  #endif  */
+    `)
     expect(css).toEqual(getWrapedCSS(`{
   "test": {
     "color": "red"
@@ -39,16 +48,30 @@ describe('style transform in cross platform', () => {
 
   it('not surport style', async () => {
     const css = await run(`
-    .test {
-      o: 0.5;
-      background: red;
-    }
-  `)
+      .test {
+        o: 0.5;
+        background: red;
+      }
+    `)
     expect(css).toEqual(getWrapedCSS(`{
   "test": {
     "o": 0.5,
     "backgroundColor": "red"
   }
+}`))
+  })
+
+  it('nest sass import cross platform', async () => {
+    const css = await run({
+      src: "@import './c.scss';"
+    })
+    expect(css).toEqual(getWrapedCSS(`{
+  "drn": {
+    "color": "red"
+  },
+  "crn": {
+    "color": "red"
+  }
 }`))
   })
 })

package/__tests__/styles/c.rn.scss

@@ -0,0 +1,5 @@
+@import './d.scss';
+
+.crn {
+  color: red;
+}

package/__tests__/styles/c.scss

@@ -0,0 +1,5 @@
+@import './d.scss';
+
+.c {
+  color: red;
+}

package/__tests__/styles/d.rn.scss

@@ -0,0 +1,3 @@
+.drn {
+  color: red;
+}

package/__tests__/styles/d.scss

@@ -0,0 +1,3 @@
+.d {
+  color: red;
+}

package/dist/transforms/postcss.js

@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makePostcssPlugins = void 0;
+const path_1 = __importDefault(require("path"));
+const resolve_1 = require("resolve");
 const postcss_1 = __importDefault(require("postcss"));
 const postcss_pxtransform_1 = __importDefault(require("postcss-pxtransform"));
 const postcss_import_1 = __importDefault(require("postcss-import"));
@@ -18,6 +20,7 @@ const defaultPxtransformOption = {
     }
 };
 function makePostcssPlugins({ filename, designWidth, deviceRatio, postcssConfig, transformOptions, additionalData }) {
+    const optionsWithDefaults = ['pxtransform', 'postcss-import', 'postcss-reporter', 'stylelint', 'cssModules'];
     if (designWidth) {
         defaultPxtransformOption.config.designWidth = designWidth;
     }
@@ -37,6 +40,23 @@ function makePostcssPlugins({ filename, designWidth, deviceRatio, postcssConfig,
     }
     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 }));
+    Object.entries(postcssConfig).forEach(([pluginName, pluginOption]) => {
+        if (optionsWithDefaults.indexOf(pluginName) > -1)
+            return;
+        if (!pluginOption || !pluginOption.enable)
+            return;
+        if (!helper_1.isNpmPkg(pluginName)) { // local plugin
+            pluginName = path_1.default.join(process.cwd(), pluginName);
+        }
+        try {
+            const pluginPath = resolve_1.sync(pluginName, { basedir: process.cwd() });
+            plugins.push(require(pluginPath)(pluginOption.config || {}));
+        }
+        catch (e) {
+            const msg = e.code === 'MODULE_NOT_FOUND' ? `缺少postcss插件${pluginName}, 已忽略` : e;
+            helper_1.printLog(msg, "warning" /* WARNING */);
+        }
+    });
     return plugins;
 }
 exports.makePostcssPlugins = makePostcssPlugins;

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

package/dist/transforms/sass.js

@@ -5,8 +5,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const sass_1 = __importDefault(require("sass"));
 const utils_1 = require("../utils");
+/**
+ * 用过用户手动安装了 node-sass，启用node-sass，默认使用 sass
+ */
+function getSassImplementation() {
+    let sassImplPkg = 'node-sass';
+    try {
+        require.resolve('node-sass');
+    }
+    catch (error) {
+        try {
+            require.resolve('sass');
+            sassImplPkg = 'sass';
+        }
+        catch (ignoreError) {
+            sassImplPkg = 'sass';
+        }
+    }
+    return require(sassImplPkg);
+}
+const sassImplementation = getSassImplementation();
 function makeURL(resource, rootDir) {
     const url = path_1.default.resolve(rootDir, resource);
     if (!fs_1.default.existsSync(url)) {
@@ -78,7 +97,7 @@ function renderToCSS(src, filename, options, transformOptions) {
     };
     const opts = Object.assign(Object.assign(Object.assign({}, options), defaultOpts), { data: src });
     return new Promise((resolve, reject) => {
-        sass_1.default.render(opts, (err, result) => {
+        sassImplementation.render(opts, (err, result) => {
             if (err) {
                 reject(err);
             }

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/package.json

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

package/src/transforms/postcss.ts

@@ -1,7 +1,9 @@
+import path from 'path'
+import { sync as resolveSync } from 'resolve'
 import postcss, { ProcessOptions } from 'postcss'
 import pxtransform from 'postcss-pxtransform'
 import postcssImport from 'postcss-import'
-import { recursiveMerge } from '@tarojs/helper'
+import { recursiveMerge, isNpmPkg, printLog, processTypeEnum } from '@tarojs/helper'
 import { resolveStyle } from '../utils'
 import reporterSkip from '../utils/reporterSkip'
 import stylelintConfig from '../config/rn-stylelint.json'
@@ -32,6 +34,8 @@ export function makePostcssPlugins ({
   transformOptions,
   additionalData
 }) {
+  const optionsWithDefaults = ['pxtransform', 'postcss-import', 'postcss-reporter', 'stylelint', 'cssModules']
+
   if (designWidth) {
     defaultPxtransformOption.config.designWidth = designWidth
   }
@@ -70,6 +74,23 @@ export function makePostcssPlugins ({
     require('postcss-reporter')({ clearReportedMessages: true })
   )
 
+  Object.entries(postcssConfig).forEach(([pluginName, pluginOption]) => {
+    if (optionsWithDefaults.indexOf(pluginName) > -1) return
+    if (!pluginOption || !(pluginOption as any).enable) return
+
+    if (!isNpmPkg(pluginName)) { // local plugin
+      pluginName = path.join(process.cwd(), pluginName)
+    }
+
+    try {
+      const pluginPath = resolveSync(pluginName, { basedir: process.cwd() })
+      plugins.push(require(pluginPath)((pluginOption as any).config || {}))
+    } catch (e) {
+      const msg = e.code === 'MODULE_NOT_FOUND' ? `缺少postcss插件${pluginName}, 已忽略` : e
+      printLog(msg, processTypeEnum.WARNING)
+    }
+  })
+
   return plugins
 }
 

package/src/transforms/sass.ts

@@ -1,9 +1,31 @@
 import fs from 'fs'
 import path from 'path'
-import sass, { Options } from 'sass'
+import { Options } from 'sass'
 import { insertAfter, insertBefore, resolveStyle, getAdditionalData } from '../utils'
 import { TransformOptions, RenderResult, RenderAdditionalResult } from '../types'
 
+/**
+ * 用过用户手动安装了 node-sass，启用node-sass，默认使用 sass
+ */
+function getSassImplementation () {
+  let sassImplPkg = 'node-sass'
+
+  try {
+    require.resolve('node-sass')
+  } catch (error) {
+    try {
+      require.resolve('sass')
+      sassImplPkg = 'sass'
+    } catch (ignoreError) {
+      sassImplPkg = 'sass'
+    }
+  }
+
+  return require(sassImplPkg)
+}
+
+const sassImplementation = getSassImplementation()
+
 // https://github.com/sass/node-sass#options
 export interface Config {
   sass?: SassGlobalConfig
@@ -99,7 +121,7 @@ function renderToCSS (src, filename, options, transformOptions) {
   const opts = { ...options, ...defaultOpts, data: src }
 
   return new Promise((resolve, reject) => {
-    sass.render(opts, (err, result) => {
+    sassImplementation.render(opts, (err, result) => {
       if (err) {
         reject(err)
       } else {