@nx/storybook 23.0.0-rc.2 → 23.0.0-rc.4

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

@@ -26,8 +26,7 @@ const path_1 = require("path");
 const utilities_1 = require("../../../utils/utilities");
 const versions_1 = require("../../../utils/versions");
 const internal_1 = require("@nx/eslint/internal");
-const internal_2 = require("@nx/devkit/internal");
-const internal_3 = require("@nx/js/internal");
+const internal_2 = require("@nx/js/internal");
 const DEFAULT_PORT = 4400;
 function addStorybookTarget(tree, projectName, uiFramework, interactionTests) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
@@ -126,7 +125,7 @@ async function addStaticTarget(tree, opts) {
 function createStorybookTsconfigFile(tree, projectRoot, uiFramework, isRootProject, mainDir) {
     const storybookMajorVersion = (0, utilities_1.storybookMajorVersion)(tree);
     const offset = (0, devkit_1.offsetFromRoot)(projectRoot);
-    const useTsSolution = (0, internal_3.isUsingTsSolutionSetup)(tree);
+    const useTsSolution = (0, internal_2.isUsingTsSolutionSetup)(tree);
     // First let's check if old configuration file exists
     // If it exists, let's rename it and move it to the new location
     const oldStorybookTsConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, '.storybook/tsconfig.json');
@@ -175,7 +174,7 @@ function createStorybookTsconfigFile(tree, projectRoot, uiFramework, isRootProje
         ],
     };
     if (useTsSolution) {
-        const runtimeConfig = (0, internal_3.findRuntimeTsConfigName)(projectRoot, tree);
+        const runtimeConfig = (0, internal_2.findRuntimeTsConfigName)(projectRoot, tree);
         if (runtimeConfig) {
             storybookTsConfig.references ??= [];
             storybookTsConfig.references.push({
@@ -372,38 +371,34 @@ function addStorybookToNamedInputs(tree) {
     }
 }
 function addStorybookToTargetDefaults(tree, setCache = true) {
-    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
-    const existing = (0, internal_2.normalizeTargetDefaults)(nxJson.targetDefaults).find((e) => e.target === 'build-storybook' &&
-        e.executor === undefined &&
-        e.projects === undefined &&
-        e.plugin === undefined);
-    const inputs = existing?.inputs
-        ? [...existing.inputs]
-        : [
-            'default',
-            nxJson.namedInputs && 'production' in nxJson.namedInputs
-                ? '^production'
-                : '^default',
-        ];
-    if (!inputs.includes('{projectRoot}/.storybook/**/*')) {
-        inputs.push('{projectRoot}/.storybook/**/*');
-    }
-    // Drop the negation glob so Storybook rebuilds when .storybook changes.
-    const negatedIndex = inputs.indexOf('!{projectRoot}/.storybook/**/*');
-    if (negatedIndex !== -1)
-        inputs.splice(negatedIndex, 1);
-    if (!inputs.includes('{projectRoot}/tsconfig.storybook.json')) {
-        inputs.push('{projectRoot}/tsconfig.storybook.json');
-    }
-    (0, internal_2.upsertTargetDefault)(tree, nxJson, {
-        target: 'build-storybook',
-        ...(setCache && existing?.cache === undefined ? { cache: true } : {}),
-        inputs,
-    });
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults['build-storybook'] ??= {};
+    if (setCache) {
+        nxJson.targetDefaults['build-storybook'].cache ??= true;
+    }
+    nxJson.targetDefaults['build-storybook'].inputs ??= [
+        'default',
+        nxJson.namedInputs && 'production' in nxJson.namedInputs
+            ? '^production'
+            : '^default',
+    ];
+    if (!nxJson.targetDefaults['build-storybook'].inputs.includes('{projectRoot}/.storybook/**/*')) {
+        nxJson.targetDefaults['build-storybook'].inputs.push('{projectRoot}/.storybook/**/*');
+    }
+    // Delete the !{projectRoot}/.storybook/**/* glob from build-storybook
+    // because we want to rebuild Storybook if the .storybook folder changes
+    const index = nxJson.targetDefaults['build-storybook'].inputs.indexOf('!{projectRoot}/.storybook/**/*');
+    if (index !== -1) {
+        nxJson.targetDefaults['build-storybook'].inputs.splice(index, 1);
+    }
+    if (!nxJson.targetDefaults['build-storybook'].inputs.includes('{projectRoot}/tsconfig.storybook.json')) {
+        nxJson.targetDefaults['build-storybook'].inputs.push('{projectRoot}/tsconfig.storybook.json');
+    }
     (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 = (0, internal_3.getProjectType)(tree, root, projectType) ===
+    let projectDirectory = (0, internal_2.getProjectType)(tree, root, projectType) ===
         'application'
         ? isNextJs
             ? 'components'
@@ -431,7 +426,7 @@ function createProjectStorybookDir(tree, projectName, uiFramework, js, tsConfigu
         interactionTests,
         mainDir,
         isNextJs: isNextJs &&
-            (0, internal_3.getProjectType)(tree, root, projectType) ===
+            (0, internal_2.getProjectType)(tree, root, projectType) ===
                 'application',
         usesSwc,
         usesVite,
@@ -458,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
-        : (0, internal_3.getProjectType)(tree, root, projectType) === 'application'
+        : (0, internal_2.getProjectType)(tree, root, projectType) === 'application'
             ? 'tsconfig.app.json'
             : 'tsconfig.lib.json');
 }

package/dist/src/generators/init/init.js

@@ -19,12 +19,14 @@ function checkDependenciesInstalled(host, schema) {
     return (0, devkit_1.addDependenciesToPackageJson)(host, {}, devDependencies, undefined, schema.keepExistingVersions ?? true);
 }
 function addCacheableOperation(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
+    const nxJson = (0, devkit_1.readNxJson)(tree);
     const cacheableOperations = nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations;
     if (cacheableOperations && !cacheableOperations.includes('build-storybook')) {
         nxJson.tasksRunnerOptions.default.options.cacheableOperations.push('build-storybook');
     }
-    (0, internal_1.upsertTargetDefault)(tree, nxJson, { target: 'build-storybook', cache: true });
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults['build-storybook'] ??= {};
+    nxJson.targetDefaults['build-storybook'].cache = true;
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function moveToDevDependencies(tree) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "23.0.0-rc.2",
+  "version": "23.0.0-rc.4",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -92,18 +92,18 @@
     "@phenomnomnominal/tsquery": "~6.2.0",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.0.0-rc.2",
-    "@nx/cypress": "23.0.0-rc.2",
-    "@nx/js": "23.0.0-rc.2",
-    "@nx/eslint": "23.0.0-rc.2"
+    "@nx/devkit": "23.0.0-rc.4",
+    "@nx/cypress": "23.0.0-rc.4",
+    "@nx/js": "23.0.0-rc.4",
+    "@nx/eslint": "23.0.0-rc.4"
   },
   "devDependencies": {
     "storybook": "9.0.6",
-    "nx": "23.0.0-rc.2"
+    "nx": "23.0.0-rc.4"
   },
   "peerDependencies": {
     "storybook": ">=8.0.0 <11.0.0",
-    "@nx/web": "23.0.0-rc.2"
+    "@nx/web": "23.0.0-rc.4"
   },
   "peerDependenciesMeta": {
     "@nx/web": {