From 49982f6bcbae3884dc8ecc5530c45b13e2e460f2 Mon Sep 17 00:00:00 2001
From: Thibaud Av <thibaud.avenier@gmail.com>
Date: Tue, 11 Jan 2022 22:39:12 +0100
Subject: [PATCH] fix(angular): fix ts build with angular 13.0

---
 app/angular/src/server/angular-cli-webpack-13.x.x.js   | 4 ++--
 app/angular/src/server/framework-preset-angular-cli.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/angular/src/server/angular-cli-webpack-13.x.x.js b/app/angular/src/server/angular-cli-webpack-13.x.x.js
index 0b74d3af9889..c8c87041cf20 100644
--- a/app/angular/src/server/angular-cli-webpack-13.x.x.js
+++ b/app/angular/src/server/angular-cli-webpack-13.x.x.js
@@ -6,7 +6,7 @@ const {
   getCommonConfig,
   getStylesConfig,
   getDevServerConfig,
-  getTypescriptWorkerPlugin,
+  getTypeScriptConfig,
 } = require('@angular-devkit/build-angular/src/webpack/configs');
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 
@@ -45,7 +45,7 @@ exports.getWebpackConfig = async (baseConfig, { builderOptions, builderContext }
     (wco) => [
       getCommonConfig(wco),
       getStylesConfig(wco),
-      getTypescriptWorkerPlugin ? getTypescriptWorkerPlugin(wco) : getDevServerConfig(wco),
+      getTypeScriptConfig ? getTypeScriptConfig(wco) : getDevServerConfig(wco),
     ]
   );
 
diff --git a/app/angular/src/server/framework-preset-angular-cli.ts b/app/angular/src/server/framework-preset-angular-cli.ts
index 714db63557ea..3ed039ccca0f 100644
--- a/app/angular/src/server/framework-preset-angular-cli.ts
+++ b/app/angular/src/server/framework-preset-angular-cli.ts
@@ -47,8 +47,8 @@ export async function webpackFinal(baseConfig: webpack.Configuration, options: P
         return getWebpackConfig13_x_x(_baseConfig, {
           builderOptions: {
             watch: options.configType === 'DEVELOPMENT',
-            ...builderOptions,
             ...legacyDefaultOptions,
+            ...builderOptions,
           },
           builderContext,
         });