postcss-pxtransform 3.5.7-alpha.9 → 3.5.8

package/index.js

@@ -1,5 +1,7 @@
+'use strict'
+
+const postcss = require('postcss')
 const pxRegex = require('./lib/pixel-unit-regex')
-const PXRegex = require('./lib/pixel-upper-unit-regex')
 const filterPropList = require('./lib/filter-prop-list')
 
 const defaults = {
@@ -35,7 +37,7 @@ const DEFAULT_WEAPP_OPTIONS = {
 
 let targetUnit
 
-module.exports = (options = {}) => {
+module.exports = postcss.plugin('postcss-pxtransform', function (options = {}) {
   options = Object.assign({}, DEFAULT_WEAPP_OPTIONS, options)
 
   const transUnits = ['px']
@@ -60,11 +62,6 @@ module.exports = (options = {}) => {
       targetUnit = 'px'
       break
     }
-    case 'harmony': {
-      options.rootValue = input => 1 / options.deviceRatio[designWidth(input)]
-      targetUnit = 'px'
-      break
-    }
     default: {
       // mini-program
       options.rootValue = input => 1 / options.deviceRatio[designWidth(input)]
@@ -80,20 +77,26 @@ module.exports = (options = {}) => {
 
   const satisfyPropList = createPropListMatcher(opts.propList)
 
-  return {
-    postcssPlugin: 'postcss-pxtransform',
-    Comment (comment) {
-      if (comment.text === 'postcss-pxtransform disable') {
-        return
+  return function (css) {
+    const pxReplace = createPxReplace(opts.rootValue, opts.unitPrecision, opts.minPixelValue, onePxTransform)(css.source.input)
+
+    for (let i = 0; i < css.nodes.length; i++) {
+      if (css.nodes[i].type === 'comment') {
+        if (css.nodes[i].text === 'postcss-pxtransform disable') {
+          return
+        } else {
+          break
+        }
       }
+    }
 
-      // delete code between comment in RN
-      // 有死循环的问题
-      if (options.platform === 'rn') {
+    // delete code between comment in RN
+    if (options.platform === 'rn') {
+      css.walkComments(comment => {
         if (comment.text === 'postcss-pxtransform rn eject enable') {
           let next = comment.next()
           while (next) {
-            if (next.text === 'postcss-pxtransform rn eject disable') {
+            if (next.type === 'comment' && next.text === 'postcss-pxtransform rn eject disable') {
               break
             }
             const temp = next.next()
@@ -101,11 +104,13 @@ module.exports = (options = {}) => {
             next = temp
           }
         }
-      }
+      })
+    }
 
-      /*  #ifdef  %PLATFORM%
-       *  平台特有样式
-       *  #endif  */
+    /*  #ifdef  %PLATFORM%  */
+    // 平台特有样式
+    /*  #endif  */
+    css.walkComments(comment => {
       const wordList = comment.text.split(' ')
       // 指定平台保留
       if (wordList.indexOf('#ifdef') > -1) {
@@ -122,10 +127,13 @@ module.exports = (options = {}) => {
           }
         }
       }
+    })
 
-      /*  #ifdef  %PLATFORM%
-       *  平台特有样式
-       *  #endif  */
+    /*  #ifndef  %PLATFORM%  */
+    // 平台特有样式
+    /*  #endif  */
+    css.walkComments(comment => {
+      const wordList = comment.text.split(' ')
       // 指定平台剔除
       if (wordList.indexOf('#ifndef') > -1) {
         // 指定平台
@@ -141,60 +149,36 @@ module.exports = (options = {}) => {
           }
         }
       }
-    },
+    })
 
-    Declaration (decl) {
-      if (options.platform === 'harmony') {
-        if (decl.value.indexOf('PX') === -1) return
-        const value = decl.value.replace(PXRegex, function (m, _$1, $2) {
-          return m.replace($2, 'vp')
-        })
-        decl.value = value
-      }
-    },
-
-    AtRule (rule) {
-      if (options.platform === 'harmony' && rule.name === 'media') {
-        if (rule.params.indexOf('PX') === -1) return
-        const value = rule.params.replace(PXRegex, function (m, _$1, $2) {
-          return m.replace($2, 'vp')
-        })
-        rule.params = value
-      }
-    },
+    css.walkDecls(function (decl, i) {
+      // This should be the fastest test and will remove most declarations
+      if (decl.value.indexOf('px') === -1) return
 
-    Once (root) {
-      const pxReplace = createPxReplace(opts.rootValue, opts.unitPrecision, opts.minPixelValue, onePxTransform)(root.source.input)
+      if (!satisfyPropList(decl.prop)) return
 
-      root.walkDecls(function (decl, i) {
-        // This should be the fastest test and will remove most declarations
-        if (decl.value.indexOf('px') === -1) return
+      if (blacklistedSelector(opts.selectorBlackList, decl.parent.selector)) return
 
-        if (!satisfyPropList(decl.prop)) return
+      const value = decl.value.replace(pxRgx, pxReplace)
 
-        if (blacklistedSelector(opts.selectorBlackList, decl.parent.selector)) return
+      // if rem unit already exists, do not add or replace
+      if (declarationExists(decl.parent, decl.prop, value)) return
 
-        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
+      if (opts.replace) {
+        decl.value = value
+      } else {
+        decl.parent.insertAfter(i, decl.clone({ value: value }))
+      }
+    })
 
-        if (opts.replace) {
-          decl.value = value
-        } else {
-          decl.parent.insertAfter(i, decl.clone({ value: value }))
-        }
+    if (opts.mediaQuery) {
+      css.walkAtRules('media', function (rule) {
+        if (rule.params.indexOf('px') === -1) return
+        rule.params = rule.params.replace(pxRgx, pxReplace)
       })
-
-      if (opts.mediaQuery) {
-        root.walkAtRules('media', function (rule) {
-          if (rule.params.indexOf('px') === -1) return
-          rule.params = rule.params.replace(pxRgx, pxReplace)
-        })
-      }
     }
   }
-}
+})
 
 function convertLegacyOptions (options) {
   if (typeof options !== 'object') return
@@ -300,5 +284,3 @@ function createPropListMatcher (propList) {
     )
   }
 }
-
-module.exports.postcss = true

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "postcss-pxtransform",
-  "version": "3.5.7-alpha.9",
+  "version": "3.5.8",
   "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位",
-  "main": "index.js",
   "keywords": [
     "postcss",
     "css",
@@ -19,15 +18,13 @@
     "url": "https://github.com/NervJS/taro/issues"
   },
   "homepage": "https://github.com/NervJS/taro#readme",
+  "dependencies": {
+    "postcss": "^6.0.22"
+  },
   "jest": {
     "testEnvironment": "node"
   },
-  "devDependencies": {
-    "postcss": "^8.4.18"
-  },
-  "peerDependencies": {
-    "postcss": "^8.4.18"
-  },
+  "main": "index.js",
   "scripts": {
     "test": "jest"
   }

package/lib/pixel-upper-unit-regex.js

@@ -1,11 +0,0 @@
-/*eslint-disable*/
-
-// excluding regex trick: http://www.rexegg.com/regex-best-trick.html
-
-// Not anything inside double quotes
-// Not anything inside single quotes
-// Not anything inside url()
-// Any digit followed by PX
-// !singlequotes|!doublequotes|!url()|pixelunit
-
-module.exports = /"[^"]+"|'[^']+'|url\([^\)]+\)|(\d*\.?\d+)(PX)/g