fix(core): fix solution tsconfig migration (#3312)

FrozenPandaz · web-flow · commit 7686a39a7c08 · 2020-07-10T16:17:32.000-04:00
diff --git a/packages/workspace/src/migrations/update-10-0-0/solution-tsconfigs.spec.ts b/packages/workspace/src/migrations/update-10-0-0/solution-tsconfigs.spec.ts
@@ -21,6 +21,18 @@ describe('Solution Tsconfigs Migration', () => {
         compilerOptions: {
           module: 'commonjs',
         },
+        files: ['src/index.ts'],
+        include: ['**/*.ts'],
+      })),
+      tree
+    );
+    tree = await callRule(
+      updateJsonInTree('apps/app1/tsconfig.app.json', () => ({
+        extends: './tsconfig.json',
+        compilerOptions: {
+          module: 'esnext',
+          types: [],
+        },
       })),
       tree
     );
@@ -30,6 +42,7 @@ describe('Solution Tsconfigs Migration', () => {
         compilerOptions: {
           module: 'esnext',
         },
+        include: ['**/*.spec.ts'],
       })),
       tree
     );
@@ -62,10 +75,40 @@ describe('Solution Tsconfigs Migration', () => {
       files: [],
       include: [],
       references: [
+        {
+          path: './tsconfig.app.json',
+        },
         {
           path: './tsconfig.spec.json',
         },
       ],
     });
   });
+
+  it('should update tsconfig.app.json', async () => {
+    const result = await runMigration('solution-tsconfigs', {}, tree);
+    const json = readJsonInTree(result, 'apps/app1/tsconfig.app.json');
+    expect(json).toEqual({
+      extends: './tsconfig.json',
+      compilerOptions: {
+        module: 'esnext',
+        types: [],
+      },
+      files: ['src/index.ts'],
+      include: ['**/*.ts'],
+    });
+  });
+
+  it('should update tsconfig.spec.json', async () => {
+    const result = await runMigration('solution-tsconfigs', {}, tree);
+    const json = readJsonInTree(result, 'apps/app1/tsconfig.spec.json');
+    expect(json).toEqual({
+      extends: './tsconfig.json',
+      compilerOptions: {
+        module: 'esnext',
+      },
+      files: ['src/index.ts'],
+      include: ['**/*.spec.ts'],
+    });
+  });
 });
diff --git a/packages/workspace/src/migrations/update-10-0-0/solution-tsconfigs.ts b/packages/workspace/src/migrations/update-10-0-0/solution-tsconfigs.ts
@@ -53,20 +53,20 @@ function visitNotIgnoredFiles(
 }
 
 function moveIncludesToProjectTsconfig(
-  file: string,
+  file: Path,
   extendedTsconfigPath: Path,
   extendedTsconfig: any
 ) {
   return updateJsonInTree(file, (json) => {
     json.files =
       json.files ||
       extendedTsconfig.files?.map((p: string) =>
-        relative(file, join(extendedTsconfigPath, p))
+        relative(dirname(file), join(dirname(extendedTsconfigPath), p))
       );
     json.include =
       json.include ||
       extendedTsconfig.include?.map((p: string) =>
-        relative(file, join(extendedTsconfigPath, p))
+        relative(dirname(file), join(dirname(extendedTsconfigPath), p))
       );
     return json;
   });
@@ -105,6 +105,8 @@ function updateExtend(file: Path): Rule {
   });
 }
 
+const originalExtendedTsconfigMap = new Map<string, any>();
+
 export default function (schema: any): Rule {
   return chain([
     renameRootTsconfig,
@@ -122,7 +124,17 @@ export default function (schema: any): Rule {
         if (extendedTsconfigPath === normalize('tsconfig.json')) {
           return updateExtend(file);
         } else if (basename(json.extends) === 'tsconfig.json') {
-          const extendedTsconfig = readJsonInTree(host, extendedTsconfigPath);
+          let extendedTsconfig = originalExtendedTsconfigMap.get(
+            extendedTsconfigPath
+          );
+
+          if (!extendedTsconfig) {
+            extendedTsconfig = readJsonInTree(host, extendedTsconfigPath);
+            originalExtendedTsconfigMap.set(
+              extendedTsconfigPath,
+              extendedTsconfig
+            );
+          }
           return chain([
             moveIncludesToProjectTsconfig(
               file,
