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

chore: Angular 18 support #598

Merged
merged 5 commits into from
Jul 15, 2024
Merged

chore: Angular 18 support #598

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
525d10d
chore: Angular 18 support
lukaVarga Jul 5, 2024
23a748e
chore: Update @uirouter/angular peer dependency
lukaVarga Jul 5, 2024
9b5b8c1
chore: Revert downstream projects
lukaVarga Jul 10, 2024
8bff28e
chore: Update package.json
lukaVarga Jul 15, 2024
8b38601
chore: Update example app
lukaVarga Jul 15, 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
2 changes: 1 addition & 1 deletion downstream_projects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"example": "./example",
"sample-app-angular-hybrid": "https://github.com/ui-router/sample-app-angular-hybrid.git"
"sample-app-angular-hybrid": "https://github.com/lukaVarga/ui-router-sample-app-angular-hybrid.git"
lukaVarga marked this conversation as resolved.
Show resolved Hide resolved
}
26 changes: 13 additions & 13 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
]
},
"peerDependencies": {
"@angular/core": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
"@angular/upgrade": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
"@uirouter/angular": "^13.0.0",
"@angular/core": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
"@angular/upgrade": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
"@uirouter/angular": "^14.0.0",
"@uirouter/angularjs": "^1.0.30",
"@uirouter/core": "^6.1.0",
"angular": "^1.5.0"
Expand All @@ -28,14 +28,14 @@
"@uirouter/core": "^6.1.0"
},
"devDependencies": {
"@angular/animations": "^17.2.1",
"@angular/common": "^17.2.1",
"@angular/compiler": "^17.2.1",
"@angular/compiler-cli": "^17.0.0",
"@angular/core": "^17.2.1",
"@angular/platform-browser": "^17.2.1",
"@angular/platform-browser-dynamic": "^17.2.1",
"@angular/upgrade": "^17.2.1",
"@angular/animations": "^18.0.6",
"@angular/common": "^18.0.6",
"@angular/compiler": "^18.0.6",
"@angular/compiler-cli": "^18.0.6",
"@angular/core": "^18.0.6",
"@angular/platform-browser": "^18.0.6",
"@angular/platform-browser-dynamic": "^18.0.6",
"@angular/upgrade": "^18.0.6",
"@types/angular": "^1.8.9",
"@types/jquery": "^3.5.6",
"@uirouter/angular": "^13.0.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be 14

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the examples folder needs updating to angular 18, etc,

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, I missed that one. I updated it now.

Expand All @@ -45,13 +45,13 @@
"@uirouter/rx": "^1.0.0",
"angular": "^1.8.3",
"husky": "^4.3.8",
"ng-packagr": "^17.2.0",
"ng-packagr": "^18.0.0",
"prettier": "^2.3.2",
"pretty-quick": "^2.0.1",
"rxjs": "^7.4.0",
"rxjs-compat": "^6.6.7",
"shx": "^0.3.3",
"typescript": "5.2.2",
"typescript": "5.4.5",
"tslib": "2.6.2",
"zone.js": "^0.14.4"
},
Expand Down
Loading
Loading