fix(webpack5-runner): 修复使用 sentry-webpack-plugin 时报错，fix NervJS#13988 (…

…NervJS#14111)
PengBoUESTC · Jul 5, 2023 · 09ac60c · 09ac60c
1 parent 856ce32
commit 09ac60c
Showing 1 changed file with 33 additions and 9 deletions.
diff --git a/packages/taro-webpack5-runner/src/plugins/MiniPlugin.ts b/packages/taro-webpack5-runner/src/plugins/MiniPlugin.ts
@@ -288,7 +288,7 @@ export default class TaroMiniPlugin {
         }
       })
 
-      const { PROCESS_ASSETS_STAGE_ADDITIONAL } = compiler.webpack.Compilation
+      const { PROCESS_ASSETS_STAGE_ADDITIONAL, PROCESS_ASSETS_STAGE_OPTIMIZE } = compiler.webpack.Compilation
       compilation.hooks.processAssets.tapAsync(
         {
           name: PLUGIN_NAME,
@@ -298,6 +298,17 @@ export default class TaroMiniPlugin {
           await this.generateMiniFiles(compilation, compiler)
         })
       )
+      compilation.hooks.processAssets.tapAsync(
+        {
+          name: PLUGIN_NAME,
+          // 删除 assets 的相关操作放在触发时机较后的 Stage，避免过早删除出现的一些问题，#13988
+          // Stage 触发顺序：https://webpack.js.org/api/compilation-hooks/#list-of-asset-processing-stages
+          stage: PROCESS_ASSETS_STAGE_OPTIMIZE
+        },
+        this.tryAsync<any>(async () => {
+          await this.optimizeMiniFiles(compilation, compiler)
+        })
+      )
     })
 
     compiler.hooks.afterEmit.tapAsync(
@@ -889,17 +900,10 @@ export default class TaroMiniPlugin {
      */
     compilation.getAssets().forEach(({ name: assetPath }) => {
       const styleExt = this.options.fileType.style
-      const templExt = this.options.fileType.templ
-      if (new RegExp(`(\\${styleExt}|\\${templExt})\\.js(\\.map){0,1}$`).test(assetPath)) {
-        delete compilation.assets[assetPath]
-      } else if (new RegExp(`${styleExt}${styleExt}$`).test(assetPath)) {
+      if (new RegExp(`${styleExt}${styleExt}$`).test(assetPath)) {
         const assetObj = compilation.assets[assetPath]
         const newAssetPath = assetPath.replace(styleExt, '')
         compilation.assets[newAssetPath] = assetObj
-        delete compilation.assets[assetPath]
-      }
-      if (!isUsingCustomWrapper && assetPath === 'custom-wrapper.js') {
-        delete compilation.assets[assetPath]
       }
     })
 
@@ -1030,6 +1034,26 @@ export default class TaroMiniPlugin {
     }
   }
 
+  async optimizeMiniFiles (compilation: Compilation, _compiler: Compiler) {
+    const isUsingCustomWrapper = componentConfig.thirdPartyComponents.has('custom-wrapper')
+
+    /**
+     * 与原生小程序混写时解析模板与样式
+     */
+    compilation.getAssets().forEach(({ name: assetPath }) => {
+      const styleExt = this.options.fileType.style
+      const templExt = this.options.fileType.templ
+      if (new RegExp(`(\\${styleExt}|\\${templExt})\\.js(\\.map){0,1}$`).test(assetPath)) {
+        delete compilation.assets[assetPath]
+      } else if (new RegExp(`${styleExt}${styleExt}$`).test(assetPath)) {
+        delete compilation.assets[assetPath]
+      }
+      if (!isUsingCustomWrapper && assetPath === 'custom-wrapper.js') {
+        delete compilation.assets[assetPath]
+      }
+    })
+  }
+
   generateConfigFile (compilation: Compilation, compiler: Compiler, filePath: string, config: Config & { component?: boolean }) {
     const { RawSource } = compiler.webpack.sources
     const fileConfigName = this.getConfigPath(this.getComponentName(filePath))