@nx/storybook 23.1.0 → 23.1.2

package/dist/src/generators/configuration/configuration.js

@@ -76,9 +76,9 @@ async function configurationGeneratorInternal(tree, rawSchema) {
     (0, util_functions_1.configureTsSolutionConfig)(tree, schema);
     (0, util_functions_1.updateLintConfig)(tree, schema);
     (0, util_functions_1.addBuildStorybookToCacheableOperations)(tree);
-    (0, util_functions_1.addStorybookToNamedInputs)(tree);
+    (0, util_functions_1.addStorybookToNamedInputs)(tree, schema);
     if (!hasPlugin) {
-        (0, util_functions_1.addStorybookToTargetDefaults)(tree);
+        (0, util_functions_1.addStorybookToTargetDefaults)(tree, schema);
     }
     let devDeps = {};
     if (!hasPlugin || schema.addExplicitTargets) {

package/dist/src/generators/configuration/lib/util-functions.d.ts

@@ -17,8 +17,8 @@ export declare function configureTsSolutionConfig(tree: Tree, schema: StorybookC
  */
 export declare function updateLintConfig(tree: Tree, schema: StorybookConfigureSchema): void;
 export declare function normalizeSchema(schema: StorybookConfigureSchema): StorybookConfigureSchema;
-export declare function addStorybookToNamedInputs(tree: Tree): void;
-export declare function addStorybookToTargetDefaults(tree: Tree, setCache?: boolean): void;
+export declare function addStorybookToNamedInputs(tree: Tree, schema: StorybookConfigureSchema): void;
+export declare function addStorybookToTargetDefaults(tree: Tree, schema: StorybookConfigureSchema, setCache?: boolean): void;
 export declare function createProjectStorybookDir(tree: Tree, projectName: string, uiFramework: UiFramework, js: boolean, tsConfiguration: boolean, root: string, projectType: string, projectIsRootProjectInStandaloneWorkspace: boolean, interactionTests: boolean, mainDir?: string, isNextJs?: boolean, usesSwc?: boolean, usesVite?: boolean, viteConfigFilePath?: string, hasPlugin?: boolean, viteConfigFileName?: string, usesReactNative?: boolean): void;
 export declare function getTsConfigPath(tree: Tree, projectName: string, path?: string): string;
 export declare function addBuildStorybookToCacheableOperations(tree: Tree): void;

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

@@ -353,7 +353,7 @@ function normalizeSchema(schema) {
         ...schema,
     };
 }
-function addStorybookToNamedInputs(tree) {
+function addStorybookToNamedInputs(tree, schema) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     if (nxJson.namedInputs) {
         const hasProductionFileset = !!nxJson.namedInputs?.production;
@@ -364,14 +364,15 @@ function addStorybookToNamedInputs(tree) {
             if (!nxJson.namedInputs.production.includes('!{projectRoot}/.storybook/**/*')) {
                 nxJson.namedInputs.production.push('!{projectRoot}/.storybook/**/*');
             }
-            if (!nxJson.namedInputs.production.includes('!{projectRoot}/tsconfig.storybook.json')) {
+            if (schema.uiFramework !== '@storybook/angular' &&
+                !nxJson.namedInputs.production.includes('!{projectRoot}/tsconfig.storybook.json')) {
                 nxJson.namedInputs.production.push('!{projectRoot}/tsconfig.storybook.json');
             }
         }
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }
 }
-function addStorybookToTargetDefaults(tree, setCache = true) {
+function addStorybookToTargetDefaults(tree, schema, setCache = true) {
     const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
     const existing = (0, internal_2.findTargetDefault)(nxJson.targetDefaults, {
         target: 'build-storybook',
@@ -391,7 +392,8 @@ function addStorybookToTargetDefaults(tree, setCache = true) {
     const negatedIndex = inputs.indexOf('!{projectRoot}/.storybook/**/*');
     if (negatedIndex !== -1)
         inputs.splice(negatedIndex, 1);
-    if (!inputs.includes('{projectRoot}/tsconfig.storybook.json')) {
+    if (schema.uiFramework !== '@storybook/angular' &&
+        !inputs.includes('{projectRoot}/tsconfig.storybook.json')) {
         inputs.push('{projectRoot}/tsconfig.storybook.json');
     }
     (0, internal_2.upsertTargetDefault)(tree, nxJson, {

package/dist/src/generators/migrate-10/migrate-10.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrate10Generator = migrate10Generator;
 const devkit_1 = require("@nx/devkit");
-const output_1 = require("nx/src/utils/output");
 const calling_storybook_cli_1 = require("./calling-storybook-cli");
 const path_1 = require("path");
 const fs_1 = require("fs");
@@ -11,7 +10,7 @@ async function migrate10Generator(tree, schema) {
     (0, assert_supported_storybook_version_1.assertSupportedStorybookVersion)(tree);
     const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
     if (!(0, calling_storybook_cli_1.checkStorybookInstalled)(packageJson)) {
-        output_1.output.error({
+        devkit_1.output.error({
             title: 'No Storybook packages installed',
             bodyLines: [
                 `🚨 Nx did not find any Storybook packages installed in your workspace.`,

package/dist/src/generators/migrate-8/helper-functions.js

@@ -6,9 +6,9 @@ exports.handleMigrationResult = handleMigrationResult;
 exports.checkStorybookInstalled = checkStorybookInstalled;
 exports.logResult = logResult;
 const devkit_1 = require("@nx/devkit");
-const fileutils_1 = require("nx/src/utils/fileutils");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const internal_1 = require("@nx/devkit/internal");
 function onlyShowGuide(storybookProjects) {
     const packageManager = (0, devkit_1.detectPackageManager)();
     const pm = (0, devkit_1.getPackageManagerCommand)(packageManager);
@@ -65,7 +65,7 @@ function getAllStorybookInfo(tree) {
     return allStorybookDirs;
 }
 function handleMigrationResult(migrateResult, allStorybookProjects) {
-    if ((0, fileutils_1.fileExists)((0, path_1.join)(devkit_1.workspaceRoot, 'migration-storybook.log')) &&
+    if ((0, internal_1.fileExists)((0, path_1.join)(devkit_1.workspaceRoot, 'migration-storybook.log')) &&
         Object.keys(migrateResult.successfulProjects)?.length) {
         const sbLogFile = (0, fs_1.readFileSync)((0, path_1.join)(devkit_1.workspaceRoot, 'migration-storybook.log'), 'utf-8');
         Object.keys(migrateResult.successfulProjects).forEach((projectName) => {

package/dist/src/generators/migrate-8/migrate-8.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrate8Generator = migrate8Generator;
 const devkit_1 = require("@nx/devkit");
-const output_1 = require("nx/src/utils/output");
 const calling_storybook_cli_1 = require("./calling-storybook-cli");
 const helper_functions_1 = require("./helper-functions");
 async function migrate8Generator(tree, schema) {
     const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
     if (!(0, helper_functions_1.checkStorybookInstalled)(packageJson)) {
-        output_1.output.error({
+        devkit_1.output.error({
             title: 'No Storybook packages installed',
             bodyLines: [
                 `🚨 Nx did not find any Storybook packages installed in your workspace.`,

package/dist/src/generators/migrate-9/helper-functions.js

@@ -6,9 +6,9 @@ exports.handleMigrationResult = handleMigrationResult;
 exports.checkStorybookInstalled = checkStorybookInstalled;
 exports.logResult = logResult;
 const devkit_1 = require("@nx/devkit");
-const fileutils_1 = require("nx/src/utils/fileutils");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const internal_1 = require("@nx/devkit/internal");
 function onlyShowGuide(storybookProjects) {
     const packageManager = (0, devkit_1.detectPackageManager)();
     const pm = (0, devkit_1.getPackageManagerCommand)(packageManager);
@@ -66,7 +66,7 @@ function getAllStorybookInfo(tree) {
     return allStorybookDirs;
 }
 function handleMigrationResult(migrateResult, allStorybookProjects) {
-    if ((0, fileutils_1.fileExists)((0, path_1.join)(devkit_1.workspaceRoot, 'migration-storybook.log')) &&
+    if ((0, internal_1.fileExists)((0, path_1.join)(devkit_1.workspaceRoot, 'migration-storybook.log')) &&
         Object.keys(migrateResult.successfulProjects)?.length) {
         const sbLogFile = (0, fs_1.readFileSync)((0, path_1.join)(devkit_1.workspaceRoot, 'migration-storybook.log'), 'utf-8');
         Object.keys(migrateResult.successfulProjects).forEach((projectName) => {

package/dist/src/generators/migrate-9/migrate-9.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrate9Generator = migrate9Generator;
 const devkit_1 = require("@nx/devkit");
-const output_1 = require("nx/src/utils/output");
 const calling_storybook_cli_1 = require("./calling-storybook-cli");
 const helper_functions_1 = require("./helper-functions");
 const assert_supported_storybook_version_1 = require("../../utils/assert-supported-storybook-version");
@@ -11,7 +10,7 @@ async function migrate9Generator(tree, schema) {
     schema.versionTag = schema.versionTag ?? 'latest';
     const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
     if (!(0, helper_functions_1.checkStorybookInstalled)(packageJson)) {
-        output_1.output.error({
+        devkit_1.output.error({
             title: 'No Storybook packages installed',
             bodyLines: [
                 `🚨 Nx did not find any Storybook packages installed in your workspace.`,

package/dist/src/migrations/update-21-1-0/update-sb-9.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = changeStorybookTargets;
 const tslib_1 = require("tslib");
-const output_1 = require("nx/src/utils/output");
+const devkit_1 = require("@nx/devkit");
 const migrate_9_1 = tslib_1.__importDefault(require("../../generators/migrate-9/migrate-9"));
 const utilities_1 = require("../../utils/utilities");
 async function changeStorybookTargets(tree) {
@@ -18,7 +18,7 @@ async function changeStorybookTargets(tree) {
          */
         return;
     }
-    output_1.output.log({
+    devkit_1.output.log({
         title: 'Migrating Storybook to v9',
         bodyLines: [
             `🚀 This migration will update your Storybook configuration to v9.`,

package/dist/src/migrations/update-22-1-0/migrate-to-storybook-10.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = migrateToStorybook10;
 const tslib_1 = require("tslib");
-const output_1 = require("nx/src/utils/output");
+const devkit_1 = require("@nx/devkit");
 const migrate_10_1 = tslib_1.__importDefault(require("../../generators/migrate-10/migrate-10"));
 async function migrateToStorybook10(tree) {
-    output_1.output.log({
+    devkit_1.output.log({
         title: 'Migrating Storybook to v10',
         bodyLines: [
             `🚀 This migration will update your Storybook configuration to v10.`,

package/dist/src/plugins/plugin.js

@@ -5,9 +5,7 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const fs_1 = require("fs");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
 const js_1 = require("@nx/js");
-const file_hasher_1 = require("nx/src/hasher/file-hasher");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const internal_2 = require("@nx/js/internal");
 /**
@@ -22,8 +20,8 @@ exports.createNodes = [
     storybookConfigGlob,
     async (configFilePaths, options, context) => {
         const normalizedOptions = normalizeOptions(options);
-        const optionsHash = (0, file_hasher_1.hashObject)(normalizedOptions);
-        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `storybook-${optionsHash}.hash`);
+        const optionsHash = (0, internal_1.hashObject)(normalizedOptions);
+        const cachePath = (0, path_1.join)(internal_1.workspaceDataDirectory, `storybook-${optionsHash}.hash`);
         const targetsCache = new internal_1.PluginCache(cachePath);
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "23.1.0",
+  "version": "23.1.2",
   "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.1.0",
-    "@nx/cypress": "23.1.0",
-    "@nx/eslint": "23.1.0",
-    "@nx/js": "23.1.0"
+    "@nx/devkit": "23.1.2",
+    "@nx/cypress": "23.1.2",
+    "@nx/js": "23.1.2",
+    "@nx/eslint": "23.1.2"
   },
   "devDependencies": {
     "storybook": "9.0.6",
-    "nx": "23.1.0"
+    "nx": "23.1.2"
   },
   "peerDependencies": {
     "storybook": ">=8.0.0 <11.0.0",
-    "@nx/web": "23.1.0"
+    "@nx/web": "23.1.2"
   },
   "peerDependenciesMeta": {
     "@nx/web": {