@dcloudio/vue-cli-plugin-hbuilderx 2.0.2-3061520221228001 → 2.0.2-3061720230112001

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-hbuilderx",
-  "version": "2.0.2-3061520221228001",
+  "version": "2.0.2-3061720230112001",
   "description": "HBuilderX plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -18,5 +18,5 @@
     "css": "~2.2.1",
     "escodegen": "^1.8.1"
   },
-  "gitHead": "eb3298bea7b261943e868bff81a9de4dfee91471"
+  "gitHead": "2d4422d48475c99a97a56a71b2eaebc0e3107f9d"
 }

package/packages/weex-styler/index.js

@@ -5,26 +5,6 @@ var util = require('./lib/util')
 var validateItem = require('./lib/validator').validate
 var shorthandParser = require('./lib/shorthand-parser')
 
-// padding & margin shorthand parsing
-function convertLengthShorthand (rule, prop) {
-  for (var i = 0; i < rule.declarations.length; i++) {
-    var declaration = rule.declarations[i]
-    if (declaration.property === prop) {
-      var values = declaration.value.split(/\s+/)
-      // values[0] = values[0] || 0
-      values[1] = values[1] || values[0]
-      values[2] = values[2] || values[0]
-      values[3] = values[3] || values[1]
-      rule.declarations.splice(i, 1)
-      rule.declarations.splice(i, 0, { type: 'declaration', property: prop + '-left', value: values[3], position: declaration.position })
-      rule.declarations.splice(i, 0, { type: 'declaration', property: prop + '-bottom', value: values[2], position: declaration.position })
-      rule.declarations.splice(i, 0, { type: 'declaration', property: prop + '-right', value: values[1], position: declaration.position })
-      rule.declarations.splice(i, 0, { type: 'declaration', property: prop + '-top', value: values[0], position: declaration.position })
-      // break
-    }
-  }
-}
-
 /**
  * mergeStyle
  * @param {*} object 
@@ -85,9 +65,6 @@ function parse (code, done) {
       if (type === 'rule') {
         if (rule.declarations && rule.declarations.length) {
           rule.declarations = shorthandParser(rule.declarations)
-          // padding & margin shorthand parsing
-          convertLengthShorthand(rule, 'padding')
-          convertLengthShorthand(rule, 'margin')
 
           rule.declarations.forEach(function (declaration) {
             var subType = declaration.type

package/packages/weex-styler/lib/shorthand-parser.js

@@ -47,31 +47,37 @@ function transition (declaration) {
   return result
 }
 
-function margin (declaration) {
-  var { value, important } = clearImportant(declaration.value)
-  var position = declaration.position
-  var splitResult = value.split(/\s+/)
-  var result = []
-  switch (splitResult.length) {
-    case 1:
-      splitResult.push(splitResult[0], splitResult[0], splitResult[0])
-      break
-    case 2:
-      splitResult.push(splitResult[0], splitResult[1])
-      break
-    case 3:
-      splitResult.push(splitResult[1])
-      break
+function createParser (property) {
+  return function (declaration) {
+    var { value, important } = clearImportant(declaration.value)
+    var position = declaration.position
+    var splitResult = value.split(/\s+/)
+    var result = []
+    switch (splitResult.length) {
+      case 1:
+        splitResult.push(splitResult[0], splitResult[0], splitResult[0])
+        break
+      case 2:
+        splitResult.push(splitResult[0], splitResult[1])
+        break
+      case 3:
+        splitResult.push(splitResult[1])
+        break
+    }
+    result.push(
+      generateDeclaration(property + '-top', splitResult[0], important, position),
+      generateDeclaration(property + '-right', splitResult[1], important, position),
+      generateDeclaration(property + '-bottom', splitResult[2], important, position),
+      generateDeclaration(property + '-left', splitResult[3], important, position)
+    )
+    return result
   }
-  result.push(
-    generateDeclaration('margin-top', splitResult[0], important, position),
-    generateDeclaration('margin-right', splitResult[1], important, position),
-    generateDeclaration('margin-bottom', splitResult[2], important, position),
-    generateDeclaration('margin-left', splitResult[3], important, position)
-  )
-  return result
 }
 
+var margin = createParser('margin')
+
+var padding = createParser('padding')
+
 function border (declaration) {
   var { value, important } = clearImportant(declaration.value)
   var property = declaration.property
@@ -199,6 +205,7 @@ function background (declaration) {
 var parserCollection = {
   transition,
   margin,
+  padding,
   border,
   'border-top': border,
   'border-right': border,