From b9d10ac0f2c6a3ce48a7f6d87513071556bac7b5 Mon Sep 17 00:00:00 2001
From: Thibaud Av <thibaud.avenier@gmail.com>
Date: Wed, 24 Nov 2021 10:25:32 +0100
Subject: [PATCH] fix(angular): change the resolution order of the
 `tsconfig.json` config

---
 app/angular/src/builders/start-storybook/index.ts      | 6 +++++-
 app/angular/src/server/framework-preset-angular-cli.ts | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/angular/src/builders/start-storybook/index.ts b/app/angular/src/builders/start-storybook/index.ts
index 173828673c22..1a5d89de2d07 100644
--- 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
index f64fc26b769d..74a14765cf42 100644
--- 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}"`);