@mpxjs/webpack-plugin 2.8.61 → 2.8.62

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

@@ -3,7 +3,7 @@ const normalizeTest = require('../normalize-test')
 const changeKey = require('../change-key')
 const normalize = require('../../../utils/normalize')
 const { capitalToHyphen } = require('../../../utils/string')
-const { isOriginTag } = require('../../../utils/dom-tag-config')
+const { isOriginTag, isBuildInTag } = require('../../../utils/dom-tag-config')
 
 const mpxViewPath = normalize.lib('runtime/components/ali/mpx-view.mpx')
 const mpxTextPath = normalize.lib('runtime/components/ali/mpx-text.mpx')
@@ -127,7 +127,7 @@ module.exports = function getSpec ({ warn, error }) {
   }
 
   /**
-   * 将小程序代码中使用的与原生 HTML tag 同名组件进行转化，以解决与原生tag命名冲突问题。
+   * 将小程序代码中使用的与原生 HTML tag 或 内建组件 同名的组件进行转化，以解决与原生tag命名冲突问题。
    * @param {string} type usingComponents
    * @returns input
    */
@@ -136,7 +136,7 @@ module.exports = function getSpec ({ warn, error }) {
       const usingComponents = input[type]
       if (usingComponents) {
         Object.keys(usingComponents).forEach(tag => {
-          if (isOriginTag(tag)) {
+          if (isOriginTag(tag) || isBuildInTag(tag)) {
             usingComponents[`mpx-com-${tag}`] = usingComponents[tag]
             delete usingComponents[tag]
           }

package/lib/platform/template/wx/component-config/fix-html-tag.js

@@ -1,9 +1,9 @@
-const { isOriginTag } = require('../../../../utils/dom-tag-config')
+const { isOriginTag, isBuildInTag } = require('../../../../utils/dom-tag-config')
 
 module.exports = function () {
   return {
     waterfall: true,
-    test: (input) => isOriginTag(input),
+    test: (input) => isOriginTag(input) || isBuildInTag(input),
     // 处理原生tag
     web (tag, data = {}) {
       // @see packages/webpack-plugin/lib/platform/json/wx/index.js webHTMLTagProcesser

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

@@ -97,7 +97,12 @@
         type: Number,
         default: 1000
       },
-      scrollOptions: Object
+      scrollOptions: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      },
     },
     watch: {
       x (newVal) {

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

@@ -30,7 +30,12 @@
         type: [Number, String],
         default: 0
       },
-      scrollOptions: Object,
+      scrollOptions: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      },
       updateRefresh: {
         type: Boolean,
         default: true

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

@@ -42,7 +42,12 @@
       },
       previousMargin: String,
       nextMargin: String,
-      scrollOptions: Object
+      scrollOptions: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      },
     },
     data () {
       return {

package/lib/utils/dom-tag-config.js

@@ -68,6 +68,19 @@ const isNativeMiniTag = makeMap(
   'open-data,native-component,aria-component,page-meta'
 )
 
+/**
+ * 是否为mpx内置组件
+ * collected from packages/webpack-plugin/lib/runtime/components/web/
+ */
+const isBuildInTag = makeMap(
+  'mpx-image,mpx-picker-view,mpx-slider,mpx-textarea,mpx-input,mpx-picker,' +
+  'mpx-swiper-item,mpx-video,mpx-button,mpx-keep-alive,mpx-progress,' +
+  'mpx-swiper,mpx-view,mpx-checkbox-group,mpx-movable-area,mpx-radio-group,' +
+  'mpx-switch,mpx-web-view,mpx-checkbox,mpx-movable-view,mpx-radio,' +
+  'mpx-tab-bar-container,mpx-form,mpx-navigator,mpx-rich-text,mpx-tab-bar,' +
+  'mpx-icon,mpx-picker-view-column,mpx-scroll-view,mpx-text'
+)
+
 const isSpace = makeMap('ensp,emsp,nbsp')
 
 const isContWidth = makeMap('col,colgroup,img,table,td,th,tr')
@@ -92,6 +105,7 @@ module.exports = {
   isVoidTag,
   isNonPhrasingTag,
   isRichTextTag,
+  isBuildInTag,
   isUnaryTag,
   isSpace,
   isContWidth,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.61",
+  "version": "2.8.62",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "f393ffc439f21b24f5f09a65ef99db20b145e19a"
+  "gitHead": "968ecb02c86fcd5e9f8f827645907ea4225266ff"
 }