Merge branch 'main' into martinbonnin-patch-1

Author: jerelmiller

.github/workflows/close-stale-issues.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Close Stale Issues
-        uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
+        uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
         with:
           # # Token for the repository. Can be passed in using `{{ secrets.GITHUB_TOKEN }}`.
           # repo-token: # optional, default is ${{ github.token }}

CHANGELOG.md

@@ -1,5 +1,11 @@
 # @apollo/client
 
+## 4.2.8
+
+### Patch Changes
+
+- [#13349](https://github.com/apollographql/apollo-client/pull/13349) [`501a33b`](https://github.com/apollographql/apollo-client/commit/501a33bba831828da0398c994662582054272743) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Prevent the `setTimeout` in `connectToDevtools` that shows the devtools suggestion from firing when the user agent does not match Chrome or Firefox. This check was previously done inside the `setTimeout` which meant the timer was scheduled for environments where we'd never show the message anyways. For test environments, this could cause flaky tests when that `setTimeout` outlived the tests and ran after any virtual DOM was torn down and removed.
+
 ## 4.2.7
 
 ### Patch Changes

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/client",
-  "version": "4.2.7",
+  "version": "4.2.8",
   "description": "A fully-featured caching GraphQL client.",
   "private": true,
   "keywords": [

package.json

@@ -1169,33 +1169,35 @@ export class ApolloClient {
      */
     if (!hasSuggestedDevtools && __DEV__) {
       hasSuggestedDevtools = true;
+      const win = window;
+
+      const ua = win.navigator.userAgent;
+      let url: string | undefined;
+
+      if (typeof ua === "string") {
+        if (ua.indexOf("Chrome/") > -1) {
+          url =
+            "https://chrome.google.com/webstore/detail/" +
+            "apollo-client-developer-t/jdkknkkbebbapilgoeccciglkfbmbnfm";
+        } else if (ua.indexOf("Firefox/") > -1) {
+          url =
+            "https://addons.mozilla.org/en-US/firefox/addon/apollo-developer-tools/";
+        }
+      }
+
       if (
-        window.document &&
-        window.top === window.self &&
-        /^(https?|file):$/.test(window.location.protocol)
+        win.document &&
+        win.top === win.self &&
+        /^(https?|file):$/.test(win.location.protocol) &&
+        url
       ) {
         setTimeout(() => {
-          if (!(window as any).__APOLLO_DEVTOOLS_GLOBAL_HOOK__) {
-            const nav = window.navigator;
-            const ua = nav && nav.userAgent;
-            let url: string | undefined;
-            if (typeof ua === "string") {
-              if (ua.indexOf("Chrome/") > -1) {
-                url =
-                  "https://chrome.google.com/webstore/detail/" +
-                  "apollo-client-developer-t/jdkknkkbebbapilgoeccciglkfbmbnfm";
-              } else if (ua.indexOf("Firefox/") > -1) {
-                url =
-                  "https://addons.mozilla.org/en-US/firefox/addon/apollo-developer-tools/";
-              }
-            }
-            if (url) {
-              invariant.log(
-                "Download the Apollo DevTools for a better development " +
-                  "experience: %s",
-                url
-              );
-            }
+          if (!(win as any).__APOLLO_DEVTOOLS_GLOBAL_HOOK__) {
+            invariant.log(
+              "Download the Apollo DevTools for a better development " +
+                "experience: %s",
+              url
+            );
           }
         }, 10000);
       }