@dcloudio/vue-cli-plugin-hbuilderx 2.0.1-alpha-34920220516002 → 2.0.1-alpha-34920220520001

package/build/webpack.nvue.conf.js

@@ -211,9 +211,11 @@ if (process.env.UNI_USING_V3_NATIVE) {
 
 if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
   plugins.push(new WebpackUniMPPlugin())
+  const assetsDir = 'static'
+  const hybridDir = 'hybrid/html'
   const array = [{
-    from: path.resolve(process.env.UNI_INPUT_DIR, 'static'),
-    to: 'static'
+    from: path.resolve(process.env.UNI_INPUT_DIR, assetsDir),
+    to: assetsDir
   }]
   // 自动化测试时，不启用androidPrivacy.json
   if (!process.env.UNI_AUTOMATOR_WS_ENDPOINT) {
@@ -225,14 +227,27 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
       })
     }
   }
-  const hybridHtmlPath = path.resolve(process.env.UNI_INPUT_DIR, 'hybrid/html')
+  const hybridHtmlPath = path.resolve(process.env.UNI_INPUT_DIR, hybridDir)
   if (fs.existsSync(hybridHtmlPath)) {
     array.push({
       from: hybridHtmlPath,
-      to: 'hybrid/html'
+      to: hybridDir
     })
   }
 
+  global.uniModules.forEach(module => {
+    const modules = 'uni_modules/'
+    const assets = modules + module + '/' + assetsDir
+    const hybrid = modules + module + hybridDir
+    array.push({
+      from: path.resolve(process.env.UNI_INPUT_DIR, assets),
+      to: assets
+    }, {
+      from: path.resolve(process.env.UNI_INPUT_DIR, hybrid),
+      to: hybrid
+    })
+  })
+
   if (process.env.UNI_USING_NVUE_COMPILER) {
     array.push({
       from: path.resolve(getTemplatePath(), 'common'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-hbuilderx",
-  "version": "2.0.1-alpha-34920220516002",
+  "version": "2.0.1-alpha-34920220520001",
   "description": "HBuilderX plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -18,5 +18,5 @@
     "css": "~2.2.1",
     "escodegen": "^1.8.1"
   },
-  "gitHead": "535630187a5e30355c60b57489686c2bb8e61e11"
+  "gitHead": "a6779d21ec5926943cd9640dfcaf4158a45684ee"
 }

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

@@ -39,7 +39,9 @@ function transition (declaration) {
       map['transition-delay'].push((match[4] || '0s').trim())
     }
     for (var key in map) {
-      result.push(generateDeclaration(key, map[key].join(', '), important, position))
+      var value = map[key]
+      value = value.find(item => item !== value[0]) ? value.join(', ') : value[0]
+      result.push(generateDeclaration(key, value, important, position))
     }
   }
   return result

package/packages/weex-styler/test/shorthand-parser.spec.js

@@ -73,6 +73,36 @@ describe('shorthand-parser', function () {
       value: '0s, 1s, 0s',
       position: {}
     }])
+
+    expect(shorthandParser([{
+      type: 'declaration',
+      property: 'transition',
+      value: 'width 2s, height 2s',
+      position: {}
+    }])).eql([{
+      type: 'declaration',
+      property: 'transition-property',
+      value: 'width, height',
+      position: {}
+    },
+    {
+      type: 'declaration',
+      property: 'transition-duration',
+      value: '2s',
+      position: {}
+    },
+    {
+      type: 'declaration',
+      property: 'transition-timing-function',
+      value: 'ease',
+      position: {}
+    },
+    {
+      type: 'declaration',
+      property: 'transition-delay',
+      value: '0s',
+      position: {}
+    }])
   })
 
   it('parse margin', function () {