@apollo/client 4.0.0-alpha.11 → 4.0.0-alpha.12

package/.changeset/brave-moons-juggle.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Remove the `typeDefs` option from `ApolloClient`.

package/.changeset/pre.json

@@ -8,6 +8,7 @@
     "afraid-grapes-call",
     "afraid-moons-arrive",
     "beige-mirrors-talk",
+    "brave-moons-juggle",
     "brave-radios-wait",
     "bright-ads-share",
     "calm-frogs-remain",
@@ -99,7 +100,9 @@
     "shiny-carrots-invent",
     "short-jokes-jam",
     "short-months-complain",
+    "short-tomatoes-attend",
     "silly-knives-exist",
+    "silly-seas-confess",
     "slimy-chicken-melt",
     "slimy-maps-press",
     "slow-ravens-explain",
@@ -111,6 +114,7 @@
     "smooth-coins-collect",
     "smooth-pens-reply",
     "soft-mails-clean",
+    "sour-kids-deliver",
     "sour-pillows-guess",
     "strange-seahorses-impress",
     "swift-rivers-share",
@@ -132,6 +136,7 @@
     "unlucky-sheep-change",
     "warm-ties-sit",
     "wicked-forks-double",
+    "witty-paws-marry",
     "yellow-cats-judge",
     "young-phones-fold",
     "young-snails-grin",

package/.changeset/short-tomatoes-attend.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Remove `TContext` generic argument from all types that use it. `TContext` is replaced with `DefaultContext` which can be modified using declaration merging.

package/.changeset/silly-seas-confess.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Drop `graphql` v15 as a valid peer dependency.

package/.changeset/sour-kids-deliver.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Rename the `@apollo/client/link/core` entrypoint to `@apollo/client/link`.

package/.changeset/witty-paws-marry.md

@@ -0,0 +1,26 @@
+---
+"@apollo/client": major
+---
+
+Require the `link` option when instantiating `ApolloClient`. This removes the `uri`, `credentials` and `headers` options from `ApolloClient` in favor of passing an instantiated `HttpLink` directly. To migrate:
+
+**If using `uri`, `credentials`, or `headers` options**
+```diff
+new ApolloClient({
+  // ...
+- uri,
+- credentials,
+- headers,
++ link: new HttpLink({ uri, credentials, headers }),
+// or if you prefer the function call approach:
++ link: createHttpLink({ uri, credentials, headers }),
+});
+```
+
+**If creating a client without the `link` option**
+```diff
+new ApolloClient({
+  // ...
++ link: ApolloLink.empty()
+});
+```

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @apollo/client
 
