From d5e7af013336bab83d0f70713553ebd7fc59dd8d Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Wed, 6 Apr 2022 21:14:32 +0300
Subject: [PATCH] fix(storybook): optional chain all includes (#9707)

ISSUES CLOSED: #9702
---
 packages/storybook/src/executors/utils.ts                   | 4 ++--
 .../storybook/src/generators/configuration/configuration.ts | 6 +++---
 packages/storybook/src/generators/init/init.ts              | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/storybook/src/executors/utils.ts b/packages/storybook/src/executors/utils.ts
index 5e2aa5d067cf7..eb50961f08fee 100644
--- a/packages/storybook/src/executors/utils.ts
+++ b/packages/storybook/src/executors/utils.ts
@@ -280,7 +280,7 @@ function normalizeTargetString(
   appName: string,
   defaultTarget: string = 'build'
 ) {
-  if (appName.includes(':')) {
+  if (appName?.includes(':')) {
     return appName;
   }
   return `${appName}:${defaultTarget}`;
@@ -308,7 +308,7 @@ export function customProjectBuildConfigIsValid(
   tree: Tree,
   projectBuildConfig: string
 ): boolean {
-  if (projectBuildConfig.includes(':')) {
+  if (projectBuildConfig?.includes(':')) {
     const { project, target } = parseTargetString(projectBuildConfig);
     const projectConfig = readProjectConfiguration(tree, project);
     if (projectConfig?.targets?.[target]) {
diff --git a/packages/storybook/src/generators/configuration/configuration.ts b/packages/storybook/src/generators/configuration/configuration.ts
index bab9bbef0d387..f6eb780b86e18 100644
--- a/packages/storybook/src/generators/configuration/configuration.ts
+++ b/packages/storybook/src/generators/configuration/configuration.ts
@@ -231,8 +231,8 @@ function configureTsProjectConfig(
   }
 
   if (
-    !tsConfigContent.exclude.includes('**/*.stories.ts') &&
-    !tsConfigContent.exclude.includes('**/*.stories.js')
+    !tsConfigContent?.exclude?.includes('**/*.stories.ts') &&
+    !tsConfigContent?.exclude?.includes('**/*.stories.js')
   ) {
     tsConfigContent.exclude = [
       ...(tsConfigContent.exclude || []),
@@ -260,7 +260,7 @@ function configureTsSolutionConfig(
   if (
     !tsConfigContent?.references
       ?.map((reference) => reference.path)
-      .includes('./.storybook/tsconfig.json')
+      ?.includes('./.storybook/tsconfig.json')
   ) {
     tsConfigContent.references = [
       ...(tsConfigContent.references || []),
diff --git a/packages/storybook/src/generators/init/init.ts b/packages/storybook/src/generators/init/init.ts
index e777a8ebf45ba..9c17b9fd903b3 100644
--- a/packages/storybook/src/generators/init/init.ts
+++ b/packages/storybook/src/generators/init/init.ts
@@ -203,7 +203,7 @@ export function addCacheableOperation(tree: Tree) {
   workspace.tasksRunnerOptions.default.options.cacheableOperations =
     workspace.tasksRunnerOptions.default.options.cacheableOperations || [];
   if (
-    !workspace.tasksRunnerOptions.default.options.cacheableOperations.includes(
+    !workspace.tasksRunnerOptions.default.options.cacheableOperations?.includes(
       'build-storybook'
     )
   ) {