@nx/angular 0.0.0-pr-30913-89a46d1 → 0.0.0-pr-31172-da609d4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "0.0.0-pr-30913-89a46d1",
+  "version": "0.0.0-pr-31172-da609d4",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -67,14 +67,14 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "0.0.0-pr-30913-89a46d1",
-    "@nx/js": "0.0.0-pr-30913-89a46d1",
-    "@nx/eslint": "0.0.0-pr-30913-89a46d1",
-    "@nx/webpack": "0.0.0-pr-30913-89a46d1",
-    "@nx/rspack": "0.0.0-pr-30913-89a46d1",
-    "@nx/module-federation": "0.0.0-pr-30913-89a46d1",
-    "@nx/web": "0.0.0-pr-30913-89a46d1",
-    "@nx/workspace": "0.0.0-pr-30913-89a46d1",
+    "@nx/devkit": "0.0.0-pr-31172-da609d4",
+    "@nx/js": "0.0.0-pr-31172-da609d4",
+    "@nx/eslint": "0.0.0-pr-31172-da609d4",
+    "@nx/webpack": "0.0.0-pr-31172-da609d4",
+    "@nx/rspack": "0.0.0-pr-31172-da609d4",
+    "@nx/module-federation": "0.0.0-pr-31172-da609d4",
+    "@nx/web": "0.0.0-pr-31172-da609d4",
+    "@nx/workspace": "0.0.0-pr-31172-da609d4",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/generators/application/lib/create-files.js

@@ -44,7 +44,7 @@ async function createFiles(tree, options, rootOffset) {
         connectCloudUrl,
         tutorialUrl: options.standalone
             ? 'https://nx.dev/getting-started/tutorials/angular-standalone-tutorial?utm_source=nx-project'
-            : 'https://nx.dev/getting-started/tutorials/angular-monorepo-tutorial?utm_source=nx-project',
+            : 'https://nx.dev/tutorials/3-angular-monorepo/1a-introduction/1-welcome?utm_source=nx-project',
         tpl: '',
     };
     const angularAppType = options.standalone ? 'standalone' : 'ng-module';

package/src/generators/component-story/files/__componentFileName__.stories.ts__tmpl__

@@ -1,8 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/angular';
 import { <%=componentName%> } from './<%=componentFileName%>';
 <%_ if ( interactionTests ) { _%>
-import { within } from '@storybook/testing-library';
-import { expect } from '@storybook/jest';
+import { expect } from 'storybook/jest';
 <%_ } _%>
 
 const meta: Meta<<%= componentName %>> = {
@@ -23,9 +22,8 @@ export const Heading: Story = {
   args: {<% for (let prop of props) { %>
     <%= prop.name %>: <%- prop.defaultValue %>,<% } %>
   },
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-    expect(canvas.getByText(/<%=componentNameSimple%> works!/gi)).toBeTruthy();
+  play: async ({ canvas }) => {
+    await expect(canvas.getByText(/<%=componentNameSimple%> works!/gi)).toBeTruthy();
   },
 };
-<%_ } _%>
+<%_ } _%>

package/src/generators/stories/stories.d.ts

@@ -1,4 +1,4 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 import type { StoriesGeneratorOptions } from './schema';
-export declare function angularStoriesGenerator(tree: Tree, options: StoriesGeneratorOptions): Promise<GeneratorCallback>;
+export declare function angularStoriesGenerator(tree: Tree, options: StoriesGeneratorOptions): Promise<void>;
 export default angularStoriesGenerator;

package/src/generators/stories/stories.js

@@ -8,7 +8,6 @@ const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const module_info_1 = require("../utils/storybook-ast/module-info");
 const picomatch = require("picomatch");
-const versions_1 = require("../../utils/versions");
 async function angularStoriesGenerator(tree, options) {
     const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.name);
     const componentsInfo = [];
@@ -33,16 +32,8 @@ async function angularStoriesGenerator(tree, options) {
             skipFormat: true,
         });
     }
-    const tasks = [];
-    if (options.interactionTests) {
-        const { interactionTestsDependencies, addInteractionsInAddons } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
-        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.name);
-        addInteractionsInAddons(tree, projectConfiguration);
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, interactionTestsDependencies()));
-    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.default = angularStoriesGenerator;