@nx/storybook 17.3.0-beta.5 → 17.3.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "17.3.0-beta.5",
+  "version": "17.3.0-beta.8",
   "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": {
@@ -30,14 +30,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "17.3.0-beta.5",
+    "@nx/devkit": "17.3.0-beta.8",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "semver": "7.5.3",
     "tslib": "^2.3.0",
-    "@nx/cypress": "17.3.0-beta.5",
-    "@nx/js": "17.3.0-beta.5",
-    "@nx/eslint": "17.3.0-beta.5",
-    "@nrwl/storybook": "17.3.0-beta.5"
+    "@nx/cypress": "17.3.0-beta.8",
+    "@nx/js": "17.3.0-beta.8",
+    "@nx/eslint": "17.3.0-beta.8",
+    "@nrwl/storybook": "17.3.0-beta.8"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/configuration/configuration.js

@@ -66,6 +66,9 @@ async function configurationGenerator(tree, rawSchema) {
     (0, util_functions_1.updateLintConfig)(tree, schema);
     (0, util_functions_1.addBuildStorybookToCacheableOperations)(tree);
     (0, util_functions_1.addStorybookToNamedInputs)(tree);
+    if (!hasPlugin) {
+        (0, util_functions_1.addStorybookToTargetDefaults)(tree);
+    }
     let devDeps = {};
     if (!hasPlugin) {
         if (schema.uiFramework === '@storybook/angular') {

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

@@ -18,6 +18,7 @@ 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): 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): void;
 export declare function getTsConfigPath(tree: Tree, projectName: string, path?: string): string;
 export declare function addBuildStorybookToCacheableOperations(tree: Tree): void;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renameAndMoveOldTsConfig = exports.findNextConfig = exports.findViteConfig = exports.getE2EProjectName = exports.rootFileIsTs = exports.workspaceHasRootProject = exports.projectIsRootProjectInStandaloneWorkspace = exports.addBuildStorybookToCacheableOperations = exports.getTsConfigPath = exports.createProjectStorybookDir = exports.addStorybookToNamedInputs = exports.normalizeSchema = exports.updateLintConfig = exports.configureTsSolutionConfig = exports.configureTsProjectConfig = exports.editTsconfigBaseJson = exports.createStorybookTsconfigFile = exports.addStaticTarget = exports.addAngularStorybookTarget = exports.addStorybookTarget = void 0;
+exports.renameAndMoveOldTsConfig = exports.findNextConfig = exports.findViteConfig = exports.getE2EProjectName = exports.rootFileIsTs = exports.workspaceHasRootProject = exports.projectIsRootProjectInStandaloneWorkspace = exports.addBuildStorybookToCacheableOperations = exports.getTsConfigPath = exports.createProjectStorybookDir = exports.addStorybookToTargetDefaults = exports.addStorybookToNamedInputs = exports.normalizeSchema = exports.updateLintConfig = exports.configureTsSolutionConfig = exports.configureTsProjectConfig = exports.editTsconfigBaseJson = exports.createStorybookTsconfigFile = exports.addStaticTarget = exports.addAngularStorybookTarget = exports.addStorybookTarget = void 0;
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const eslint_1 = require("@nx/eslint");
@@ -338,28 +338,35 @@ function addStorybookToNamedInputs(tree) {
                 nxJson.namedInputs.production.push('!{projectRoot}/tsconfig.storybook.json');
             }
         }
-        nxJson.targetDefaults ??= {};
-        nxJson.targetDefaults['build-storybook'] ??= {};
-        nxJson.targetDefaults['build-storybook'].inputs ??= [
-            'default',
-            hasProductionFileset ? '^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);
     }
 }
 exports.addStorybookToNamedInputs = addStorybookToNamedInputs;
+function addStorybookToTargetDefaults(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults['build-storybook'] ??= {};
+    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);
+}
+exports.addStorybookToTargetDefaults = addStorybookToTargetDefaults;
 function createProjectStorybookDir(tree, projectName, uiFramework, js, tsConfiguration, root, projectType, projectIsRootProjectInStandaloneWorkspace, interactionTests, mainDir, isNextJs, usesSwc, usesVite, viteConfigFilePath, hasPlugin, viteConfigFileName) {
     let projectDirectory = projectType === 'application'
         ? isNextJs

package/src/generators/init/init.js

@@ -2,12 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
 const semver_1 = require("semver");
+const plugin_1 = require("../../plugins/plugin");
 const utilities_1 = require("../../utils/utilities");
 const versions_1 = require("../../utils/versions");
-function checkDependenciesInstalled(host) {
+function checkDependenciesInstalled(host, schema) {
     const devDependencies = {
         '@nx/storybook': versions_1.nxVersion,
+        '@nx/web': versions_1.nxVersion,
     };
     if (process.env.NX_PCV3 === 'true') {
         let storybook7VersionToInstall = versions_1.storybookVersion;
@@ -18,7 +21,7 @@ function checkDependenciesInstalled(host) {
         }
         devDependencies['storybook'] = storybook7VersionToInstall;
     }
-    return (0, devkit_1.addDependenciesToPackageJson)(host, {}, devDependencies);
+    return (0, devkit_1.addDependenciesToPackageJson)(host, {}, devDependencies, undefined, schema.keepExistingVersions);
 }
 function addCacheableOperation(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
@@ -47,14 +50,19 @@ function moveToDevDependencies(tree) {
     return updated ? () => (0, devkit_1.installPackagesTask)(tree) : () => { };
 }
 async function initGenerator(tree, schema) {
-    addCacheableOperation(tree);
     if (process.env.NX_PCV3 === 'true') {
         (0, utilities_1.addPlugin)(tree);
     }
+    else {
+        addCacheableOperation(tree);
+    }
     const tasks = [];
     if (!schema.skipPackageJson) {
         tasks.push(moveToDevDependencies(tree));
-        tasks.push(checkDependenciesInstalled(tree));
+        tasks.push(checkDependenciesInstalled(tree, schema));
+    }
+    if (schema.updatePackageScripts) {
+        await (0, update_package_scripts_1.updatePackageScripts)(tree, plugin_1.createNodes);
     }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/init/schema.d.ts

@@ -1,4 +1,6 @@
 export interface Schema {
   skipFormat?: boolean;
   skipPackageJson?: boolean;
+  keepExistingVersions?: boolean;
+  updatePackageScripts?: boolean;
 }

package/src/generators/init/schema.json

@@ -14,6 +14,18 @@
       "description": "Do not add dependencies to `package.json`.",
       "type": "boolean",
       "default": false
+    },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
+    },
+    "updatePackageScripts": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Update `package.json` scripts with inferred targets",
+      "default": false
     }
   }
 }

package/src/migrations/update-16-5-0/move-storybook-tsconfig.js

@@ -14,6 +14,7 @@ async function default_1(tree) {
         (0, util_functions_1.renameAndMoveOldTsConfig)(projectRoot, pathToStorybookConfigFile, tree);
     });
     (0, util_functions_1.addStorybookToNamedInputs)(tree);
+    (0, util_functions_1.addStorybookToTargetDefaults)(tree);
     await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;