Apollo Client v4 compatibility

.changeset/chatty-cherries-drum.md

@@ -0,0 +1,56 @@
+---
+'apollo-angular': major
+---
+
+Namespaced types
+
+Before:
+
+```ts
+import type {
+  Options,
+  BatchOptions
+} from 'apollo-angular/http';
+
+import type {
+  MutationOptionsAlone,
+  QueryOptionsAlone,
+  SubscriptionOptionsAlone,
+  WatchQueryOptions,
+  WatchQueryOptionsAlone,
+} from 'apollo-angular';
+
+type AllTypes =
+  | Options
+  | BatchOptions
+  | MutationOptionsAlone
+  | QueryOptionsAlone
+  | SubscriptionOptionsAlone
+  | WatchQueryOptions
+  | WatchQueryOptionsAlone;
+```
+
+After:
+
+```ts
+import type {
+  HttpBatchLink,
+  HttpLink
+} from 'apollo-angular/http';
+
+import type {
+  Apollo,
+  Mutation,
+  Query,
+  Subscription,
+} from 'apollo-angular';
+
+type AllTypes =
+  | HttpLink.Options
+  | HttpBatchLink.Options
+  | Mutation.MutateOptions
+  | Query.FetchOptions
+  | Subscription.SubscribeOptions
+  | Apollo.WatchQueryOptions
+  | Query.WatchOptions;
+```

.changeset/config.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
-  "changelog": ["@changesets/changelog-github", { "repo": "kamilkisiela/apollo-angular" }],
+  "changelog": ["@changesets/changelog-github", { "repo": "Ecodev/apollo-angular" }],
   "commit": false,
   "access": "public",
   "baseBranch": "master",

.changeset/early-tigers-draw.md

@@ -0,0 +1,5 @@
+---
+'apollo-angular': patch
+---
+
+Drop support for node 18

.changeset/funny-trainers-look.md

@@ -0,0 +1,12 @@
+---
+'apollo-angular': major
+---
+
+`httpHeaders` is a class
+
+Migrate your code like so:
+
+```diff
+- const link = httpHeaders();
++ const link = new HttpHeadersLink();
+```

.changeset/giant-clouds-shout.md

@@ -0,0 +1,11 @@
+---
+'apollo-angular': major
+---
+
+Move `useZone` option into subscription options
+
+
+```diff
+- const obs = apollo.subscribe(options, { useZone: false });
++ const obs = apollo.subscribe({ ...options, useZone: false });
+```

.changeset/odd-badgers-fetch.md

@@ -0,0 +1,5 @@
+---
+'apollo-angular': patch
+---
+
+Drop ESM2022 in favor of FESM2022

.changeset/rich-dogs-fetch.md

