Fix initialization of Storybook in Angular 16.1

storybookjs · Jul 25, 2023 · 06e3194 · 06e3194
1 parent 65d79c4
commit 06e3194
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/code/lib/cli/src/automigrate/fixes/angular-builders-multiproject.ts b/code/lib/cli/src/automigrate/fixes/angular-builders-multiproject.ts
@@ -19,7 +19,7 @@ export const angularBuildersMultiproject: Fix<AngularBuildersMultiprojectRunOpti
     const frameworkPackageName = getFrameworkPackageName(mainConfig);
 
     if (
-      (await isNxProject(packageManager)) ||
+      (await isNxProject()) ||
       frameworkPackageName !== '@storybook/angular' ||
       !angularVersion ||
       semver.lt(angularVersion, '14.0.0')

diff --git a/code/lib/cli/src/automigrate/fixes/angular-builders.ts b/code/lib/cli/src/automigrate/fixes/angular-builders.ts
@@ -25,7 +25,7 @@ export const angularBuilders: Fix<AngularBuildersRunOptions> = {
     // Skip in case of NX
     if (
       !angularVersion ||
-      (await isNxProject(packageManager)) ||
+      (await isNxProject()) ||
       framewworkPackageName !== '@storybook/angular'
     ) {
       return null;

diff --git a/code/lib/cli/src/detect.ts b/code/lib/cli/src/detect.ts
@@ -212,7 +212,7 @@ export async function detect(
     return ProjectType.UNDETECTED;
   }
 
-  if (await isNxProject(packageManager)) {
+  if (await isNxProject()) {
     return ProjectType.NX;
   }
 

diff --git a/code/lib/cli/src/helpers.ts b/code/lib/cli/src/helpers.ts
@@ -300,7 +300,6 @@ export function getStorybookVersionSpecifier(packageJson: PackageJsonWithDepsAnd
   return allDeps[storybookPackage];
 }
 
-export async function isNxProject(packageManager: JsPackageManager) {
-  const nxVersion = await packageManager.getPackageVersion('nx');
-  return !!nxVersion ?? findUp.sync('nx.json');
+export async function isNxProject() {
+  return findUp.sync('nx.json');
 }
diff --git a/code/lib/cli/src/initiate.ts b/code/lib/cli/src/initiate.ts
@@ -295,6 +295,8 @@ async function doInitiate(
   }
   done();
 
+  console.log({ projectType });
+
   const storybookInstantiated = isStorybookInstantiated();
 
   if (options.force === false && storybookInstantiated && projectType !== ProjectType.ANGULAR) {