@nx/angular 20.1.0-canary.20241030-62f58eb → 20.1.0-canary.20241101-d4f4dac

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "20.1.0-canary.20241030-62f58eb",
+  "version": "20.1.0-canary.20241101-d4f4dac",
   "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": {
@@ -80,12 +80,12 @@
     "webpack-merge": "^5.8.0",
     "webpack": "^5.88.0",
     "@module-federation/enhanced": "0.6.9",
-    "@nx/devkit": "20.1.0-canary.20241030-62f58eb",
-    "@nx/js": "20.1.0-canary.20241030-62f58eb",
-    "@nx/eslint": "20.1.0-canary.20241030-62f58eb",
-    "@nx/webpack": "20.1.0-canary.20241030-62f58eb",
-    "@nx/web": "20.1.0-canary.20241030-62f58eb",
-    "@nx/workspace": "20.1.0-canary.20241030-62f58eb",
+    "@nx/devkit": "20.1.0-canary.20241101-d4f4dac",
+    "@nx/js": "20.1.0-canary.20241101-d4f4dac",
+    "@nx/eslint": "20.1.0-canary.20241101-d4f4dac",
+    "@nx/webpack": "20.1.0-canary.20241101-d4f4dac",
+    "@nx/web": "20.1.0-canary.20241101-d4f4dac",
+    "@nx/workspace": "20.1.0-canary.20241101-d4f4dac",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/generators/application/files/ng-module/src/app/app.component.html__tpl__

@@ -1 +1,8 @@
-<% if(minimal) { %><h1>Welcome <%= appName %></h1><% } else { %><<%= nxWelcomeSelector %>></<%= nxWelcomeSelector %>><% } %> <% if(routing) { %><router-outlet></router-outlet><% } %>
+<%_ if(minimal) { _%>
+<h1>Welcome <%= appName %></h1>
+<%_ } else { _%>
+<<%= nxWelcomeSelector %>></<%= nxWelcomeSelector %>>
+<%_ } _%> 
+<%_ if(routing) { _%>
+<router-outlet></router-outlet>
+<%_ } _%>

package/src/generators/application/files/standalone-components/src/app/app.component.html__tpl__

@@ -1 +1,8 @@
-<% if(minimal) { %><h1>Welcome <%= appName %></h1><% } else { %><<%= nxWelcomeSelector %>></<%= nxWelcomeSelector %>><% } %> <% if(routing) { %><router-outlet></router-outlet><% } %>
+<%_ if(minimal) { _%>
+<h1>Welcome <%= appName %></h1>
+<%_ } else { _%>
+<<%= nxWelcomeSelector %>></<%= nxWelcomeSelector %>>
+<%_ } _%>
+<%_ if(routing) { _%>
+<router-outlet></router-outlet>
+<%_ } _%>

package/src/generators/component/files/__fileName__.__style__

@@ -2,5 +2,5 @@
   display: block;
 }
 <% } else { %>\:host
-  display: block;
+  display: block
 <% }} %>

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

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

package/src/generators/library/files/base/README.md__tpl__

@@ -1,9 +1,9 @@
 # <%= libName %>
 
 This library was generated with [Nx](https://nx.dev).
-<% if (unitTesting) { %>
+<%_ if (unitTesting) { _%>
 
 ## Running unit tests
 
 Run `nx test <%= libName %>` to execute the unit tests.
-<% } %>
+<%_ } _%>

package/src/generators/utils/add-jest.js

@@ -24,10 +24,10 @@ async function addJest(tree, options) {
         const contents = tree.read(setupFile, 'utf-8');
         tree.write(setupFile, `// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
 globalThis.ngJest = {
-testEnvironmentOptions: {
-  errorOnUnknownElements: true,
-  errorOnUnknownProperties: true,
-},
+  testEnvironmentOptions: {
+    errorOnUnknownElements: true,
+    errorOnUnknownProperties: true,
+  },
 };
 ${contents}`);
     }

package/src/generators/utils/add-vitest.js

@@ -10,7 +10,7 @@ async function addVitest(tree, options) {
             '@analogjs/vite-plugin-angular': versions_1.analogVitestAngular,
         }, undefined, true);
     }
-    const { createOrEditViteConfig, viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+    const { createOrEditViteConfig, vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
     const relativeTestSetupPath = (0, devkit_1.joinPathFragments)('src', 'test-setup.ts');
     const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, relativeTestSetupPath);
     if (!tree.exists(setupFile)) {
@@ -27,12 +27,13 @@ getTestBed().initTestEnvironment(
   platformBrowserDynamicTesting()
 );
 `);
-        await viteConfigurationGenerator(tree, {
+        await vitestGenerator(tree, {
             project: options.name,
-            newProject: true,
             uiFramework: 'none',
-            includeVitest: true,
+            skipViteConfig: true,
             testEnvironment: 'jsdom',
+            coverageProvider: 'v8',
+            addPlugin: false,
         });
         createOrEditViteConfig(tree, {
             project: options.name,