@dcloudio/vue-cli-plugin-hbuilderx 2.0.1-34720220422002 → 2.0.1-34920220607003

package/build/webpack.nvue.conf.js

@@ -86,7 +86,9 @@ const plugins = [
       UNI_CLOUD_PROVIDER: process.env.UNI_CLOUD_PROVIDER,
       UNICLOUD_DEBUG: process.env.UNICLOUD_DEBUG,
       RUN_BY_HBUILDERX: process.env.RUN_BY_HBUILDERX,
-      UNI_AUTOMATOR_WS_ENDPOINT: JSON.stringify(process.env.UNI_AUTOMATOR_WS_ENDPOINT)
+      UNI_AUTOMATOR_WS_ENDPOINT: JSON.stringify(process.env.UNI_AUTOMATOR_WS_ENDPOINT),
+      UNI_STAT_UNI_CLOUD: process.env.UNI_STAT_UNI_CLOUD || '',
+      UNI_STAT_DEBUG: process.env.UNI_STAT_DEBUG || ''
     }
   }),
   new webpack.BannerPlugin({
@@ -209,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) {
@@ -223,14 +227,34 @@ 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 assetsPath = path.resolve(process.env.UNI_INPUT_DIR, assets)
+    if (fs.existsSync(assetsPath)) {
+      array.push({
+        from: assetsPath,
+        to: assets
+      })
+    }
+    const hybridHtml = modules + module + '/' + hybridDir
+    const hybridHtmlPath = path.resolve(process.env.UNI_INPUT_DIR, hybridHtml)
+    if (fs.existsSync(hybridHtmlPath)) {
+      array.push({
+        from: hybridHtmlPath,
+        to: hybridHtml
+      })
+    }
+  })
+
   if (process.env.UNI_USING_NVUE_COMPILER) {
     array.push({
       from: path.resolve(getTemplatePath(), 'common'),
@@ -390,4 +414,4 @@ module.exports = function () {
       zlib: false
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-hbuilderx",
-  "version": "2.0.1-34720220422002",
+  "version": "2.0.1-34920220607003",
   "description": "HBuilderX plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -18,5 +18,5 @@
     "css": "~2.2.1",
     "escodegen": "^1.8.1"
   },
-  "gitHead": "6577bf36e4d78c84bb8ceedc63bfbd463cb36b4d"
+  "gitHead": "ab4199a51b6a576ce347f419e2b013ec3a60c15a"
 }

package/packages/webpack-uni-nvue-loader/lib/style.js

@@ -8,7 +8,6 @@ module.exports = function (content, map) {
   this.callback(null, 'module.exports = ' + genStyleString(content, this), map)
 }
 const uniI18n = require('@dcloudio/uni-cli-i18n')
-const print = require('../../../util/console')
 
 // @todo:
 // font-relative lengths: em, ex, ch, ic
@@ -60,13 +59,13 @@ function genStyleString (input, loader) {
           msgs.forEach(msg => {
             switch (msg.split(':')[0]) {
               case 'ERROR':
-                print.error(msg)
+                console.error(msg)
                 break
               case 'WARNING' :
-                print.warn(msg)
+                console.warn(msg)
                 break
               default:
-                print.log(msg)
+                console.log(msg)
                 break
             }
           })

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

@@ -16,15 +16,34 @@ function clearImportant (value) {
 }
 
 function transition (declaration) {
-  var CHUNK_REGEXP = /^(\S*)?\s*(\d*\.?\d+(?:ms|s)?)?\s*(\S*)?\s*(\d*\.?\d+(?:ms|s)?)?$/
+  var CHUNK_REGEXP = /^([a-z-_]\S*)(\s+[\d.]+m?s)?(\s+[a-z-_]\S*)?(\s+[\d.]+m?s)?/
   var { value, important } = clearImportant(declaration.value)
-  var match = value.match(CHUNK_REGEXP)
-  var result = []
+  var values = value.replace(/(\d)\s*,\s*/g, '$1#').split(',')
   var position = declaration.position
-  match[1] && result.push(generateDeclaration('transition-property', match[1], important, position))
-  match[2] && result.push(generateDeclaration('transition-duration', match[2], important, position))
-  match[3] && result.push(generateDeclaration('transition-timing-function', match[3], important, position))
-  match[4] && result.push(generateDeclaration('transition-delay', match[4], important, position))
+  var result = []
+  var map = {
+    'transition-property': [],
+    'transition-duration': [],
+    'transition-timing-function': [],
+    'transition-delay': []
+  }
+  if (values.length) {
+    for (var i1 = 0; i1 < values.length; i1++) {
+      var match = values[i1].trim().match(CHUNK_REGEXP)
+      if (!match) {
+        return []
+      }
+      map['transition-property'].push(match[1] || 'all')
+      map['transition-duration'].push((match[2] || '0s').trim())
+      map['transition-timing-function'].push((match[3] || 'ease').trim().replace(/#/g, ', '))
+      map['transition-delay'].push((match[4] || '0s').trim())
+    }
+    for (var key in map) {
+      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

@@ -43,6 +43,66 @@ describe('shorthand-parser', function () {
         position: {}
       }
     ])
+
+    expect(shorthandParser([{
+      type: 'declaration',
+      property: 'transition',
+      value: 'width 2s ease-in-out, height 1s 1s, top cubic-bezier(0.1, 0.7, 1.0, 0.1)',
+      position: {}
+    }])).eql([{
+      type: 'declaration',
+      property: 'transition-property',
+      value: 'width, height, top',
+      position: {}
+    },
+    {
+      type: 'declaration',
+      property: 'transition-duration',
+      value: '2s, 1s, 0s',
+      position: {}
+    },
+    {
+      type: 'declaration',
+      property: 'transition-timing-function',
+      value: 'ease-in-out, ease, cubic-bezier(0.1, 0.7, 1.0, 0.1)',
+      position: {}
+    },
+    {
+      type: 'declaration',
+      property: 'transition-delay',
+      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 () {

package/util/console.js

@@ -1,23 +0,0 @@
-const ZERO_WIDTH_CHAR = {
-  NOTE: '',
-  WARNING: '\u200B',
-  ERROR: '\u200C',
-  backup0: '\u200D',
-  backup1: '\u200E',
-  backup2: '\u200F',
-  backup3: '\uFEFF'
-}
-
-module.exports = {
-  warn (msg) {
-    msg = ZERO_WIDTH_CHAR.WARNING + msg + ZERO_WIDTH_CHAR.WARNING
-    console.warn(msg)
-  },
-  error (msg) {
-    msg = ZERO_WIDTH_CHAR.ERROR + msg + ZERO_WIDTH_CHAR.ERROR
-    console.error(msg)
-  },
-  log (msg) {
-    console.log(msg)
-  }
-}