@mpxjs/webpack-plugin 2.7.52 → 2.8.0-beta.2

package/lib/platform/template/wx/component-config/map.js

@@ -65,11 +65,11 @@ module.exports = function ({ print }) {
         test: /^(tap|markertap|callouttap|controltap|regionchange|)$/,
         ali (eventName) {
           const eventMap = {
-            'tap': 'tap',
-            'markertap': 'markerTap',
-            'callouttap': 'calloutTap',
-            'controltap': 'controlTap',
-            'regionchange': 'regionChange'
+            tap: 'tap',
+            markertap: 'markerTap',
+            callouttap: 'calloutTap',
+            controltap: 'controlTap',
+            regionchange: 'regionChange'
           }
           return eventMap[eventName]
         }

package/lib/platform/template/wx/component-config/navigator.js

@@ -44,7 +44,7 @@ module.exports = function ({ print }) {
             // 如果是个变量，报warning~
             aliPropLog(attr)
           } else {
-            let supportedList = ['navigate', 'redirect', 'switchTab', 'navigateBack', 'reLaunch', 'exit']
+            const supportedList = ['navigate', 'redirect', 'switchTab', 'navigateBack', 'reLaunch', 'exit']
             if (supportedList.indexOf(attr.value) === -1) {
               aliValueLogError(attr)
             }
@@ -58,14 +58,14 @@ module.exports = function ({ print }) {
             // 如果是个变量，报warning~
             ttPropLog(attr)
           } else {
-            let supportedList = ['navigate', 'redirect', 'switchTab', 'navigateBack', 'reLaunch']
+            const supportedList = ['navigate', 'redirect', 'switchTab', 'navigateBack', 'reLaunch']
             if (supportedList.indexOf(attr.value) === -1) {
               ttValueLogError(attr)
             }
           }
         },
         web (attr) {
-          let supportedList = ['navigate', 'redirect', 'navigateBack', 'reLaunch']
+          const supportedList = ['navigate', 'redirect', 'navigateBack', 'reLaunch']
           if (supportedList.indexOf(attr.value) === -1) {
             webValueLogError(attr)
           }
@@ -77,7 +77,7 @@ module.exports = function ({ print }) {
           if (isMustache(attr.value)) {
             qaPropLog(attr)
           } else {
-            let supportedList = ['navigate', 'redirect', 'switchTab', 'navigateBack', 'reLaunch']
+            const supportedList = ['navigate', 'redirect', 'switchTab', 'navigateBack', 'reLaunch']
             if (supportedList.indexOf(attr.value) === -1) {
               qaValueLogError(attr)
             }
@@ -102,9 +102,9 @@ module.exports = function ({ print }) {
         qa: qaEventLog,
         jd (eventName) {
           const eventMap = {
-            'success': 'success',
-            'fail': 'error',
-            'complete': 'complete'
+            success: 'success',
+            fail: 'error',
+            complete: 'complete'
           }
           return eventMap[eventName]
         }

package/lib/platform/template/wx/component-config/progress.js

@@ -30,16 +30,16 @@ module.exports = function ({ print }) {
         test: /^(activeColor|backgroundColor)$/,
         ali (obj) {
           const propsMap = {
-            'activeColor': 'active-color',
-            'backgroundColor': 'background-color'
+            activeColor: 'active-color',
+            backgroundColor: 'background-color'
           }
           obj.name = propsMap[obj.name]
           return obj
         },
         tt (obj) {
           const propsMap = {
-            'activeColor': 'active-color',
-            'backgroundColor': 'background-color'
+            activeColor: 'active-color',
+            backgroundColor: 'background-color'
           }
           obj.name = propsMap[obj.name]
           return obj

package/lib/platform/template/wx/component-config/scroll-view.js

@@ -46,9 +46,9 @@ module.exports = function ({ print }) {
         test: /^(scrolltoupper|scrolltolower|scroll)$/,
         ali (eventName) {
           const eventMap = {
-            'scrolltoupper': 'scrollToUpper',
-            'scrolltolower': 'scrollToLower',
-            'scroll': 'scroll'
+            scrolltoupper: 'scrollToUpper',
+            scrolltolower: 'scrollToLower',
+            scroll: 'scroll'
           }
           return eventMap[eventName]
         }

package/lib/platform/template/wx/component-config/slider.js

@@ -17,10 +17,10 @@ module.exports = function ({ print }) {
         test: /^(color|selected-color|activeColor|backgroundColor|block-size|block-color)$/,
         ali (obj) {
           const propsMap = {
-            'color': 'background-color',
+            color: 'background-color',
             'selected-color': 'active-color',
-            'activeColor': 'active-color',
-            'backgroundColor': 'background-color',
+            activeColor: 'active-color',
+            backgroundColor: 'background-color',
             'block-size': 'handle-size',
             'block-color': 'handle-color'
           }
@@ -32,7 +32,7 @@ module.exports = function ({ print }) {
         test: /^(color|selected-color)$/,
         swan (obj) {
           const propsMap = {
-            'color': 'backgroundColor',
+            color: 'backgroundColor',
             'selected-color': 'activeColor'
           }
           obj.name = propsMap[obj.name]
@@ -43,8 +43,8 @@ module.exports = function ({ print }) {
         test: /^(activeColor|backgroundColor)$/,
         tt (obj) {
           const propsMap = {
-            'activeColor': 'active-color',
-            'backgroundColor': 'background-color'
+            activeColor: 'active-color',
+            backgroundColor: 'background-color'
           }
           obj.name = propsMap[obj.name]
           return obj

package/lib/platform/template/wx/component-config/swiper.js

@@ -52,8 +52,8 @@ module.exports = function ({ print }) {
         test: /^(change|animationfinish)$/,
         ali (eventName) {
           const eventMap = {
-            'change': 'change',
-            'animationfinish': 'animationEnd'
+            change: 'change',
+            animationfinish: 'animationEnd'
           }
           return eventMap[eventName]
         }

package/lib/platform/template/wx/component-config/video.js

@@ -55,10 +55,10 @@ module.exports = function ({ print }) {
         test: /^(timeupdate|fullscreenchange|waiting|loadedmetadata)$/,
         ali (evtName) {
           const eventMap = {
-            'timeupdate': 'timeUpdate',
-            'fullscreenchange': 'fullScreenChange',
-            'waiting': 'loading',
-            'loadedmetadata': 'renderStart'
+            timeupdate: 'timeUpdate',
+            fullscreenchange: 'fullScreenChange',
+            waiting: 'loading',
+            loadedmetadata: 'renderStart'
           }
           return eventMap[evtName]
         }

package/lib/platform/template/wx/component-config/view.js

@@ -46,10 +46,10 @@ module.exports = function ({ print }) {
         //
         ali (eventName) {
           const eventMap = {
-            'transitionend': 'transitionEnd',
-            'animationstart': 'animationStart',
-            'animationiteration': 'animationIteration',
-            'animationend': 'animationEnd'
+            transitionend: 'transitionEnd',
+            animationstart: 'animationStart',
+            animationiteration: 'animationIteration',
+            animationend: 'animationEnd'
           }
           return eventMap[eventName]
         },

package/lib/platform/template/wx/index.js

@@ -147,7 +147,7 @@ module.exports = function getSpec ({ warn, error }) {
                 modelValuePathArr = modelValuePath.split('.')
               }
             }
-            let modelValue = match[1].trim()
+            const modelValue = match[1].trim()
             return [
               {
                 name: ':' + modelProp,
@@ -188,9 +188,9 @@ module.exports = function getSpec ({ warn, error }) {
           if (el.isStyleParsed) {
             return false
           }
-          let styleBinding = []
+          const styleBinding = []
           el.isStyleParsed = true
-          el.attrsList.map((item, index) => {
+          el.attrsList.forEach((item) => {
             const parsed = parseMustache(item.value)
             if (item.name === 'style') {
               if (parsed.hasBinding || parsed.result.indexOf('rpx') > -1) {
@@ -293,11 +293,43 @@ module.exports = function getSpec ({ warn, error }) {
             value
           }
         },
+        swan ({ name, value }, { eventRules }) {
+          const match = this.test.exec(name)
+          const eventName = match[2]
+          runRules(eventRules, eventName, { mode: 'swan' })
+        },
+        qq ({ name, value }, { eventRules }) {
+          const match = this.test.exec(name)
+          const eventName = match[2]
+          runRules(eventRules, eventName, { mode: 'qq' })
+        },
         jd ({ name, value }, { eventRules }) {
           const match = this.test.exec(name)
           const eventName = match[2]
           runRules(eventRules, eventName, { mode: 'jd' })
         },
+        // tt ({ name, value }, { eventRules }) {
+        //   const match = this.test.exec(name)
+        //   const prefix = match[1]
+        //   const eventName = match[2]
+        //   const modifierStr = match[3] || ''
+        //   const rEventName = runRules(eventRules, eventName, { mode: 'tt' })
+        //   return {
+        //     // 字节将所有事件转为小写
+        //     name: prefix + rEventName.toLowerCase() + modifierStr,
+        //     value
+        //   }
+        // },
+        tt ({ name, value }, { eventRules }) {
+          const match = this.test.exec(name)
+          const eventName = match[2]
+          runRules(eventRules, eventName, { mode: 'tt' })
+        },
+        dd ({ name, value }, { eventRules }) {
+          const match = this.test.exec(name)
+          const eventName = match[2]
+          runRules(eventRules, eventName, { mode: 'dd' })
+        },
         web ({ name, value }, { eventRules, el }) {
           const match = this.test.exec(name)
           const prefix = match[1]
@@ -320,7 +352,7 @@ module.exports = function getSpec ({ warn, error }) {
       {
         test: /^aria-(role|label)$/,
         ali () {
-          warn(`Ali environment does not support aria-role|label props!`)
+          warn('Ali environment does not support aria-role|label props!')
         }
       }
     ],
@@ -329,8 +361,8 @@ module.exports = function getSpec ({ warn, error }) {
         {
           ali (prefix) {
             const prefixMap = {
-              'bind': 'on',
-              'catch': 'catch'
+              bind: 'on',
+              catch: 'catch'
             }
             if (!prefixMap[prefix]) {
               error(`Ali environment does not support [${prefix}] event handling!`)
@@ -373,13 +405,13 @@ module.exports = function getSpec ({ warn, error }) {
           test: /^(touchstart|touchmove|touchcancel|touchend|tap|longpress|longtap|transitionend|animationstart|animationiteration|animationend|touchforcechange)$/,
           ali (eventName) {
             const eventMap = {
-              'touchstart': 'touchStart',
-              'touchmove': 'touchMove',
-              'touchend': 'touchEnd',
-              'touchcancel': 'touchCancel',
-              'tap': 'tap',
-              'longtap': 'longTap',
-              'longpress': 'longTap'
+              touchstart: 'touchStart',
+              touchmove: 'touchMove',
+              touchend: 'touchEnd',
+              touchcancel: 'touchCancel',
+              tap: 'tap',
+              longtap: 'longTap',
+              longpress: 'longTap'
             }
             if (eventMap[eventName]) {
               return eventMap[eventName]

package/lib/resolver/PackageEntryPlugin.js

@@ -18,7 +18,7 @@ module.exports = class PackageEntryPlugin {
     const target = resolver.ensureHook(this.target)
     resolver.getHook(this.source).tapAsync('PackageEntryPlugin', (request, resolveContext, callback) => {
       if (request.miniprogram) return callback()
-      let { path: resourcePath, descriptionFileData, descriptionFileRoot } = request
+      const { path: resourcePath, descriptionFileData, descriptionFileRoot } = request
       if (request.miniprogram || !descriptionFileData) return callback()
 
       let { name, miniprogram } = descriptionFileData

package/lib/runtime/components/web/filterTag.js

@@ -1,6 +1,6 @@
 // eslint-disable-next-line
 const attribute = /^\s*([^\s"'<>\/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/ // useless escape
-const ncname = `[a-zA-Z_][\\w\\-\\.]*`
+const ncname = '[a-zA-Z_][\\w\\-\\.]*'
 const qname = `((?:${ncname}\\:)?${ncname})`
 const startTagOpen = new RegExp(`^<${qname}`)
 const startTagClose = /^\s*(\/?)>/
@@ -208,7 +208,7 @@ function parseHTML (html, options) {
 }
 
 export function parse (template) {
-  let nodes = []
+  const nodes = []
   const stack = []
   let root
   function pushChild (currentParent, child) {
@@ -220,7 +220,7 @@ export function parse (template) {
   }
   parseHTML(template, {
     start (tag, attrs, unary) {
-      let element = createASTElement(tag, attrs, currentParent)
+      const element = createASTElement(tag, attrs, currentParent)
       if (!unary && !stack.length) {
         root = element
       }
@@ -232,9 +232,9 @@ export function parse (template) {
       }
       attrs.forEach(attr => {
         if (invalidAttributeRE.test(attr.name)) {
-          console.warn(`Invalid dynamic argument expression: attribute names cannot contain ` +
-            `spaces, quotes, <, >, / or =.`, {
-            start: attr.start + attr.name.indexOf(`[`),
+          console.warn('Invalid dynamic argument expression: attribute names cannot contain ' +
+            'spaces, quotes, <, >, / or =.', {
+            start: attr.start + attr.name.indexOf('['),
             end: attr.start + attr.name.length
           })
         }

package/lib/runtime/components/web/getInnerListeners.js

@@ -1,4 +1,4 @@
-import { isEmptyObject } from './util'
+import { isEmptyObject } from '../../utils'
 const isTouchDevice = document && ('ontouchstart' in document.documentElement)
 
 function processModel (listeners, context) {

package/lib/runtime/components/web/mpx-button.vue

@@ -175,7 +175,6 @@
     display block
     margin-left auto
     margin-right auto
-    margin-bottom 10px
     box-sizing border-box
     font-size 18px
     text-align center

package/lib/runtime/components/web/mpx-icon.vue

@@ -1,6 +1,6 @@
 <script>
   import getInnerListeners from './getInnerListeners'
-  import { processSize } from './util'
+  import { processSize } from '../../utils'
 
   let defaultColor = {
     success: '#09BB07',

package/lib/runtime/components/web/mpx-keep-alive.vue

@@ -1,5 +1,5 @@
 <script>
-  import { inBrowser } from '../../../utils/env'
+  import { isBrowser } from '../../env'
 
   function isDef (v) {
     return v !== undefined && v !== null
@@ -41,7 +41,7 @@
     render: function render () {
       const slot = this.$slots.default
       const vnode = getFirstComponentChild(slot)
-      if (!inBrowser) {
+      if (!isBrowser) {
         return vnode || (slot && slot[0])
       }
       const vnodeKey = getVnodeKey(vnode)

package/lib/runtime/components/web/mpx-picker.vue

@@ -36,7 +36,7 @@
 <script type="text/ecmascript-6">
   import BScroll from '@better-scroll/core'
   import Wheel from '@better-scroll/wheel'
-  import { type } from './util'
+  import { type } from '../../utils'
   import { getCustomEvent } from './getInnerListeners'
 
   const startYear = 1970

package/lib/runtime/components/web/mpx-progress.vue

@@ -1,6 +1,6 @@
 <script>
   import getInnerListeners, { getCustomEvent } from './getInnerListeners'
-  import { processSize } from './util'
+  import { processSize } from '../../utils'
 
   export default {
     name: 'mpx-progress',

package/lib/runtime/components/web/mpx-scroll-view.vue

@@ -1,6 +1,6 @@
 <script>
   import getInnerListeners, { getCustomEvent } from './getInnerListeners'
-  import { processSize } from './util'
+  import { processSize } from '../../utils'
   import BScroll from '@better-scroll/core'
   import PullDown from '@better-scroll/pull-down'
   import ObserveDom from '@better-scroll/observe-dom'

package/lib/runtime/env.js

@@ -0,0 +1 @@
+export const isBrowser = typeof window !== 'undefined'

package/lib/runtime/i18n.wxs

@@ -6,14 +6,18 @@ function genRegExp (str, flags) {
   }
 }
 
-function likeArray (arr) {
+function isArray (arr) {
   if (!__mpx_wxs__) {
     return Array.isArray(arr)
   } else {
-    return arr && arr.constructor === 'Array'
+    return isDef(arr) && arr.constructor === 'Array'
   }
 }
 
+function isString (str) {
+  return typeof str === 'string'
+}
+
 function isObject (obj) {
   return obj !== null && typeof obj === 'object'
 }
@@ -83,7 +87,7 @@ function compile (tokens, values) {
   var compiled = []
   var index = 0
 
-  var mode = likeArray(values)
+  var mode = isArray(values)
     ? 'list'
     : isObject(values)
       ? 'named'
@@ -118,9 +122,7 @@ function compile (tokens, values) {
 }
 
 function interpolate (message, values) {
-  if (!values) {
-    return [message]
-  }
+  values = values || {}
   var tokens = _tokenCaches[message]
   if (!tokens) {
     tokens = parseMessage(message)
@@ -151,7 +153,7 @@ function outPutByPath (context, path) {
     var key
     var item = path[index]
     if (result) {
-      if (likeArray(item)) {
+      if (isArray(item)) {
         // 获取子数组的输出结果作为当前key
         key = outPutByPath(context, item)
       } else if (genRegExp('^__mpx_str_').test(item)) {
@@ -245,50 +247,43 @@ function parsePath (pathStr) {
   return curStack.value
 }
 
-function translate (messages, locale, key, values) {
-  var res = ''
-  if (messages && messages[locale] && key) {
-    var message = getPathValue(messages[locale], key)
-    if (isDef(message)) {
-      res = render(message, values)
-    }
+function translate (messages, locale, fallbackLocale, key, values) {
+  var message = getMessage(messages, locale, fallbackLocale, key)
+  if (isString(message)) {
+    return render(message, values)
   }
-  return res
+  return key
 }
 
 function exist (messages, locale, key) {
-  var res = false
-  if (messages && messages[locale] && key) {
-    var message = getPathValue(messages[locale], key)
-    if (isDef(message)) {
-      res = true
-    }
-  }
-  return res
+  return isDef(resolve(messages, locale, key))
 }
 
-var messages = {}
-var dateTimeFormats = {}
-var numberFormats = {}
-var locale = 'zh-CN'
+function getMessage (messages, locale, fallbackLocale, key) {
+  var locales = [locale, fallbackLocale]
+  for (var i = 0; i < locales.length; i++) {
+    var message = resolve(messages, locales[i], key)
+    if (isDef(message)) return message
+  }
+}
 
-function getLocale () {
-  return __mpx_locale__ || locale
+function resolve (messages, locale, key) {
+  if (messages && messages[locale] && key) {
+    return getPathValue(messages[locale], key)
+  }
 }
 
-function getMessages () {
-  // __mpx_messages__会在编译时通过lib/wxs/i18n-loader注入
-  return __mpx_messages__ || messages
+function getLocale () {
+  return __mpx_locale__ || 'zh-CN'
 }
 
-function getDateTimeFormats () {
-  // __mpx_datetime_formats__会在编译时通过lib/wxs/i18n-loader注入
-  return __mpx_datetime_formats__ || dateTimeFormats
+function getFallbackLocale () {
+  return __mpx_fallback_locale__ || 'zh-CN'
 }
 
-function getNumberFormats () {
-  // __mpx_number_formats__会在编译时通过lib/wxs/i18n-loader注入
-  return __mpx_number_formats__ || numberFormats
+function getMessages (messages) {
+  // __mpx_messages__会在编译时通过lib/wxs/i18n-loader注入
+  return messages || __mpx_messages__ || {}
 }
 
 function fetchChoice (message, choice) {
@@ -307,46 +302,17 @@ function getChoiceIndex (choice, choicesLength) {
 }
 
 module.exports = {
-  t: function (locale, key, values) {
-    return translate(getMessages(), locale, key, values)
-  },
-  tc: function (locale, key, choice, values) {
-    return fetchChoice(translate(getMessages(), locale, key, values), choice)
+  t: function (messages, locale, fallbackLocale, key, values) {
+    return translate(getMessages(messages), locale, fallbackLocale, key, values)
   },
-  te: function (locale, key) {
-    return exist(getMessages(), locale, key)
+  tc: function (messages, locale, fallbackLocale, key, choice, values) {
+    return fetchChoice(translate(getMessages(messages), locale, fallbackLocale, key, values), choice)
   },
-  d: function (locale, value, key) {
-    // if (__mpx_wxs__) {
-    console.log('Datetime localization is not supported!')
-    return value
-    // } else {
-    //   if (!key) {
-    //     return new Intl.DateTimeFormat(locale).format(value)
-    //   }
-    //   var formats = getDateTimeFormats()[locale]
-    //   if (isDef(formats)) {
-    //     var format = formats[key]
-    //     return new Intl.DateTimeFormat(locale, format).format(value)
-    //   }
-    //   return value
-    // }
+  te: function (messages, locale, fallbackLocale, key) {
+    return exist(getMessages(messages), locale, key)
   },
-  n: function (locale, value, key, options) {
-    // if (__mpx_wxs__) {
-    console.log('Number localization is not supported!')
-    return value
-    // } else {
-    //   if (!key) {
-    //     return new Intl.NumberFormat(locale, options).format(value)
-    //   }
-    //   var formats = getNumberFormats()[locale]
-    //   if (isDef(formats)) {
-    //     var format = formats[key]
-    //     return new Intl.NumberFormat(locale, Object.assign({}, format, options)).format(value)
-    //   }
-    //   return value
-    // }
+  tm: function (messages, locale, fallbackLocale, key) {
+    return getMessage(getMessages(messages), locale, fallbackLocale, key)
   }
 }
 
@@ -354,12 +320,9 @@ if (!__mpx_wxs__) {
   if (!global.i18n) {
     global.i18n = {
       locale: getLocale(),
-      version: 0
+      fallbackLocale: getFallbackLocale(),
+      messages: getMessages(),
+      methods: module.exports
     }
-    global.i18nMethods = Object.assign(module.exports, {
-      __getMessages: getMessages,
-      __getDateTimeFormats: getDateTimeFormats,
-      __getNumberFormats: getNumberFormats
-    })
   }
 }

package/lib/runtime/optionProcessor.d.ts

@@ -11,7 +11,3 @@ export default function processOption (...args: any): object
 export function getComponent (...args: any): object
 
 export function getWxsMixin (...args: any): object
-
-
-
-