feat(angular): support angular 17.3.0 (#22202)

nrwl · Mar 19, 2024 · 8baddb5 · 8baddb5
1 parent d058c8c
commit 8baddb5
Show file tree

Hide file tree

Showing 35 changed files with 2,840 additions and 802 deletions.
diff --git a/docs/generated/packages/angular/executors/application.json b/docs/generated/packages/angular/executors/application.json
@@ -66,6 +66,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",
@@ -252,9 +256,9 @@
           "properties": {
             "replace": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             },
-            "with": { "type": "string", "pattern": "\\.(([cm]?j|t)sx?|json)$" }
+            "with": { "type": "string", "pattern": "\\.(([cm]?[jt])sx?|json)$" }
           },
           "additionalProperties": false,
           "required": ["replace", "with"]
@@ -673,9 +677,9 @@
         "properties": {
           "replace": {
             "type": "string",
-            "pattern": "\\.(([cm]?j|t)sx?|json)$"
+            "pattern": "\\.(([cm]?[jt])sx?|json)$"
           },
-          "with": { "type": "string", "pattern": "\\.(([cm]?j|t)sx?|json)$" }
+          "with": { "type": "string", "pattern": "\\.(([cm]?[jt])sx?|json)$" }
         },
         "additionalProperties": false,
         "required": ["replace", "with"]

diff --git a/docs/generated/packages/angular/executors/browser-esbuild.json b/docs/generated/packages/angular/executors/browser-esbuild.json
@@ -235,9 +235,9 @@
           "properties": {
             "replace": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             },
-            "with": { "type": "string", "pattern": "\\.(([cm]?j|t)sx?|json)$" }
+            "with": { "type": "string", "pattern": "\\.(([cm]?[jt])sx?|json)$" }
           },
           "additionalProperties": false,
           "required": ["replace", "with"]
@@ -307,8 +307,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",
@@ -587,9 +586,9 @@
         "properties": {
           "replace": {
             "type": "string",
-            "pattern": "\\.(([cm]?j|t)sx?|json)$"
+            "pattern": "\\.(([cm]?[jt])sx?|json)$"
           },
-          "with": { "type": "string", "pattern": "\\.(([cm]?j|t)sx?|json)$" }
+          "with": { "type": "string", "pattern": "\\.(([cm]?[jt])sx?|json)$" }
         },
         "additionalProperties": false,
         "required": ["replace", "with"]

diff --git a/docs/generated/packages/angular/executors/webpack-browser.json b/docs/generated/packages/angular/executors/webpack-browser.json
@@ -251,11 +251,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,
@@ -266,11 +266,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,
@@ -344,8 +344,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",
@@ -609,11 +608,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,
@@ -624,11 +623,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,

diff --git a/docs/generated/packages/angular/executors/webpack-server.json b/docs/generated/packages/angular/executors/webpack-server.json
@@ -110,11 +110,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,
@@ -125,11 +125,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,
@@ -182,8 +182,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",
@@ -340,11 +339,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,
@@ -355,11 +354,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,

diff --git a/package.json b/package.json
@@ -26,19 +26,19 @@
   },
   "devDependencies": {
     "@actions/core": "^1.10.0",
-    "@angular-devkit/architect": "0.1702.0",
-    "@angular-devkit/build-angular": "17.2.0",
-    "@angular-devkit/core": "17.2.0",
-    "@angular-devkit/schematics": "17.2.0",
-    "@angular-eslint/eslint-plugin": "17.0.1",
-    "@angular-eslint/eslint-plugin-template": "17.0.1",
-    "@angular-eslint/template-parser": "17.0.1",
-    "@angular/cli": "~17.2.0",
-    "@angular/common": "17.2.1",
-    "@angular/compiler": "17.2.1",
-    "@angular/compiler-cli": "17.2.1",
-    "@angular/core": "17.2.1",
-    "@angular/router": "17.2.1",
+    "@angular-devkit/architect": "~0.1703.0",
+    "@angular-devkit/build-angular": "~17.3.0",
+    "@angular-devkit/core": "~17.3.0",
+    "@angular-devkit/schematics": "~17.3.0",
+    "@angular-eslint/eslint-plugin": "~17.3.0",
+    "@angular-eslint/eslint-plugin-template": "~17.3.0",
+    "@angular-eslint/template-parser": "~17.3.0",
+    "@angular/cli": "~17.3.0",
+    "@angular/common": "~17.3.0",
+    "@angular/compiler": "~17.3.0",
+    "@angular/compiler-cli": "~17.3.0",
+    "@angular/core": "~17.3.0",
+    "@angular/router": "~17.3.0",
     "@babel/core": "^7.23.2",
     "@babel/helper-create-regexp-features-plugin": "^7.22.9",
     "@babel/plugin-transform-runtime": "^7.23.2",
@@ -93,7 +93,7 @@
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.0.4",
     "@rollup/plugin-url": "^7.0.0",
-    "@schematics/angular": "17.2.0",
+    "@schematics/angular": "~17.3.0",
     "@side/jest-runtime": "^1.1.0",
     "@storybook/addon-essentials": "7.5.3",
     "@storybook/core-server": "7.5.3",
@@ -132,10 +132,10 @@
     "@types/tmp": "^0.2.0",
     "@types/yargs": "^17.0.10",
     "@types/yarnpkg__lockfile": "^1.1.5",
-    "@typescript-eslint/eslint-plugin": "6.18.1",
-    "@typescript-eslint/parser": "6.18.1",
-    "@typescript-eslint/type-utils": "6.18.1",
-    "@typescript-eslint/utils": "6.18.1",
+    "@typescript-eslint/eslint-plugin": "^7.3.0",
+    "@typescript-eslint/parser": "^7.3.0",
+    "@typescript-eslint/type-utils": "^7.3.0",
+    "@typescript-eslint/utils": "^7.3.0",
     "@xstate/immer": "0.3.1",
     "@xstate/inspect": "0.7.0",
     "@xstate/react": "3.0.1",
@@ -167,7 +167,7 @@
     "ejs": "^3.1.7",
     "enhanced-resolve": "^5.8.3",
     "esbuild": "0.19.5",
-    "eslint": "8.48.0",
+    "eslint": "~8.57.0",
     "eslint-config-next": "14.0.4",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-cypress": "2.14.0",
@@ -228,7 +228,7 @@
     "mini-css-extract-plugin": "~2.4.7",
     "minimatch": "9.0.3",
     "next-sitemap": "^3.1.10",
-    "ng-packagr": "17.2.0",
+    "ng-packagr": "~17.3.0",
     "node-fetch": "^2.6.7",
     "npm-package-arg": "11.0.1",
     "nuxt": "^3.10.0",
@@ -239,7 +239,7 @@
     "ora": "5.3.0",
     "parse-markdown-links": "^1.0.4",
     "parse5": "4.0.0",
-    "piscina": "^4.2.1",
+    "piscina": "^4.4.0",
     "postcss": "8.4.19",
     "postcss-import": "~14.1.0",
     "postcss-preset-env": "~7.5.0",
@@ -283,7 +283,7 @@
     "tsconfig-paths-webpack-plugin": "4.0.0",
     "typedoc": "0.25.12",
     "typedoc-plugin-markdown": "3.17.1",
-    "typescript": "~5.3.2",
+    "typescript": "~5.4.2",
     "unist-builder": "^4.0.0",
     "unzipper": "^0.10.11",
     "url-loader": "^4.1.1",
@@ -374,4 +374,3 @@
     ]
   }
 }
-
diff --git a/packages/angular/migrations.json b/packages/angular/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
+        }
+      }
     }
   }
 }