@nx/storybook 18.3.0-beta.1 → 18.3.0-beta.2

package/package.json

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

package/src/generators/init/init.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGeneratorInternal = exports.initGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
+const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const semver_1 = require("semver");
 const plugin_1 = require("../../plugins/plugin");
 const utilities_1 = require("../../utils/utilities");
@@ -60,7 +60,30 @@ async function initGeneratorInternal(tree, schema) {
         nxJson.useInferencePlugins !== false;
     schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
-        (0, utilities_1.addPlugin)(tree);
+        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/storybook/plugin', plugin_1.createNodes, {
+            serveStorybookTargetName: [
+                'storybook',
+                'serve:storybook',
+                'serve-storybook',
+                'storybook:serve',
+                'storybook-serve',
+            ],
+            buildStorybookTargetName: [
+                'build-storybook',
+                'build:storybook',
+                'storybook:build',
+            ],
+            testStorybookTargetName: [
+                'test-storybook',
+                'test:storybook',
+                'storybook:test',
+            ],
+            staticStorybookTargetName: [
+                'static-storybook',
+                'static:storybook',
+                'storybook:static',
+            ],
+        }, schema.updatePackageScripts);
         (0, update_gitignore_1.updateGitignore)(tree);
     }
     else {
@@ -71,9 +94,6 @@ async function initGeneratorInternal(tree, schema) {
         tasks.push(moveToDevDependencies(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/utils/utilities.d.ts

@@ -40,4 +40,3 @@ export declare function findStorybookAndBuildTargetsAndCompiler(targets: {
 export declare function isTheFileAStory(tree: Tree, path: string): boolean;
 export declare function getTsSourceFile(host: Tree, path: string): ts.SourceFile;
 export declare function pleaseUpgrade(): string;
-export declare function addPlugin(tree: Tree): void;

package/src/utils/utilities.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addPlugin = exports.pleaseUpgrade = exports.getTsSourceFile = exports.isTheFileAStory = exports.findStorybookAndBuildTargetsAndCompiler = exports.dedupe = exports.storybookConfigExistsCheck = exports.safeFileDelete = exports.getInstalledStorybookVersion = exports.storybookMajorVersion = exports.Constants = void 0;
-const devkit_1 = require("@nx/devkit");
+exports.pleaseUpgrade = exports.getTsSourceFile = exports.isTheFileAStory = exports.findStorybookAndBuildTargetsAndCompiler = exports.dedupe = exports.storybookConfigExistsCheck = exports.safeFileDelete = exports.getInstalledStorybookVersion = exports.storybookMajorVersion = exports.Constants = void 0;
 const fs_1 = require("fs");
 const js_1 = require("@nx/js");
 const ts = require("typescript");
@@ -222,25 +221,3 @@ function pleaseUpgrade() {
     `;
 }
 exports.pleaseUpgrade = pleaseUpgrade;
-function addPlugin(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.plugins ??= [];
-    for (const plugin of nxJson.plugins) {
-        if (typeof plugin === 'string'
-            ? plugin === '@nx/storybook/plugin'
-            : plugin.plugin === '@nx/storybook/plugin') {
-            return;
-        }
-    }
-    nxJson.plugins.push({
-        plugin: '@nx/storybook/plugin',
-        options: {
-            buildStorybookTargetName: 'build-storybook',
-            serveStorybookTargetName: 'storybook',
-            testStorybookTargetName: 'test-storybook',
-            staticStorybookTargetName: 'static-storybook',
-        },
-    });
-    (0, devkit_1.updateNxJson)(tree, nxJson);
-}
-exports.addPlugin = addPlugin;