+## 4.0.0-alpha.12
+
+### Major Changes
+
+- [#12586](https://github.com/apollographql/apollo-client/pull/12586) [`605db8e`](https://github.com/apollographql/apollo-client/commit/605db8e94fe2ce74c0a395f38f6873d40f431365) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Remove the `typeDefs` option from `ApolloClient`.
+
+- [#12588](https://github.com/apollographql/apollo-client/pull/12588) [`eed825a`](https://github.com/apollographql/apollo-client/commit/eed825a2549f1d21fff2ec179815206b3baf0fcb) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Remove `TContext` generic argument from all types that use it. `TContext` is replaced with `DefaultContext` which can be modified using declaration merging.
+
+- [#12590](https://github.com/apollographql/apollo-client/pull/12590) [`a005e82`](https://github.com/apollographql/apollo-client/commit/a005e822de7b24783f85be45df142ffbb9bc561b) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Drop `graphql` v15 as a valid peer dependency.
+
+- [#12591](https://github.com/apollographql/apollo-client/pull/12591) [`a7e7383`](https://github.com/apollographql/apollo-client/commit/a7e738328951f5dac25a5fe48d28b3640a3e0eb9) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Rename the `@apollo/client/link/core` entrypoint to `@apollo/client/link`.
+
+- [#12589](https://github.com/apollographql/apollo-client/pull/12589) [`15f5a1c`](https://github.com/apollographql/apollo-client/commit/15f5a1c29ac05015387a7bbc2dbe9a91d09fedfa) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Require the `link` option when instantiating `ApolloClient`. This removes the `uri`, `credentials` and `headers` options from `ApolloClient` in favor of passing an instantiated `HttpLink` directly. To migrate:
+
+  **If using `uri`, `credentials`, or `headers` options**
+
+  ```diff
+  new ApolloClient({
+    // ...
+  - uri,
+  - credentials,
+  - headers,
+  + link: new HttpLink({ uri, credentials, headers }),
+  // or if you prefer the function call approach:
+  + link: createHttpLink({ uri, credentials, headers }),
+  });
+  ```
+
+  **If creating a client without the `link` option**
+
+  ```diff
+  new ApolloClient({
+    // ...
+  + link: ApolloLink.empty()
+  });
+  ```
+
 ## 4.0.0-alpha.11
 
 ### Major Changes

package/__cjs/cache/core/cache.cjs

@@ -94,7 +94,7 @@ class ApolloCache {
         if (environment_1.__DEV__) {
             const actualFragmentName = fragmentName || (0, utilities_1.getFragmentDefinition)(fragment).name.value;
             if (!id) {
-                __DEV__ && invariant_1.invariant.warn(96, actualFragmentName);
+                __DEV__ && invariant_1.invariant.warn(97, actualFragmentName);
             }
         }
         const diffOptions = {

package/__cjs/cache/inmemory/entityStore.cjs

@@ -81,7 +81,7 @@ class EntityStore {
         // then there are no fields to be merged, so we're done.
         if (!incoming)
             return;
-        (0, invariant_1.invariant)(typeof dataId === "string", 82);
+        (0, invariant_1.invariant)(typeof dataId === "string", 83);
         const merged = new utilities_1.DeepMerger(storeObjectReconciler).merge(existing, incoming);
         // Even if merged === existing, existing may have come from a lower
         // layer, so we always need to set this.data[dataId] on this level.
@@ -181,7 +181,7 @@ class EntityStore {
                             if (environment_1.__DEV__) {
                                 const checkReference = (ref) => {
                                     if (this.lookup(ref.__ref) === undefined) {
-                                        __DEV__ && invariant_1.invariant.warn(83, ref);
+                                        __DEV__ && invariant_1.invariant.warn(84, ref);
                                         return true;
                                     }
                                 };
@@ -210,7 +210,7 @@ class EntityStore {
                                             }
                                         }
                                         if (seenReference && someNonReference !== undefined) {
-                                            __DEV__ && invariant_1.invariant.warn(84, someNonReference);
+                                            __DEV__ && invariant_1.invariant.warn(85, someNonReference);
                                             break;
                                         }
                                     }

package/__cjs/cache/inmemory/key-extractor.cjs

@@ -41,7 +41,7 @@ function keyFieldsFnFromSpecifier(specifier) {
                     // context.readField for this extraction.
                     extracted = extractKeyPath(object, schemaKeyPath, extractKey);
                 }
-                (0, invariant_1.invariant)(extracted !== void 0, 85, schemaKeyPath.join("."), object);
+                (0, invariant_1.invariant)(extracted !== void 0, 86, schemaKeyPath.join("."), object);
                 return extracted;
             }));
             return `${context.typename}:${JSON.stringify(keyObject)}`;

package/__cjs/cache/inmemory/policies.cjs

@@ -203,7 +203,7 @@ class Policies {
         const rootId = "ROOT_" + which.toUpperCase();
         const old = this.rootTypenamesById[rootId];
         if (typename !== old) {
-            (0, invariant_1.invariant)(!old || old === which, 86, which);
+            (0, invariant_1.invariant)(!old || old === which, 87, which);
             // First, delete any old __typename associated with this rootId from
             // rootIdsByTypename.
             if (old)
@@ -348,7 +348,7 @@ class Policies {
                 if (supertypeSet.has(supertype)) {
                     if (!typenameSupertypeSet.has(supertype)) {
                         if (checkingFuzzySubtypes) {
-                            __DEV__ && invariant_1.invariant.warn(87, typename, supertype);
+                            __DEV__ && invariant_1.invariant.warn(88, typename, supertype);
                         }
                         // Record positive results for faster future lookup.
                         // Unfortunately, we cannot safely cache negative results,
@@ -559,7 +559,7 @@ function normalizeReadFieldOptions(readFieldArgs, objectOrReference, variables)
         }
     }
     if (environment_1.__DEV__ && options.from === void 0) {
-        __DEV__ && invariant_1.invariant.warn(88, (0, utilities_1.stringifyForDisplay)(Array.from(readFieldArgs)));
+        __DEV__ && invariant_1.invariant.warn(89, (0, utilities_1.stringifyForDisplay)(Array.from(readFieldArgs)));
     }
     if (void 0 === options.variables) {
         options.variables = variables;
@@ -569,7 +569,7 @@ function normalizeReadFieldOptions(readFieldArgs, objectOrReference, variables)
 function makeMergeObjectsFunction(store) {
     return function mergeObjects(existing, incoming) {
         if ((0, helpers_js_1.isArray)(existing) || (0, helpers_js_1.isArray)(incoming)) {
-            throw (0, invariant_1.newInvariantError)(89);
+            throw (0, invariant_1.newInvariantError)(90);
         }
         // These dynamic checks are necessary because the parameters of a
         // custom merge function can easily have the any type, so the type

package/__cjs/cache/inmemory/readFromStore.cjs

@@ -197,7 +197,7 @@ class StoreReader {
             else {
                 const fragment = (0, utilities_1.getFragmentFromSelection)(selection, context.lookupFragment);
                 if (!fragment && selection.kind === graphql_1.Kind.FRAGMENT_SPREAD) {
-                    throw (0, invariant_1.newInvariantError)(90, selection.name.value);
+                    throw (0, invariant_1.newInvariantError)(91, selection.name.value);
                 }
                 if (fragment && policies.fragmentMatches(fragment, typename)) {
                     fragment.selectionSet.selections.forEach(workSet.add, workSet);
@@ -281,7 +281,7 @@ function assertSelectionSetForIdValue(store, field, fieldValue) {
             if ((0, utilities_1.isNonNullObject)(value)) {
                 (0, invariant_1.invariant)(
                     !(0, utilities_1.isReference)(value),
-                    91,
+                    92,
                     (0, helpers_js_1.getTypenameFromStoreObject)(store, value),
                     field.name.value
                 );

package/__cjs/cache/inmemory/writeToStore.cjs

@@ -72,7 +72,7 @@ class StoreWriter {
             context,
         });
         if (!(0, utilities_1.isReference)(ref)) {
-            throw (0, invariant_1.newInvariantError)(92, result);
+            throw (0, invariant_1.newInvariantError)(93, result);
         }
         // So far, the store has not been modified, so now it's time to process
         // context.incomingById and merge those incoming fields into context.store.
@@ -222,7 +222,7 @@ class StoreWriter {
                 // provide a default value, so its absence from the written data should
                 // not be cause for alarm.
                 !policies.getReadFunction(typename, field.name.value)) {
-                __DEV__ && invariant_1.invariant.error(93, (0, utilities_1.resultKeyNameFromField)(field), result);
+                __DEV__ && invariant_1.invariant.error(94, (0, utilities_1.resultKeyNameFromField)(field), result);
             }
         });
         // Identify the result object, even if dataId was already provided,
@@ -369,7 +369,7 @@ class StoreWriter {
                 else {
                     const fragment = (0, utilities_1.getFragmentFromSelection)(selection, context.lookupFragment);
                     if (!fragment && selection.kind === graphql_1.Kind.FRAGMENT_SPREAD) {
-                        throw (0, invariant_1.newInvariantError)(94, selection.name.value);
+                        throw (0, invariant_1.newInvariantError)(95, selection.name.value);
                     }
                     if (fragment &&
                         policies.fragmentMatches(fragment, typename, result, context.variables)) {
@@ -542,7 +542,7 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
             }
         });
     }
-    __DEV__ && invariant_1.invariant.warn(95, fieldName, parentType, childTypenames.length ?
+    __DEV__ && invariant_1.invariant.warn(96, fieldName, parentType, childTypenames.length ?
         "either ensure all objects of type " +
             childTypenames.join(" and ") +
             " have an ID or a custom merge function, or "

package/__cjs/core/ApolloClient.cjs

@@ -7,8 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApolloClient = exports.mergeOptions = void 0;
 const graphql_1 = require("graphql");
 const rxjs_1 = require("rxjs");
-const core_1 = require("@apollo/client/link/core");
-const http_1 = require("@apollo/client/link/http");
+const link_1 = require("@apollo/client/link");
 const utilities_1 = require("@apollo/client/utilities");
 Object.defineProperty(exports, "mergeOptions", { enumerable: true, get: function () { return utilities_1.mergeOptions; } });
 const environment_1 = require("@apollo/client/utilities/environment");
@@ -47,7 +46,6 @@ class ApolloClient {
     version;
     queryDeduplication;
     defaultOptions;
-    typeDefs;
     devtoolsConfig;
     queryManager;
     devToolsHookCb;
@@ -81,24 +79,19 @@ class ApolloClient {
      * ```
      */
     constructor(options) {
-        if (!options.cache) {
-            throw (0, invariant_1.newInvariantError)(58);
+        if (environment_1.__DEV__) {
+            (0, invariant_1.invariant)(options.cache, 58);
+            (0, invariant_1.invariant)(options.link, 59);
         }
-        const { uri, credentials, headers, cache, documentTransform, ssrMode = false, ssrForceFetchDelay = 0, 
+        const { cache, documentTransform, ssrMode = false, ssrForceFetchDelay = 0, 
         // Expose the client instance as window.__APOLLO_CLIENT__ and call
         // onBroadcast in queryManager.broadcastQueries to enable browser
         // devtools, but disable them by default in production.
-        connectToDevTools, queryDeduplication = true, defaultOptions, defaultContext, assumeImmutableResults = cache.assumeImmutableResults, resolvers, typeDefs, fragmentMatcher, name: clientAwarenessName, version: clientAwarenessVersion, devtools, dataMasking, } = options;
-        let { link } = options;
-        if (!link) {
-            link =
-                uri ? new http_1.HttpLink({ uri, credentials, headers }) : core_1.ApolloLink.empty();
-        }
+        connectToDevTools, queryDeduplication = true, defaultOptions, defaultContext, assumeImmutableResults = cache.assumeImmutableResults, resolvers, fragmentMatcher, name: clientAwarenessName, version: clientAwarenessVersion, devtools, dataMasking, link, } = options;
         this.link = link;
         this.cache = cache;
         this.queryDeduplication = queryDeduplication;
         this.defaultOptions = defaultOptions || {};
-        this.typeDefs = typeDefs;
         this.devtoolsConfig = {
             ...devtools,
             enabled: devtools?.enabled ?? connectToDevTools,
@@ -246,13 +239,13 @@ class ApolloClient {
             options = (0, utilities_1.mergeOptions)(this.defaultOptions.query, options);
         }
         if (environment_1.__DEV__) {
-            (0, invariant_1.invariant)(options.fetchPolicy !== "cache-and-network", 59);
-            (0, invariant_1.invariant)(options.fetchPolicy !== "standby", 60);
-            (0, invariant_1.invariant)(options.query, 61);
-            (0, invariant_1.invariant)(options.query.kind === "Document", 62);
-            (0, invariant_1.invariant)(!options.returnPartialData, 63);
-            (0, invariant_1.invariant)(!options.pollInterval, 64);
-            (0, invariant_1.invariant)(!options.notifyOnNetworkStatusChange, 65);
+            (0, invariant_1.invariant)(options.fetchPolicy !== "cache-and-network", 60);
+            (0, invariant_1.invariant)(options.fetchPolicy !== "standby", 61);
+            (0, invariant_1.invariant)(options.query, 62);
+            (0, invariant_1.invariant)(options.query.kind === "Document", 63);
+            (0, invariant_1.invariant)(!options.returnPartialData, 64);
+            (0, invariant_1.invariant)(!options.pollInterval, 65);
+            (0, invariant_1.invariant)(!options.notifyOnNetworkStatusChange, 66);
             (0, utilities_1.checkDocument)(options.query, graphql_1.OperationTypeNode.QUERY);
         }
         return this.queryManager.query(options);
@@ -372,7 +365,7 @@ class ApolloClient {
         this.devToolsHookCb = cb;
     }
     __requestRaw(payload) {
-        return (0, core_1.execute)(this.link, payload, { client: this });
+        return (0, link_1.execute)(this.link, payload, { client: this });
     }
     /**
      * Resets your entire store by clearing out your cache and then re-executing
@@ -474,7 +467,7 @@ class ApolloClient {
         // result.queries and result.results instead, you shouldn't have to worry
         // about preventing uncaught rejections for the Promise.all result.
         result.catch((error) => {
-            __DEV__ && invariant_1.invariant.debug(66, error);
+            __DEV__ && invariant_1.invariant.debug(67, error);
         });
         return result;
     }