fix: merge error

alibaba · Dec 25, 2023 · 645d42a · 645d42a
1 parent 63c87a3
commit 645d42a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/packages/ice/src/webpack/ServerCompilerPlugin.ts b/packages/ice/src/webpack/ServerCompilerPlugin.ts
@@ -39,12 +39,13 @@ export default class ServerCompilerPlugin {
       await this.ensureRoutesConfig();
       if (compilation) {
         // Option of compilationInfo need to be object, while it may changed during multi-time compilation.
+        this.compilerOptions.compilationInfo.assetsManifest =
+          JSON.parse(compilation.getAsset('assets-manifest.json').source.source().toString());
         if (compilation.getAsset('react-client-manifest.json')) {
           // @ts-ignore
           this.compilerOptions.compilationInfo.rscManifest =
             JSON.parse(compilation.getAsset('react-client-manifest.json').source.source().toString());
         }
-        JSON.parse(compilation.getAsset('assets-manifest.json').source.source().toString());
       }
       // For first time, we create a new task.
       // The next time, we use incremental build so do not create task again.