@apollo/client 4.2.7 → 4.2.8

package/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/__cjs/core/ApolloClient.cjs

@@ -148,29 +148,28 @@ class ApolloClient {
          */
         if (!hasSuggestedDevtools && environment_1.__DEV__) {
             hasSuggestedDevtools = true;
-            if (window.document &&
-                window.top === window.self &&
-                /^(https?|file):$/.test(window.location.protocol)) {
+            const win = window;
+            const ua = win.navigator.userAgent;
+            let url;
+            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 (win.document &&
+                win.top === win.self &&
+                /^(https?|file):$/.test(win.location.protocol) &&
+                url) {
                 setTimeout(() => {
-                    if (!window.__APOLLO_DEVTOOLS_GLOBAL_HOOK__) {
-                        const nav = window.navigator;
-                        const ua = nav && nav.userAgent;
-                        let url;
-                        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) {
-                            __DEV__ && invariant_1.invariant.log("Download the Apollo DevTools for a better development " +
-                                "experience: %s", url);
-                        }
+                    if (!win.__APOLLO_DEVTOOLS_GLOBAL_HOOK__) {
+                        __DEV__ && invariant_1.invariant.log("Download the Apollo DevTools for a better development " +
+                            "experience: %s", url);
                     }
                 }, 10000);
             }