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

package/lib/runtime/optionProcessor.js

@@ -1,4 +1,5 @@
-import { inBrowser } from '../utils/env'
+import { isBrowser } from './env'
+import { hasOwn } from './utils'
 
 export default function processOption (
   option,
@@ -13,13 +14,12 @@ export default function processOption (
   genericsInfo,
   mixin,
   Vue,
-  VueRouter,
-  i18n
+  VueRouter
 ) {
   if (ctorType === 'app') {
     // 对于app中的组件需要全局注册
     for (const componentName in componentsMap) {
-      if (componentsMap.hasOwnProperty(componentName)) {
+      if (hasOwn(componentsMap, componentName)) {
         const component = componentsMap[componentName]
         Vue.component(componentName, component)
       }
@@ -50,11 +50,12 @@ export default function processOption (
           }
           animates.forEach((itemAnimation) => {
             switch (itemAnimation.type) {
-              case 'style':
+              case 'style': {
                 const [key, value] = itemAnimation.args
                 dynamicStyle[key] = value
                 property.push(key)
                 break
+              }
               default:
                 dynamicStyle.transform += `${itemAnimation.type}(${itemAnimation.args}) `
                 if (!property.includes('transform')) {
@@ -99,7 +100,7 @@ export default function processOption (
         if (typeof cssText === 'string') {
           cssText.split(listDelimiter).forEach((item) => {
             if (item) {
-              var tmp = item.split(propertyDelimiter)
+              const tmp = item.split(propertyDelimiter)
               tmp.length > 1 && (parsedStyleObj[tmp[0].trim()] = tmp[1].trim())
             }
           })
@@ -122,7 +123,7 @@ export default function processOption (
       if (style) {
         style.forEach(item => {
           parseStyleText(item)
-          for (let key in parsedStyleObj) {
+          for (const key in parsedStyleObj) {
             parsedStyleObj[key] = transRpxStyleFn(parsedStyleObj[key])
           }
         })
@@ -133,7 +134,7 @@ export default function processOption (
     const routes = []
 
     for (const pagePath in pagesMap) {
-      if (pagesMap.hasOwnProperty(pagePath)) {
+      if (hasOwn(pagesMap, pagePath)) {
         const page = pagesMap[pagePath]
         routes.push({
           path: '/' + pagePath,
@@ -276,7 +277,7 @@ export default function processOption (
         next()
       })
       // 处理visibilitychange时触发当前活跃页面组件的onshow/onhide
-      if (inBrowser) {
+      if (isBrowser) {
         const errorHandler = function (args, fromVue) {
           if (global.__mpxAppCbs && global.__mpxAppCbs.error && global.__mpxAppCbs.error.length) {
             global.__mpxAppCbs.error.forEach((cb) => {
@@ -313,7 +314,7 @@ export default function processOption (
               if (global.__mpxAppCbs && global.__mpxAppCbs.show) {
                 global.__mpxAppCbs.show.forEach((cb) => {
                   // todo 实现app.onShow参数
-                  /* eslint-disable standard/no-callback-literal */
+                  /* eslint-disable node/no-callback-literal */
                   cb({})
                 })
               }
@@ -329,13 +330,14 @@ export default function processOption (
       }
     }
 
-    if (i18n) {
-      option.i18n = i18n
+    // 注入pinia
+    if (global.__mpxPinia) {
+      option.pinia = global.__mpxPinia
     }
   } else {
     // 局部注册页面和组件中依赖的组件
     for (const componentName in componentsMap) {
-      if (componentsMap.hasOwnProperty(componentName)) {
+      if (hasOwn(componentsMap, componentName)) {
         const component = componentsMap[componentName]
         if (!option.components) {
           option.components = {}

package/lib/runtime/stringify.wxs

@@ -81,7 +81,7 @@ function isObject (obj) {
   return obj !== null && typeof obj === 'object'
 }
 
-function likeArray (arr) {
+function isArray (arr) {
   if (!__mpx_wxs__) {
     return Array.isArray(arr)
   } else {
@@ -95,7 +95,7 @@ function isDef (v) {
 
 function stringifyDynamicClass (value) {
   if (!value) return ''
-  if (likeArray(value)) {
+  if (isArray(value)) {
     return stringifyArray(value)
   }
   if (isObject(value)) {
@@ -195,7 +195,7 @@ function mergeObjectArray (arr) {
 
 function normalizeDynamicStyle (value) {
   if (!value) return {}
-  if (likeArray(value)) {
+  if (isArray(value)) {
     return mergeObjectArray(value)
   }
   if (typeof value === 'string') {

package/lib/runtime/swanHelper.wxs

@@ -1,4 +1,4 @@
-function likeArray (arr) {
+function isArray (arr) {
   if (!__mpx_wxs__) {
     return Array.isArray(arr)
   } else {
@@ -12,7 +12,7 @@ function isObject (obj) {
 
 module.exports = {
   processFor: function (value) {
-    if (likeArray(value) || isObject(value)) {
+    if (isArray(value) || isObject(value)) {
       return value
     }
     if (typeof value === 'number') {

package/lib/runtime/{components/web/util.js → utils.js}

@@ -1,7 +1,3 @@
-/**
- @file web运行时组件抹平中需要用到的一些工具方法
- */
-
 /**
  * 处理字符串类型的宽高数值，兼容rpx
  * @param {object | number} size 宽高
@@ -37,8 +33,15 @@ export function isEmptyObject (obj) {
   if (!obj) {
     return true
   }
-  for (let key in obj) {
+  /* eslint-disable no-unreachable-loop */
+  for (const key in obj) {
     return false
   }
   return true
 }
+
+const hasOwnProperty = Object.prototype.hasOwnProperty
+
+export function hasOwn (obj, key) {
+  return hasOwnProperty.call(obj, key)
+}