@nx/storybook 20.4.0-beta.0 → 20.4.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "20.4.0-beta.0",
+  "version": "20.4.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Storybook contains executors and generators for allowing your workspace to use the powerful Storybook integration testing & documenting capabilities.",
   "repository": {
@@ -33,13 +33,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "20.4.0-beta.0",
+    "@nx/devkit": "20.4.0-beta.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
-    "@nx/cypress": "20.4.0-beta.0",
-    "@nx/js": "20.4.0-beta.0",
-    "@nx/eslint": "20.4.0-beta.0"
+    "@nx/cypress": "20.4.0-beta.2",
+    "@nx/js": "20.4.0-beta.2",
+    "@nx/eslint": "20.4.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/configuration/configuration.js

@@ -12,6 +12,7 @@ const versions_1 = require("../../utils/versions");
 const interaction_testing_utils_1 = require("./lib/interaction-testing.utils");
 const ensure_dependencies_1 = require("./lib/ensure-dependencies");
 const edit_root_tsconfig_1 = require("./lib/edit-root-tsconfig");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function configurationGenerator(tree, schema) {
     return configurationGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
@@ -62,7 +63,8 @@ async function configurationGeneratorInternal(tree, rawSchema) {
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
         ? p === '@nx/storybook/plugin'
         : p.plugin === '@nx/storybook/plugin');
-    const mainDir = !!nextConfigFilePath && projectType === 'application'
+    const mainDir = !!nextConfigFilePath &&
+        (0, ts_solution_setup_1.getProjectType)(tree, root, projectType) === 'application'
         ? 'components'
         : 'src';
     const usesVite = !!viteConfigFilePath || schema.uiFramework?.endsWith('-vite');

package/src/generators/configuration/lib/util-functions.js

@@ -399,7 +399,8 @@ function addStorybookToTargetDefaults(tree, setCache = true) {
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function createProjectStorybookDir(tree, projectName, uiFramework, js, tsConfiguration, root, projectType, projectIsRootProjectInStandaloneWorkspace, interactionTests, mainDir, isNextJs, usesSwc, usesVite, viteConfigFilePath, hasPlugin, viteConfigFileName, usesReactNative) {
-    let projectDirectory = projectType === 'application'
+    let projectDirectory = (0, ts_solution_setup_1.getProjectType)(tree, root, projectType) ===
+        'application'
         ? isNextJs
             ? 'components'
             : 'src/app'
@@ -424,7 +425,9 @@ function createProjectStorybookDir(tree, projectName, uiFramework, js, tsConfigu
         projectType,
         interactionTests,
         mainDir,
-        isNextJs: isNextJs && projectType === 'application',
+        isNextJs: isNextJs &&
+            (0, ts_solution_setup_1.getProjectType)(tree, root, projectType) ===
+                'application',
         usesSwc,
         usesVite,
         isRootProject: projectIsRootProjectInStandaloneWorkspace,
@@ -450,7 +453,7 @@ function getTsConfigPath(tree, projectName, path) {
     const { root, projectType } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     return (0, path_1.join)(root, path?.length > 0
         ? path
-        : projectType === 'application'
+        : (0, ts_solution_setup_1.getProjectType)(tree, root, projectType) === 'application'
             ? 'tsconfig.app.json'
             : 'tsconfig.lib.json');
 }