Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Angular 18 #26213

Merged
merged 25 commits into from
Jun 17, 2024
Merged

Upgrade to Angular 18 #26213

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
43641cd
Upgrade to Angular 18
mraible May 21, 2024
7502e6a
Upgrade CLI to 18.0.0-rc.3
mraible May 21, 2024
c5af9d4
Revert tslib downgrade
mraible May 21, 2024
1a9512d
override sub dependencies
mshima May 22, 2024
99cc195
add more overrides
mshima May 22, 2024
c636d78
add more overrides
mshima May 22, 2024
79c9596
fix overrides
mshima May 22, 2024
1f2e977
Upgrade to Angular 18.0.0
mraible May 23, 2024
4d7ebfc
Upgrade to latest Angular versions
mraible May 31, 2024
673d2f7
Merge branch 'main' into angular-18
mraible May 31, 2024
53efea3
bump dependencies
mshima May 31, 2024
43ac4a8
bump dependencies
mshima May 31, 2024
9eab13a
Update package.json.ejs
mshima May 31, 2024
35981f3
Update package.json.ejs
mshima May 31, 2024
b787799
Update package.json.ejs
mshima Jun 1, 2024
f5d60ca
update fa-icon usage
mshima Jun 1, 2024
51a7286
Bump @angular-eslint/eslint-plugin
dependabot[bot] Jun 13, 2024
c97a3a5
Bump the angular group across 1 directory with 9 updates
dependabot[bot] Jun 13, 2024
e11a94e
Merge remote-tracking branch 'upstream/main' into angular-18
mshima Jun 13, 2024
b15eae4
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/genera…
mshima Jun 13, 2024
cc1fb7d
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/genera…
mshima Jun 13, 2024
f496d30
drop overrides
mshima Jun 13, 2024
15e5e6a
Update @angular-builders/jest to 18.0.0
DanielFran Jun 17, 2024
3d00201
Update @angular-builders/custom-webpack version to 18.0.0
DanielFran Jun 17, 2024
6273885
Update @angular/cli version to 18.0.4
DanielFran Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions generators/angular/resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"@angular/common": "17.3.9",
"@angular/common": "18.0.0",
mraible marked this conversation as resolved.
Show resolved Hide resolved
"@fortawesome/angular-fontawesome": "0.14.1",
"@fortawesome/fontawesome-svg-core": "6.5.2",
"@fortawesome/free-solid-svg-icons": "6.5.2",
Expand All @@ -24,7 +24,7 @@
"@angular-builders/custom-webpack": "17.0.2",
"@angular-builders/jest": "17.0.3",
"@angular-eslint/eslint-plugin": "17.4.1",
"@angular/cli": "17.3.7",
"@angular/cli": "18.0.0",
mraible marked this conversation as resolved.
Show resolved Hide resolved
"@types/jest": "29.5.12",
"@types/node": "20.11.25",
"@types/sockjs-client": "1.5.4",
Expand Down
10 changes: 10 additions & 0 deletions generators/angular/templates/package.json.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,16 @@
"webpack-notifier": "<%= nodeDependencies['webpack-notifier'] %>"
},
"overrides": {
"@angular/compiler-cli": "<%= nodeDependencies['@angular/common'] %>",
"@angular/common": "<%= nodeDependencies['@angular/common'] %>",
"@angular/compiler": "<%= nodeDependencies['@angular/common'] %>",
"@angular/core": "<%= nodeDependencies['@angular/common'] %>",
"@angular/forms": "<%= nodeDependencies['@angular/common'] %>",
"@angular/localize": "<%= nodeDependencies['@angular/common'] %>",
"@angular/platform-browser": "<%= nodeDependencies['@angular/common'] %>",
"@angular/platform-browser-dynamic": "<%= nodeDependencies['@angular/common'] %>",
"@angular/router": "<%= nodeDependencies['@angular/common'] %>",
"@angular-devkit/build-angular": "<%= nodeDependencies['@angular/common'] %>",
"browser-sync": "<%= nodeDependencies['browser-sync'] %>",
"webpack": "<%= nodeDependencies['webpack'] %>"
},
Expand Down
Loading