chore: Angular 16 support (#589)

* preparation work for angular 16 support * update to @uirouter/angular@12.0.0 * Update to ui-router/angular@12 * Temporarily point to the Angular 16 update PR * update packages * update rxjs * change back to point to sample-app-angular-hybrid
ui-router · Aug 18, 2023 · 02cb6e2 · 02cb6e2
1 parent f3b9a2b
commit 02cb6e2
Show file tree

Hide file tree

Showing 7 changed files with 1,425 additions and 1,529 deletions.
diff --git a/downstream_projects.json b/downstream_projects.json
@@ -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/ui-router/sample-app-angular-hybrid.git"
 }
diff --git a/example/package.json b/example/package.json
@@ -14,25 +14,25 @@
     ]
   },
   "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",
     "@uirouter/rx": "1.0.0",
     "angular": "1.8.3",
     "rxjs": "^7.4.0",
     "tslib": "1.13.0",
-    "typescript": "4.8.4",
-    "zone.js": "0.11.4"
+    "typescript": "4.9.5",
+    "zone.js": "0.13.0"
   },
   "overrides": {
     "@uirouter/core": "6.1.0"
@@ -43,8 +43,8 @@
   "devDependencies": {
     "@uirouter/cypress-runner": "^3.0.0",
     "ts-loader": "9.4.2",
-    "webpack": "5.64.4",
-    "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "4.6.0"
+    "webpack": "^5.77.0",
+    "webpack-cli": "^5.0.1",
+    "webpack-dev-server": "^4.13.2"
   }
 }
diff --git a/example/src/main.ts b/example/src/main.ts
@@ -94,7 +94,6 @@ const nestedState: NgHybridStateDeclaration = {
     UIRouterUpgradeModule.forRoot({ states: [nestedState] }),
   ],
   declarations: [Ng2Component],
-  entryComponents: [Ng2Component],
 })
 export class RootModule {
   constructor(private upgrade: UpgradeModule) {}

diff --git a/package.json b/package.json
@@ -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",
@@ -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"
@@ -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": "^7.4.0",
     "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,

diff --git a/src/angular-hybrid.ts b/src/angular-hybrid.ts
@@ -202,7 +202,6 @@ export function getParentUIViewInject(r: StateRegistry): ParentUIViewInject {
 
     ..._UIROUTER_SERVICE_PROVIDERS,
   ],
-  entryComponents: [UIViewNgUpgrade],
   exports: [UIViewNgUpgrade, UIRouterModule],
 })
 export class UIRouterUpgradeModule {

diff --git a/tsconfig.json b/tsconfig.json
@@ -19,7 +19,8 @@
   },
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,
-    "strictMetadataEmit": true
+    "strictMetadataEmit": true,
+    "compilationMode": "partial"
   },
-  "files": [ "src/index.ts" ]
+  "files": ["src/index.ts"]
 }