fix(loader): 修复 px transform 传入参数 loader 未接受问题

NervJS · Oct 18, 2022 · 793090c · 793090c
1 parent d25bb4a
commit 793090c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 27 deletions.
diff --git a/packages/taro-webpack-runner/src/config/dev.conf.ts b/packages/taro-webpack-runner/src/config/dev.conf.ts
@@ -96,8 +96,7 @@ export default function (appPath: string, config: Partial<BuildConfig>, appConfi
     outputDir,
     routerConfig: router,
     useHtmlComponents,
-    designWidth,
-    deviceRatio
+    pxTransformConfig: pxtransformOption?.config || {}
   })
 
   if (enableExtract) {

diff --git a/packages/taro-webpack-runner/src/config/prod.conf.ts b/packages/taro-webpack-runner/src/config/prod.conf.ts
@@ -98,8 +98,7 @@ export default function (appPath: string, config: Partial<BuildConfig>, appConfi
     outputDir,
     routerConfig: router,
     useHtmlComponents,
-    designWidth,
-    deviceRatio
+    pxTransformConfig: pxtransformOption?.config || {}
   })
 
   if (enableExtract) {

diff --git a/packages/taro-webpack-runner/src/plugins/MainPlugin.ts b/packages/taro-webpack-runner/src/plugins/MainPlugin.ts
@@ -19,8 +19,12 @@ interface IMainPluginOptions {
   framework: FRAMEWORK_MAP
   frameworkExts: string[]
   useHtmlComponents: boolean
-  deviceRatio: any
-  designWidth: number
+  pxTransformConfig: {
+    baseFontSize: number
+    deviceRatio: any
+    designWidth: number
+    minRootSize: number
+  }
   loaderMeta?: Record<string, string>
 }
 
@@ -42,8 +46,12 @@ export default class MainPlugin {
       framework: FRAMEWORK_MAP.NERV,
       frameworkExts: SCRIPT_EXT,
       useHtmlComponents: false,
-      deviceRatio: {},
-      designWidth: 750
+      pxTransformConfig: {
+        baseFontSize: 20,
+        deviceRatio: {},
+        designWidth: 750,
+        minRootSize: 20
+      }
     })
     this.sourceDir = this.options.sourceDir
     this.outputDir = this.options.outputDir
@@ -75,7 +83,7 @@ export default class MainPlugin {
 
     compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
       compilation.hooks.normalModuleLoader.tap(PLUGIN_NAME, (_loaderContext, module: any) => {
-        const { framework, entryFileName, sourceDir, designWidth, deviceRatio, loaderMeta, routerConfig } = this.options
+        const { framework, entryFileName, sourceDir, pxTransformConfig, loaderMeta, routerConfig } = this.options
         const { dir, name } = path.parse(module.resource)
         const suffixRgx = /\.(boot|config)/
         if (!suffixRgx.test(name)) return
@@ -98,10 +106,7 @@ export default class MainPlugin {
               framework,
               loaderMeta,
               pages: this.pagesConfigList,
-              pxTransformConfig: {
-                designWidth,
-                deviceRatio
-              },
+              pxTransformConfig,
               sourceDir,
               useHtmlComponents: this.options.useHtmlComponents
             }

diff --git a/packages/taro-webpack5-runner/src/plugins/H5Plugin.ts b/packages/taro-webpack5-runner/src/plugins/H5Plugin.ts
@@ -17,8 +17,12 @@ interface IH5PluginOptions {
   framework: FRAMEWORK_MAP
   frameworkExts: string[]
   useHtmlComponents: boolean
-  deviceRatio: any
-  designWidth: number
+  pxTransformConfig: {
+    baseFontSize: number
+    deviceRatio: any
+    designWidth: number
+    minRootSize: number
+  }
   prebundle?: boolean
   loaderMeta?: Record<string, string>
 }
@@ -40,8 +44,12 @@ export default class H5Plugin {
       framework: FRAMEWORK_MAP.NERV,
       frameworkExts: SCRIPT_EXT,
       useHtmlComponents: false,
-      deviceRatio: {},
-      designWidth: 750,
+      pxTransformConfig: {
+        baseFontSize: 20,
+        deviceRatio: {},
+        designWidth: 750,
+        minRootSize: 20
+      },
       prebundle: false
     })
   }
@@ -73,7 +81,7 @@ export default class H5Plugin {
 
     compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
       webpack.NormalModule.getCompilationHooks(compilation).loader.tap(PLUGIN_NAME, (_loaderContext: LoaderContext<any>, module: webpack.NormalModule) => {
-        const { framework, entryFileName, appPath, sourceDir, designWidth, deviceRatio, loaderMeta, prebundle, routerConfig } = this.options
+        const { framework, entryFileName, appPath, sourceDir, pxTransformConfig, loaderMeta, prebundle, routerConfig } = this.options
         const { dir, name } = path.parse(module.resource)
         const suffixRgx = /\.(boot|config)/
         if (!suffixRgx.test(name)) return
@@ -103,10 +111,7 @@ export default class H5Plugin {
               framework,
               loaderMeta,
               pages: this.inst.pagesConfigList,
-              pxTransformConfig: {
-                designWidth,
-                deviceRatio
-              },
+              pxTransformConfig,
               sourceDir,
               useHtmlComponents: this.options.useHtmlComponents
             },

diff --git a/packages/taro-webpack5-runner/src/webpack/H5WebpackPlugin.ts b/packages/taro-webpack5-runner/src/webpack/H5WebpackPlugin.ts
@@ -119,10 +119,9 @@ export class H5WebpackPlugin {
     const {
       entryFileName = 'app',
       router = {},
-      useHtmlComponents = false,
-      designWidth = 750,
-      deviceRatio
+      useHtmlComponents = false
     } = config
+    const pxTransformConfig = this.pxtransformOption?.config || {}
     const prebundleOptions = this.combination.getPrebundleOptions()
     const options = {
       appPath,
@@ -133,8 +132,7 @@ export class H5WebpackPlugin {
       entryFileName,
       routerConfig: router,
       useHtmlComponents,
-      designWidth,
-      deviceRatio,
+      pxTransformConfig,
       prebundle: prebundleOptions.enable
     }