From baa4475b80881ecec6e6e0cd2de9ffcebbdbef4c Mon Sep 17 00:00:00 2001
From: Victor Savkin <vic.savkin@gmail.com>
Date: Mon, 21 Dec 2020 12:44:11 -0500
Subject: [PATCH] fix(misc): migration sets tsConfigs property for jest
 executor

---
 packages/tao/src/commands/ngcli-adapter.ts | 33 +++++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/packages/tao/src/commands/ngcli-adapter.ts b/packages/tao/src/commands/ngcli-adapter.ts
index 1f6030f58b..1dcd9007c7 100644
--- a/packages/tao/src/commands/ngcli-adapter.ts
+++ b/packages/tao/src/commands/ngcli-adapter.ts
@@ -359,9 +359,9 @@ export class NxScopedHostForMigrations extends NxScopedHost {
           ) {
             return super
               .read('/workspace.json' as any)
-              .pipe(map(processConfig));
+              .pipe(map(processConfigWhenReading));
           } else {
-            return super.read(path).pipe(map(processConfig));
+            return super.read(path).pipe(map(processConfigWhenReading));
           }
         } else {
           return super.read(path);
@@ -407,7 +407,10 @@ export class NxScopedHostForMigrations extends NxScopedHost {
           hasWorkspace &&
           (path == '/angular.json' || path == 'angular.json')
         ) {
-          return super.write('/workspace.json' as any, content);
+          return super.write(
+            '/workspace.json' as any,
+            processConfigWhenWriting(content)
+          );
         } else {
           return super.write(path as any, content);
         }
@@ -420,7 +423,7 @@ export class NxScopedHostForMigrations extends NxScopedHost {
   }
 }
 
-function processConfig(content: ArrayBuffer) {
+function processConfigWhenReading(content: ArrayBuffer) {
   try {
     const json = JSON.parse(Buffer.from(content).toString());
     Object.values(json.projects).forEach((p: any) => {
@@ -442,6 +445,28 @@ function processConfig(content: ArrayBuffer) {
   }
 }
 
+function processConfigWhenWriting(content: ArrayBuffer) {
+  try {
+    const json = JSON.parse(Buffer.from(content).toString());
+    Object.values(json.projects).forEach((p: any) => {
+      try {
+        Object.values(p.architect || p.targets).forEach((e: any) => {
+          if (
+            (e.builder === '@nrwl/jest:jest' ||
+              e.executor === '@nrwl/jest:jest') &&
+            e.options.tsConfig
+          ) {
+            delete e.options.tsConfig;
+          }
+        });
+      } catch (e) {}
+    });
+    return Buffer.from(JSON.stringify(json, null, 2));
+  } catch (e) {
+    return content;
+  }
+}
+
 export async function generate(
   root: string,
   opts: GenerateOptions,