Merge branch 'main' into fix/env

TheKonka · Mar 14, 2024 · b51196c · b51196c
2 parents 61c1ce4 + f080a07
commit b51196c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/packages/taro-components/src/components/movable-area/movable-view.tsx b/packages/taro-components/src/components/movable-area/movable-view.tsx
@@ -21,8 +21,8 @@ export class MovableView {
    * 超过可移动区域后，是否还可以移动
    */
   @Prop() outOfBounds: boolean = false
-  /** 
-   * 是否带有惯性 
+  /**
+   * 是否带有惯性
    */
   @Prop() inertia: boolean = false
   /**
@@ -404,7 +404,10 @@ export class MovableView {
     if (this.disabled || !this.element || this.scaling || !this.touching || touches.length > 1) {
       return
     }
-    e.preventDefault()
+
+    if (this.direction !== "horizontal") {
+      e.preventDefault()
+    }
 
     const touch = touches[0]
 

diff --git a/packages/taro-webpack-runner/src/index.ts b/packages/taro-webpack-runner/src/index.ts
@@ -167,16 +167,18 @@ const buildDev = async (appPath: string, config: BuildConfig, appHelper: AppHelp
       publicPath,
       contentBase: outputPath,
       writeToDisk: config.isBuildNativeComp,
+      proxy,
+    },
+    baseDevServerOption,
+    customDevServerOption,
+    {
       historyApiFallback: {
         rewrites: [{
           from: /./,
           to: publicPath
         }]
-      },
-      proxy,
-    },
-    baseDevServerOption,
-    customDevServerOption
+      }
+    }
   )
 
   if (devServerOptions.proxy?.length < 1) {

diff --git a/packages/taro-webpack5-runner/src/index.h5.ts b/packages/taro-webpack5-runner/src/index.h5.ts
@@ -261,14 +261,16 @@ async function getDevServerOptions (appPath: string, config: H5BuildConfig): Pro
             const pathname = chunkFilename.replace('[name]', path.basename(context.parsedUrl.pathname).replace(/\.[^.]*.hot-update\.(js|json)/, ''))
             return (['', 'auto'].includes(publicPath) ? '' : publicPath) + pathname
           }
-        }, {
-          from: /./,
-          to: publicPath
         }]
       },
       proxy
     },
-    customDevServerOption
+    customDevServerOption,
+    {
+      historyApiFallback: {
+        rewrites: [{ from: /./, to: publicPath }]
+      }
+    }
   )
 
   const originalPort = Number(devServerOptions.port)