postcss-pxtransform 3.5.0-beta.1 → 3.5.0-beta.2

package/__tests__/index.test.js

@@ -619,3 +619,24 @@ describe('platform 为 h5，指定平台 h5 平台剔除', () => {
     expect(processed).toBe('/*  #ifndef  h5  *//*  #endif  */ .test{}')
   })
 })
+
+describe('rpx 单位转换', () => {
+  it('{platform: \'weapp\', designWidth: 640} ', () => {
+    const rules = 'h1 {margin: 0 0 20rpx;font-size: 40Px;line-height: 1.2;} .test{}'
+    const options = {
+      platform: 'weapp',
+      designWidth: 640
+    }
+    const processed = postcss(pxtorem(options)).process(rules).css
+    expect(processed).toBe('h1 {margin: 0 0 20rpx;font-size: 40Px;line-height: 1.2;} .test{}')
+  })
+  it('{platform: \'h5\', designWidth: 640} ', () => {
+    const rules = 'h1 {margin: 0 0 20rpx;font-size: 40Px;line-height: 1.2;} .test{}'
+    const options = {
+      platform: 'h5',
+      designWidth: 640
+    }
+    const processed = postcss(pxtorem(options)).process(rules).css
+    expect(processed).toBe('h1 {margin: 0 0 0.5rem;font-size: 40Px;line-height: 1.2;} .test{}')
+  })
+})

package/index.js

@@ -42,15 +42,15 @@ let targetUnit
 module.exports = postcss.plugin('postcss-pxtransform', function (options = {}) {
   options = Object.assign({}, DEFAULT_WEAPP_OPTIONS, options)
 
-  const isFunctionDw = typeof options.designWidth === 'function'
-  const designWidth = input => isFunctionDw
+  const transUnits = ['px']
+  const designWidth = input => typeof options.designWidth === 'function'
     ? options.designWidth(input)
     : options.designWidth
-
   switch (options.platform) {
     case 'h5': {
       options.rootValue = input => baseFontSize * designWidth(input) / 640
       targetUnit = 'rem'
+      transUnits.push('rpx')
       break
     }
     case 'rn': {
@@ -74,6 +74,7 @@ module.exports = postcss.plugin('postcss-pxtransform', function (options = {}) {
 
   const opts = Object.assign({}, defaults, options)
   const onePxTransform = typeof options.onePxTransform === 'undefined' ? true : options.onePxTransform
+  const pxRgx = pxRegex(transUnits)
 
   const satisfyPropList = createPropListMatcher(opts.propList)
 
@@ -157,10 +158,9 @@ module.exports = postcss.plugin('postcss-pxtransform', function (options = {}) {
 
       if (!satisfyPropList(decl.prop)) return
 
-      if (blacklistedSelector(opts.selectorBlackList,
-        decl.parent.selector)) return
+      if (blacklistedSelector(opts.selectorBlackList, decl.parent.selector)) return
 
-      const value = decl.value.replace(pxRegex, pxReplace)
+      const value = decl.value.replace(pxRgx, pxReplace)
 
       // if rem unit already exists, do not add or replace
       if (declarationExists(decl.parent, decl.prop, value)) return
@@ -175,7 +175,7 @@ module.exports = postcss.plugin('postcss-pxtransform', function (options = {}) {
     if (opts.mediaQuery) {
       css.walkAtRules('media', function (rule) {
         if (rule.params.indexOf('px') === -1) return
-        rule.params = rule.params.replace(pxRegex, pxReplace)
+        rule.params = rule.params.replace(pxRgx, pxReplace)
       })
     }
   }

package/lib/pixel-unit-regex.js

@@ -8,4 +8,4 @@
 // Any digit followed by px
 // !singlequotes|!doublequotes|!url()|pixelunit
 
-module.exports = /"[^"]+"|'[^']+'|url\([^\)]+\)|(\d*\.?\d+)px/g
+module.exports = (units = ['px']) => new RegExp(`"[^"]+"|'[^']+'|url\\([^\\)]+\\)|(\\d*\\.?\\d+)(${units.join('|')})`, 'g')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-pxtransform",
-  "version": "3.5.0-beta.1",
+  "version": "3.5.0-beta.2",
   "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位",
   "keywords": [
     "postcss",
@@ -28,5 +28,5 @@
     "testEnvironment": "node"
   },
   "main": "index.js",
-  "gitHead": "ba9d945ccebb86f06edb7f845110526d92dc7b00"
+  "gitHead": "c85adaa45959e6cafc15e6531f4735a7dfa2aab0"
 }