Merge pull request #470 from apollographql/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.api-reports/api-report-cache.api.md

@@ -59,7 +59,6 @@ export namespace ApolloCache {
 export abstract class ApolloCache {
     // (undocumented)
     readonly assumeImmutableResults: boolean;
-    // (undocumented)
     batch<U>(options: Cache_2.BatchOptions<this, U>): U;
     abstract diff<TData = unknown, TVariables extends OperationVariables = OperationVariables>(query: Cache_2.DiffOptions<TData, TVariables>): Cache_2.DiffResult<TData>;
     // (undocumented)
@@ -124,13 +123,9 @@ type BroadcastOptions = Pick<Cache_2.BatchOptions<InMemoryCache>, "optimistic" |
 namespace Cache_2 {
     // (undocumented)
     interface BatchOptions<TCache extends ApolloCache, TUpdateResult = void> {
-        // (undocumented)
         onWatchUpdated?: (this: TCache, watch: Cache_2.WatchOptions, diff: Cache_2.DiffResult<any>, lastDiff?: Cache_2.DiffResult<any> | undefined) => any;
-        // (undocumented)
         optimistic?: string | boolean;
-        // (undocumented)
         removeOptimistic?: string;
-        // (undocumented)
         update(cache: TCache): TUpdateResult;
     }
     // (undocumented)
@@ -497,7 +492,6 @@ export class InMemoryCache extends ApolloCache {
     constructor(config?: InMemoryCacheConfig);
     // (undocumented)
     readonly assumeImmutableResults = true;
-    // (undocumented)
     batch<TUpdateResult>(options: Cache_2.BatchOptions<InMemoryCache, TUpdateResult>): TUpdateResult;
     // Warning: (ae-forgotten-export) The symbol "BroadcastOptions" needs to be exported by the entry point index.d.ts
     //

.api-reports/api-report-core.api.md

@@ -101,6 +101,7 @@ import { TypePolicy } from '@apollo/client/cache';
 import { UnconventionalError } from '@apollo/client/errors';
 import { Unmasked } from '@apollo/client/masking';
 import type { VariablesOption } from '@apollo/client/utilities/internal';
+import type { variablesUnknownSymbol } from '@apollo/client/utilities/internal';
 import { WatchFragmentOptions } from '@apollo/client/cache';
 import { WatchFragmentResult } from '@apollo/client/cache';
 
@@ -300,6 +301,7 @@ export namespace ApolloClient {
         returnPartialData?: boolean;
         skipPollAttempt?: () => boolean;
         query: DocumentNode_2 | TypedDocumentNode<TData, TVariables>;
+        [variablesUnknownSymbol]?: boolean;
     } & VariablesOption<NoInfer<TVariables>>;
     // (undocumented)
     export type WriteFragmentOptions<TData, TVariables extends OperationVariables> = Base.WriteFragmentOptions<TData, TVariables> & VariablesOption<TVariables>;
@@ -1132,8 +1134,8 @@ export type WatchQueryOptions<TVariables extends OperationVariables = OperationV
 
 // Warnings were encountered during analysis:
 //
-// src/core/ApolloClient.ts:353:5 - (ae-forgotten-export) The symbol "NextFetchPolicyContext" needs to be exported by the entry point index.d.ts
-// src/core/ObservableQuery.ts:361:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:356:5 - (ae-forgotten-export) The symbol "NextFetchPolicyContext" needs to be exported by the entry point index.d.ts
+// src/core/ObservableQuery.ts:363:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
 // src/core/QueryManager.ts:180:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)

.api-reports/api-report-utilities_internal.api.md

@@ -447,6 +447,9 @@ export type VariablesOption<TVariables extends OperationVariables> = {} extends
     variables: TVariables;
 };
 
+// @internal @deprecated
+export const variablesUnknownSymbol: unique symbol;
+
 // Warnings were encountered during analysis:
 //
 // src/utilities/internal/getStoreKeyName.ts:88:1 - (ae-forgotten-export) The symbol "storeKeyNameStringify" needs to be exported by the entry point index.d.ts

.api-reports/api-report.api.md

@@ -58,7 +58,6 @@ export namespace ApolloCache {
 export abstract class ApolloCache {
     // (undocumented)
     readonly assumeImmutableResults: boolean;
-    // (undocumented)
     batch<U>(options: Cache_2.BatchOptions<this, U>): U;
     abstract diff<TData = unknown, TVariables extends OperationVariables = OperationVariables>(query: Cache_2.DiffOptions<TData, TVariables>): Cache_2.DiffResult<TData>;
     // (undocumented)
@@ -314,6 +313,7 @@ export namespace ApolloClient {
         returnPartialData?: boolean;
         skipPollAttempt?: () => boolean;
         query: DocumentNode | TypedDocumentNode<TData, TVariables>;
+        [variablesUnknownSymbol]?: boolean;
     } & VariablesOption<NoInfer<TVariables>>;
     // (undocumented)
     export type WriteFragmentOptions<TData, TVariables extends OperationVariables> = Base.WriteFragmentOptions<TData, TVariables> & VariablesOption<TVariables>;
@@ -550,13 +550,9 @@ export const build: "source" | "esm" | "cjs";
 namespace Cache_2 {
     // (undocumented)
     interface BatchOptions<TCache extends ApolloCache, TUpdateResult = void> {
-        // (undocumented)
         onWatchUpdated?: (this: TCache, watch: Cache_2.WatchOptions, diff: Cache_2.DiffResult<any>, lastDiff?: Cache_2.DiffResult<any> | undefined) => any;
-        // (undocumented)
         optimistic?: string | boolean;
-        // (undocumented)
         removeOptimistic?: string;
-        // (undocumented)
         update(cache: TCache): TUpdateResult;
     }
     // (undocumented)
@@ -1324,7 +1320,6 @@ export class InMemoryCache extends ApolloCache {
     constructor(config?: InMemoryCacheConfig);
     // (undocumented)
     readonly assumeImmutableResults = true;
-    // (undocumented)
     batch<TUpdateResult>(options: Cache_2.BatchOptions<InMemoryCache, TUpdateResult>): TUpdateResult;
     // Warning: (ae-forgotten-export) The symbol "BroadcastOptions" needs to be exported by the entry point index.d.ts
     //
@@ -2649,6 +2644,9 @@ type VariablesOption<TVariables extends OperationVariables> = {} extends TVariab
     variables: TVariables;
 };
 
+// @internal @deprecated
+const variablesUnknownSymbol: unique symbol;
+
 // Warning: (ae-forgotten-export) The symbol "verbosityLevels" needs to be exported by the entry point index.d.ts
 //
 // @public (undocumented)
@@ -2711,9 +2709,9 @@ interface WriteContext extends ReadMergeModifyContext {
 // src/cache/inmemory/policies.ts:167:3 - (ae-forgotten-export) The symbol "KeySpecifier" needs to be exported by the entry point index.d.ts
 // src/cache/inmemory/policies.ts:167:3 - (ae-forgotten-export) The symbol "KeyArgsFunction" needs to be exported by the entry point index.d.ts
 // src/cache/inmemory/types.ts:134:3 - (ae-forgotten-export) The symbol "KeyFieldsFunction" needs to be exported by the entry point index.d.ts
-// src/core/ApolloClient.ts:159:5 - (ae-forgotten-export) The symbol "IgnoreModifier" needs to be exported by the entry point index.d.ts
-// src/core/ApolloClient.ts:353:5 - (ae-forgotten-export) The symbol "NextFetchPolicyContext" needs to be exported by the entry point index.d.ts
-// src/core/ObservableQuery.ts:361:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:162:5 - (ae-forgotten-export) The symbol "IgnoreModifier" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:356:5 - (ae-forgotten-export) The symbol "NextFetchPolicyContext" needs to be exported by the entry point index.d.ts
+// src/core/ObservableQuery.ts:363:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
 // src/core/QueryManager.ts:180:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts
 // src/local-state/LocalState.ts:147:5 - (ae-forgotten-export) The symbol "LocalState" needs to be exported by the entry point index.d.ts
 // src/local-state/LocalState.ts:200:7 - (ae-forgotten-export) The symbol "LocalState" needs to be exported by the entry point index.d.ts

.github/workflows/prerelease.yml

@@ -21,8 +21,6 @@ jobs:
       contents: write
       pull-requests: write
       id-token: write
-    outputs:
-      packages: ${{ steps.changesets.outputs.publishedPackages }}
     steps:
       - uses: actions/create-github-app-token@v1
         id: github-actions-bot-app-token
@@ -40,29 +38,20 @@ jobs:
           # with the correct commits
           fetch-depth: 0
 
-      - name: Append NPM token to .npmrc
-        run: |
-          cat << EOF > "$HOME/.npmrc"
-            provenance=true
-            //registry.npmjs.org/:_authToken=$NPM_TOKEN
-          EOF
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: Check for pre.json file existence
+        id: check_files
+        uses: andstor/[email protected]
+        with:
+          files: ".changeset/pre.json"
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: ">=23.6.0"
+          node-version: "24.x"
 
       - name: Install dependencies with cache
         uses: bahmutov/npm-install@v1
 
-      - name: Check for pre.json file existence
-        id: check_files
-        uses: andstor/[email protected]
-        with:
-          files: ".changeset/pre.json"
-
       - name: Enter prerelease mode (alpha by default)
         # If .changeset/pre.json does not exist and we did not recently exit
         # prerelease mode, enter prerelease mode with tag alpha
@@ -82,85 +71,6 @@ jobs:
         uses: changesets/action@v1
         with:
           version: npm run changeset-version
+          publish: echo "This step should never publish"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Publish to npm + GitHub
-        id: changesets
-        # Only run publish if we're still in pre mode and the last commit was
-        # via an automatically created Version Packages PR
-        if: steps.check_files.outputs.files_exists == 'true' && startsWith(github.event.head_commit.message, 'Version Packages')
-        uses: changesets/action@v1
-        with:
-          version: echo "This step should never version"
-          publish: npm run changeset-publish
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-  postrelease:
-    name: Postrelease
-    runs-on: ubuntu-latest
-    needs: prerelease
-    if: needs.prerelease.result == 'success' && fromJSON(needs.prerelease.outputs.packages)[0] != null
-    strategy:
-      matrix:
-        package: ${{ fromJSON(needs.prerelease.outputs.packages) }}
-    steps:
-      - uses: actions/create-github-app-token@v1
-        id: github-actions-bot-app-token
-        with:
-          app-id: 819772
-          private-key: ${{ secrets.APOLLO_GITHUB_ACTIONS_BOT_PRIVATE_KEY }}
-
-      - name: Checkout repo
-        uses: actions/checkout@v5
-        with:
-          token: ${{ steps.github-actions-bot-app-token.outputs.token }}
-
-      - name: Append NPM token to .npmrc
-        run: |
-          cat << EOF > "$HOME/.npmrc"
-            provenance=true
-            //registry.npmjs.org/:_authToken=$NPM_TOKEN
-          EOF
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: ">=23.6.0"
-
-      - name: Install dependencies with cache
-        uses: bahmutov/npm-install@v1
-
-      - name: Tag release with next on npm
-        run: |
-          if NEXT=$(npm show ${{ matrix.package.name }}@next version) node -e 'process.exit(require("semver").gt("${{ matrix.package.version }}",process.env.NEXT)?0:1)'; then
-            npm dist-tag add ${{ matrix.package.name }}@${{ matrix.package.version }} next;
-          fi
-
-      - name: Send a Slack notification on publish
-        id: slack
-        uses: slackapi/[email protected]
-        with:
-          # Slack channel id, channel name, or user id to post message
-          # See also: https://api.slack.com/methods/chat.postMessage#channels
-          # You can pass in multiple channels to post to by providing
-          # a comma-delimited list of channel IDs
-          channel-id: "C01PS0CB41G"
-          payload: |
-            {
-              "blocks": [
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": "A new version of `${{ matrix.package.name }}` was released: <https://github.com/apollographql/apollo-client/releases/tag/${{ matrix.package.name }}@${{ matrix.package.version }}|v${{ matrix.package.version }}> :rocket:"
-                  }
-                }
-              ]
-            }
-        env:
-          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

.github/workflows/release.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - "release-*"
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 
@@ -21,8 +22,8 @@ jobs:
       pull-requests: write
       id-token: write
     outputs:
-      published: ${{ steps.changesets.outputs.published }}
-      publishedPackages: ${{ steps.changesets.outputs.publishedPackages }}
+      published: ${{ steps.changesets.outputs.published || steps.changesets-prerelease.outputs.published }}
+      publishedPackages: ${{ steps.changesets.outputs.publishedPackages || steps.changesets-prerelease.outputs.publishedPackages }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@v5
@@ -37,36 +38,41 @@ jobs:
         with:
           files: ".changeset/pre.json"
 
-      - name: Append NPM token to .npmrc
-        run: |
-          cat << EOF > "$HOME/.npmrc"
-            provenance=true
-            //registry.npmjs.org/:_authToken=$NPM_TOKEN
-          EOF
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: ">=23.6.0"
+          node-version: "24.x"
+          registry-url: "https://registry.npmjs.org"
 
       - name: Install dependencies (with cache)
         uses: bahmutov/npm-install@v1
 
-      - name: Create release PR or publish to npm + GitHub
+      - name: "[main] Create release PR or publish to npm + GitHub"
         id: changesets
-        if: steps.check_files.outputs.files_exists == 'false'
+        if: github.ref_name == 'main' && steps.check_files.outputs.files_exists == 'false'
         uses: changesets/action@v1
         with:
           version: npm run changeset-version
           publish: npm run changeset-publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_TOKEN: ""
+
+      - name: "[prerelease] Publish to npm + GitHub"
+        id: changesets-prerelease
+        # Only run publish if we're still in pre mode and the last commit was
+        # via an automatically created Version Packages PR
+        if: github.ref_name != 'main' && steps.check_files.outputs.files_exists == 'true' && startsWith(github.event.head_commit.message, 'Version Packages')
+        uses: changesets/action@v1
+        with:
+          version: echo "This step should never version"
+          publish: npm run changeset-publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ""
 
-  postrelease:
-    name: Postrelease
+  slack-notification:
+    name: Postrelease Slack Notification
     runs-on: ubuntu-latest
     needs: release
     if: needs.release.result == 'success' && needs.release.outputs.published == 'true'
@@ -102,7 +108,7 @@ jobs:
                     },
                     {
                       "type": "mrkdwn",
-                      "text": "*Tag:*\n`latest`"
+                      "text": "*Tag:*\n`${{ github.ref_name == 'main' && 'latest' || 'next' }}`"
                     },
                     {
                       "type": "mrkdwn",
@@ -118,3 +124,32 @@ jobs:
             }
         env:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+
+  tag-next:
+    name: Postrelease Tag Next Release
+    runs-on: ubuntu-latest
+    needs: release
+    if: github.ref_name != 'main' && needs.release.result == 'success' && needs.release.outputs.published == 'true'
+    permissions:
+      id-token: write
+    strategy:
+      matrix:
+        package: ${{ fromJSON(needs.release.outputs.publishedPackages) }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v5
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: "24.x"
+          registry-url: "https://registry.npmjs.org"
+
+      - name: Install dependencies with cache
+        uses: bahmutov/npm-install@v1
+
+      - name: Tag release with next on npm
+        run: |
+          if NEXT=$(npm show ${{ matrix.package.name }}@next version) node -e 'process.exit(require("semver").gt("${{ matrix.package.version }}",process.env.NEXT)?0:1)'; then
+            npm dist-tag add ${{ matrix.package.name }}@${{ matrix.package.version }} next;
+          fi

.size-limits.json

@@ -1,6 +1,6 @@
 {
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (CJS)": 43931,
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production) (CJS)": 38761,
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\"": 33451,
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production)": 27513
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (CJS)": 44088,
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production) (CJS)": 38925,
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\"": 33546,
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production)": 27621
 }