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

package/migrations.json

@@ -963,6 +963,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "18.2.0": {
+      "version": "18.2.0-beta.1",
+      "packages": {
+        "core-js": {
+          "version": "3.36.1",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

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

package/src/generators/configuration/configuration.js

@@ -87,7 +87,7 @@ async function configurationGeneratorInternal(tree, rawSchema) {
             (0, util_functions_1.addStorybookTarget)(tree, schema.project, schema.uiFramework, schema.interactionTests);
         }
         if (schema.configureStaticServe) {
-            (0, util_functions_1.addStaticTarget)(tree, schema);
+            await (0, util_functions_1.addStaticTarget)(tree, schema);
         }
     }
     else {

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

@@ -3,7 +3,7 @@ import { StorybookConfigureSchema } from '../schema';
 import { UiFramework } from '../../../utils/models';
 export declare function addStorybookTarget(tree: Tree, projectName: string, uiFramework: UiFramework, interactionTests: boolean): void;
 export declare function addAngularStorybookTarget(tree: Tree, projectName: string, interactionTests: boolean): void;
-export declare function addStaticTarget(tree: Tree, opts: StorybookConfigureSchema): void;
+export declare function addStaticTarget(tree: Tree, opts: StorybookConfigureSchema): Promise<void>;
 export declare function createStorybookTsconfigFile(tree: Tree, projectRoot: string, uiFramework: UiFramework, isRootProject: boolean, mainDir: 'components' | 'src'): void;
 export declare function editTsconfigBaseJson(tree: Tree): void;
 export declare function configureTsProjectConfig(tree: Tree, schema: StorybookConfigureSchema): void;
@@ -18,7 +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 addStorybookToTargetDefaults(tree: Tree, 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, useReactNative?: boolean): 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

@@ -91,9 +91,9 @@ function addAngularStorybookTarget(tree, projectName, interactionTests) {
     (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
 }
 exports.addAngularStorybookTarget = addAngularStorybookTarget;
-function addStaticTarget(tree, opts) {
-    const nrwlWeb = (0, devkit_1.ensurePackage)('@nx/web', versions_1.nxVersion);
-    nrwlWeb.webStaticServeGenerator(tree, {
+async function addStaticTarget(tree, opts) {
+    const { webStaticServeGenerator } = (0, devkit_1.ensurePackage)('@nx/web', versions_1.nxVersion);
+    await webStaticServeGenerator(tree, {
         buildTarget: `${opts.project}:build-storybook`,
         outputPath: (0, devkit_1.joinPathFragments)('dist/storybook', opts.project),
         targetName: 'static-storybook',
@@ -339,10 +339,13 @@ function addStorybookToNamedInputs(tree) {
     }
 }
 exports.addStorybookToNamedInputs = addStorybookToNamedInputs;
-function addStorybookToTargetDefaults(tree) {
+function addStorybookToTargetDefaults(tree, setCache = true) {
     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
@@ -423,23 +426,12 @@ function getTsConfigPath(tree, projectName, path) {
 }
 exports.getTsConfigPath = getTsConfigPath;
 function addBuildStorybookToCacheableOperations(tree) {
-    (0, devkit_1.updateJson)(tree, 'nx.json', (json) => ({
-        ...json,
-        tasksRunnerOptions: {
-            ...(json.tasksRunnerOptions ?? {}),
-            default: {
-                ...(json.tasksRunnerOptions?.default ?? {}),
-                options: {
-                    ...(json.tasksRunnerOptions?.default?.options ?? {}),
-                    cacheableOperations: Array.from(new Set([
-                        ...(json.tasksRunnerOptions?.default?.options
-                            ?.cacheableOperations ?? []),
-                        'build-storybook',
-                    ])),
-                },
-            },
-        },
-    }));
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations &&
+        !nxJson.tasksRunnerOptions.default.options.cacheableOperations.includes('build-storybook')) {
+        nxJson.tasksRunnerOptions.default.options.cacheableOperations.push('build-storybook');
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
 }
 exports.addBuildStorybookToCacheableOperations = addBuildStorybookToCacheableOperations;
 function projectIsRootProjectInStandaloneWorkspace(projectRoot) {

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

@@ -14,7 +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);
+    (0, util_functions_1.addStorybookToTargetDefaults)(tree, false);
     await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;