@nx/storybook 20.0.0-beta.3 → 20.0.0-beta.5

package/package.json

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

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -18,14 +18,14 @@ async function convertToInferred(tree, options) {
         testStorybookTargetName: 'test-storybook',
     }, [
         {
-            executors: ['@nx/storybook:build', '@nrwl/storybook:build'],
+            executors: ['@nx/storybook:build'],
             postTargetTransformer: (0, build_post_target_transformer_1.buildPostTargetTransformer)(migrationLogs),
             targetPluginOptionMapper: (targetName) => ({
                 buildStorybookTargetName: targetName,
             }),
         },
         {
-            executors: ['@nx/storybook:storybook', '@nrwl/storybook:storybook'],
+            executors: ['@nx/storybook:storybook'],
             postTargetTransformer: (0, serve_post_target_transformer_1.servePostTargetTransformer)(migrationLogs),
             targetPluginOptionMapper: (targetName) => ({
                 serveStorybookTargetName: targetName,

package/src/generators/cypress-project/cypress-project.js

@@ -132,9 +132,7 @@ function updateAngularJsonBuilder(tree, opts) {
 function projectAlreadyHasCypress(tree) {
     const packageJsonContents = (0, devkit_1.readJson)(tree, 'package.json');
     return ((packageJsonContents?.['devDependencies']?.['@nx/cypress'] ||
-        packageJsonContents?.['dependencies']?.['@nx/cypress'] ||
-        packageJsonContents?.['devDependencies']?.['@nrwl/cypress'] ||
-        packageJsonContents?.['dependencies']?.['@nrwl/cypress']) &&
+        packageJsonContents?.['dependencies']?.['@nx/cypress']) &&
         (packageJsonContents?.['devDependencies']?.['cypress'] ||
             packageJsonContents?.['dependencies']?.['cypress']));
 }

package/src/generators/migrate-7/helper-functions.js

@@ -403,9 +403,7 @@ function checkStorybookInstalled(packageJson) {
     return ((packageJson.dependencies['@storybook/core-server'] ||
         packageJson.devDependencies['@storybook/core-server']) &&
         (packageJson.dependencies['@nx/storybook'] ||
-            packageJson.devDependencies['@nx/storybook'] ||
-            packageJson.dependencies['@nrwl/storybook'] ||
-            packageJson.devDependencies['@nrwl/storybook']));
+            packageJson.devDependencies['@nx/storybook']));
 }
 function checkWebComponentsInstalled(packageJson) {
     return (packageJson.dependencies['@storybook/web-components'] ||

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

@@ -119,9 +119,7 @@ function checkStorybookInstalled(packageJson) {
     return ((packageJson.dependencies['@storybook/core-server'] ||
         packageJson.devDependencies['@storybook/core-server']) &&
         (packageJson.dependencies['@nx/storybook'] ||
-            packageJson.devDependencies['@nx/storybook'] ||
-            packageJson.dependencies['@nrwl/storybook'] ||
-            packageJson.devDependencies['@nrwl/storybook']));
+            packageJson.devDependencies['@nx/storybook']));
 }
 function logResult(tree, migrationSummary) {
     devkit_1.output.log({

package/src/plugins/plugin.js

@@ -98,7 +98,9 @@ function buildTarget(namedInputs, outputs, projectRoot, frameworkIsAngular, proj
                     externalDependencies: [
                         'storybook',
                         '@storybook/angular',
-                        '@storybook/test-runner',
+                        isStorybookTestRunnerInstalled()
+                            ? '@storybook/test-runner'
+                            : undefined,
                     ],
                 },
             ],
@@ -115,7 +117,12 @@ function buildTarget(namedInputs, outputs, projectRoot, frameworkIsAngular, proj
                     ? ['production', '^production']
                     : ['default', '^default']),
                 {
-                    externalDependencies: ['storybook', '@storybook/test-runner'],
+                    externalDependencies: [
+                        'storybook',
+                        isStorybookTestRunnerInstalled()
+                            ? '@storybook/test-runner'
+                            : undefined,
+                    ],
                 },
             ],
         };
@@ -146,7 +153,12 @@ function testTarget(projectRoot) {
         options: { cwd: projectRoot },
         inputs: [
             {
-                externalDependencies: ['storybook', '@storybook/test-runner'],
+                externalDependencies: [
+                    'storybook',
+                    isStorybookTestRunnerInstalled()
+                        ? '@storybook/test-runner'
+                        : undefined,
+                ],
             },
         ],
     };

package/src/utils/utilities.js

@@ -96,18 +96,6 @@ function findStorybookAndBuildTargetsAndCompiler(targets) {
         '@nx/angular:webpack-browser',
         '@nx/esbuild:esbuild',
         '@nx/next:build',
-        '@nrwl/js:babel',
-        '@nrwl/js:swc',
-        '@nrwl/js:tsc',
-        '@nrwl/webpack:webpack',
-        '@nrwl/rollup:rollup',
-        '@nrwl/web:rollup',
-        '@nrwl/vite:build',
-        '@nrwl/angular:ng-packagr-lite',
-        '@nrwl/angular:package',
-        '@nrwl/angular:webpack-browser',
-        '@nrwl/esbuild:esbuild',
-        '@nrwl/next:build',
         '@nxext/vite:build',
         '@angular-devkit/build-angular:application',
         '@angular-devkit/build-angular:browser',
@@ -145,13 +133,11 @@ function findStorybookAndBuildTargetsAndCompiler(targets) {
             returnObject.compiler = targets[target].options?.compiler;
         }
         else if (targets[target].executor === '@storybook/angular:start-storybook' ||
-            targets[target].executor === '@nrwl/storybook:storybook' ||
             targets[target].executor === '@nx/storybook:storybook') {
             returnObject.storybookTarget = target;
         }
         else if (targets[target].executor === '@storybook/angular:build-storybook' ||
-            targets[target].executor === '@nx/storybook:build' ||
-            targets[target].executor === '@nrwl/storybook:build') {
+            targets[target].executor === '@nx/storybook:build') {
             returnObject.storybookBuildTarget = target;
         }
         else if (targets[target].options?.compiler) {