@nx/angular 18.1.3 → 18.2.0-beta.1

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2023 Narwhal Technologies Inc.
+Copyright (c) 2017-2024 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/migrations.json

@@ -377,6 +377,15 @@
       "version": "18.1.1-beta.0",
       "description": "Ensure targetDefaults inputs for task hashing when '@nx/angular:webpack-browser' is used are correct for Module Federation.",
       "factory": "./src/migrations/update-18-1-1/fix-target-defaults-inputs"
+    },
+    "update-angular-cli-version-17-3-0": {
+      "cli": "nx",
+      "version": "18.2.0-beta.0",
+      "requires": {
+        "@angular/core": ">=17.3.0"
+      },
+      "description": "Update the @angular/cli package version to ~17.3.0.",
+      "factory": "./src/migrations/update-18-2-0/update-angular-cli"
     }
   },
   "packageJsonUpdates": {
@@ -1718,6 +1727,84 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "18.2.0": {
+      "version": "18.2.0-beta.0",
+      "x-prompt": "Do you want to update the Angular version to v17.3?",
+      "requires": {
+        "@angular/core": ">=17.2.0 <17.3.0"
+      },
+      "packages": {
+        "@angular-devkit/build-angular": {
+          "version": "~17.3.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/core": {
+          "version": "~17.3.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/schematics": {
+          "version": "~17.3.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/pwa": {
+          "version": "~17.3.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/ssr": {
+          "version": "~17.3.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@schematics/angular": {
+          "version": "~17.3.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/architect": {
+          "version": "~0.1703.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-webpack": {
+          "version": "~0.1703.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/core": {
+          "version": "~17.3.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@angular/material": {
+          "version": "~17.3.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/cdk": {
+          "version": "~17.3.0",
+          "alwaysAddToPackageJson": false
+        },
+        "ng-packagr": {
+          "version": "~17.3.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "18.2.0-angular-eslint": {
+      "version": "18.2.0-beta.0",
+      "requires": {
+        "eslint": "^7.20.0 || ^8.0.0",
+        "@angular/core": ">= 17.0.0 < 18.0.0"
+      },
+      "packages": {
+        "@angular-eslint/eslint-plugin": {
+          "version": "~17.3.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/eslint-plugin-template": {
+          "version": "~17.3.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/template-parser": {
+          "version": "~17.3.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "18.1.3",
+  "version": "18.2.0-beta.1",
   "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- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -68,7 +68,7 @@
   },
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@typescript-eslint/type-utils": "^6.9.1",
+    "@typescript-eslint/type-utils": "^7.3.0",
     "chalk": "^4.1.0",
     "find-cache-dir": "^3.3.2",
     "ignore": "^5.0.4",
@@ -78,14 +78,14 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "18.1.3",
-    "@nx/js": "18.1.3",
-    "@nx/eslint": "18.1.3",
-    "@nx/webpack": "18.1.3",
-    "@nx/web": "18.1.3",
-    "@nx/workspace": "18.1.3",
-    "piscina": "^4.2.1",
-    "@nrwl/angular": "18.1.3"
+    "@nx/devkit": "18.2.0-beta.1",
+    "@nx/js": "18.2.0-beta.1",
+    "@nx/eslint": "18.2.0-beta.1",
+    "@nx/webpack": "18.2.0-beta.1",
+    "@nx/web": "18.2.0-beta.1",
+    "@nx/workspace": "18.2.0-beta.1",
+    "piscina": "^4.4.0",
+    "@nrwl/angular": "18.2.0-beta.1"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

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

@@ -1,4 +1,4 @@
-import { Schema } from '@angular-devkit/build-angular/src/builders/browser/schema';
+import type { Schema } from '@angular-devkit/build-angular/src/builders/browser/schema';
 
 export type BrowserBuilderSchema = Schema & {
   customWebpackConfig?: {

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

@@ -292,8 +292,7 @@
     },
     "deployUrl": {
       "type": "string",
-      "description": "URL where files will be deployed.",
-      "x-deprecated": "Use `baseHref` option, `APP_BASE_HREF` DI token or a combination of both instead. For more information, see https://angular.io/guide/deployment#the-deploy-url."
+      "description": "Customize the base path for the URLs of resources in 'index.html' and component stylesheets. This option is only necessary for specific deployment scenarios, such as with Angular Elements or when utilizing different CDN locations."
     },
     "verbose": {
       "type": "boolean",
@@ -517,11 +516,11 @@
           "properties": {
             "src": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             },
             "replaceWith": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             }
           },
           "additionalProperties": false,
@@ -532,11 +531,11 @@
           "properties": {
             "replace": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             },
             "with": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             }
           },
           "additionalProperties": false,

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

@@ -123,8 +123,7 @@
     },
     "deployUrl": {
       "type": "string",
-      "description": "URL where files will be deployed.",
-      "x-deprecated": "Use \"baseHref\" browser builder option, \"APP_BASE_HREF\" DI token or a combination of both instead. For more information, see https://angular.io/guide/deployment#the-deploy-url."
+      "description": "Customize the base path for the URLs of resources in 'index.html' and component stylesheets. This option is only necessary for specific deployment scenarios, such as with Angular Elements or when utilizing different CDN locations."
     },
     "vendorChunk": {
       "type": "boolean",
@@ -290,11 +289,11 @@
           "properties": {
             "src": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             },
             "replaceWith": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             }
           },
           "additionalProperties": false,
@@ -305,11 +304,11 @@
           "properties": {
             "replace": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             },
             "with": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             }
           },
           "additionalProperties": false,

package/src/executors/application/schema.json

@@ -35,6 +35,10 @@
       "type": "string",
       "description": "The full path for the TypeScript configuration file, relative to the current workspace."
     },
+    "deployUrl": {
+      "type": "string",
+      "description": "Customize the base path for the URLs of resources in 'index.html' and component stylesheets. This option is only necessary for specific deployment scenarios, such as with Angular Elements or when utilizing different CDN locations. _Note: this is only supported in Angular versions >= 17.3.0_."
+    },
     "scripts": {
       "description": "Global scripts to be included in the build.",
       "type": "array",
@@ -612,11 +616,11 @@
       "properties": {
         "replace": {
           "type": "string",
-          "pattern": "\\.(([cm]?j|t)sx?|json)$"
+          "pattern": "\\.(([cm]?[jt])sx?|json)$"
         },
         "with": {
           "type": "string",
-          "pattern": "\\.(([cm]?j|t)sx?|json)$"
+          "pattern": "\\.(([cm]?[jt])sx?|json)$"
         }
       },
       "additionalProperties": false,

package/src/executors/application/utils/validate-options.js

@@ -43,5 +43,10 @@ function validateOptions(options) {
             throw new Error(`The "clearScreen" option requires Angular version 17.2.0 or greater. You are currently using version ${angularVersion}.`);
         }
     }
+    if ((0, semver_1.lt)(angularVersion, '17.3.0')) {
+        if (options.deployUrl) {
+            throw new Error(`The "deployUrl" option requires Angular version 17.3.0 or greater. You are currently using version ${angularVersion}.`);
+        }
+    }
 }
 exports.validateOptions = validateOptions;

package/src/executors/browser-esbuild/schema.json

@@ -279,8 +279,7 @@
     },
     "deployUrl": {
       "type": "string",
-      "description": "URL where files will be deployed.",
-      "x-deprecated": "Use \"baseHref\" option, \"APP_BASE_HREF\" DI token or a combination of both instead. For more information, see https://angular.io/guide/deployment#the-deploy-url."
+      "description": "Customize the base path for the URLs of resources in 'index.html' and component stylesheets. This option is only necessary for specific deployment scenarios, such as with Angular Elements or when utilizing different CDN locations."
     },
     "verbose": {
       "type": "boolean",
@@ -519,11 +518,11 @@
       "properties": {
         "replace": {
           "type": "string",
-          "pattern": "\\.(([cm]?j|t)sx?|json)$"
+          "pattern": "\\.(([cm]?[jt])sx?|json)$"
         },
         "with": {
           "type": "string",
-          "pattern": "\\.(([cm]?j|t)sx?|json)$"
+          "pattern": "\\.(([cm]?[jt])sx?|json)$"
         }
       },
       "additionalProperties": false,

package/src/executors/utilities/ng-packagr/stylesheet-processor.js

@@ -80,6 +80,7 @@ class StylesheetProcessor {
         this.renderWorker = new Piscina({
             filename: require.resolve('ng-packagr/lib/styles/stylesheet-processor-worker'),
             maxThreads,
+            recordTiming: false,
             env: {
                 ...process.env,
                 FORCE_COLOR: '' + color_1.colors.enabled,
@@ -157,6 +158,7 @@ class AsyncStylesheetProcessor {
         this.renderWorker = new Piscina({
             filename: require.resolve('ng-packagr/lib/styles/stylesheet-processor-worker'),
             maxThreads,
+            recordTiming: false,
             env: {
                 ...process.env,
                 FORCE_COLOR: '' + color_1.colors.enabled,

package/src/generators/convert-to-application-executor/convert-to-application-executor.js

@@ -67,7 +67,7 @@ async function convertProjectTargets(tree, projectName, angularVersion, isProvid
         warnIfProvided(`The provided project "${projectName}" is not an application. Skipping conversion.`);
         return false;
     }
-    const { buildTargetName, serverTargetName } = getTargetsToConvert(project.targets);
+    const { buildTargetName, serverTargetName } = getTargetsToConvert(project.targets, angularVersion);
     if (!buildTargetName) {
         warnIfProvided(`The provided project "${projectName}" does not have any targets using on of the ` +
             `'@angular-devkit/build-angular:browser', '@angular-devkit/build-angular:browser-esbuild', ` +
@@ -125,7 +125,9 @@ async function convertProjectTargets(tree, projectName, angularVersion, isProvid
             }
         }
         // Delete removed options
-        delete options['deployUrl'];
+        if ((0, semver_1.lt)(angularVersion, '17.3.0')) {
+            delete options['deployUrl'];
+        }
         delete options['vendorChunk'];
         delete options['commonChunk'];
         delete options['resourcesOutputPath'];
@@ -191,7 +193,7 @@ async function convertProjectTargets(tree, projectName, angularVersion, isProvid
     (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
     return true;
 }
-function getTargetsToConvert(targets) {
+function getTargetsToConvert(targets, angularVersion) {
     let buildTargetName;
     let serverTargetName;
     for (const target of Object.keys(targets)) {
@@ -203,7 +205,7 @@ function getTargetsToConvert(targets) {
         // build target
         if (executorsToConvert.has(targets[target].executor)) {
             for (const [, options] of (0, targets_1.allTargetOptions)(targets[target])) {
-                if (options.deployUrl) {
+                if ((0, semver_1.lt)(angularVersion, '17.3.0') && options.deployUrl) {
                     devkit_1.logger.warn(`The project is using the "deployUrl" option which is not available in the application builder. Skipping conversion.`);
                     return {};
                 }

package/src/migrations/update-18-2-0/update-angular-cli.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export declare const angularCliVersion = "~17.3.0";
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-18-2-0/update-angular-cli.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.angularCliVersion = void 0;
+const devkit_1 = require("@nx/devkit");
+exports.angularCliVersion = '~17.3.0';
+async function default_1(tree) {
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+}
+exports.default = default_1;

package/src/utils/versions.d.ts

@@ -1,7 +1,7 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "~17.2.0";
-export declare const angularDevkitVersion = "~17.2.0";
-export declare const ngPackagrVersion = "~17.2.0";
+export declare const angularVersion = "~17.3.0";
+export declare const angularDevkitVersion = "~17.3.0";
+export declare const ngPackagrVersion = "~17.3.0";
 export declare const ngrxVersion = "~17.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.14.3";
@@ -13,7 +13,7 @@ export declare const expressVersion = "~4.18.2";
 export declare const typesExpressVersion = "4.17.14";
 export declare const browserSyncVersion = "^3.0.0";
 export declare const moduleFederationNodeVersion = "~1.0.5";
-export declare const angularEslintVersion = "~17.0.0";
+export declare const angularEslintVersion = "~17.3.0";
 export declare const tailwindVersion = "^3.0.2";
 export declare const postcssVersion = "^8.4.5";
 export declare const postcssUrlVersion = "~10.1.3";

package/src/utils/versions.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.angularVersion = '~17.2.0';
-exports.angularDevkitVersion = '~17.2.0';
-exports.ngPackagrVersion = '~17.2.0';
+exports.angularVersion = '~17.3.0';
+exports.angularDevkitVersion = '~17.3.0';
+exports.ngPackagrVersion = '~17.3.0';
 exports.ngrxVersion = '~17.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.14.3';
@@ -16,7 +16,7 @@ exports.expressVersion = '~4.18.2';
 exports.typesExpressVersion = '4.17.14';
 exports.browserSyncVersion = '^3.0.0';
 exports.moduleFederationNodeVersion = '~1.0.5';
-exports.angularEslintVersion = '~17.0.0';
+exports.angularEslintVersion = '~17.3.0';
 exports.tailwindVersion = '^3.0.2';
 exports.postcssVersion = '^8.4.5';
 exports.postcssUrlVersion = '~10.1.3';