fix: remove mpx url-loader config in build web mode (mpx-ecology#14)

* style: mpx-mp index code style
mater1996 · Mar 24, 2022 · c7a62b2 · c7a62b2
1 parent f53e3cd
commit c7a62b2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/packages/vue-cli-plugin-mpx-mp/index.js b/packages/vue-cli-plugin-mpx-mp/index.js
@@ -10,6 +10,27 @@ module.exports = function (api, options) {
     const wxmlLoader = MpxWebpackPlugin.wxmlLoader()
     const wxssLoader = MpxWebpackPlugin.wxssLoader()
 
+    let imgLoaderConfig = {
+      name: 'img/[name][hash].[ext]'
+    }
+    if (
+      options &&
+      options.pluginOptions &&
+      options.pluginOptions.mpx &&
+      options.pluginOptions.mpx.urlLoader
+    ) {
+      imgLoaderConfig = options.pluginOptions.mpx.urlLoader
+    }
+    const mpxUrlLoader = MpxWebpackPlugin.urlLoader(imgLoaderConfig)
+
+    webpackConfig.module.rules.delete('images')
+    webpackConfig.module
+      .rule('images')
+      .test(/\.(png|jpe?g|gif|svg)$/)
+      .use('mpx-url-loader')
+      .loader(mpxUrlLoader.loader)
+      .options(mpxUrlLoader.options)
+
     webpackConfig.module
       .rule('mpx')
       .test(/\.mpx$/)

diff --git a/packages/vue-cli-plugin-mpx/config/base.js b/packages/vue-cli-plugin-mpx/config/base.js
@@ -14,26 +14,6 @@ module.exports = function (api, options, webpackConfig) {
     .use('mpx-wxs-pre-loader')
     .loader(MpxWebpackPlugin.wxsPreLoader().loader)
 
-  webpackConfig.module.rules.delete('images')
-  let imgLoaderConfig = {
-    name: 'img/[name][hash].[ext]'
-  }
-  if (
-    options &&
-    options.pluginOptions &&
-    options.pluginOptions.mpx &&
-    options.pluginOptions.mpx.urlLoader
-  ) {
-    imgLoaderConfig = options.pluginOptions.mpx.urlLoader
-  }
-  const mpxUrlLoader = MpxWebpackPlugin.urlLoader(imgLoaderConfig)
-  webpackConfig.module
-    .rule('images')
-    .test(/\.(png|jpe?g|gif|svg)$/)
-    .use('mpx-url-loader')
-    .loader(mpxUrlLoader.loader)
-    .options(mpxUrlLoader.options)
-
   const transpileDepRegex = genTranspileDepRegex(options.transpileDependencies || [])
   webpackConfig.module
     .rule('js')