Merge branch 'main' into release-3.5.

CHANGELOG.md

@@ -40,13 +40,24 @@
 - Update `zen-observable-ts` to eliminate transitive dependency on `@types/zen-observable`. <br/>
   [@benjamn](https://github.com/benjamn) in [#8695](https://github.com/apollographql/apollo-client/pull/8695)
 
-## Apollo Client 3.4.10 (not yet released)
+## Apollo Client 3.4.10
 
 ### Improvements
 
 - Warn when calling `refetch({ variables })` instead of `refetch(variables)`, except for queries that declare a variable named `$variables` (uncommon). <br/>
   [@benjamn](https://github.com/benjamn) in [#8702](https://github.com/apollographql/apollo-client/pull/8702)
 
+### Bug Fixes
+
+- Fix `ObservableQuery.getCurrentResult()` returning cached `data` with certain fetch policies. <br/>
+  [@brainkim](https://github.com/brainkim) in [#8718](https://github.com/apollographql/apollo-client/pull/8718)
+
+- Prevent `ssrMode`/`ssrForceFetchDelay` from causing queries to hang. <br/>
+  [@brainkim](https://github.com/brainkim) in [#8709](https://github.com/apollographql/apollo-client/pull/8709)
+
+- Import `@apollo/client/utilities/globals` internally wherever `__DEV__` is used, not just in `@apollo/client/**/index.js` entry points. <br/>
+  [@benjamn](https://github.com/benjamn) in [#8720](https://github.com/apollographql/apollo-client/pull/8720)
+
 ## Apollo Client 3.4.9
 
 ### Bug Fixes

config/entryPoints.js

@@ -21,10 +21,8 @@ const entryPoints = [
   { dirs: ['react', 'hooks'] },
   { dirs: ['react', 'parser'] },
   { dirs: ['react', 'ssr'] },
-  { dirs: ['utilities'],
-    sideEffects: [
-      "./globals/**"
-    ]},
+  { dirs: ['utilities'] },
+  { dirs: ['utilities', 'globals'], sideEffects: true },
   { dirs: ['testing'], extensions: [".js", ".jsx"] },
 ];
 

config/resolveModuleIds.ts

@@ -7,7 +7,30 @@ eachFile(distDir, (file, relPath) => new Promise((resolve, reject) => {
   fs.readFile(file, "utf8", (error, source) => {
     if (error) return reject(error);
 
-    const output = new Transformer().transform(source, file);
+    const tr = new Transformer;
+    const output = tr.transform(source, file);
+
+    if (
+      /\b__DEV__\b/.test(source) &&
+      // Ignore modules that reside within @apollo/client/utilities/globals.
+      !relPath.startsWith("utilities/globals/")
+    ) {
+      let importsUtilitiesGlobals = false;
+
+      tr.absolutePaths.forEach(absPath => {
+        const distRelativePath =
+          path.relative(distDir, absPath).split(path.sep).join("/");
+        if (distRelativePath === "utilities/globals/index.js") {
+          importsUtilitiesGlobals = true;
+        }
+      });
+
+      if (!importsUtilitiesGlobals) {
+        reject(new Error(`Module ${
+          relPath
+        } uses __DEV__ but does not import @apollo/client/utilities/globals`));
+      }
+    }
 
     if (source === output) {
       resolve(file);
@@ -24,6 +47,8 @@ const n = recast.types.namedTypes;
 type Node = recast.types.namedTypes.Node;
 
 class Transformer {
+  absolutePaths = new Set<string>();
+
   transform(code: string, file: string) {
     const ast = reparse(code);
     const transformer = this;
@@ -103,6 +128,7 @@ class Transformer {
         } : pkg;
       },
     });
+    this.absolutePaths.add(absPath);
     const relPath = path.relative(basedir, absPath);
     const relId = relPath.split(path.sep).join('/');
     return this.isRelative(relId) ? relId : "./" + relId;

docs/package.json

@@ -15,6 +15,6 @@
   },
   "devDependencies": {
     "typedoc": "0.15.8",
-    "typescript": "4.3.5"
+    "typescript": "4.4.2"
   }
 }

package.json

@@ -31,15 +31,14 @@
   "scripts": {
     "prebuild": "npm run clean",
     "build": "tsc",
-    "postbuild": "npm run update-version && npm run invariants && npm run sourcemaps && npm run rollup && npm run prepdist && npm run resolve && npm run check-DEV && npm run verify-version",
+    "postbuild": "npm run update-version && npm run invariants && npm run sourcemaps && npm run rollup && npm run prepdist && npm run resolve && npm run verify-version",
     "update-version": "node config/version.js update",
     "verify-version": "node config/version.js verify",
     "invariants": "ts-node-script config/processInvariants.ts",
     "sourcemaps": "ts-node-script config/rewriteSourceMaps.ts",
     "rollup": "rollup -c ./config/rollup.config.js",
     "prepdist": "node ./config/prepareDist.js",
     "resolve": "ts-node-script config/resolveModuleIds.ts",
-    "check-DEV": "ts-node-script config/checkDEV.ts",
     "clean": "rimraf -r dist coverage lib temp",
     "test": "jest --config ./config/jest.config.js",
     "test:debug": "BABEL_ENV=server node --inspect-brk node_modules/.bin/jest --config ./config/jest.config.js --runInBand --testTimeout 99999",
@@ -101,7 +100,7 @@
     "@types/hoist-non-react-statics": "3.3.1",
     "@types/jest": "26.0.24",
     "@types/lodash": "4.14.172",
-    "@types/node": "16.7.1",
+    "@types/node": "16.7.6",
     "@types/react": "17.0.19",
     "@types/react-dom": "17.0.2",
     "@types/recompose": "0.30.8",
@@ -125,10 +124,10 @@
     "rollup-plugin-terser": "7.0.2",
     "rxjs": "6.6.7",
     "subscriptions-transport-ws": "0.9.19",
-    "terser": "5.7.1",
+    "terser": "5.7.2",
     "ts-jest": "26.5.6",
     "ts-node": "10.2.1",
-    "typescript": "4.3.5",
+    "typescript": "4.4.2",
     "wait-for-observables": "1.0.3"
   },
   "publishConfig": {

src/__tests__/__snapshots__/exports.ts.snap

@@ -323,7 +323,6 @@ Array [
   "buildQueryFromSelectionSet",
   "canUseWeakMap",
   "canUseWeakSet",
-  "checkDEV",
   "checkDocument",
   "cloneDeep",
   "compact",
@@ -373,3 +372,14 @@ Array [
   "valueToObjectRepresentation",
 ]
 `;
+
+exports[`exports of public entry points @apollo/client/utilities/globals 1`] = `
+Array [
+  "DEV",
+  "InvariantError",
+  "checkDEV",
+  "global",
+  "invariant",
+  "maybe",
+]
+`;

src/__tests__/exports.ts

@@ -22,6 +22,7 @@ import * as reactParser from "../react/parser";
 import * as reactSSR from "../react/ssr";
 import * as testing from "../testing";
 import * as utilities from "../utilities";
+import * as utilitiesGlobals from "../utilities/globals";
 
 const entryPoints = require("../../config/entryPoints.js");
 
@@ -61,6 +62,7 @@ describe('exports of public entry points', () => {
   check("@apollo/client/react/ssr", reactSSR);
   check("@apollo/client/testing", testing);
   check("@apollo/client/utilities", utilities);
+  check("@apollo/client/utilities/globals", utilitiesGlobals);
 
   it("completeness", () => {
     const { join } = require("path").posix;

src/cache/index.ts

@@ -1,5 +1,4 @@
-import { checkDEV } from "../utilities";
-checkDEV();
+import '../utilities/globals';
 
 export { Transaction, ApolloCache } from './core/cache';
 export { Cache } from './core/types/Cache';

src/cache/inmemory/entityStore.ts

@@ -1,5 +1,5 @@
+import { invariant } from '../../utilities/globals';
 import { dep, OptimisticDependencyFunction } from 'optimism';
-import { invariant } from 'ts-invariant';
 import { equal } from '@wry/equality';
 import { Trie } from '@wry/trie';
 

src/cache/inmemory/inMemoryCache.ts

@@ -1,10 +1,11 @@
+import { invariant } from '../../utilities/globals';
+
 // Make builtins like Map and Set safe to use with non-extensible objects.
 import './fixPolyfills';
 
 import { DocumentNode } from 'graphql';
 import { OptimisticWrapperFunction, wrap } from 'optimism';
 import { equal } from '@wry/equality';
-import { invariant } from 'ts-invariant';
 
 import { ApolloCache } from '../core/cache';
 import { Cache } from '../core/types/Cache';

src/cache/inmemory/object-canon.ts

@@ -1,3 +1,5 @@
+import "../../utilities/globals";
+
 import { Trie } from "@wry/trie";
 import {
   canUseWeakMap,

src/cache/inmemory/policies.ts

@@ -1,3 +1,5 @@
+import { invariant, InvariantError } from '../../utilities/globals';
+
 import {
   InlineFragmentNode,
   FragmentDefinitionNode,
@@ -6,7 +8,6 @@ import {
 } from 'graphql';
 
 import { Trie } from '@wry/trie';
-import { invariant, InvariantError } from 'ts-invariant';
 
 import {
   FragmentMap,