From 39378a9c5a176e1d8fec8c32bb2716c04ff88894 Mon Sep 17 00:00:00 2001
From: Ian VanSchooten <ian.vanschooten@gmail.com>
Date: Fri, 15 Jul 2022 08:47:31 -0400
Subject: [PATCH] Merge pull request #18714 from
 storybookjs/fix-commonjs-detection

CLI: Fix detection of type: module when initializing storybook
---
 lib/cli/src/generators/baseGenerator.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/cli/src/generators/baseGenerator.ts b/lib/cli/src/generators/baseGenerator.ts
index 1071db277dc2..bf05e7387493 100644
--- a/lib/cli/src/generators/baseGenerator.ts
+++ b/lib/cli/src/generators/baseGenerator.ts
@@ -12,6 +12,7 @@ export type GeneratorOptions = {
   language: SupportedLanguage;
   builder: Builder;
   linkable: boolean;
+  commonJs: boolean;
 };
 
 export interface FrameworkOptions {
@@ -67,7 +68,7 @@ const hasInteractiveStories = (framework: SupportedFrameworks) =>
 export async function baseGenerator(
   packageManager: JsPackageManager,
   npmOptions: NpmOptions,
-  { language, builder }: GeneratorOptions,
+  { language, builder, commonJs }: GeneratorOptions,
   framework: SupportedFrameworks,
   options: FrameworkOptions = defaultOptions
 ) {
@@ -150,7 +151,7 @@ export async function baseGenerator(
     framework: frameworkPackage,
     addons: [...addons, ...stripVersions(extraAddons)],
     extensions,
-    commonJs: options.commonJs,
+    commonJs,
     ...mainOptions,
   });
   if (addComponents) {