Merge pull request the-guild-org#2405 from the-guild-org/powerkiki

Angular 22

Author: PowerKiKi

.changeset/apollo-angular-2405-dependencies.md

@@ -0,0 +1,5 @@
+---
+"apollo-angular": patch
+---
+dependencies updates:
+  - Updated dependency [`@angular/core@^20.0.0 || ^21.0.0 || ^22.0.0` ↗︎](https://www.npmjs.com/package/@angular/core/v/20.0.0) (from `^19.0.0 || ^20.0.0 || ^21.0.0`, in `peerDependencies`)

.changeset/pretty-phones-take.md

@@ -0,0 +1,5 @@
+---
+'apollo-angular': minor
+---
+
+Support Angular 22

.changeset/shaky-shrimps-warn.md

@@ -0,0 +1,5 @@
+---
+'apollo-angular': patch
+---
+
+ng-add schematics drop support for NgModule applications

.github/workflows/main.yml

@@ -7,12 +7,12 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v6
       - uses: pnpm/action-setup@v6
 
-      - uses: actions/setup-node@master
+      - uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
 
       - name: Install
@@ -45,12 +45,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v6
       - uses: pnpm/action-setup@v6
 
-      - uses: actions/setup-node@master
+      - uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
 
       - name: Install
@@ -67,12 +67,12 @@ jobs:
   prettier:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v6
       - uses: pnpm/action-setup@v6
 
-      - uses: actions/setup-node@master
+      - uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
 
       - name: Install
@@ -88,15 +88,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        angular_version: [19, 20, 21]
+        angular_version: [20, 21, 22]
         graphql_version: [16]
-        node_version: [20, 22, 24]
+        node_version: [20, 22, 24, 26]
         exclude:
-          - angular_version: 19
-            node_version: 24
+          - angular_version: 20
+            node_version: 26
+          - angular_version: 21
+            node_version: 26
+          - angular_version: 22
+            node_version: 20
     steps:
       - name: Use Node.js ${{ matrix.node_version }}
-        uses: actions/setup-node@master
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node_version }}
 

.github/workflows/pr.yml

@@ -5,27 +5,6 @@ on:
       - master
 
 jobs:
-  dependencies:
-    uses: the-guild-org/shared-config/.github/workflows/changesets-dependencies.yaml@main
-    secrets:
-      githubToken: ${{ secrets.GITHUB_TOKEN }}
-
-  alpha:
-    permissions:
-      contents: write
-      id-token: write
-      packages: write
-    uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main
-    if: ${{ github.event.pull_request.title != 'Upcoming Release Changes' }}
-    with:
-      packageManager: pnpm
-      npmTag: alpha
-      buildScript: build
-      nodeVersion: 22
-    secrets:
-      githubToken: ${{ secrets.GITHUB_TOKEN }}
-      npmToken: ${{ secrets.NPM_TOKEN }}
-
   release-candidate:
     permissions:
       contents: write
@@ -38,7 +17,7 @@ jobs:
       npmTag: rc
       restoreDeletedChangesets: true
       buildScript: build
-      nodeVersion: 22
+      nodeVersion: 26
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
       npmToken: ${{ secrets.NPM_TOKEN }}

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       packageManager: pnpm
       createGithubReleases: true
       releaseScript: release
-      nodeVersion: 22
+      nodeVersion: 26
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
       npmToken: ${{ secrets.NPM_TOKEN }}

.github/workflows/website.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: the-guild-org/shared-config/setup@main
         name: website
         with:
-          nodeVersion: 22 # change if needed
+          nodeVersion: 26 # change if needed
           packageManager: pnpm # change if needed
 
       - name: Pre-install wrangler

package.json

@@ -2,7 +2,7 @@
   "name": "apollo-angular-monorepo",
   "license": "MIT",
   "private": true,
-  "packageManager": "pnpm@11.2.1",
+  "packageManager": "pnpm@11.5.2",
   "scripts": {
     "build": "pnpm run --recursive build",
     "ci-only:integration": "./scripts/integration tests",
@@ -16,7 +16,7 @@
     "test:e2e": "./scripts/run-e2e-locally.sh"
   },
   "devDependencies": {
-    "@angular/cli": "^19.2.0",
+    "@angular/cli": "^20.3.0",
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.3",
     "@theguild/prettier-config": "^2.0.1",

packages/apollo-angular/package.json

@@ -38,7 +38,7 @@
     "test:schematics": "tsc -p schematics/tsconfig.test.json && node scripts/move-schematics.js && jasmine --config=schematics/jasmine.json"
   },
   "peerDependencies": {
-    "@angular/core": "^19.0.0 || ^20.0.0 || ^21.0.0",
+    "@angular/core": "^20.0.0 || ^21.0.0 || ^22.0.0",
     "@apollo/client": "^4.0.1",
     "graphql": "^16.0.0",
     "rxjs": "^7.8.0"
@@ -47,24 +47,25 @@
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@analogjs/vite-plugin-angular": "^2.1.1",
-    "@analogjs/vitest-angular": "^2.1.1",
-    "@angular-devkit/schematics": "^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",
+    "@analogjs/vite-plugin-angular": "^2.6.0",
+    "@analogjs/vitest-angular": "^2.6.0",
+    "@angular-devkit/schematics": "^20.3.0",
+    "@angular/common": "^20.3.0",
+    "@angular/compiler": "^20.3.0",
+    "@angular/compiler-cli": "^20.3.0",
+    "@angular/core": "^20.3.0",
+    "@angular/platform-browser": "^20.3.0",
+    "@angular/platform-browser-dynamic": "^20.3.0",
+    "@angular/platform-server": "^20.3.0",
     "@types/jasmine": "^5.1.7",
     "@types/node": "^22.0.0",
     "jasmine": "^5.6.0",
     "jsdom": "^26.0.0",
-    "ng-packagr": "^19.2.2",
+    "ng-packagr": "^20.3.0",
     "typescript": "~5.8.0",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^4.0.14"
+    "vitest": "^4.0.14",
+    "zone.js": "^0.16.2"
   },
   "publishConfig": {
     "directory": "build",

packages/apollo-angular/schematics/README.md

@@ -12,8 +12,6 @@ Add Apollo Angular and its dependencies and configures the application.
   - apollo-angular
   - @apollo/client
   - graphql
-- Adds `GraphQLModule` with required setup to use the plugin.
-- Imports `GraphQLModule` in the root NgModule (`AppModule`).
-- Imports `HttpClientModule` in the root NgModule (`AppModule`).
+- Provides `Apollo` and `HttpClient` in the application
 
 Command: `ng add apollo-angular`