Merge pull request #2389 from matictrebusak/upgrade/angular-21-support

Added support for angular 21

Author: PowerKiKi

.changeset/fresh-beans-crash.md

@@ -0,0 +1,5 @@
+---
+'apollo-angular': major
+---
+
+Drop support for Angular 18

.changeset/goofy-hotels-shout.md

@@ -0,0 +1,5 @@
+---
+'apollo-angular': major
+---
+
+Support for Angular 21

.github/workflows/main.yml

@@ -112,7 +112,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        angular_version: [18, 19, 20]
+        angular_version: [18, 19, 20, 21]
         graphql_version: [16]
         node_version: [20, 22, 24]
         exclude:

CONTRIBUTING.md

@@ -165,7 +165,6 @@ We are using `Changeset` to manage and publish our releasing flow.
 1. Make your changes to the code and test them thoroughly.
 2. Run the command `yarn changeset` in your terminal. This will prompt you to select the type of
    change you made. The available options are patch, minor, and major.
-
    1. `Patch` for backward-compatible bug fixes.
    2. `Minor` for new features and backward-compatible changes.
    3. `Major` for breaking changes.

package.json

@@ -24,40 +24,40 @@
     "test:e2e": "./scripts/run-e2e-locally.sh"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^18.0.1",
-    "@angular-devkit/core": "^18.0.1",
-    "@angular-devkit/schematics": "^18.0.1",
-    "@angular/animations": "^18.0.0",
-    "@angular/cli": "^18.0.1",
-    "@angular/common": "^18.0.0",
-    "@angular/compiler": "^18.0.0",
-    "@angular/compiler-cli": "^18.0.0",
-    "@angular/core": "^18.0.0",
-    "@angular/platform-browser": "^18.0.0",
-    "@angular/platform-browser-dynamic": "^18.0.0",
-    "@angular/platform-server": "^18.0.0",
-    "@angular/router": "^18.0.0",
+    "@angular-devkit/build-angular": "^19.2.0",
+    "@angular-devkit/core": "^19.2.0",
+    "@angular-devkit/schematics": "^19.2.0",
+    "@angular/animations": "^19.2.0",
+    "@angular/cli": "^19.2.0",
+    "@angular/common": "^19.2.0",
+    "@angular/compiler": "^19.2.0",
+    "@angular/compiler-cli": "^19.2.0",
+    "@angular/core": "^19.2.0",
+    "@angular/platform-browser": "^19.2.0",
+    "@angular/platform-browser-dynamic": "^19.2.0",
+    "@angular/platform-server": "^19.2.0",
+    "@angular/router": "^19.2.0",
     "@apollo/client": "4.0.1",
     "@babel/core": "^7.24.6",
     "@babel/preset-env": "^7.24.6",
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.3",
-    "@schematics/angular": "^18.0.1",
+    "@schematics/angular": "^19.2.0",
     "@theguild/prettier-config": "^2.0.1",
     "@types/node": "^20.12.12",
     "browserlist": "^1.0.1",
     "graphql": "^16.8.0",
     "husky": "^9.0.0",
     "lint-staged": "^15.2.5",
-    "ng-packagr": "^19.0.0",
-    "prettier": "^3.5.3",
+    "ng-packagr": "^19.2.0",
+    "prettier": "^3.7.1",
     "react": "^18.3.1",
     "rimraf": "^5.0.7",
     "rxjs": "~7.8.0",
     "shelljs": "^0.8.5",
     "tslib": "^2.3.0",
-    "typescript": "5.4.5",
-    "zone.js": "~0.14.6"
+    "typescript": "~5.7.2",
+    "zone.js": "~0.15.0"
   },
   "husky": {
     "hooks": {

packages/apollo-angular/package.json

@@ -38,23 +38,24 @@
     "test:schematics": "tsc -p schematics/tsconfig.test.json && node scripts/move-schematics.js && jasmine --config=schematics/jasmine.json"
   },
   "peerDependencies": {
-    "@angular/core": "^18.0.0 || ^19.0.0 || ^20.0.0",
+    "@angular/core": "^19.0.0 || ^20.0.0 || ^21.0.0",
     "@apollo/client": "^4.0.1",
     "graphql": "^16.0.0",
-    "rxjs": "^7.3.0"
+    "rxjs": "^7.8.0"
   },
   "dependencies": {
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@analogjs/vite-plugin-angular": "^1.14.0",
-    "@analogjs/vitest-angular": "^1.14.0",
+    "@analogjs/vite-plugin-angular": "^2.1.1",
+    "@analogjs/vitest-angular": "^2.1.1",
+    "@angular/build": "^19.2.0",
     "@types/jasmine": "^5.1.7",
     "@types/node": "^20.12.12",
     "jasmine": "^5.6.0",
     "jsdom": "^26.0.0",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.0.7"
+    "vitest": "^4.0.14"
   },
   "publishConfig": {
     "directory": "build",

packages/apollo-angular/tests/Apollo.spec.ts

@@ -460,6 +460,8 @@ describe('Apollo', () => {
         loading: false,
       });
 
+      await expect(stream.takeComplete()).resolves.toBeUndefined();
+
       await expect(stream).not.toEmitAnything();
     });
 
@@ -502,6 +504,8 @@ describe('Apollo', () => {
         loading: false,
       });
 
+      await expect(stream.takeComplete()).resolves.toBeUndefined();
+
       await expect(stream).not.toEmitAnything();
     });
   });

website/next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.