Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/fresh-beans-crash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'apollo-angular': major
---

Drop support for Angular 18
5 changes: 5 additions & 0 deletions .changeset/goofy-hotels-shout.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'apollo-angular': major
---

Support for Angular 21
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
11 changes: 6 additions & 5 deletions packages/apollo-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 4 additions & 0 deletions packages/apollo-angular/tests/Apollo.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,8 @@ describe('Apollo', () => {
loading: false,
});

await expect(stream.takeComplete()).resolves.toBeUndefined();

await expect(stream).not.toEmitAnything();
});

Expand Down Expand Up @@ -502,6 +504,8 @@ describe('Apollo', () => {
loading: false,
});

await expect(stream.takeComplete()).resolves.toBeUndefined();

await expect(stream).not.toEmitAnything();
});
});
Expand Down
2 changes: 1 addition & 1 deletion website/next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Loading