@nx/angular 18.0.0-beta.2 → 18.0.0-beta.3

package/executors.json

@@ -40,7 +40,7 @@
     "dev-server": {
       "implementation": "./src/builders/dev-server/dev-server.impl",
       "schema": "./src/builders/dev-server/schema.json",
-      "description": "The `dev-server` executor is very similar to the standard `dev-server` builder provided by the Angular Devkit. It is usually used in tandem with `@nrwl/angular:webpack-browser` when your Angular application uses a custom webpack configuration."
+      "description": "Serves an Angular application using [Webpack](https://webpack.js.org/) when the build target is using a Webpack-based executor, or [Vite](https://vitejs.dev/) when the build target uses an esbuild-based executor."
     },
     "webpack-server": {
       "implementation": "./src/builders/webpack-server/webpack-server.impl",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "18.0.0-beta.2",
+  "version": "18.0.0-beta.3",
   "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, 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- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -78,16 +78,16 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "18.0.0-beta.2",
-    "@nx/cypress": "18.0.0-beta.2",
-    "@nx/jest": "18.0.0-beta.2",
-    "@nx/js": "18.0.0-beta.2",
-    "@nx/eslint": "18.0.0-beta.2",
-    "@nx/webpack": "18.0.0-beta.2",
-    "@nx/web": "18.0.0-beta.2",
-    "@nx/workspace": "18.0.0-beta.2",
+    "@nx/devkit": "18.0.0-beta.3",
+    "@nx/cypress": "18.0.0-beta.3",
+    "@nx/jest": "18.0.0-beta.3",
+    "@nx/js": "18.0.0-beta.3",
+    "@nx/eslint": "18.0.0-beta.3",
+    "@nx/webpack": "18.0.0-beta.3",
+    "@nx/web": "18.0.0-beta.3",
+    "@nx/workspace": "18.0.0-beta.3",
     "piscina": "^4.2.1",
-    "@nrwl/angular": "18.0.0-beta.2"
+    "@nrwl/angular": "18.0.0-beta.3"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

package/src/builders/dev-server/dev-server.impl.js

@@ -54,9 +54,11 @@ function executeDevServerBuilder(rawOptions, context) {
             throw new Error(`Custom Webpack Config File Not Found!\nTo use a custom webpack config, please ensure the path to the custom webpack file is correct: \n${pathToWebpackConfig}`);
         }
     }
+    const normalizedIndexHtmlTransformer = buildTargetOptions.indexHtmlTransformer ??
+        buildTargetOptions.indexFileTransformer;
     let pathToIndexFileTransformer;
-    if (buildTargetOptions.indexFileTransformer) {
-        pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetOptions.indexFileTransformer);
+    if (normalizedIndexHtmlTransformer) {
+        pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, normalizedIndexHtmlTransformer);
         if (pathToIndexFileTransformer && !(0, fs_1.existsSync)(pathToIndexFileTransformer)) {
             throw new Error(`File containing Index File Transformer function Not Found!\n Please ensure the path to the file containing the function is correct: \n${pathToIndexFileTransformer}`);
         }
@@ -184,6 +186,7 @@ function patchBuilderContext(context, isUsingEsbuildBuilder, buildTarget) {
 function cleanBuildTargetOptions(options) {
     delete options.buildLibsFromSource;
     delete options.customWebpackConfig;
+    delete options.indexHtmlTransformer;
     delete options.indexFileTransformer;
     delete options.plugins;
     return options;

package/src/builders/dev-server/schema.json

@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Schema for Webpack Dev Server",
-  "description": "The dev-server executor is very similar to the standard dev server builder provided by the Angular Devkit. It is usually used in tandem with `@nx/angular:webpack-browser` when your Angular application uses a custom webpack configuration.",
+  "description": "Serves an Angular application using [Webpack](https://webpack.js.org/) when the build target is using a Webpack-based executor, or [Vite](https://vitejs.dev/) when the build target uses an esbuild-based executor.",
   "examplesFile": "../../../docs/dev-server-examples.md",
   "type": "object",
   "presets": [

package/src/builders/webpack-browser/schema.d.ts

@@ -4,6 +4,10 @@ export type BrowserBuilderSchema = Schema & {
   customWebpackConfig?: {
     path: string;
   };
-  indexFileTransformer?: string;
+  indexHtmlTransformer?: string;
   buildLibsFromSource?: boolean;
+  /**
+   * @deprecated Use `indexHtmlTransformer` instead. It will be removed in Nx 19.
+   */
+  indexFileTransformer?: string;
 };

package/src/builders/webpack-browser/schema.json

@@ -458,9 +458,10 @@
       "x-priority": "important",
       "additionalProperties": false
     },
-    "indexFileTransformer": {
+    "indexHtmlTransformer": {
       "description": "Path to transformer function to transform the index.html",
-      "type": "string"
+      "type": "string",
+      "alias": "indexFileTransformer"
     },
     "buildLibsFromSource": {
       "type": "boolean",

package/src/builders/webpack-browser/webpack-browser.impl.js

@@ -24,7 +24,7 @@ function shouldSkipInitialTargetRun(projectGraph, project, target) {
 }
 function executeWebpackBrowserBuilder(options, context) {
     options.buildLibsFromSource ??= true;
-    const { buildLibsFromSource, customWebpackConfig, indexFileTransformer, ...delegateBuilderOptions } = options;
+    const { buildLibsFromSource, customWebpackConfig, indexHtmlTransformer, indexFileTransformer, ...delegateBuilderOptions } = options;
     process.env.NX_BUILD_LIBS_FROM_SOURCE = `${buildLibsFromSource}`;
     process.env.NX_BUILD_TARGET = (0, devkit_1.targetToTargetString)({ ...context.target });
     const pathToWebpackConfig = customWebpackConfig?.path &&
@@ -32,8 +32,9 @@ function executeWebpackBrowserBuilder(options, context) {
     if (pathToWebpackConfig && !(0, fs_1.existsSync)(pathToWebpackConfig)) {
         throw new Error(`Custom Webpack Config File Not Found!\nTo use a custom webpack config, please ensure the path to the custom webpack file is correct: \n${pathToWebpackConfig}`);
     }
-    const pathToIndexFileTransformer = indexFileTransformer &&
-        (0, devkit_1.joinPathFragments)(context.workspaceRoot, indexFileTransformer);
+    const normalizedIndexHtmlTransformer = indexHtmlTransformer ?? indexFileTransformer;
+    const pathToIndexFileTransformer = normalizedIndexHtmlTransformer &&
+        (0, devkit_1.joinPathFragments)(context.workspaceRoot, normalizedIndexHtmlTransformer);
     if (pathToIndexFileTransformer && !(0, fs_1.existsSync)(pathToIndexFileTransformer)) {
         throw new Error(`File containing Index File Transformer function Not Found!\n Please ensure the path to the file containing the function is correct: \n${pathToIndexFileTransformer}`);
     }

package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.js

@@ -13,7 +13,7 @@ exports.default = default_1;
 function isWebpackBrowserUsed(tree) {
     const projects = (0, devkit_1.getProjects)(tree);
     for (const project of projects.values()) {
-        const targets = project.targets;
+        const targets = project.targets || {};
         for (const [_, target] of Object.entries(targets)) {
             if (target.executor === '@nx/angular:webpack-browser' &&
                 (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.ts')) ||