@mpxjs/webpack-plugin 2.10.13-beta.2 → 2.10.14-beta.1

package/lib/index.js

@@ -1880,92 +1880,72 @@ try {
       normalModuleFactory.hooks.afterResolve.tap('MpxWebpackPlugin', ({ createData }) => {
         const { queryObj } = parseRequest(createData.request)
         const loaders = createData.loaders
-        const type = queryObj.type
-        const mpxProcessFlag = queryObj.mpx && queryObj.mpx !== MPX_PROCESSED_FLAG
-        const vueProcessFlag = queryObj.vue && queryObj.mpx !== MPX_PROCESSED_FLAG
-        if (mpxProcessFlag || vueProcessFlag) {
+        if (queryObj.mpx && queryObj.mpx !== MPX_PROCESSED_FLAG) {
+          const type = queryObj.type
           const extract = queryObj.extract
-          if (type === 'styles' || type === 'style') {
-            const loaderTypes = {
-              'node_modules/stylus-loader': -1,
-              'node_modules/sass-loader': -1,
-              'node_modules/less-loader': -1,
-              'node_modules/css-loader': -1
-            }
+
+          if (type === 'styles') {
+            let insertBeforeIndex = -1
+            // 单次遍历收集所有索引
             loaders.forEach((loader, index) => {
               const currentLoader = toPosix(loader.loader)
-              for (const key in loaderTypes) {
-                if (currentLoader.includes(key)) {
-                  loaderTypes[key] = index
-                  break
-                }
+              if (currentLoader.includes('node_modules/stylus-loader') || currentLoader.includes('node_modules/sass-loader') || currentLoader.includes('node_modules/less-loader')) {
+                insertBeforeIndex = index
               }
             })
-            const insertStripLoaders = (index) => {
-              if (index !== -1) {
-                loaders.splice(index, 0, { loader: styleStripConditionalPath, options: {id: 0} })
-                loaders.splice(index + 2, 0, { loader: styleStripConditionalPath, options: {id: 1} })
-                return true
-              }
-              return false
-            }
 
-            const priorities = ['node_modules/stylus-loader', 'node_modules/less-loader', 'node_modules/sass-loader', 'node_modules/css-loader']
-            for (const loaderKey of priorities) {
-              if (insertStripLoaders(loaderTypes[loaderKey])) {
-                break
-              }
+            if (insertBeforeIndex !== -1) {
+              loaders.splice(insertBeforeIndex, 0, { loader: styleStripConditionalPath })
             }
+            loaders.push({ loader: styleStripConditionalPath })
           }
 
-          if (mpxProcessFlag) {
-            switch (type) {
-              case 'styles':
-              case 'template': {
-                let insertBeforeIndex = -1
-                const info = typeLoaderProcessInfo[type]
-                loaders.forEach((loader, index) => {
-                  const currentLoader = toPosix(loader.loader)
-                  if (currentLoader.includes(info[0])) {
-                    loader.loader = info[1]
-                    insertBeforeIndex = index
-                  } else if (currentLoader.includes(info[1])) {
-                    insertBeforeIndex = index
-                  }
-                })
-                if (insertBeforeIndex > -1) {
-                  loaders.splice(insertBeforeIndex + 1, 0, {
-                    loader: info[2]
-                  })
+          switch (type) {
+            case 'styles':
+            case 'template': {
+              let insertBeforeIndex = -1
+              const info = typeLoaderProcessInfo[type]
+              loaders.forEach((loader, index) => {
+                const currentLoader = toPosix(loader.loader)
+                if (currentLoader.includes(info[0])) {
+                  loader.loader = info[1]
+                  insertBeforeIndex = index
+                } else if (currentLoader.includes(info[1])) {
+                  insertBeforeIndex = index
                 }
-                break
+              })
+              if (insertBeforeIndex > -1) {
+                loaders.splice(insertBeforeIndex + 1, 0, {
+                  loader: info[2]
+                })
               }
-              case 'json':
-                if (queryObj.isTheme) {
-                  loaders.unshift({
-                    loader: jsonThemeCompilerPath
-                  })
-                } else if (queryObj.isPlugin) {
-                  loaders.unshift({
-                    loader: jsonPluginCompilerPath
-                  })
-                } else {
-                  loaders.unshift({
-                    loader: jsonCompilerPath
-                  })
-                }
-                break
-              case 'wxs':
+              break
+            }
+            case 'json':
+              if (queryObj.isTheme) {
                 loaders.unshift({
-                  loader: wxsLoaderPath
+                  loader: jsonThemeCompilerPath
                 })
-                break
-            }
-            if (extract) {
+              } else if (queryObj.isPlugin) {
+                loaders.unshift({
+                  loader: jsonPluginCompilerPath
+                })
+              } else {
+                loaders.unshift({
+                  loader: jsonCompilerPath
+                })
+              }
+              break
+            case 'wxs':
               loaders.unshift({
-                loader: extractorPath
+                loader: wxsLoaderPath
               })
-            }
+              break
+          }
+          if (extract) {
+            loaders.unshift({
+              loader: extractorPath
+            })
           }
           createData.resource = addQuery(createData.resource, { mpx: MPX_PROCESSED_FLAG }, true)
         }

package/lib/runtime/components/react/dist/mpx-swiper.jsx

@@ -662,7 +662,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
             const moveDistance = e[strAbso] - preAbsolutePos.value;
             const eventData = {
                 translation: moveDistance,
-                transdir: moveDistance !== 0 ? moveDistance : e[strAbso] - moveTranstion.value
+                transdir: moveDistance
             };
             // 1. 支持滑动中超出一半更新索引的能力：只更新索引并不会影响onFinalize依据当前offset计算的索引
             const { half } = computeHalf(eventData);

package/lib/runtime/components/react/dist/mpx-view.jsx

@@ -203,16 +203,13 @@ function backgroundSize(imageProps, preImageInfo, imageSize, layoutInfo) {
         else { // 数值类型      ImageStyle
             // 数值类型设置为 stretch
             imageProps.resizeMode = 'stretch';
-            if (type === 'linear') {
-                const dimensionWidth = calcPercent(width, layoutWidth) || 0;
-                const dimensionHeight = calcPercent(height, layoutHeight) || 0;
-                // ios 上 linear 组件只要重新触发渲染，在渲染过程中 width 或者 height 被设置为 0，即使后面再更新为正常宽高，也会渲染不出来
-                if (dimensionWidth && dimensionHeight) {
-                    dimensions = {
-                        width: dimensionWidth,
-                        height: dimensionHeight
-                    };
-                }
+            if (type === 'linear' && (!layoutWidth || !layoutHeight)) {
+                // ios 上 linear 组件只要重新触发渲染，在渲染过程中外层容器 width 或者 height 被设置为 0，通过设置 % 的方式会渲染不出来，即使后面再更新为正常宽高也渲染不出来
+                // 所以 hack 手动先将 linear 宽高也设置为 0，后面再更新为正确的数值或 %。
+                dimensions = {
+                    width: 0,
+                    height: 0
+                };
             }
             else {
                 dimensions = {

package/lib/runtime/components/react/mpx-swiper.tsx

@@ -755,7 +755,7 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
         const moveDistance = e[strAbso] - preAbsolutePos.value
         const eventData = {
           translation: moveDistance,
-          transdir: moveDistance !== 0 ? moveDistance : e[strAbso] - moveTranstion.value
+          transdir: moveDistance
         }
         // 1. 支持滑动中超出一半更新索引的能力：只更新索引并不会影响onFinalize依据当前offset计算的索引
         const { half } = computeHalf(eventData)

package/lib/runtime/components/react/mpx-view.tsx

@@ -287,16 +287,13 @@ function backgroundSize (imageProps: ImageProps, preImageInfo: PreImageInfo, ima
     } else { // 数值类型      ImageStyle
       // 数值类型设置为 stretch
       imageProps.resizeMode = 'stretch'
-      if (type === 'linear') {
-        const dimensionWidth = calcPercent(width as NumberVal, layoutWidth) || 0
-        const dimensionHeight = calcPercent(height as NumberVal, layoutHeight) || 0
-        // ios 上 linear 组件只要重新触发渲染，在渲染过程中 width 或者 height 被设置为 0，即使后面再更新为正常宽高，也会渲染不出来
-        if (dimensionWidth && dimensionHeight) {
-          dimensions = {
-            width: dimensionWidth,
-            height: dimensionHeight
-          } as { width: NumberVal, height: NumberVal }
-        }
+      if (type === 'linear' && (!layoutWidth || !layoutHeight)) {
+        // ios 上 linear 组件只要重新触发渲染，在渲染过程中外层容器 width 或者 height 被设置为 0，通过设置 % 的方式会渲染不出来，即使后面再更新为正常宽高也渲染不出来
+        // 所以 hack 手动先将 linear 宽高也设置为 0，后面再更新为正确的数值或 %。
+        dimensions = {
+          width: 0,
+          height: 0
+        } as { width: NumberVal, height: NumberVal }
       } else {
         dimensions = {
           width: isPercent(width) ? width : +width,

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

@@ -56,19 +56,7 @@
           if (val !== -1) this.setSelectionRange(undefined, val)
         },
         immediate: true
-      },
-      focus (val) {
-        if (val) {
-          this.$nextTick(() => {
-            this.$refs.input.focus()
-          })
-        } else {
-          this.$nextTick(() => {
-            this.$refs.input.blur()
-          })
-        }
-      },
-      immediate: true
+      }
     },
     render (createElement) {
       const mergeBefore = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.13-beta.2",
+  "version": "2.10.14-beta.1",
   "description": "mpx compile core",
   "keywords": [
     "mpx"