From adc4fe5d151a7e314d1e40f7b071578bf69b88a7 Mon Sep 17 00:00:00 2001 From: mark7-bell <88339313+mark7-bell@users.noreply.github.com> Date: Thu, 29 May 2025 13:23:47 -0600 Subject: [PATCH 1/7] Add Angular 20 to package.json --- packages/apollo-angular/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-angular/package.json b/packages/apollo-angular/package.json index fecb00609..dbe23cf1f 100644 --- a/packages/apollo-angular/package.json +++ b/packages/apollo-angular/package.json @@ -36,7 +36,7 @@ "test:schematics": "tsc -p schematics/tsconfig.test.json && node scripts/move-schematics.js && jasmine --config=schematics/jasmine.json" }, "peerDependencies": { - "@angular/core": "^17.0.0 || ^18.0.0 || ^19.0.0", + "@angular/core": "^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0", "@apollo/client": "^3.13.1", "graphql": "^15.0.0 || ^16.0.0", "rxjs": "^6.0.0 || ^7.0.0" From 3f9ab3dd25a59ce1abcdff32af6b89398f27cdae Mon Sep 17 00:00:00 2001 From: mark7-bell <88339313+mark7-bell@users.noreply.github.com> Date: Thu, 29 May 2025 13:49:54 -0600 Subject: [PATCH 2/7] Add Angular 20 to the testing matrix in main.yml. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 51b95bf13..2a3aed21e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -115,7 +115,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - angular_version: [17, 18, 19] + angular_version: [17, 18, 19, 20] graphql_version: [15, 16] node_version: [18, 20] steps: From 7e6d08efb1ad14c8e14c9c935080f64624d3e79c Mon Sep 17 00:00:00 2001 From: mark7-bell <88339313+mark7-bell@users.noreply.github.com> Date: Thu, 29 May 2025 15:49:03 -0600 Subject: [PATCH 3/7] Update main.yml --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2a3aed21e..bed75261f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -118,6 +118,9 @@ jobs: angular_version: [17, 18, 19, 20] graphql_version: [15, 16] node_version: [18, 20] + exclude: + - angular_version: 20 + node_version: 18 steps: - name: Use Node.js ${{ matrix.node_version }} uses: actions/setup-node@master From 975c12c60d74624ce46bbd247c53aab6e200a1be Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Fri, 30 May 2025 08:35:15 +0200 Subject: [PATCH 4/7] Drop support for Angular 17 Because it is EOL --- .changeset/lazy-plants-poke.md | 5 +++++ .github/workflows/main.yml | 2 +- packages/apollo-angular/package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changeset/lazy-plants-poke.md diff --git a/.changeset/lazy-plants-poke.md b/.changeset/lazy-plants-poke.md new file mode 100644 index 000000000..f4254d282 --- /dev/null +++ b/.changeset/lazy-plants-poke.md @@ -0,0 +1,5 @@ +--- +'apollo-angular': major +--- + +Drop support for Angular 17 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bed75261f..c125a0421 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -115,7 +115,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - angular_version: [17, 18, 19, 20] + angular_version: [18, 19, 20] graphql_version: [15, 16] node_version: [18, 20] exclude: diff --git a/packages/apollo-angular/package.json b/packages/apollo-angular/package.json index dbe23cf1f..3acd144fd 100644 --- a/packages/apollo-angular/package.json +++ b/packages/apollo-angular/package.json @@ -36,7 +36,7 @@ "test:schematics": "tsc -p schematics/tsconfig.test.json && node scripts/move-schematics.js && jasmine --config=schematics/jasmine.json" }, "peerDependencies": { - "@angular/core": "^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0", + "@angular/core": "^18.0.0 || ^19.0.0 || ^20.0.0", "@apollo/client": "^3.13.1", "graphql": "^15.0.0 || ^16.0.0", "rxjs": "^6.0.0 || ^7.0.0" From f7dda4ea6781f1c19caffa044cc8fca7553fd78a Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Fri, 30 May 2025 08:40:31 +0200 Subject: [PATCH 5/7] Test on node 22 and 24 --- .github/workflows/main.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c125a0421..eb7f3ccb4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -117,8 +117,20 @@ jobs: matrix: angular_version: [18, 19, 20] graphql_version: [15, 16] - node_version: [18, 20] + node_version: [18, 20, 22, 24] exclude: + - angular_version: 18 + node_version: 22 + + - angular_version: 18 + node_version: 24 + + - angular_version: 19 + node_version: 22 + + - angular_version: 19 + node_version: 24 + - angular_version: 20 node_version: 18 steps: From 9c2c9c8cc22e69dcd98b346a0d379507302254d0 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Fri, 30 May 2025 08:45:13 +0200 Subject: [PATCH 6/7] Support component without suffix in e2e --- scripts/prepare-e2e.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/prepare-e2e.js b/scripts/prepare-e2e.js index f3ee2c9ff..290aefe43 100755 --- a/scripts/prepare-e2e.js +++ b/scripts/prepare-e2e.js @@ -7,7 +7,12 @@ const cwd = process.cwd(); const [, , name, version] = process.argv; function updateComponent() { - let filepath = path.join(cwd, `./${name}/src/app/app.component.ts`); + let filepath = + [ + path.join(cwd, `./${name}/src/app/app.component.ts`), + path.join(cwd, `./${name}/src/app/app.ts`), + ].find(path => fs.existsSync(path)); + const code = `import { Apollo } from 'apollo-angular';\n` + `import { versionInfo } from 'graphql';\n` + From 36ee0c23c9585c249c28f91b015e442145135d69 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Fri, 30 May 2025 10:12:52 +0200 Subject: [PATCH 7/7] Declare Angular 20 support --- .changeset/yellow-points-sort.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/yellow-points-sort.md diff --git a/.changeset/yellow-points-sort.md b/.changeset/yellow-points-sort.md new file mode 100644 index 000000000..deeaaeb77 --- /dev/null +++ b/.changeset/yellow-points-sort.md @@ -0,0 +1,5 @@ +--- +'apollo-angular': major +--- + +Support Angular 20