@@ -0,0 +1,14 @@
+---
+'apollo-angular': patch
+---
+
+New repository owners
+
+[@kamilkisiela](https://github.com/kamilkisiela), the creator of this library, has found new
+interests and is not able to contribute like in the past. He gracefully transferred ownership of the
+repository to me. I have been maintaining this library since 2022, and will continue doing so in the
+foreseeable future.
+
+For the package consumers, pretty much nothing will change. The package name, the code, the relation
+with [The Guild](https://github.com/the-guild-org), and the maintenance style will all remain the
+same. The only difference is the new repository URL: https://github.com/the-guild-org/apollo-angular.

.changeset/tough-masks-search.md

@@ -0,0 +1,26 @@
+---
+'apollo-angular': major
+---
+
+Combined parameters of `Query`, `Mutation` and `Subscription` classes generated via codegen
+
+Migrate your code like so:
+
+```diff
+class MyComponent {
+  myQuery = inject(MyQuery);
+  myMutation = inject(MyMutation);
+  mySubscription = inject(MySubscription);
+
+  constructor() {
+-    myQuery.watch({ myVariable: 'foo' }, { fetchPolicy: 'cache-and-network' });
++    myQuery.watch({ variables: { myVariable: 'foo' }, fetchPolicy: 'cache-and-network' })    
+
+-    myMutation.mutate({ myVariable: 'foo' }, { errorPolicy: 'ignore' });
++    myMutation.mutate({ variables: { myVariable: 'foo' }, errorPolicy: 'ignore' }); 
+
+-    mySubscription.subscribe({ myVariable: 'foo' }, { fetchPolicy: 'network-only' });
++    mySubscription.subscribe({ variables: { myVariable: 'foo' }, fetchPolicy: 'network-only' });
+  }
+}
+```

.github/FUNDING.yml

@@ -1,4 +1,3 @@
 # These are supported funding model platforms
 
-github: kamilkisiela
-custom: http://paypal.me/kamilkisiela
+github: PowerKiKi

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
   - name: Feature Request
-    url: https://github.com/kamilkisiela/apollo-angular/discussions/new
+    url: https://github.com/the-guild-org/apollo-angular/discussions/new
     about: Request and discuss a feature
   - name: Ask a Question
-    url: https://github.com/kamilkisiela/apollo-angular/discussions/new
+    url: https://github.com/the-guild-org/apollo-angular/discussions/new
     about: Ask questions and discuss with other community members

.github/workflows/main.yml

@@ -9,10 +9,9 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      - name: Use Node.js 18
-        uses: actions/setup-node@master
+      - uses: actions/setup-node@master
         with:
-          node-version: 18
+          node-version: 22
 
       - uses: actions/cache@v4
         name: Cache node_modules
@@ -59,10 +58,9 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      - name: Use Node.js 18
-        uses: actions/setup-node@master
+      - uses: actions/setup-node@master
         with:
-          node-version: 18
+          node-version: 22
 
       - uses: actions/cache@v4
         name: Cache node_modules
@@ -89,10 +87,9 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      - name: Use Node.js 18
-        uses: actions/setup-node@master
+      - uses: actions/setup-node@master
         with:
-          node-version: 18
+          node-version: 22
 
       - uses: actions/cache@v4
         name: Cache node_modules
@@ -115,9 +112,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        angular_version: [17, 18, 19]
-        graphql_version: [15, 16]
-        node_version: [18, 20]
+        angular_version: [18, 19, 20]
+        graphql_version: [16]
+        node_version: [20, 22, 24]
+        exclude:
+          - angular_version: 18
+            node_version: 24
+
+          - angular_version: 19
+            node_version: 24
     steps:
       - name: Use Node.js ${{ matrix.node_version }}
         uses: actions/setup-node@master

.github/workflows/pr.yml

@@ -20,7 +20,7 @@ jobs:
     with:
       npmTag: alpha
       buildScript: build
-      nodeVersion: 18
+      nodeVersion: 22
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
       npmToken: ${{ secrets.NPM_TOKEN }}
@@ -36,7 +36,7 @@ jobs:
       npmTag: rc
       restoreDeletedChangesets: true
       buildScript: build
-      nodeVersion: 18
+      nodeVersion: 22
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
       npmToken: ${{ secrets.NPM_TOKEN }}

.github/workflows/release.yml

@@ -10,11 +10,13 @@ jobs:
       contents: write
       id-token: write
       packages: write
+      issues: write
+      pull-requests: write
     uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@main
     with:
       createGithubReleases: true
       releaseScript: release
-      nodeVersion: 18
+      nodeVersion: 22
     secrets:
-      githubToken: ${{ secrets.GUILD_BOT_TOKEN }}
+      githubToken: ${{ secrets.GITHUB_TOKEN }}
       npmToken: ${{ secrets.NPM_TOKEN }}

.github/workflows/website.yml

@@ -23,9 +23,12 @@ jobs:
       - uses: the-guild-org/shared-config/setup@main
         name: website
         with:
-          nodeVersion: 18 # change if needed
+          nodeVersion: 22 # change if needed
           packageManager: yarn # change if needed
 
+      - name: Pre-install wrangler
+        run: yarn add wrangler --ignore-workspace-root-check
+
       - uses: the-guild-org/shared-config/website-cf@main
         name: build and deploy website
         env:

.nvmrc

@@ -1 +1 @@
-18
+22

package.json

@@ -37,7 +37,7 @@
     "@angular/platform-browser-dynamic": "^18.0.0",
     "@angular/platform-server": "^18.0.0",
     "@angular/router": "^18.0.0",
-    "@apollo/client": "https://pkg.pr.new/@apollo/client@12221",
+    "@apollo/client": "4.0.1",
     "@babel/core": "^7.24.6",
     "@babel/preset-env": "^7.24.6",
     "@changesets/changelog-github": "^0.5.0",
@@ -49,7 +49,7 @@
     "graphql": "^16.8.0",
     "husky": "^9.0.0",
     "lint-staged": "^15.2.5",
-    "ng-packagr": "^18.0.0",
+    "ng-packagr": "^19.0.0",
     "prettier": "^3.5.3",
     "react": "^18.3.1",
     "rimraf": "^5.0.7",