fix(angular): change the resolution order of the tsconfig.json config

storybookjs · Nov 24, 2021 · 57a96ac · 57a96ac
1 parent d6ba659
commit 57a96ac
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/app/angular/src/builders/build-storybook/index.spec.ts b/app/angular/src/builders/build-storybook/index.spec.ts
@@ -5,6 +5,7 @@ import * as path from 'path';
 
 const buildStandaloneMock = jest.fn();
 jest.doMock('@storybook/angular/standalone', () => buildStandaloneMock);
+jest.doMock('find-up', () => ({ sync: () => './storybook/tsconfig.ts' }));
 
 const cpSpawnMock = {
   spawn: jest.fn(),
@@ -86,7 +87,7 @@ describe('Build Storybook Builder', () => {
       quiet: false,
       outputDir: 'storybook-static',
       mode: 'static',
-      tsConfig: 'src/tsconfig.app.json',
+      tsConfig: './storybook/tsconfig.ts',
     });
   });
 
@@ -153,7 +154,7 @@ describe('Build Storybook Builder', () => {
     expect(output.success).toBeTruthy();
     expect(cpSpawnMock.spawn).toHaveBeenCalledWith('compodoc', [
       '-p',
-      'src/tsconfig.app.json',
+      './storybook/tsconfig.ts',
       '-d',
       '',
       '-e',
@@ -173,7 +174,7 @@ describe('Build Storybook Builder', () => {
       quiet: false,
       outputDir: 'storybook-static',
       mode: 'static',
-      tsConfig: 'src/tsconfig.app.json',
+      tsConfig: './storybook/tsconfig.ts',
     });
   });
 });
diff --git a/app/angular/src/builders/build-storybook/index.ts b/app/angular/src/builders/build-storybook/index.ts
@@ -9,6 +9,7 @@ import { JsonObject } from '@angular-devkit/core';
 import { from, Observable, of, throwError } from 'rxjs';
 import { CLIOptions } from '@storybook/core-common';
 import { catchError, map, mapTo, switchMap } from 'rxjs/operators';
+import { sync as findUpSync } from 'find-up';
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import buildStandalone, { StandaloneOptions } from '@storybook/angular/standalone';
@@ -99,7 +100,10 @@ async function setup(options: StorybookBuilderOptions, context: BuilderContext)
   }
 
   return {
-    tsConfig: options.tsConfig ?? browserOptions.tsConfig ?? undefined,
+    tsConfig:
+      options.tsConfig ??
+      findUpSync('tsconfig.json', { cwd: options.configDir }) ??
+      browserOptions.tsConfig,
   };
 }
 

diff --git a/app/angular/src/builders/start-storybook/index.spec.ts b/app/angular/src/builders/start-storybook/index.spec.ts
@@ -5,6 +5,7 @@ import * as path from 'path';
 
 const buildStandaloneMock = jest.fn();
 jest.doMock('@storybook/angular/standalone', () => buildStandaloneMock);
+jest.doMock('find-up', () => ({ sync: () => './storybook/tsconfig.ts' }));
 
 const cpSpawnMock = {
   spawn: jest.fn(),
@@ -92,7 +93,7 @@ describe('Start Storybook Builder', () => {
       sslCa: undefined,
       sslCert: undefined,
       sslKey: undefined,
-      tsConfig: 'src/tsconfig.app.json',
+      tsConfig: './storybook/tsconfig.ts',
     });
   });
 
@@ -165,7 +166,7 @@ describe('Start Storybook Builder', () => {
     expect(output.success).toBeTruthy();
     expect(cpSpawnMock.spawn).toHaveBeenCalledWith('compodoc', [
       '-p',
-      'src/tsconfig.app.json',
+      './storybook/tsconfig.ts',
       '-d',
       '',
       '-e',
@@ -190,7 +191,7 @@ describe('Start Storybook Builder', () => {
       sslCa: undefined,
       sslCert: undefined,
       sslKey: undefined,
-      tsConfig: 'src/tsconfig.app.json',
+      tsConfig: './storybook/tsconfig.ts',
     });
   });
 });
diff --git a/app/angular/src/builders/start-storybook/index.ts b/app/angular/src/builders/start-storybook/index.ts
@@ -14,6 +14,7 @@ import {
 import { from, Observable, of } from 'rxjs';
 import { CLIOptions } from '@storybook/core-common';
 import { map, switchMap, mapTo } from 'rxjs/operators';
+import { sync as findUpSync } from 'find-up';
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import buildStandalone, { StandaloneOptions } from '@storybook/angular/standalone';
@@ -122,7 +123,10 @@ async function setup(options: StorybookBuilderOptions, context: BuilderContext)
   }
 
   return {
-    tsConfig: options.tsConfig ?? browserOptions.tsConfig ?? undefined,
+    tsConfig:
+      options.tsConfig ??
+      findUpSync('tsconfig.json', { cwd: options.configDir }) ??
+      browserOptions.tsConfig,
   };
 }
 function runInstance(options: StandaloneOptions) {

diff --git a/app/angular/src/server/framework-preset-angular-cli.ts b/app/angular/src/server/framework-preset-angular-cli.ts
@@ -118,8 +118,8 @@ async function getBuilderOptions(
     ...(options.angularBuilderOptions as JsonObject),
     tsConfig:
       options.tsConfig ??
-      browserTargetOptions.tsConfig ??
-      findUpSync('tsconfig.json', { cwd: options.configDir }),
+      findUpSync('tsconfig.json', { cwd: options.configDir }) ??
+      browserTargetOptions.tsConfig,
   };
   logger.info(`=> Using angular project with "tsConfig:${builderOptions.tsConfig}"`);