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

chore: Angular 16 support #589

Merged
merged 7 commits into from
Aug 18, 2023
Merged

chore: Angular 16 support #589

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aa8177e
preparation work for angular 16 support
boxmein Jun 29, 2023
6072693
update to @uirouter/angular@12.0.0
boxmein Jul 12, 2023
b8d013f
Update to ui-router/angular@12
boxmein Jul 12, 2023
4948a39
Temporarily point to the Angular 16 update PR
boxmein Jul 12, 2023
0c7ed6f
update packages
boxmein Aug 16, 2023
5f2ab51
update rxjs
boxmein Aug 16, 2023
10405a0
change back to point to sample-app-angular-hybrid
boxmein Aug 18, 2023
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@fix_incorrect_core_version"
"sample-app-angular-hybrid": "https://github.com/boxmein-forks/sample-app-angular-hybrid.git@boxmein_913"
}
16 changes: 8 additions & 8 deletions example/package.json
View file
Open in desktop
boxmein marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
]
},
"dependencies": {
"@angular/animations": "^15.2.3",
"@angular/common": "^15.2.3",
"@angular/compiler": "^15.2.3",
"@angular/core": "^15.2.3",
"@angular/platform-browser": "^15.2.3",
"@angular/platform-browser-dynamic": "^15.2.3",
"@angular/upgrade": "^15.2.3",
"@angular/animations": "^16.0.0",
"@angular/common": "^16.0.0",
"@angular/compiler": "^16.0.0",
"@angular/core": "^16.0.0",
"@angular/platform-browser": "^16.0.0",
"@angular/platform-browser-dynamic": "^16.0.0",
"@angular/upgrade": "^16.0.0",
"@types/angular": "^1.6.39",
"@types/jquery": "^3.2.16",
"@uirouter/angular": "^11.0.0",
"@uirouter/angular": "^12.0.0",
"@uirouter/angular-hybrid": "latest",
"@uirouter/angularjs": "1.0.30",
"@uirouter/core": "6.1.0",
Expand Down
1 change: 0 additions & 1 deletion example/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ const nestedState: NgHybridStateDeclaration = {
UIRouterUpgradeModule.forRoot({ states: [nestedState] }),
],
declarations: [Ng2Component],
entryComponents: [Ng2Component],
})
export class RootModule {
constructor(private upgrade: UpgradeModule) {}
Expand Down
32 changes: 16 additions & 16 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@uirouter/angular-hybrid",
"version": "15.0.2",
"version": "16.0.0",
"scripts": {
"example": "cd example && npm i && npm start",
"clean": "shx rm -rf lib _bundles dist",
Expand All @@ -17,9 +17,9 @@
]
},
"peerDependencies": {
"@angular/core": "^14.0.0 || ^15.0.0",
"@angular/upgrade": "^14.0.0 || ^15.0.0",
"@uirouter/angular": "^11.0.0",
"@angular/core": "^14.0.0 || ^15.0.0 || ^16.0.0",
"@angular/upgrade": "^14.0.0 || ^15.0.0 || ^16.0.0",
"@uirouter/angular": "^12.0.0",
"@uirouter/angularjs": "^1.0.30",
"@uirouter/core": "^6.1.0",
"angular": "^1.5.0"
Expand All @@ -28,31 +28,31 @@
"@uirouter/core": "^6.1.0"
},
"devDependencies": {
"@angular/animations": "^15.2.3",
"@angular/common": "^15.2.3",
"@angular/compiler": "^15.2.3",
"@angular/compiler-cli": "^15.2.3",
"@angular/core": "^15.2.3",
"@angular/platform-browser": "^15.2.3",
"@angular/platform-browser-dynamic": "^15.2.3",
"@angular/upgrade": "^15.2.3",
"@angular/animations": "^16.0.0",
"@angular/common": "^16.0.0",
"@angular/compiler": "^16.0.0",
"@angular/compiler-cli": "^16.0.0",
"@angular/core": "^16.0.0",
"@angular/platform-browser": "^16.0.0",
"@angular/platform-browser-dynamic": "^16.0.0",
"@angular/upgrade": "^16.0.0",
"@types/angular": "^1.8.2",
"@types/jquery": "^3.5.6",
"@uirouter/angular": "11.0.0",
"@uirouter/angular": "^12.0.0",
"@uirouter/angularjs": "^1.0.30",
"@uirouter/core": "^6.1.0",
"@uirouter/publish-scripts": "^2.6.0",
"@uirouter/rx": "^1.0.0",
"angular": "^1.8.3",
"husky": "^4.3.8",
"ng-packagr": "^15.2.2",
"ng-packagr": "^16.0.0",
"prettier": "^2.3.2",
"pretty-quick": "^2.0.1",
"rxjs": "^6.6.7",
"rxjs-compat": "^6.6.7",
"shx": "^0.3.3",
"typescript": "4.8.4",
"zone.js": "0.11.4"
"typescript": "4.9.5",
"zone.js": "^0.13.0"
},
"distDir": "dist",
"sideEffects": true,
Expand Down
1 change: 0 additions & 1 deletion src/angular-hybrid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ export function getParentUIViewInject(r: StateRegistry): ParentUIViewInject {

..._UIROUTER_SERVICE_PROVIDERS,
],
entryComponents: [UIViewNgUpgrade],
exports: [UIViewNgUpgrade, UIRouterModule],
})
export class UIRouterUpgradeModule {
Expand Down
5 changes: 3 additions & 2 deletions tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
},
"angularCompilerOptions": {
"skipTemplateCodegen": true,
"strictMetadataEmit": true
"strictMetadataEmit": true,
"compilationMode": "partial"
},
"files": [ "src/index.ts" ]
"files": ["src/index.ts"]
}
Loading